aboutsummaryrefslogtreecommitdiff
path: root/pkgs
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/audio/gigedit/default.nix6
-rw-r--r--pkgs/applications/audio/gigedit/gigedit-1.1.0-pangomm-2.40.1.patch15
-rw-r--r--pkgs/applications/misc/librecad/default.nix70
-rw-r--r--pkgs/applications/misc/librecad/fix_qt_5_11_build.patch36
-rw-r--r--pkgs/applications/networking/irc/kvirc/default.nix6
-rw-r--r--pkgs/applications/networking/mailreaders/imapfilter.nix4
-rw-r--r--pkgs/build-support/rust/cargo-vendor/cargo-vendor.nix693
-rw-r--r--pkgs/build-support/rust/cargo-vendor/default.nix10
-rw-r--r--pkgs/build-support/rust/default-crate-overrides.nix5
-rw-r--r--pkgs/build-support/rust/fetchcargo.nix4
-rw-r--r--pkgs/development/tools/skopeo/default.nix4
-rw-r--r--pkgs/os-specific/linux/kernel/common-config.nix3
-rw-r--r--pkgs/tools/audio/beets/default.nix21
-rw-r--r--pkgs/tools/misc/diskus/default.nix10
-rw-r--r--pkgs/top-level/all-packages.nix4
15 files changed, 115 insertions, 776 deletions
diff --git a/pkgs/applications/audio/gigedit/default.nix b/pkgs/applications/audio/gigedit/default.nix
index d8fada45eb1..b8ec2d7116f 100644
--- a/pkgs/applications/audio/gigedit/default.nix
+++ b/pkgs/applications/audio/gigedit/default.nix
@@ -4,15 +4,13 @@
stdenv.mkDerivation rec {
pname = "gigedit";
- version = "1.1.0";
+ version = "1.1.1";
src = fetchurl {
url = "https://download.linuxsampler.org/packages/${pname}-${version}.tar.bz2";
- sha256 = "087pc919q28r1vw31c7w4m14bqnp4md1i2wbmk8w0vmwv2cbx2ni";
+ sha256 = "08db12crwf0dy1dbyrmivqqpg5zicjikqkmf2kb1ywpq0a9hcxrb";
};
- patches = [ ./gigedit-1.1.0-pangomm-2.40.1.patch ];
-
preConfigure = "make -f Makefile.svn";
nativeBuildInputs = [ autoconf automake intltool libtool pkgconfig which ];
diff --git a/pkgs/applications/audio/gigedit/gigedit-1.1.0-pangomm-2.40.1.patch b/pkgs/applications/audio/gigedit/gigedit-1.1.0-pangomm-2.40.1.patch
deleted file mode 100644
index eb00fcc87a2..00000000000
--- a/pkgs/applications/audio/gigedit/gigedit-1.1.0-pangomm-2.40.1.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/src/gigedit/wrapLabel.cc
-+++ b/src/gigedit/wrapLabel.cc
-@@ -64,12 +64,7 @@ WrapLabel::WrapLabel(const Glib::ustring &text) // IN: The label text
- : mWrapWidth(0),
- mWrapHeight(0)
- {
-- // pangomm >= 2.35.1
--#if PANGOMM_MAJOR_VERSION > 2 || (PANGOMM_MAJOR_VERSION == 2 && (PANGOMM_MINOR_VERSION > 35 || (PANGOMM_MINOR_VERSION == 35 && PANGOMM_MICRO_VERSION >= 1)))
-- get_layout()->set_wrap(Pango::WrapMode::WORD_CHAR);
--#else
- get_layout()->set_wrap(Pango::WRAP_WORD_CHAR);
--#endif
- set_alignment(0.0, 0.0);
- set_text(text);
- }
diff --git a/pkgs/applications/misc/librecad/default.nix b/pkgs/applications/misc/librecad/default.nix
index 09089a072b3..142dafe38eb 100644
--- a/pkgs/applications/misc/librecad/default.nix
+++ b/pkgs/applications/misc/librecad/default.nix
@@ -1,42 +1,64 @@
-{ stdenv, fetchurl, qt4, qmake4Hook, muparser, which, boost, pkgconfig }:
+{ mkDerivation, lib, fetchFromGitHub, installShellFiles, pkgconfig, runtimeShell
+, qtbase, qtsvg, qttools, qmake
+, boost, muparser }:
-stdenv.mkDerivation rec {
- version = "2.1.3";
+mkDerivation rec {
pname = "librecad";
+ version = "2.2.0-rc1";
- src = fetchurl {
- url = "https://github.com/LibreCAD/LibreCAD/tarball/${version}";
- name = "${pname}-${version}" + ".tar.gz";
- sha256 = "1czp8bja61hfav2m7184cq1np1n76w3w6vn0hlkp81hhz9zc62sx";
+ src = fetchFromGitHub {
+ owner = "LibreCAD";
+ repo = "LibreCAD";
+ rev = version;
+ sha256 = "0kwj838hqzbw95gl4x6scli9gj3gs72hdmrrkzwq5rjxam18k3f3";
};
- patchPhase = ''
- sed -i -e s,/bin/bash,`type -P bash`, scripts/postprocess-unix.sh
- sed -i -e s,/usr/share,$out/share, librecad/src/lib/engine/rs_system.cpp
+ patches = [ ./fix_qt_5_11_build.patch ];
+
+ postPatch = ''
+ substituteInPlace scripts/postprocess-unix.sh \
+ --replace /bin/sh ${runtimeShell}
+
+ substituteInPlace librecad/src/lib/engine/rs_system.cpp \
+ --replace /usr/share $out/share
+
+ substituteInPlace librecad/src/main/qc_applicationwindow.cpp \
+ --replace __DATE__ 0
'';
- qmakeFlags = [ "MUPARSER_DIR=${muparser}" "BOOST_DIR=${boost.dev}" ];
+ qmakeFlags = [
+ "MUPARSER_DIR=${muparser}"
+ "BOOST_DIR=${boost.dev}"
+ ];
installPhase = ''
- install -m 555 -D unix/librecad $out/bin/librecad
- install -m 444 -D desktop/librecad.desktop $out/share/applications/librecad.desktop
- install -m 444 -D desktop/librecad.sharedmimeinfo $out/share/mime/packages/librecad.xml
- install -m 444 -D desktop/graphics_icons_and_splash/Icon\ LibreCAD/Icon_Librecad.svg \
+ runHook preInstall
+
+ install -Dm555 -t $out/bin unix/{librecad,ttf2lff}
+ install -Dm444 -t $out/share/applications desktop/librecad.desktop
+ install -Dm644 -t $out/share/pixmaps librecad/res/main/librecad.png
+ install -Dm444 desktop/librecad.sharedmimeinfo $out/share/mime/packages/librecad.xml
+ install -Dm444 desktop/graphics_icons_and_splash/Icon\ LibreCAD/Icon_Librecad.svg \
$out/share/icons/hicolor/scalable/apps/librecad.svg
+
+ installManPage desktop/librecad.?
+
cp -R unix/resources $out/share/librecad
+
+ runHook postInstall
'';
- buildInputs = [ qt4 muparser which boost ];
- nativeBuildInputs = [ pkgconfig qmake4Hook ];
+ buildInputs = [ boost muparser qtbase qtsvg ];
+
+ nativeBuildInputs = [ installShellFiles pkgconfig qmake qttools ];
enableParallelBuilding = true;
- meta = {
- description = "A 2D CAD package based upon Qt";
- homepage = https://librecad.org;
- repositories.git = git://github.com/LibreCAD/LibreCAD.git;
- license = stdenv.lib.licenses.gpl2;
- maintainers = with stdenv.lib.maintainers; [viric];
- platforms = with stdenv.lib.platforms; linux;
+ meta = with lib; {
+ description = "2D CAD package based on Qt";
+ homepage = "https://librecad.org";
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ viric ];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/misc/librecad/fix_qt_5_11_build.patch b/pkgs/applications/misc/librecad/fix_qt_5_11_build.patch
new file mode 100644
index 00000000000..04701e5ab1e
--- /dev/null
+++ b/pkgs/applications/misc/librecad/fix_qt_5_11_build.patch
@@ -0,0 +1,36 @@
+diff --git a/librecad/src/ui/forms/qg_commandwidget.cpp b/librecad/src/ui/forms/qg_commandwidget.cpp
+index 835e47d..2c878e8 100644
+--- a/librecad/src/ui/forms/qg_commandwidget.cpp
++++ b/librecad/src/ui/forms/qg_commandwidget.cpp
+@@ -27,6 +27,7 @@
+
+ #include <algorithm>
+
++#include <QAction>
+ #include <QKeyEvent>
+ #include <QFileDialog>
+ #include <QSettings>
+diff --git a/librecad/src/ui/generic/colorwizard.cpp b/librecad/src/ui/generic/colorwizard.cpp
+index 2beaceb..84068ad 100644
+--- a/librecad/src/ui/generic/colorwizard.cpp
++++ b/librecad/src/ui/generic/colorwizard.cpp
+@@ -27,6 +27,7 @@
+ #include "colorwizard.h"
+ #include "ui_colorwizard.h"
+
++#include <QAction>
+ #include <QColorDialog>
+ #include <QLineEdit>
+ #include <QListWidget>
+diff --git a/librecad/src/ui/generic/widgetcreator.cpp b/librecad/src/ui/generic/widgetcreator.cpp
+index 7c35144..0e394f2 100644
+--- a/librecad/src/ui/generic/widgetcreator.cpp
++++ b/librecad/src/ui/generic/widgetcreator.cpp
+@@ -27,6 +27,7 @@
+ #include "widgetcreator.h"
+ #include "ui_widgetcreator.h"
+
++#include <QActionGroup>
+ #include <QSettings>
+ #include <QLineEdit>
+ #include <QPushButton>
diff --git a/pkgs/applications/networking/irc/kvirc/default.nix b/pkgs/applications/networking/irc/kvirc/default.nix
index bd38855109a..6fd66096b5b 100644
--- a/pkgs/applications/networking/irc/kvirc/default.nix
+++ b/pkgs/applications/networking/irc/kvirc/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchFromGitHub
+{ lib, mkDerivation, fetchFromGitHub
, qtbase, qtmultimedia, qtsvg, qtx11extras
, pkgconfig, cmake, gettext
}:
-stdenv.mkDerivation rec {
+mkDerivation rec {
pname = "kvirc";
version = "5.0.0";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
pkgconfig cmake gettext
];
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Advanced IRC Client";
homepage = "http://www.kvirc.net/";
license = licenses.gpl2;
diff --git a/pkgs/applications/networking/mailreaders/imapfilter.nix b/pkgs/applications/networking/mailreaders/imapfilter.nix
index 78b1aad03fb..7d7972c3e58 100644
--- a/pkgs/applications/networking/mailreaders/imapfilter.nix
+++ b/pkgs/applications/networking/mailreaders/imapfilter.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "imapfilter";
- version = "2.6.12";
+ version = "2.6.13";
src = fetchFromGitHub {
owner = "lefcha";
repo = "imapfilter";
rev = "v${version}";
- sha256 = "0vzpc54fjf5vb5vx5w0fl20xvx1k9cg6a3hbl86mm8kwsqf3wrab";
+ sha256 = "02997rnnvid3rfkxmlgjpbspi4svdmq8r8wd2zvf25iadim3hxqi";
};
makeFlagsArray = "PREFIX=$(out)";
diff --git a/pkgs/build-support/rust/cargo-vendor/cargo-vendor.nix b/pkgs/build-support/rust/cargo-vendor/cargo-vendor.nix
deleted file mode 100644
index 9af5cbe652c..00000000000
--- a/pkgs/build-support/rust/cargo-vendor/cargo-vendor.nix
+++ /dev/null
@@ -1,693 +0,0 @@
-# Generated by carnix 0.10.0: carnix generate-nix --src .
-{ lib, buildPlatform, buildRustCrate, buildRustCrateHelpers, cratesIO, fetchgit }:
-with buildRustCrateHelpers;
-let inherit (lib.lists) fold;
- inherit (lib.attrsets) recursiveUpdate;
-in
-rec {
- crates = cratesIO // rec {
-# cargo-vendor-0.1.23
-
- crates.cargo_vendor."0.1.23" = deps: { features?(features_.cargo_vendor."0.1.23" deps {}) }: buildRustCrate {
- crateName = "cargo-vendor";
- version = "0.1.23";
- description = "A Cargo subcommand to vendor all crates.io dependencies onto the local\nfilesystem.\n";
- authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
- edition = "2018";
- src = exclude [ ".git" "target" ] ./.;
- dependencies = mapFeatures features ([
- (cratesIO.crates."cargo"."${deps."cargo_vendor"."0.1.23"."cargo"}" deps)
- (cratesIO.crates."docopt"."${deps."cargo_vendor"."0.1.23"."docopt"}" deps)
- (cratesIO.crates."env_logger"."${deps."cargo_vendor"."0.1.23"."env_logger"}" deps)
- (cratesIO.crates."failure"."${deps."cargo_vendor"."0.1.23"."failure"}" deps)
- (cratesIO.crates."serde"."${deps."cargo_vendor"."0.1.23"."serde"}" deps)
- (cratesIO.crates."serde_json"."${deps."cargo_vendor"."0.1.23"."serde_json"}" deps)
- (cratesIO.crates."toml"."${deps."cargo_vendor"."0.1.23"."toml"}" deps)
- ]
- ++ (if features.cargo_vendor."0.1.23".openssl or false then [ (cratesIO.crates.openssl."${deps."cargo_vendor"."0.1.23".openssl}" deps) ] else []));
- features = mkFeatures (features."cargo_vendor"."0.1.23" or {});
- };
- features_.cargo_vendor."0.1.23" = deps: f: updateFeatures f (rec {
- cargo."${deps.cargo_vendor."0.1.23".cargo}".default = true;
- cargo_vendor."0.1.23".default = (f.cargo_vendor."0.1.23".default or true);
- docopt."${deps.cargo_vendor."0.1.23".docopt}".default = true;
- env_logger."${deps.cargo_vendor."0.1.23".env_logger}".default = true;
- failure."${deps.cargo_vendor."0.1.23".failure}".default = true;
- openssl = fold recursiveUpdate {} [
- { "${deps.cargo_vendor."0.1.23".openssl}"."vendored" =
- (f.openssl."${deps.cargo_vendor."0.1.23".openssl}"."vendored" or false) ||
- (cargo_vendor."0.1.23"."vendored-openssl" or false) ||
- (f."cargo_vendor"."0.1.23"."vendored-openssl" or false); }
- { "${deps.cargo_vendor."0.1.23".openssl}".default = true; }
- ];
- serde = fold recursiveUpdate {} [
- { "${deps.cargo_vendor."0.1.23".serde}"."derive" = true; }
- { "${deps.cargo_vendor."0.1.23".serde}".default = true; }
- ];
- serde_json."${deps.cargo_vendor."0.1.23".serde_json}".default = true;
- toml."${deps.cargo_vendor."0.1.23".toml}".default = true;
- }) [
- (cratesIO.features_.cargo."${deps."cargo_vendor"."0.1.23"."cargo"}" deps)
- (cratesIO.features_.docopt."${deps."cargo_vendor"."0.1.23"."docopt"}" deps)
- (cratesIO.features_.env_logger."${deps."cargo_vendor"."0.1.23"."env_logger"}" deps)
- (cratesIO.features_.failure."${deps."cargo_vendor"."0.1.23"."failure"}" deps)
- (cratesIO.features_.openssl."${deps."cargo_vendor"."0.1.23"."openssl"}" deps)
- (cratesIO.features_.serde."${deps."cargo_vendor"."0.1.23"."serde"}" deps)
- (cratesIO.features_.serde_json."${deps."cargo_vendor"."0.1.23"."serde_json"}" deps)
- (cratesIO.features_.toml."${deps."cargo_vendor"."0.1.23"."toml"}" deps)
- ];
-
-
-# end
-
- };
-
- cargo_vendor = crates.crates.cargo_vendor."0.1.23" deps;
- __all = [ (cargo_vendor {}) ];
- deps.adler32."1.0.3" = {};
- deps.aho_corasick."0.7.3" = {
- memchr = "2.2.0";
- };
- deps.ansi_term."0.11.0" = {
- winapi = "0.3.7";
- };
- deps.atty."0.2.11" = {
- termion = "1.5.1";
- libc = "0.2.51";
- winapi = "0.3.7";
- };
- deps.autocfg."0.1.2" = {};
- deps.backtrace."0.3.15" = {
- cfg_if = "0.1.7";
- rustc_demangle = "0.1.14";
- autocfg = "0.1.2";
- backtrace_sys = "0.1.28";
- libc = "0.2.51";
- winapi = "0.3.7";
- };
- deps.backtrace_sys."0.1.28" = {
- libc = "0.2.51";
- cc = "1.0.35";
- };
- deps.bitflags."1.0.4" = {};
- deps.bstr."0.1.2" = {
- memchr = "2.2.0";
- };
- deps.build_const."0.2.1" = {};
- deps.byteorder."1.3.1" = {};
- deps.bytes."0.4.12" = {
- byteorder = "1.3.1";
- iovec = "0.1.2";
- };
- deps.bytesize."1.0.0" = {};
- deps.cargo."0.35.0" = {
- atty = "0.2.11";
- byteorder = "1.3.1";
- bytesize = "1.0.0";
- clap = "2.33.0";
- crates_io = "0.23.0";
- crossbeam_utils = "0.6.5";
- crypto_hash = "0.3.3";
- curl = "0.4.21";
- curl_sys = "0.4.18";
- env_logger = "0.6.1";
- failure = "0.1.5";
- filetime = "0.2.4";
- flate2 = "1.0.7";
- fs2 = "0.4.3";
- git2 = "0.8.0";
- git2_curl = "0.9.0";
- glob = "0.2.11";
- hex = "0.3.2";
- home = "0.3.4";
- ignore = "0.4.7";
- im_rc = "12.3.4";
- jobserver = "0.1.13";
- lazy_static = "1.3.0";
- lazycell = "1.2.1";
- libc = "0.2.51";
- libgit2_sys = "0.7.11";
- log = "0.4.6";
- num_cpus = "1.10.0";
- opener = "0.3.2";
- rustc_workspace_hack = "1.0.0";
- rustfix = "0.4.5";
- same_file = "1.0.4";
- semver = "0.9.0";
- serde = "1.0.90";
- serde_ignored = "0.0.4";
- serde_json = "1.0.39";
- shell_escape = "0.1.4";
- tar = "0.4.22";
- tempfile = "3.0.7";
- termcolor = "1.0.4";
- toml = "0.4.10";
- unicode_width = "0.1.5";
- url = "1.7.2";
- url_serde = "0.2.0";
- core_foundation = "0.6.4";
- fwdansi = "1.0.1";
- miow = "0.3.3";
- winapi = "0.3.7";
- };
- deps.cargo_vendor."0.1.23" = {
- cargo = "0.35.0";
- docopt = "1.1.0";
- env_logger = "0.6.1";
- failure = "0.1.5";
- openssl = "0.10.20";
- serde = "1.0.90";
- serde_json = "1.0.39";
- toml = "0.5.0";
- };
- deps.cc."1.0.35" = {};
- deps.cfg_if."0.1.7" = {};
- deps.clap."2.33.0" = {
- atty = "0.2.11";
- bitflags = "1.0.4";
- strsim = "0.8.0";
- textwrap = "0.11.0";
- unicode_width = "0.1.5";
- vec_map = "0.8.1";
- ansi_term = "0.11.0";
- };
- deps.cloudabi."0.0.3" = {
- bitflags = "1.0.4";
- };
- deps.commoncrypto."0.2.0" = {
- commoncrypto_sys = "0.2.0";
- };
- deps.commoncrypto_sys."0.2.0" = {
- libc = "0.2.51";
- };
- deps.core_foundation."0.6.4" = {
- core_foundation_sys = "0.6.2";
- libc = "0.2.51";
- };
- deps.core_foundation_sys."0.6.2" = {};
- deps.crates_io."0.23.0" = {
- curl = "0.4.21";
- failure = "0.1.5";
- http = "0.1.17";
- serde = "1.0.90";
- serde_derive = "1.0.90";
- serde_json = "1.0.39";
- url = "1.7.2";
- };
- deps.crc."1.8.1" = {
- build_const = "0.2.1";
- };
- deps.crc32fast."1.2.0" = {
- cfg_if = "0.1.7";
- };
- deps.crossbeam_channel."0.3.8" = {
- crossbeam_utils = "0.6.5";
- smallvec = "0.6.9";
- };
- deps.crossbeam_utils."0.6.5" = {
- cfg_if = "0.1.7";
- lazy_static = "1.3.0";
- };
- deps.crypto_hash."0.3.3" = {
- hex = "0.3.2";
- commoncrypto = "0.2.0";
- openssl = "0.10.20";
- winapi = "0.3.7";
- };
- deps.curl."0.4.21" = {
- curl_sys = "0.4.18";
- libc = "0.2.51";
- socket2 = "0.3.8";
- openssl_probe = "0.1.2";
- openssl_sys = "0.9.43";
- kernel32_sys = "0.2.2";
- schannel = "0.1.15";
- winapi = "0.2.8";
- };
- deps.curl_sys."0.4.18" = {
- libc = "0.2.51";
- libnghttp2_sys = "0.1.1";
- libz_sys = "1.0.25";
- cc = "1.0.35";
- pkg_config = "0.3.14";
- openssl_sys = "0.9.43";
- winapi = "0.3.7";
- };
- deps.docopt."1.1.0" = {
- lazy_static = "1.3.0";
- regex = "1.1.6";
- serde = "1.0.90";
- strsim = "0.9.1";
- };
- deps.either."1.5.2" = {};
- deps.env_logger."0.6.1" = {
- atty = "0.2.11";
- humantime = "1.2.0";
- log = "0.4.6";
- regex = "1.1.6";
- termcolor = "1.0.4";
- };
- deps.failure."0.1.5" = {
- backtrace = "0.3.15";
- failure_derive = "0.1.5";
- };
- deps.failure_derive."0.1.5" = {
- proc_macro2 = "0.4.27";
- quote = "0.6.12";
- syn = "0.15.32";
- synstructure = "0.10.1";
- };
- deps.filetime."0.2.4" = {
- cfg_if = "0.1.7";
- redox_syscall = "0.1.54";
- libc = "0.2.51";
- };
- deps.flate2."1.0.7" = {
- crc32fast = "1.2.0";
- libc = "0.2.51";
- libz_sys = "1.0.25";
- miniz_sys = "0.1.11";
- miniz_oxide_c_api = "0.2.1";
- };
- deps.fnv."1.0.6" = {};
- deps.foreign_types."0.3.2" = {
- foreign_types_shared = "0.1.1";
- };
- deps.foreign_types_shared."0.1.1" = {};
- deps.fs2."0.4.3" = {
- libc = "0.2.51";
- winapi = "0.3.7";
- };
- deps.fuchsia_cprng."0.1.1" = {};
- deps.fwdansi."1.0.1" = {
- memchr = "2.2.0";
- termcolor = "1.0.4";
- };
- deps.git2."0.8.0" = {
- bitflags = "1.0.4";
- libc = "0.2.51";
- libgit2_sys = "0.7.11";
- log = "0.4.6";
- url = "1.7.2";
- openssl_probe = "0.1.2";
- openssl_sys = "0.9.43";
- };
- deps.git2_curl."0.9.0" = {
- curl = "0.4.21";
- git2 = "0.8.0";
- log = "0.4.6";
- url = "1.7.2";
- };
- deps.glob."0.2.11" = {};
- deps.globset."0.4.3" = {
- aho_corasick = "0.7.3";
- bstr = "0.1.2";
- fnv = "1.0.6";
- log = "0.4.6";
- regex = "1.1.6";
- };
- deps.hashbrown."0.1.8" = {
- byteorder = "1.3.1";
- scopeguard = "0.3.3";
- };
- deps.hex."0.3.2" = {};
- deps.home."0.3.4" = {
- scopeguard = "0.3.3";
- winapi = "0.3.7";
- };
- deps.http."0.1.17" = {
- bytes = "0.4.12";
- fnv = "1.0.6";
- itoa = "0.4.3";
- };
- deps.humantime."1.2.0" = {
- quick_error = "1.2.2";
- };
- deps.idna."0.1.5" = {
- matches = "0.1.8";
- unicode_bidi = "0.3.4";
- unicode_normalization = "0.1.8";
- };
- deps.ignore."0.4.7" = {
- crossbeam_channel = "0.3.8";
- globset = "0.4.3";
- lazy_static = "1.3.0";
- log = "0.4.6";
- memchr = "2.2.0";
- regex = "1.1.6";
- same_file = "1.0.4";
- thread_local = "0.3.6";
- walkdir = "2.2.7";
- winapi_util = "0.1.2";
- };
- deps.im_rc."12.3.4" = {
- sized_chunks = "0.1.3";
- typenum = "1.10.0";
- rustc_version = "0.2.3";
- };
- deps.iovec."0.1.2" = {
- libc = "0.2.51";
- winapi = "0.2.8";
- };
- deps.itertools."0.7.11" = {
- either = "1.5.2";
- };
- deps.itoa."0.4.3" = {};
- deps.jobserver."0.1.13" = {
- log = "0.4.6";
- libc = "0.2.51";
- rand = "0.6.5";
- };
- deps.kernel32_sys."0.2.2" = {
- winapi = "0.2.8";
- winapi_build = "0.1.1";
- };
- deps.lazy_static."1.3.0" = {};
- deps.lazycell."1.2.1" = {};
- deps.libc."0.2.51" = {};
- deps.libgit2_sys."0.7.11" = {
- curl_sys = "0.4.18";
- libc = "0.2.51";
- libssh2_sys = "0.2.11";
- libz_sys = "1.0.25";
- cc = "1.0.35";
- pkg_config = "0.3.14";
- openssl_sys = "0.9.43";
- };
- deps.libnghttp2_sys."0.1.1" = {
- libc = "0.2.51";
- cc = "1.0.35";
- };
- deps.libssh2_sys."0.2.11" = {
- libc = "0.2.51";
- libz_sys = "1.0.25";
- cc = "1.0.35";
- pkg_config = "0.3.14";
- openssl_sys = "0.9.43";
- };
- deps.libz_sys."1.0.25" = {
- libc = "0.2.51";
- cc = "1.0.35";
- pkg_config = "0.3.14";
- };
- deps.lock_api."0.1.5" = {
- scopeguard = "0.3.3";
- };
- deps.log."0.4.6" = {
- cfg_if = "0.1.7";
- };
- deps.matches."0.1.8" = {};
- deps.matrixmultiply."0.1.15" = {
- rawpointer = "0.1.0";
- };
- deps.memchr."2.2.0" = {};
- deps.miniz_sys."0.1.11" = {
- libc = "0.2.51";
- cc = "1.0.35";
- };
- deps.miniz_oxide."0.2.1" = {
- adler32 = "1.0.3";
- };
- deps.miniz_oxide_c_api."0.2.1" = {
- crc = "1.8.1";
- libc = "0.2.51";
- miniz_oxide = "0.2.1";
- cc = "1.0.35";
- };
- deps.miow."0.3.3" = {
- socket2 = "0.3.8";
- winapi = "0.3.7";
- };
- deps.ndarray."0.12.1" = {
- itertools = "0.7.11";
- matrixmultiply = "0.1.15";
- num_complex = "0.2.1";
- num_traits = "0.2.6";
- };
- deps.num_complex."0.2.1" = {
- num_traits = "0.2.6";
- };
- deps.num_traits."0.2.6" = {};
- deps.num_cpus."1.10.0" = {
- libc = "0.2.51";
- };
- deps.once_cell."0.1.8" = {
- parking_lot = "0.7.1";
- };
- deps.opener."0.3.2" = {
- failure = "0.1.5";
- failure_derive = "0.1.5";
- winapi = "0.3.7";
- };
- deps.openssl."0.10.20" = {
- bitflags = "1.0.4";
- cfg_if = "0.1.7";
- foreign_types = "0.3.2";
- lazy_static = "1.3.0";
- libc = "0.2.51";
- openssl_sys = "0.9.43";
- };
- deps.openssl_probe."0.1.2" = {};
- deps.openssl_src."111.2.1+1.1.1b" = {
- cc = "1.0.35";
- };
- deps.openssl_sys."0.9.43" = {
- libc = "0.2.51";
- cc = "1.0.35";
- openssl_src = "111.2.1+1.1.1b";
- pkg_config = "0.3.14";
- rustc_version = "0.2.3";
- };
- deps.parking_lot."0.7.1" = {
- lock_api = "0.1.5";
- parking_lot_core = "0.4.0";
- };
- deps.parking_lot_core."0.4.0" = {
- rand = "0.6.5";
- smallvec = "0.6.9";
- rustc_version = "0.2.3";
- libc = "0.2.51";
- winapi = "0.3.7";
- };
- deps.percent_encoding."1.0.1" = {};
- deps.pkg_config."0.3.14" = {};
- deps.proc_macro2."0.4.27" = {
- unicode_xid = "0.1.0";
- };
- deps.quick_error."1.2.2" = {};
- deps.quote."0.6.12" = {
- proc_macro2 = "0.4.27";
- };
- deps.rand."0.6.5" = {
- rand_chacha = "0.1.1";
- rand_core = "0.4.0";
- rand_hc = "0.1.0";
- rand_isaac = "0.1.1";
- rand_jitter = "0.1.3";
- rand_os = "0.1.3";
- rand_pcg = "0.1.2";
- rand_xorshift = "0.1.1";
- autocfg = "0.1.2";
- libc = "0.2.51";
- winapi = "0.3.7";
- };
- deps.rand_chacha."0.1.1" = {
- rand_core = "0.3.1";
- autocfg = "0.1.2";
- };
- deps.rand_core."0.3.1" = {
- rand_core = "0.4.0";
- };
- deps.rand_core."0.4.0" = {};
- deps.rand_hc."0.1.0" = {
- rand_core = "0.3.1";
- };
- deps.rand_isaac."0.1.1" = {
- rand_core = "0.3.1";
- };
- deps.rand_jitter."0.1.3" = {
- rand_core = "0.4.0";
- libc = "0.2.51";
- winapi = "0.3.7";
- };
- deps.rand_os."0.1.3" = {
- rand_core = "0.4.0";
- rdrand = "0.4.0";
- cloudabi = "0.0.3";
- fuchsia_cprng = "0.1.1";
- libc = "0.2.51";
- winapi = "0.3.7";
- };
- deps.rand_pcg."0.1.2" = {
- rand_core = "0.4.0";
- autocfg = "0.1.2";
- };
- deps.rand_xorshift."0.1.1" = {
- rand_core = "0.3.1";
- };
- deps.rawpointer."0.1.0" = {};
- deps.rdrand."0.4.0" = {
- rand_core = "0.3.1";
- };
- deps.redox_syscall."0.1.54" = {};
- deps.redox_termios."0.1.1" = {
- redox_syscall = "0.1.54";
- };
- deps.regex."1.1.6" = {
- aho_corasick = "0.7.3";
- memchr = "2.2.0";
- regex_syntax = "0.6.6";
- thread_local = "0.3.6";
- utf8_ranges = "1.0.2";
- };
- deps.regex_syntax."0.6.6" = {
- ucd_util = "0.1.3";
- };
- deps.remove_dir_all."0.5.1" = {
- winapi = "0.3.7";
- };
- deps.rustc_demangle."0.1.14" = {};
- deps.rustc_workspace_hack."1.0.0" = {};
- deps.rustc_version."0.2.3" = {
- semver = "0.9.0";
- };
- deps.rustfix."0.4.5" = {
- failure = "0.1.5";
- log = "0.4.6";
- serde = "1.0.90";
- serde_derive = "1.0.90";
- serde_json = "1.0.39";
- };
- deps.ryu."0.2.7" = {};
- deps.same_file."1.0.4" = {
- winapi_util = "0.1.2";
- };
- deps.schannel."0.1.15" = {
- lazy_static = "1.3.0";
- winapi = "0.3.7";
- };
- deps.scopeguard."0.3.3" = {};
- deps.semver."0.9.0" = {
- semver_parser = "0.7.0";
- serde = "1.0.90";
- };
- deps.semver_parser."0.7.0" = {};
- deps.serde."1.0.90" = {
- serde_derive = "1.0.90";
- };
- deps.serde_derive."1.0.90" = {
- proc_macro2 = "0.4.27";
- quote = "0.6.12";
- syn = "0.15.32";
- };
- deps.serde_ignored."0.0.4" = {
- serde = "1.0.90";
- };
- deps.serde_json."1.0.39" = {
- itoa = "0.4.3";
- ryu = "0.2.7";
- serde = "1.0.90";
- };
- deps.shell_escape."0.1.4" = {};
- deps.sized_chunks."0.1.3" = {
- typenum = "1.10.0";
- };
- deps.smallvec."0.6.9" = {};
- deps.socket2."0.3.8" = {
- cfg_if = "0.1.7";
- libc = "0.2.51";
- redox_syscall = "0.1.54";
- winapi = "0.3.7";
- };
- deps.strsim."0.8.0" = {};
- deps.strsim."0.9.1" = {
- hashbrown = "0.1.8";
- ndarray = "0.12.1";
- };
- deps.syn."0.15.32" = {
- proc_macro2 = "0.4.27";
- quote = "0.6.12";
- unicode_xid = "0.1.0";
- };
- deps.synstructure."0.10.1" = {
- proc_macro2 = "0.4.27";
- quote = "0.6.12";
- syn = "0.15.32";
- unicode_xid = "0.1.0";
- };
- deps.tar."0.4.22" = {
- filetime = "0.2.4";
- redox_syscall = "0.1.54";
- libc = "0.2.51";
- };
- deps.tempfile."3.0.7" = {
- cfg_if = "0.1.7";
- rand = "0.6.5";
- remove_dir_all = "0.5.1";
- redox_syscall = "0.1.54";
- libc = "0.2.51";
- winapi = "0.3.7";
- };
- deps.termcolor."1.0.4" = {
- wincolor = "1.0.1";
- };
- deps.termion."1.5.1" = {
- libc = "0.2.51";
- redox_syscall = "0.1.54";
- redox_termios = "0.1.1";
- };
- deps.textwrap."0.11.0" = {
- unicode_width = "0.1.5";
- };
- deps.thread_local."0.3.6" = {
- lazy_static = "1.3.0";
- };
- deps.toml."0.4.10" = {
- serde = "1.0.90";
- };
- deps.toml."0.5.0" = {
- serde = "1.0.90";
- };
- deps.typenum."1.10.0" = {};
- deps.ucd_util."0.1.3" = {};
- deps.unicode_bidi."0.3.4" = {
- matches = "0.1.8";
- };
- deps.unicode_normalization."0.1.8" = {
- smallvec = "0.6.9";
- };
- deps.unicode_width."0.1.5" = {};
- deps.unicode_xid."0.1.0" = {};
- deps.url."1.7.2" = {
- idna = "0.1.5";
- matches = "0.1.8";
- percent_encoding = "1.0.1";
- };
- deps.url_serde."0.2.0" = {
- serde = "1.0.90";
- url = "1.7.2";
- };
- deps.utf8_ranges."1.0.2" = {};
- deps.vcpkg."0.2.6" = {};
- deps.vec_map."0.8.1" = {};
- deps.walkdir."2.2.7" = {
- same_file = "1.0.4";
- winapi = "0.3.7";
- winapi_util = "0.1.2";
- };
- deps.winapi."0.2.8" = {};
- deps.winapi."0.3.7" = {
- winapi_i686_pc_windows_gnu = "0.4.0";
- winapi_x86_64_pc_windows_gnu = "0.4.0";
- };
- deps.winapi_build."0.1.1" = {};
- deps.winapi_i686_pc_windows_gnu."0.4.0" = {};
- deps.winapi_util."0.1.2" = {
- winapi = "0.3.7";
- };
- deps.winapi_x86_64_pc_windows_gnu."0.4.0" = {};
- deps.wincolor."1.0.1" = {
- winapi = "0.3.7";
- winapi_util = "0.1.2";
- };
-}
diff --git a/pkgs/build-support/rust/cargo-vendor/default.nix b/pkgs/build-support/rust/cargo-vendor/default.nix
deleted file mode 100644
index f252c6a6cb1..00000000000
--- a/pkgs/build-support/rust/cargo-vendor/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ callPackage, fetchFromGitHub }:
-
-((callPackage ./cargo-vendor.nix {}).cargo_vendor {}).overrideAttrs (attrs: {
- src = fetchFromGitHub {
- owner = "alexcrichton";
- repo = "cargo-vendor";
- rev = "9355661303ce2870d68a69d99953fce22581e31e";
- sha256 = "0d4j3r09am3ynwhczimzv39264f5xz37jxa9js123y46w5by3wd2";
- };
-})
diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix
index b3ab9f5ba78..1c4fe9daead 100644
--- a/pkgs/build-support/rust/default-crate-overrides.nix
+++ b/pkgs/build-support/rust/default-crate-overrides.nix
@@ -15,11 +15,6 @@ in
++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security libiconv ];
};
- cargo-vendor = attrs: {
- buildInputs = [ openssl zlib curl ]
- ++ stdenv.lib.optionals stdenv.isDarwin [ Security ];
- };
-
libz-sys = attrs: {
buildInputs = [ pkgconfig zlib ];
extraLinkFlags = ["-L${zlib.out}/lib"];
diff --git a/pkgs/build-support/rust/fetchcargo.nix b/pkgs/build-support/rust/fetchcargo.nix
index 4e6058383d4..bc80db0947b 100644
--- a/pkgs/build-support/rust/fetchcargo.nix
+++ b/pkgs/build-support/rust/fetchcargo.nix
@@ -1,4 +1,4 @@
-{ stdenv, cacert, git, cargo, cargo-vendor, python3 }:
+{ stdenv, cacert, git, cargo, python3 }:
let cargo-vendor-normalise = stdenv.mkDerivation {
name = "cargo-vendor-normalise";
src = ./cargo-vendor-normalise.py;
@@ -20,7 +20,7 @@ in
{ name ? "cargo-deps", src, srcs, patches, sourceRoot, sha256, cargoUpdateHook ? "" }:
stdenv.mkDerivation {
name = "${name}-vendor";
- nativeBuildInputs = [ cacert cargo-vendor git cargo-vendor-normalise cargo ];
+ nativeBuildInputs = [ cacert git cargo-vendor-normalise cargo ];
inherit src srcs patches sourceRoot;
phases = "unpackPhase patchPhase installPhase";
diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix
index e7b21c40f17..e36f34bb10c 100644
--- a/pkgs/development/tools/skopeo/default.nix
+++ b/pkgs/development/tools/skopeo/default.nix
@@ -5,13 +5,13 @@
with stdenv.lib;
let
- version = "0.1.37";
+ version = "0.1.39";
src = fetchFromGitHub {
rev = "v${version}";
owner = "containers";
repo = "skopeo";
- sha256 = "1ly5yq3aj4ciqn6hbhvxqp1im81pbas9smdhbbks7iwjvh944d62";
+ sha256 = "1jkxmvh079pd9j4aa39ilmclwafnjs0yqdiigwh8cj7yf97x4vsi";
};
defaultPolicyFile = runCommand "skopeo-default-policy.json" {} "cp ${src}/default-policy.json $out";
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 4ad222b83e4..3b409f15aba 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -52,6 +52,9 @@ let
CPU_FREQ_DEFAULT_GOV_PERFORMANCE = yes;
CPU_FREQ_GOV_SCHEDUTIL = whenAtLeast "4.9" yes;
PM_WAKELOCKS = yes;
+ # Power-capping framework and support for INTEL RAPL
+ POWERCAP = yes;
+ INTEL_RAPL = module;
};
external-firmware = {
diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix
index 21e748cc79d..241e552b05c 100644
--- a/pkgs/tools/audio/beets/default.nix
+++ b/pkgs/tools/audio/beets/default.nix
@@ -17,9 +17,12 @@
, enableKeyfinder ? true, keyfinder-cli ? null
, enableKodiupdate ? true
, enableLastfm ? true
+, enableLoadext ? true
, enableMpd ? true
+, enablePlaylist ? true
, enableReplaygain ? true, bs1770gain ? null
, enableSonosUpdate ? true
+, enableSubsonicupdate ? true
, enableThumbnails ? true
, enableWeb ? true
@@ -60,10 +63,13 @@ let
kodiupdate = enableKodiupdate;
lastgenre = enableLastfm;
lastimport = enableLastfm;
+ loadext = enableLoadext;
mpdstats = enableMpd;
mpdupdate = enableMpd;
+ playlist = enablePlaylist;
replaygain = enableReplaygain;
sonosupdate = enableSonosUpdate;
+ subsonicupdate = enableSubsonicupdate;
thumbnails = enableThumbnails;
web = enableWeb;
};
@@ -102,13 +108,13 @@ let
in pythonPackages.buildPythonApplication rec {
pname = "beets";
- version = "1.4.7";
+ version = "1.4.9";
src = fetchFromGitHub {
owner = "beetbox";
repo = "beets";
rev = "v${version}";
- sha256 = "17gfz0g7pqm6wha8zf63zpw07zgi787w1bjwdcxdh1l3z4m7jc9l";
+ sha256 = "1qxdqbzvz97zgykzdwn78g2xyxmg0q2jdb12dnjnrwvhmjv67vi8";
};
propagatedBuildInputs = [
@@ -127,6 +133,9 @@ in pythonPackages.buildPythonApplication rec {
++ optional (enableFetchart
|| enableEmbyupdate
|| enableKodiupdate
+ || enableLoadext
+ || enablePlaylist
+ || enableSubsonicupdate
|| enableAcousticbrainz)
pythonPackages.requests
++ optional enableConvert ffmpeg
@@ -160,14 +169,6 @@ in pythonPackages.buildPythonApplication rec {
patches = [
./replaygain-default-bs1770gain.patch
./keyfinder-default-bin.patch
-
- # Fix Python 3.7 compatibility
- (fetchpatch {
- url = "https://github.com/beetbox/beets/commit/"
- + "15d44f02a391764da1ce1f239caef819f08beed8.patch";
- sha256 = "12rjb4959nvnrm3fvvki7chxjkipa0cy8i0yi132xrcn8141dnpm";
- excludes = [ "docs/changelog.rst" ];
- })
];
postPatch = ''
diff --git a/pkgs/tools/misc/diskus/default.nix b/pkgs/tools/misc/diskus/default.nix
index 591cd5fe040..7b1e5ed6c0a 100644
--- a/pkgs/tools/misc/diskus/default.nix
+++ b/pkgs/tools/misc/diskus/default.nix
@@ -2,18 +2,18 @@
rustPlatform.buildRustPackage rec {
pname = "diskus";
- version = "0.5.0";
+ version = "0.6.0";
src = fetchFromGitHub {
owner = "sharkdp";
repo = "diskus";
rev = "v${version}";
- sha256 = "18scxspi5ncags8bnxq4ah9w8hrlwwlgpq7q9qfh4d81asmbyr8n";
+ sha256 = "087w58q5kd3r23a9qnhqgvq4vhv69b5a6a7n3kh09g5cjszy8s05";
};
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
- cargoSha256 = "13d4h6f3idwj2bxafqrjihgwwr8v3k158r7b569jp7q2v1msqqx1";
+ cargoSha256 = "07wsl1vw2aimgmrlri03pfcxv13klqxyvmmsbzgnq9sc9qzzy8gp";
meta = with stdenv.lib; {
description = "A minimal, fast alternative to 'du -sh'";
@@ -21,5 +21,9 @@ rustPlatform.buildRustPackage rec {
license = with licenses; [ asl20 /* or */ mit ];
maintainers = [ maintainers.fuerbringer ];
platforms = platforms.unix;
+ longDescription = ''
+ diskus is a very simple program that computes the total size of the
+ current directory. It is a parallelized version of du -sh.
+ '';
};
}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c6a018f7f2b..6e4e3ba468e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8319,7 +8319,6 @@ in
buildRustCrateHelpers = callPackage ../build-support/rust/build-rust-crate/helpers.nix { };
buildRustCrateTests = recurseIntoAttrs (callPackage ../build-support/rust/build-rust-crate/test { }).tests;
cratesIO = callPackage ../build-support/rust/crates-io.nix { };
- cargo-vendor = callPackage ../build-support/rust/cargo-vendor { };
cargo-web = callPackage ../development/tools/cargo-web {
inherit (darwin.apple_sdk.frameworks) CoreServices Security;
@@ -18301,7 +18300,6 @@ in
libpng = libpng_apng;
python = python2;
gnused = gnused_422;
- icu = icu63;
inherit (darwin.apple_sdk.frameworks) CoreMedia ExceptionHandling
Kerberos AVFoundation MediaToolbox
CoreLocation Foundation AddressBook;
@@ -19143,7 +19141,7 @@ in
libowfat = callPackage ../development/libraries/libowfat { };
- librecad = callPackage ../applications/misc/librecad { };
+ librecad = libsForQt5.callPackage ../applications/misc/librecad { };
libreoffice = hiPrio libreoffice-still;
libreoffice-unwrapped = libreoffice.libreoffice;
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-29 00:02:06 +0000