From 3cf05b37f2215eb225a9b36b565ef30516845b79 Mon Sep 17 00:00:00 2001 From: Mario Rodas <marsam@users.noreply.github.com> Date: Tue, 29 Dec 2020 04:20:00 +0000 Subject: [PATCH 001/188] ruby: update RVM patchsets --- pkgs/development/interpreters/ruby/rvm-patchsets.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/ruby/rvm-patchsets.nix b/pkgs/development/interpreters/ruby/rvm-patchsets.nix index 14f932e1d65c..3c2113d608c5 100644 --- a/pkgs/development/interpreters/ruby/rvm-patchsets.nix +++ b/pkgs/development/interpreters/ruby/rvm-patchsets.nix @@ -3,6 +3,6 @@ fetchFromGitHub { owner = "skaes"; repo = "rvm-patchsets"; - rev = "e2f4b82e47aeaf2a3b894da3b46ba6f0ca92cbb6"; - sha256 = "059mvf8jcjrfplr8hv2y6ibc41id979k0zwfh6zdnb7dynym4bsg"; + rev = "28c6469ce841ff3033c376e78a7043009a3bdc5c"; + sha256 = "0kh08hahrwif61sq0qlvgyqiymxi8c8h2dw4s3ln4aq696k4gba9"; } From 1b3130ec1aee306a34441773e4bf744183dbae95 Mon Sep 17 00:00:00 2001 From: Mario Rodas <marsam@users.noreply.github.com> Date: Tue, 29 Dec 2020 04:20:00 +0000 Subject: [PATCH 002/188] ruby_3_0: init 3.0.0 https://www.ruby-lang.org/en/news/2020/12/25/ruby-3-0-0-released/ --- .../development/interpreters/ruby/default.nix | 24 +++++++++++++------ .../ruby/do-not-regenerate-revision.h.patch | 23 ++++++++++++++++++ .../ruby/do-not-update-gems-baseruby.patch | 14 +++++++++++ .../interpreters/ruby/patchsets.nix | 4 ++++ pkgs/top-level/all-packages.nix | 4 +++- 5 files changed, 61 insertions(+), 8 deletions(-) create mode 100644 pkgs/development/interpreters/ruby/do-not-regenerate-revision.h.patch create mode 100644 pkgs/development/interpreters/ruby/do-not-update-gems-baseruby.patch diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 65189fda0793..d53edaad03e1 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -27,6 +27,7 @@ let ver = version; tag = ver.gitTag; atLeast27 = lib.versionAtLeast ver.majMin "2.7"; + atLeast30 = lib.versionAtLeast ver.majMin "3.0"; baseruby = self.override { useRailsExpress = false; docSupport = false; @@ -109,7 +110,9 @@ let (import ./patchsets.nix { inherit patchSet useRailsExpress ops fetchpatch; patchLevel = ver.patchLevel; - }).${ver.majMinTiny}; + }).${ver.majMinTiny} + ++ op atLeast27 ./do-not-regenerate-revision.h.patch + ++ op (atLeast30 && useRailsExpress) ./do-not-update-gems-baseruby.patch; postUnpack = opString rubygemsSupport '' rm -rf $sourceRoot/{lib,test}/rubygems* @@ -121,17 +124,12 @@ let sed -i configure.ac -e '/config.guess/d' cp --remove-destination ${config}/config.guess tool/ cp --remove-destination ${config}/config.sub tool/ + '' + opString (!atLeast30) '' # Make the build reproducible for ruby <= 2.7 # See https://github.com/ruby/io-console/commit/679a941d05d869f5e575730f6581c027203b7b26#diff-d8422f096931c58d4463e2489f62a228b0f24f0492950ba88c8c89a0d741cfe6 sed -i ext/io/console/io-console.gemspec -e '/s\.date/d' ''; - # Force the revision.h generation. Somehow `revision.tmp` is an empty - # file and because we don't add `git` to buildInputs, hence the check is - # always true. - # https://github.com/ruby/ruby/commit/97a5af62a318fcd93a4e5e4428d576c0280ddbae - buildFlags = lib.optionals atLeast27 [ "REVISION_LATEST=0" ]; - configureFlags = ["--enable-shared" "--enable-pthread" "--with-soname=ruby-${version}"] ++ op useRailsExpress "--with-baseruby=${baseruby}/bin/ruby" ++ op (!jitSupport) "--disable-jit-support" @@ -149,6 +147,10 @@ let preConfigure = opString docSupport '' configureFlagsArray+=("--with-ridir=$devdoc/share/ri") + + # rdoc creates XDG_DATA_DIR (defaulting to $HOME/.local/share) even if + # it's not going to be used. + export HOME=$TMPDIR ''; # fails with "16993 tests, 2229489 assertions, 105 failures, 14 errors, 89 skips" @@ -261,4 +263,12 @@ in { git = "0kbgznf1yprfp9645k31ra5f4757b7fichzi0hdg6nxkj90853s0"; }; }; + + ruby_3_0 = generic { + version = rubyVersion "3" "0" "0" ""; + sha256 = { + src = "0a4fmxafxvkg1m738g2lmkhipwnmd96kzqy1m9kvk3n1l50x2gm1"; + git = "0fvnxv97m94nridlc5nvvrlg53pr5g042dkfc5ysd327s7xj4cjp"; + }; + }; } diff --git a/pkgs/development/interpreters/ruby/do-not-regenerate-revision.h.patch b/pkgs/development/interpreters/ruby/do-not-regenerate-revision.h.patch new file mode 100644 index 000000000000..ddeb368ee8ae --- /dev/null +++ b/pkgs/development/interpreters/ruby/do-not-regenerate-revision.h.patch @@ -0,0 +1,23 @@ +Do not regenerate revision.h + +Ruby's makefile compares the shipped version with the git revision to regenerate +revision.h [1], but since we don't include git in buildInputs, this comparison +fails and it can't find $(REVISION_H). + +[1] https://github.com/ruby/ruby/commit/97a5af62a318fcd93a4e5e4428d576c0280ddbae + +diff -Naur ruby.old/defs/gmake.mk ruby.new/defs/gmake.mk +--- ruby.old/defs/gmake.mk ++++ ruby.new/defs/gmake.mk +@@ -325,11 +325,9 @@ + + REVISION_IN_HEADER := $(shell sed -n 's/^\#define RUBY_FULL_REVISION "\(.*\)"/\1/p' $(srcdir)/revision.h 2>/dev/null) + REVISION_LATEST := $(shell $(CHDIR) $(srcdir) && git log -1 --format=%H 2>/dev/null) +-ifneq ($(REVISION_IN_HEADER),$(REVISION_LATEST)) + # GNU make treat the target as unmodified when its dependents get + # updated but it is not updated, while others may not. + $(srcdir)/revision.h: $(REVISION_H) +-endif + + # Query on the generated rdoc + # diff --git a/pkgs/development/interpreters/ruby/do-not-update-gems-baseruby.patch b/pkgs/development/interpreters/ruby/do-not-update-gems-baseruby.patch new file mode 100644 index 000000000000..2de1977630cb --- /dev/null +++ b/pkgs/development/interpreters/ruby/do-not-update-gems-baseruby.patch @@ -0,0 +1,14 @@ +Do not update gems when building with base ruby + +diff -Naur ruby.old/defs/gmake.mk ruby.new/defs/gmake.mk +--- ruby.old/common.mk ++++ ruby.new/common.mk +@@ -1298,7 +1298,7 @@ update-config_files: PHONY + config.guess config.sub + + refresh-gems: update-bundled_gems prepare-gems +-prepare-gems: $(HAVE_BASERUBY:yes=update-gems) $(HAVE_BASERUBY:yes=extract-gems) ++prepare-gems: + + update-gems$(gnumake:yes=-nongnumake): PHONY + $(ECHO) Downloading bundled gem files... diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index 69f224641849..246d44e20d16 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -16,4 +16,8 @@ "${patchSet}/patches/ruby/2.7/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.7/head/railsexpress/03-more-detailed-stacktrace.patch" ]; + "3.0.0" = ops useRailsExpress [ + "${patchSet}/patches/ruby/3.0/head/railsexpress/01-improve-gc-stats.patch" + "${patchSet}/patches/ruby/3.0/head/railsexpress/02-malloc-trim.patch" + ]; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fba1a0f30f78..2818e46010da 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11561,13 +11561,15 @@ in bison = buildPackages.bison_3_5; }) ruby_2_6 - ruby_2_7; + ruby_2_7 + ruby_3_0; ruby = ruby_2_6; rubyPackages = rubyPackages_2_6; rubyPackages_2_6 = recurseIntoAttrs ruby_2_6.gems; rubyPackages_2_7 = recurseIntoAttrs ruby_2_7.gems; + rubyPackages_3_0 = recurseIntoAttrs ruby_3_0.gems; mruby = callPackage ../development/compilers/mruby { }; From 9d1cf62309fccd6237a5cfddc30ccb7cec5a6280 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" <ryantm-bot@ryantm.com> Date: Tue, 19 Jan 2021 21:18:07 +0000 Subject: [PATCH 003/188] kubie: 0.11.1 -> 0.12.1 --- pkgs/development/tools/kubie/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/kubie/default.nix b/pkgs/development/tools/kubie/default.nix index 33d4ea0df1d2..779ef460b393 100644 --- a/pkgs/development/tools/kubie/default.nix +++ b/pkgs/development/tools/kubie/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "kubie"; - version = "0.11.1"; + version = "0.12.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "sbstp"; repo = "kubie"; - sha256 = "0q21qd9fhchggby18gzyvds517n9vq7b1rr0gmzik4036ykg1lm2"; + sha256 = "sha256-y4/azFr2fngmUxQw3c2xAhAppYHeD6Bz7IvZ6GTdsEQ="; }; - cargoSha256 = "0dp4prv8c2a6mxl7wskpc65qlfjphdxshb4q2bswqa5i21h8r534"; + cargoSha256 = "sha256-/Vg3qojBWN2tp8QaKmHrzy3cDWlkT6067Wprcjlu31U="; nativeBuildInputs = [ installShellFiles ]; From f296c4f81f02e4f38a16aa2ec5e26282a5bfe81a Mon Sep 17 00:00:00 2001 From: TredwellGit <tredwell@tutanota.com> Date: Sun, 31 Jan 2021 07:12:32 +0000 Subject: [PATCH 004/188] xorg.libXt: 1.2.0 -> 1.2.1 https://lists.x.org/archives/xorg-announce/2021-January/003070.html --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index e8b29f9bbac9..f475af73ae5f 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1015,11 +1015,11 @@ lib.makeScope newScope (self: with self; { }) {}; libXt = callPackage ({ stdenv, pkg-config, fetchurl, libICE, xorgproto, libSM, libX11 }: stdenv.mkDerivation { - name = "libXt-1.2.0"; + name = "libXt-1.2.1"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/lib/libXt-1.2.0.tar.bz2"; - sha256 = "0cbqlyssr8aia88c8i7z59z9d0kp3p2hp6683xhz9ndyv8qza7dk"; + url = "mirror://xorg/individual/lib/libXt-1.2.1.tar.bz2"; + sha256 = "0q1x7842r8rcn2m0q4q9f69h4qa097fyizs8brzx5ns62s7w1737"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 3ee31e4c2a7a..708b531752a0 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -202,7 +202,7 @@ mirror://xorg/individual/lib/libXres-1.2.0.tar.bz2 mirror://xorg/individual/lib/libXScrnSaver-1.2.3.tar.bz2 mirror://xorg/individual/lib/libxshmfence-1.3.tar.bz2 mirror://xorg/individual/lib/libXTrap-1.0.1.tar.bz2 -mirror://xorg/individual/lib/libXt-1.2.0.tar.bz2 +mirror://xorg/individual/lib/libXt-1.2.1.tar.bz2 mirror://xorg/individual/lib/libXtst-1.2.3.tar.bz2 mirror://xorg/individual/lib/libXv-1.0.11.tar.bz2 mirror://xorg/individual/lib/libXvMC-1.0.12.tar.bz2 From 11b4d6c633439c9429b9dc5324e13cf2bf9a4382 Mon Sep 17 00:00:00 2001 From: Moritz Angermann <moritz.angermann@gmail.com> Date: Tue, 9 Feb 2021 09:46:47 +0800 Subject: [PATCH 005/188] responsie file logic --- pkgs/build-support/cc-wrapper/cc-wrapper.sh | 19 +++++++++++++++---- pkgs/build-support/cc-wrapper/default.nix | 1 + .../expand-response-params/default.nix | 2 +- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh index c2e6c1406358..d26b284ed3f8 100644 --- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh @@ -180,7 +180,18 @@ fi PATH="$path_backup" # Old bash workaround, see above. -exec @prog@ \ - ${extraBefore+"${extraBefore[@]}"} \ - ${params+"${params[@]}"} \ - ${extraAfter+"${extraAfter[@]}"} + +if (( "${NIX_CC_USE_RESPONSE_FILE:-@use_response_file_by_default@}" >= 1 )); then + RESPONSE_FILE=$(mktemp) + printf "%q\n" \ + ${extraBefore+"${extraBefore[@]}"} \ + ${params+"${params[@]}"} \ + ${extraAfter+"${extraAfter[@]}"} \ + > "${RESPONSE_FILE}" + exec @prog@ "@${RESPONSE_FILE}" +else + exec @prog@ \ + ${extraBefore+"${extraBefore[@]}"} \ + ${params+"${params[@]}"} \ + ${extraAfter+"${extraAfter[@]}"} +fi diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 8de2366ff5f5..77ec0930e857 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -121,6 +121,7 @@ stdenv.mkDerivation { local dst="$1" local wrapper="$2" export prog="$3" + export use_response_file_by_default=${if isClang then "1" else "0"} substituteAll "$wrapper" "$out/bin/$dst" chmod +x "$out/bin/$dst" } diff --git a/pkgs/build-support/expand-response-params/default.nix b/pkgs/build-support/expand-response-params/default.nix index 2a4bee74197b..402f0071a533 100644 --- a/pkgs/build-support/expand-response-params/default.nix +++ b/pkgs/build-support/expand-response-params/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { src=$PWD ''; buildPhase = '' - "$CC" -std=c99 -O3 -o "expand-response-params" expand-response-params.c + NIX_CC_USE_RESPONSE_FILE=0 "$CC" -std=c99 -O3 -o "expand-response-params" expand-response-params.c ''; installPhase = '' mkdir -p $prefix/bin From e3d19670a0f6b012aac5e05b50951d8a991ba143 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com> Date: Fri, 12 Feb 2021 23:56:15 +0100 Subject: [PATCH 006/188] curl: enable brotli by default --- pkgs/development/tools/build-managers/cmake/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 7c2e5372e731..6b86e0c0b731 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, pkg-config -, bzip2, curl, expat, libarchive, xz, zlib, libuv, rhash +, bzip2, curlMinimal, expat, libarchive, xz, zlib, libuv, rhash , buildPackages # darwin attributes , ps @@ -50,7 +50,7 @@ stdenv.mkDerivation (rec { nativeBuildInputs = [ setupHook pkg-config ]; buildInputs = [] - ++ lib.optionals useSharedLibraries [ bzip2 curl expat libarchive xz zlib libuv rhash ] + ++ lib.optionals useSharedLibraries [ bzip2 curlMinimal expat libarchive xz zlib libuv rhash ] ++ lib.optional useOpenSSL openssl ++ lib.optional useNcurses ncurses ++ lib.optional useQt4 qt4 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5d366be81fdf..b28b3b6bdb67 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -410,7 +410,7 @@ in else makeOverridable (import ../build-support/fetchurl) { inherit lib stdenvNoCC buildPackages; inherit cacert; - curl = buildPackages.curl.override (old: rec { + curl = buildPackages.curlMinimal.override (old: rec { # break dependency cycles fetchurl = stdenv.fetchurlBoot; zlib = buildPackages.zlib.override { fetchurl = stdenv.fetchurlBoot; }; @@ -3426,13 +3426,16 @@ in cudnn = cudnn_cudatoolkit_10; curlFull = curl.override { - idnSupport = true; ldapSupport = true; + }; + + curl = curlMinimal.override { + idnSupport = true; gssSupport = true; brotliSupport = true; }; - curl = callPackage ../tools/networking/curl { }; + curlMinimal = callPackage ../tools/networking/curl { }; curl_unix_socket = callPackage ../tools/networking/curl-unix-socket { }; From 70dd7b038bf15c9cc326eb82f4aa5f0f46eb579a Mon Sep 17 00:00:00 2001 From: Finn Behrens <me@kloenk.de> Date: Thu, 11 Feb 2021 16:18:22 +0100 Subject: [PATCH 007/188] rust: 1.49.0 -> 1.50.0 --- .../compilers/rust/{1_49.nix => 1_50.nix} | 26 +++++++++---------- pkgs/top-level/all-packages.nix | 8 +++--- 2 files changed, 17 insertions(+), 17 deletions(-) rename pkgs/development/compilers/rust/{1_49.nix => 1_50.nix} (59%) diff --git a/pkgs/development/compilers/rust/1_49.nix b/pkgs/development/compilers/rust/1_50.nix similarity index 59% rename from pkgs/development/compilers/rust/1_49.nix rename to pkgs/development/compilers/rust/1_50.nix index 3e76cdfe9690..06449d59dad6 100644 --- a/pkgs/development/compilers/rust/1_49.nix +++ b/pkgs/development/compilers/rust/1_50.nix @@ -19,8 +19,8 @@ } @ args: import ./default.nix { - rustcVersion = "1.49.0"; - rustcSha256 = "0yf7kll517398dgqsr7m3gldzj0iwsp3ggzxrayckpqzvylfy2mm"; + rustcVersion = "1.50.0"; + rustcSha256 = "0pjs7j62maiyvkmhp9zrxl528g2n0fphp4rq6ap7aqdv0a6qz5wm"; llvmSharedForBuild = pkgsBuildBuild.llvm_11.override { enableSharedLibraries = true; }; llvmSharedForHost = pkgsBuildHost.llvm_11.override { enableSharedLibraries = true; }; @@ -33,22 +33,22 @@ import ./default.nix { # Note: the version MUST be one version prior to the version we're # building - bootstrapVersion = "1.48.0"; + bootstrapVersion = "1.49.0"; # fetch hashes by running `print-hashes.sh ${bootstrapVersion}` bootstrapHashes = { - i686-unknown-linux-gnu = "7fdb8836a1f0427d5b47e6a2d496f67ebff04350407411f57cf20c9b3544e26f"; - x86_64-unknown-linux-gnu = "950420a35b2dd9091f1b93a9ccd5abc026ca7112e667f246b1deb79204e2038b"; - x86_64-unknown-linux-musl = "4ed9627f57b4e0b9807fc5e7513d9731f4791668b7f875b9e44e65e21072c56f"; - arm-unknown-linux-gnueabihf = "e68a81eebd4570343a0fc35cb8ee24cad911d6cee2e374f284b76546ca6636d5"; - armv7-unknown-linux-gnueabihf = "3aed4a63ebdd57690a31d11afbe95e6407edc224a6769be5694a1ed43bf899cb"; - aarch64-unknown-linux-gnu = "c4769418d8d89f432e4a3a21ad60f99629e4b13bbfc29aef7d9d51c4e8ee8a8a"; - aarch64-unknown-linux-musl = "ac4de580a28e45a9773b389b296d13bfeeb08263cb1f8343859577a54940dae9"; - x86_64-apple-darwin = "20e727cad10f43e3abcedb2a80979ae26923038e0e8a855e8a783da255054113"; - powerpc64le-unknown-linux-gnu = "e6457a0214f3b1b04bd5b2618bba7e3826e254216420dede2971b571a1c13bb1"; + i686-unknown-linux-gnu = "5371bfa2c8e566aa283acdfa93d24b981c789d7c040ac1ca74e76bff1c7f6598"; + x86_64-unknown-linux-gnu = "8b14446df82f3707d69cf58fed92f18e0bff91621c62baf89288ef70e3e92981"; + x86_64-unknown-linux-musl = "f92a5a4adcfac4206a223d089a364a8375d1b6f112f3f2efa3f6d53d08a61904"; + arm-unknown-linux-gnueabihf = "e5d93576eef874a9b22be9aa157cac5c8cdebebde8b57f0693248d4a589df42c"; + armv7-unknown-linux-gnueabihf = "34ba3c979b144ef27d3c71d177cc1774551edf26e79d36719c86a51d9b9e34c0"; + aarch64-unknown-linux-gnu = "b551bd482041307fa3373a687d6d6a2c4c0931c2e0a68b8b75dc80bc5cf5f002"; + aarch64-unknown-linux-musl = "0a43d96a508c720520328112d609916d062f866a5c35f1db8f906284035d6d98"; + x86_64-apple-darwin = "fe3e248bc4b0ee0a2595693687ad845c8a8bda824a56c9321520bcca02433716"; + powerpc64le-unknown-linux-gnu = "365d7721dd2521e5dad12aa73651bad2be375e798e443636d2c523cad5b54359"; }; - selectRustPackage = pkgs: pkgs.rust_1_49; + selectRustPackage = pkgs: pkgs.rust_1_50; rustcPatches = [ ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index faf922f89be5..0816ab2e8727 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10745,14 +10745,14 @@ in rust_1_45 = callPackage ../development/compilers/rust/1_45.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; - rust_1_49 = callPackage ../development/compilers/rust/1_49.nix { + rust_1_50 = callPackage ../development/compilers/rust/1_50.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; - rust = rust_1_49; + rust = rust_1_50; rustPackages_1_45 = rust_1_45.packages.stable; - rustPackages_1_49 = rust_1_49.packages.stable; - rustPackages = rustPackages_1_49; + rustPackages_1_50 = rust_1_50.packages.stable; + rustPackages = rustPackages_1_50; inherit (rustPackages) cargo clippy rustc rustPlatform; From f214329ab35689ea34db28b5407aef6545c7817a Mon Sep 17 00:00:00 2001 From: Thomas Tuegel <ttuegel@mailbox.org> Date: Sun, 14 Feb 2021 06:01:50 -0600 Subject: [PATCH 008/188] kdeApplications: 20.12.1 -> 20.12.2 --- pkgs/applications/kde/fetch.sh | 2 +- pkgs/applications/kde/srcs.nix | 1792 ++++++++++++++++---------------- 2 files changed, 897 insertions(+), 897 deletions(-) diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh index d659c551bd68..861cd5f83561 100644 --- a/pkgs/applications/kde/fetch.sh +++ b/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( http://download.kde.org/stable/release-service/20.12.1/src -A '*.tar.xz' ) +WGET_ARGS=( http://download.kde.org/stable/release-service/20.12.2/src -A '*.tar.xz' ) diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix index f78d29db6bc9..c1def1bd613b 100644 --- a/pkgs/applications/kde/srcs.nix +++ b/pkgs/applications/kde/srcs.nix @@ -4,1795 +4,1795 @@ { akonadi = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/akonadi-20.12.1.tar.xz"; - sha256 = "1173365c84fq5vn58blsmbdp9x34gf2yrwvsi89i0l7xhpz8zx5k"; - name = "akonadi-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/akonadi-20.12.2.tar.xz"; + sha256 = "0659vgj8y77i0axdwwajaw6kxfa48j6s56nl6xhnv8686ss8plkw"; + name = "akonadi-20.12.2.tar.xz"; }; }; akonadi-calendar = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/akonadi-calendar-20.12.1.tar.xz"; - sha256 = "0zzy4f03zypj4crjy0fhk5xjgipflal3gpfibav2wcmgx034znw5"; - name = "akonadi-calendar-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/akonadi-calendar-20.12.2.tar.xz"; + sha256 = "0vzv4yycb2nnz5ifsydv0k080wgnhjzim6lfd6qrh38mgxpb2hzw"; + name = "akonadi-calendar-20.12.2.tar.xz"; }; }; akonadi-calendar-tools = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/akonadi-calendar-tools-20.12.1.tar.xz"; - sha256 = "1x5zmv32iaf17n9b8y034yhwq0dhwjwxw3i5cj97k4dpyar5s72q"; - name = "akonadi-calendar-tools-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/akonadi-calendar-tools-20.12.2.tar.xz"; + sha256 = "06bzha5h14x6m4xzbbz2h3s00v4pc2a8d716dav9bqi0pvvq3cj0"; + name = "akonadi-calendar-tools-20.12.2.tar.xz"; }; }; akonadiconsole = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/akonadiconsole-20.12.1.tar.xz"; - sha256 = "0rf7ckra0yjkwspmd4401lssiss2p8qrw9rd6j5gbw7kii05bcmz"; - name = "akonadiconsole-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/akonadiconsole-20.12.2.tar.xz"; + sha256 = "12fslhpxah99fzvg3a1g67n69mi4xvgz9ra787pdvzrs0lca9xa0"; + name = "akonadiconsole-20.12.2.tar.xz"; }; }; akonadi-contacts = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/akonadi-contacts-20.12.1.tar.xz"; - sha256 = "0gxcs8nn07y6ln5ymsbdhcm63zqxcq2ja2sxziim65bfg9g85arl"; - name = "akonadi-contacts-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/akonadi-contacts-20.12.2.tar.xz"; + sha256 = "05y1rpvq1shiqlgql56k052glsslawy742q4n2hs301xhg0izavz"; + name = "akonadi-contacts-20.12.2.tar.xz"; }; }; akonadi-import-wizard = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/akonadi-import-wizard-20.12.1.tar.xz"; - sha256 = "1wdhgvv2zblyhcxrvby7ic3449hdmcnn3hvcswgwrgbcy4bzz7zz"; - name = "akonadi-import-wizard-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/akonadi-import-wizard-20.12.2.tar.xz"; + sha256 = "1gqjr5k6kkxi77vq0f6mc5mr31qvjsiicj6sxwpbm0c34vydfzym"; + name = "akonadi-import-wizard-20.12.2.tar.xz"; }; }; akonadi-mime = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/akonadi-mime-20.12.1.tar.xz"; - sha256 = "1xsrc8572zlslabn47km58sr48wdb0pmfrh3jbn9227w9iwir3z5"; - name = "akonadi-mime-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/akonadi-mime-20.12.2.tar.xz"; + sha256 = "0zdgkny32zwa2r2yhi285f56jkj0ini6p3sv5hi7f43mi7r5m994"; + name = "akonadi-mime-20.12.2.tar.xz"; }; }; akonadi-notes = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/akonadi-notes-20.12.1.tar.xz"; - sha256 = "15d23wm0kymifcxcbip0hpnzwmzdjwxmcvqvmwgq00vy81j6k7wm"; - name = "akonadi-notes-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/akonadi-notes-20.12.2.tar.xz"; + sha256 = "0rbg2vwk0a1zbfw5cmz0jx3yzap7j6yi7c0igq1fgg3an7sw4j2v"; + name = "akonadi-notes-20.12.2.tar.xz"; }; }; akonadi-search = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/akonadi-search-20.12.1.tar.xz"; - sha256 = "065qp3nf8274fh0bna8hjs28p030wgfnr3gnp7b2791kzp25l488"; - name = "akonadi-search-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/akonadi-search-20.12.2.tar.xz"; + sha256 = "0m7l7f26gj018d5pipbgmmxiqky98avpypxbydrms6afdglvi5ja"; + name = "akonadi-search-20.12.2.tar.xz"; }; }; akregator = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/akregator-20.12.1.tar.xz"; - sha256 = "0xs5adbq9ra0ziccl1z0nsm6kvrf8vjwa8djd3nwc2csjw8wim5k"; - name = "akregator-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/akregator-20.12.2.tar.xz"; + sha256 = "11y2mmf2svbxvqb1bjwzrivkq8w508fwg7513bzl62pbjqa8g3gk"; + name = "akregator-20.12.2.tar.xz"; }; }; analitza = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/analitza-20.12.1.tar.xz"; - sha256 = "1qnqqbrjpzndbffjwqlyfqmxxxz04fi3i2g8dx6y8q79z927fzkd"; - name = "analitza-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/analitza-20.12.2.tar.xz"; + sha256 = "09qpqjyps9h8wc8dvbnj8iz2xc4naxjdicqxsbfwfly5wbf8xq6x"; + name = "analitza-20.12.2.tar.xz"; }; }; ark = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/ark-20.12.1.tar.xz"; - sha256 = "18zaaawwhlci23hkzjl535qsi8wdjc05hij3r76225jb1jb6cwrm"; - name = "ark-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/ark-20.12.2.tar.xz"; + sha256 = "1p8ylvk4g1x2mmfdprz911iivcvr4mciam427b6ygdrhqc7rbbqb"; + name = "ark-20.12.2.tar.xz"; }; }; artikulate = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/artikulate-20.12.1.tar.xz"; - sha256 = "1cvpya408r521p9398mk0xn8pb6awqm74qcjy2r0ylx0l6bkv3ca"; - name = "artikulate-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/artikulate-20.12.2.tar.xz"; + sha256 = "0s6vjhipb4i6bv9ff7nzm9gza8jghih9kf7f7ynq10109fk8gy6i"; + name = "artikulate-20.12.2.tar.xz"; }; }; audiocd-kio = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/audiocd-kio-20.12.1.tar.xz"; - sha256 = "1rlr1w0cy3q31jsaqiv50frqcl3x5jq31pnrkmyhgy23mays8ly1"; - name = "audiocd-kio-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/audiocd-kio-20.12.2.tar.xz"; + sha256 = "0kd7yxl571pwrijwn78pigdclwqpmd50b5cj4lna481q78f91zsa"; + name = "audiocd-kio-20.12.2.tar.xz"; }; }; baloo-widgets = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/baloo-widgets-20.12.1.tar.xz"; - sha256 = "115y0cdlsdzx6c017gr8x6in9jxyw0sqyamakqgfyy5phn203yr3"; - name = "baloo-widgets-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/baloo-widgets-20.12.2.tar.xz"; + sha256 = "0w9jrx2mz1kyn2az6jx4kympl6zd950waz4zj97cjrcq2dg5a85g"; + name = "baloo-widgets-20.12.2.tar.xz"; }; }; blinken = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/blinken-20.12.1.tar.xz"; - sha256 = "05dbmh1lk1ag735yiv7vql6fx15lw9a3qihxflzhbfrgng7dsxks"; - name = "blinken-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/blinken-20.12.2.tar.xz"; + sha256 = "0a0nkmbx1bkqjs7cf5qqm877wqvzdx9cxm9395jfxcycn5pyfps9"; + name = "blinken-20.12.2.tar.xz"; }; }; bomber = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/bomber-20.12.1.tar.xz"; - sha256 = "07iy6b8hwklb5mgrf8sagmrza78p3yf7i4x7w9lb2z9v2x5qw22y"; - name = "bomber-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/bomber-20.12.2.tar.xz"; + sha256 = "08lyj6rn9jhhwzpwh2c14v8jiwishi1wk19nm5wazy2iajbd88jv"; + name = "bomber-20.12.2.tar.xz"; }; }; bovo = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/bovo-20.12.1.tar.xz"; - sha256 = "1wrw81xrayhjadvjfi0zdc0vw445f4zmd32n0rca78i68ls5qbxv"; - name = "bovo-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/bovo-20.12.2.tar.xz"; + sha256 = "05xx11rqqsxm084hfxnx1wzmr2wdpny3w608h8g5vby2jgdj47b7"; + name = "bovo-20.12.2.tar.xz"; }; }; calendarsupport = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/calendarsupport-20.12.1.tar.xz"; - sha256 = "1accj2vx6zvqp632i5c85q4rzpg54xlihzf1rs80sdb9lch8nwrp"; - name = "calendarsupport-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/calendarsupport-20.12.2.tar.xz"; + sha256 = "0gz3p4az49430zwgmlqjcfzjlgnaf7cl1x0qaaxyl8il14ambrbd"; + name = "calendarsupport-20.12.2.tar.xz"; }; }; cantor = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/cantor-20.12.1.tar.xz"; - sha256 = "1qj6lmcgmqr110qw2r906b0kp73f9gzvm75ry1gdb77bza5g67x2"; - name = "cantor-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/cantor-20.12.2.tar.xz"; + sha256 = "1w513a06xshdw4fcn6wmliygpjsyvqcbmfjg2bdibpsnznmk4y4p"; + name = "cantor-20.12.2.tar.xz"; }; }; cervisia = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/cervisia-20.12.1.tar.xz"; - sha256 = "0hnpysp01z5a3gmm2jr2m1y7a5hcfl32lhmnrm0rg589pdxb30xf"; - name = "cervisia-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/cervisia-20.12.2.tar.xz"; + sha256 = "08m962r6wkvih1yfj22z3nyfx6r3ac9pcc7i7dxxdkfcxhqpprhb"; + name = "cervisia-20.12.2.tar.xz"; }; }; dolphin = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/dolphin-20.12.1.tar.xz"; - sha256 = "0n2g8mqq28xrjy17jyja4siaf2ac2b8gppqc19wjxn981zs545mp"; - name = "dolphin-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/dolphin-20.12.2.tar.xz"; + sha256 = "19mss2vs074xv5qc644y87f8v99mdndhhd7hclqgq6gckxcjzy2r"; + name = "dolphin-20.12.2.tar.xz"; }; }; dolphin-plugins = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/dolphin-plugins-20.12.1.tar.xz"; - sha256 = "0kn79c3w6qx70d7f8kdavl5ifq1pmcs4dc88i0zma8hskgvcjvcj"; - name = "dolphin-plugins-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/dolphin-plugins-20.12.2.tar.xz"; + sha256 = "0zjy429cqb6nspmiharvszjhpn662y23s9wbdqs04h2p6pi8raxn"; + name = "dolphin-plugins-20.12.2.tar.xz"; }; }; dragon = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/dragon-20.12.1.tar.xz"; - sha256 = "0nj2cba4w7q4q1w7lv63s9zgqrvha5figp5w9apklqps4z1d2p0s"; - name = "dragon-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/dragon-20.12.2.tar.xz"; + sha256 = "0yssqbfgm92bls5cfy0xcqnqfqx00ns2i6rlwdlx38kfh0r47cag"; + name = "dragon-20.12.2.tar.xz"; }; }; elisa = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/elisa-20.12.1.tar.xz"; - sha256 = "1lmgxi7xdyzjyi15ighkp2ylc6riqzgjmnfjc7p6na88vl2h2diy"; - name = "elisa-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/elisa-20.12.2.tar.xz"; + sha256 = "1sl55kynkwxaypdm6zjdk85yxxq9754xm6ybxm7qdafq691g9zjr"; + name = "elisa-20.12.2.tar.xz"; }; }; eventviews = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/eventviews-20.12.1.tar.xz"; - sha256 = "10nq8gx1bybhjx5dnrx2x5gslg8nw3vazy22jz03slgspm0gsajc"; - name = "eventviews-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/eventviews-20.12.2.tar.xz"; + sha256 = "1g4aqhh2b5s45m0qqp46wazcc7rzcp3mmds4q9x3isckqpijzp39"; + name = "eventviews-20.12.2.tar.xz"; }; }; ffmpegthumbs = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/ffmpegthumbs-20.12.1.tar.xz"; - sha256 = "17p9xqyfsaibhkfkhbx9mxjkdl5xdc3h91gsrkkwkqyfa5vs9c5g"; - name = "ffmpegthumbs-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/ffmpegthumbs-20.12.2.tar.xz"; + sha256 = "0iw1g7x31jkbmniawvjwy8wk573rv05idk08q1vavxa5vixxqsbg"; + name = "ffmpegthumbs-20.12.2.tar.xz"; }; }; filelight = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/filelight-20.12.1.tar.xz"; - sha256 = "0k7ia3q1j520n3i1va7v4nhdfycxv54sis6vq62ihm53kb0jrj4i"; - name = "filelight-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/filelight-20.12.2.tar.xz"; + sha256 = "0m38il0rz7zip9rxing4j5fppwyrjgv1d7n3vrp3x4wnmd08j46q"; + name = "filelight-20.12.2.tar.xz"; }; }; granatier = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/granatier-20.12.1.tar.xz"; - sha256 = "0mhqjg0wznvf1dc7f9dmw6ccva84g09cds2jls37zzblqbfdnzw3"; - name = "granatier-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/granatier-20.12.2.tar.xz"; + sha256 = "0gssfcqq1czh5l1dwi5lpj0f9bgv2jf0wma9i5j0aqrf9b086g7f"; + name = "granatier-20.12.2.tar.xz"; }; }; grantlee-editor = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/grantlee-editor-20.12.1.tar.xz"; - sha256 = "1684k6gpmvbbxjha5qkvfvas2lws0zm5v5s41z6yjxyshrbc29jh"; - name = "grantlee-editor-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/grantlee-editor-20.12.2.tar.xz"; + sha256 = "0fbb9zia4kjc7rw4s27vsy6isvkx56k50gn6y1cyfl0gqy70v4cw"; + name = "grantlee-editor-20.12.2.tar.xz"; }; }; grantleetheme = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/grantleetheme-20.12.1.tar.xz"; - sha256 = "1w87pz09lb3n511w0qir70c317j4gqgc7iyw3cgs2pqzz9f19vcx"; - name = "grantleetheme-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/grantleetheme-20.12.2.tar.xz"; + sha256 = "1cv23ias36mp4zm84fk21f3f7nx3jz7xpiyz0nvz6xcsiww77762"; + name = "grantleetheme-20.12.2.tar.xz"; }; }; gwenview = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/gwenview-20.12.1.tar.xz"; - sha256 = "0xjipr1ib8r42xsd75ack2198q6gf3xxl1zc9ir2ihdk3sg6lsb1"; - name = "gwenview-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/gwenview-20.12.2.tar.xz"; + sha256 = "0cr6jjnvin8jv6hnajxg6zlph5syg2zjrcwd784dlzv23hna9v5n"; + name = "gwenview-20.12.2.tar.xz"; }; }; incidenceeditor = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/incidenceeditor-20.12.1.tar.xz"; - sha256 = "1hdyy1sisavxjhwgpxh4ab4a3cvsvjj6hfa9w8kn8ypipd6nmqac"; - name = "incidenceeditor-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/incidenceeditor-20.12.2.tar.xz"; + sha256 = "1q48ydma2rcpn3dnf9p08mqfs481n5fhc9m5wl2cvm6as54sfmp8"; + name = "incidenceeditor-20.12.2.tar.xz"; }; }; itinerary = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/itinerary-20.12.1.tar.xz"; - sha256 = "02mmbj32ankv06mlgdrfyppkfi1dkgy9ky22d6bnz3l1vyld76s9"; - name = "itinerary-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/itinerary-20.12.2.tar.xz"; + sha256 = "1dkgsiqww9z6k0xbvn15w630jdhmxr1kkz5dcv1n9yl7bgj32s35"; + name = "itinerary-20.12.2.tar.xz"; }; }; juk = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/juk-20.12.1.tar.xz"; - sha256 = "0rx4dmnk15xrf9knwsvjmf963xn59rlzwwsa6wrjjpi8r6br8x4r"; - name = "juk-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/juk-20.12.2.tar.xz"; + sha256 = "1dc6n07hkd8as2q1i2l3jzqcijw3qd4ihx1205nzn7z256bby58n"; + name = "juk-20.12.2.tar.xz"; }; }; k3b = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/k3b-20.12.1.tar.xz"; - sha256 = "02ybzn8gg82r7i7rg8swyza30zwsf3fassmp6hqffn15g4kc2lrp"; - name = "k3b-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/k3b-20.12.2.tar.xz"; + sha256 = "0gqg8r2p6nksbdg4c8wqz57dj8d1cw7cmrgzc1l2pin4v3qdx94g"; + name = "k3b-20.12.2.tar.xz"; }; }; kaccounts-integration = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kaccounts-integration-20.12.1.tar.xz"; - sha256 = "01xy3ih2fw4xnf5jkadrbq1dzmvvvrslbq4afj9501vhzyfqgm92"; - name = "kaccounts-integration-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kaccounts-integration-20.12.2.tar.xz"; + sha256 = "15py7fp6sajvx0c7zi7zhfx16sqn8kkkvglkvcq0b9kglswpvkfj"; + name = "kaccounts-integration-20.12.2.tar.xz"; }; }; kaccounts-providers = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kaccounts-providers-20.12.1.tar.xz"; - sha256 = "1f3gr63jwm7b8nkpdmpkgvsrhrpaxf7wcl0gczhdli1v6svjv8vq"; - name = "kaccounts-providers-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kaccounts-providers-20.12.2.tar.xz"; + sha256 = "0205l3k3nzx6cnar90zrbgmabapyry4a991lqflkpxgdrkh0ajc0"; + name = "kaccounts-providers-20.12.2.tar.xz"; }; }; kaddressbook = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kaddressbook-20.12.1.tar.xz"; - sha256 = "0j6mjj902h5zpipywp5xhbifrbgrb1lz1cg317md7ya4wc7z36fp"; - name = "kaddressbook-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kaddressbook-20.12.2.tar.xz"; + sha256 = "0xqsl7fav1vqq4iqy2m02s92rnr28pi1ak3sv0ra7q1gb89rhi0y"; + name = "kaddressbook-20.12.2.tar.xz"; }; }; kajongg = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kajongg-20.12.1.tar.xz"; - sha256 = "0v9sq5l6w3x78dpimdlbm36g9n4qy06xr0bzfzn2jf3bzgzrn2zk"; - name = "kajongg-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kajongg-20.12.2.tar.xz"; + sha256 = "0vh6qb3d54nnxrxacq9fn7jq1hshhhnvw9ff0wgh214jlr0gnbqk"; + name = "kajongg-20.12.2.tar.xz"; }; }; kalarm = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kalarm-20.12.1.tar.xz"; - sha256 = "0k4fxrzxb6vvpdqlln4g7iz1s34d9jkk415c44f1i34kl2mfsyq0"; - name = "kalarm-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kalarm-20.12.2.tar.xz"; + sha256 = "1lpg1viwn868hw0dd8zs11iafkhzlr3cydfplnh4ss6visga50kb"; + name = "kalarm-20.12.2.tar.xz"; }; }; kalarmcal = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kalarmcal-20.12.1.tar.xz"; - sha256 = "104fbq2mf20p67rs7x76h36qk8d0srkkll2pq39ln4hc7nhsrws5"; - name = "kalarmcal-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kalarmcal-20.12.2.tar.xz"; + sha256 = "17lll9671318dxhxpnjaih31xz5b971gw6kmrgz2ljq5nz1l027b"; + name = "kalarmcal-20.12.2.tar.xz"; }; }; kalgebra = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kalgebra-20.12.1.tar.xz"; - sha256 = "10y9zygpik418y5781xmy5xysvf3xa97sbzdbch8lrvxwprbmkzm"; - name = "kalgebra-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kalgebra-20.12.2.tar.xz"; + sha256 = "0dwvm4b0wpkd3i79q3xs2v3majwa56hgq8r4vv071a8ci8fn27bz"; + name = "kalgebra-20.12.2.tar.xz"; }; }; kalzium = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kalzium-20.12.1.tar.xz"; - sha256 = "1n1ar12zq2maa4dn5yq7m6l3m60n7c98c460mrd6rp7f73kadnsj"; - name = "kalzium-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kalzium-20.12.2.tar.xz"; + sha256 = "0jdg0akxmylbvh80cz31cycrdqvyafsv9j7hfpdhrizdy7vvqywg"; + name = "kalzium-20.12.2.tar.xz"; }; }; kamera = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kamera-20.12.1.tar.xz"; - sha256 = "1bj01d9h26ifq8nsa1bw49xfihmisnbk7p557zpqvixxayq6v8dq"; - name = "kamera-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kamera-20.12.2.tar.xz"; + sha256 = "1licmi05g1qpfh88annqd89av77jsmhxnsidgkvf4ffczwd097l6"; + name = "kamera-20.12.2.tar.xz"; }; }; kamoso = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kamoso-20.12.1.tar.xz"; - sha256 = "087m9lphj6s0xssaryyh91gh9v3ji5423rjd549dkd3vscgda4lb"; - name = "kamoso-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kamoso-20.12.2.tar.xz"; + sha256 = "0ar19nlw2bxrbn4wky8ky3x5m70rf7fb0fviniblqcrggyymgmb9"; + name = "kamoso-20.12.2.tar.xz"; }; }; kanagram = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kanagram-20.12.1.tar.xz"; - sha256 = "0bflybrm3kz1p1n6fksihvd8m0h0jj968b2wjz88663bs48jqf6q"; - name = "kanagram-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kanagram-20.12.2.tar.xz"; + sha256 = "00p2mpprbq9zi1zzscb4d0fdj2knnfkjxclf3q982jz4laxyqalf"; + name = "kanagram-20.12.2.tar.xz"; }; }; kapman = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kapman-20.12.1.tar.xz"; - sha256 = "1hs88q4h5l58fvr09vb5ns9pdj4k064ax5ccnj9yan4bn0s9b4f9"; - name = "kapman-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kapman-20.12.2.tar.xz"; + sha256 = "1fs33p9g52k5nywpih7nns3mh0apfhnn174k9711vwnamr73ph6k"; + name = "kapman-20.12.2.tar.xz"; }; }; kapptemplate = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kapptemplate-20.12.1.tar.xz"; - sha256 = "1a8fpwbvs2zmmak7zyv75z67ja31vx68s9lz9vldmiik9rrslyy6"; - name = "kapptemplate-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kapptemplate-20.12.2.tar.xz"; + sha256 = "19rnxw0q8w890ns237vpaapipm3zjz7n0rn9yzxa5cqaf30l7jv5"; + name = "kapptemplate-20.12.2.tar.xz"; }; }; kate = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kate-20.12.1.tar.xz"; - sha256 = "13m24b3fxb1d1k9rg2xfa7i28cjx68g9dbjrbd34acmpg01vp6vk"; - name = "kate-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kate-20.12.2.tar.xz"; + sha256 = "1kdznizqh28parijpsi67jmb8mlx4gn7z4szlh5kjd1mv9rikvm7"; + name = "kate-20.12.2.tar.xz"; }; }; katomic = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/katomic-20.12.1.tar.xz"; - sha256 = "15s5kwddd1m9g5lhpc61bj6yzxpwzcc8fm24yhslb8l44nk685id"; - name = "katomic-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/katomic-20.12.2.tar.xz"; + sha256 = "1sxh6x09is33b3zdgj3d6zn9z19qc25v4hskffmw5xivnwz9vzfl"; + name = "katomic-20.12.2.tar.xz"; }; }; kbackup = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kbackup-20.12.1.tar.xz"; - sha256 = "043dkgpdk56jmx0z8izlgj8r9j8h9rvjc3yalpqd5nrlgmj0smym"; - name = "kbackup-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kbackup-20.12.2.tar.xz"; + sha256 = "138x20p27a0yx4n6xamc660nk0zzrap7zhkkwpy9ayh07rgh1222"; + name = "kbackup-20.12.2.tar.xz"; }; }; kblackbox = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kblackbox-20.12.1.tar.xz"; - sha256 = "001yf4j14xzpabwg37yisls5na9rpxpgs45d4wdlqa90d50syzl7"; - name = "kblackbox-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kblackbox-20.12.2.tar.xz"; + sha256 = "1c6by0hi9bzs6j1y0qxrvz6ahdxhzivnw9hg4jndmhgbsqqix4q5"; + name = "kblackbox-20.12.2.tar.xz"; }; }; kblocks = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kblocks-20.12.1.tar.xz"; - sha256 = "029dxqg2d6c08r99ng16lc3b1dnnrj5bpz25zgv90aygzx31qq4s"; - name = "kblocks-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kblocks-20.12.2.tar.xz"; + sha256 = "06slcac3hvdmb5lymyqb1z8mn3r756xz2ghwdqz1d2mn3n2jd0bw"; + name = "kblocks-20.12.2.tar.xz"; }; }; kbounce = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kbounce-20.12.1.tar.xz"; - sha256 = "1vdc7xhbh0wpvk66sqs0xly0mmbpw922vg4kjjn21awamv4r52pm"; - name = "kbounce-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kbounce-20.12.2.tar.xz"; + sha256 = "19xvvxmbwpwkwsm0mxjnh92m352lkshsjgi8yrax1hdblymr60v1"; + name = "kbounce-20.12.2.tar.xz"; }; }; kbreakout = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kbreakout-20.12.1.tar.xz"; - sha256 = "11bx32lffagmyvxx2wss794fy3icz9k5yq4mjs2qxpf9pyvg6qgd"; - name = "kbreakout-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kbreakout-20.12.2.tar.xz"; + sha256 = "1n1vrj08j1drc1apikhgwdbmb5daypgnkw6yxhqc3xi2a3wglkqz"; + name = "kbreakout-20.12.2.tar.xz"; }; }; kbruch = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kbruch-20.12.1.tar.xz"; - sha256 = "06sbr6wrn4nh69hq96i5rgzbr9g0rc6c54h9g2zpnpff339lnsqi"; - name = "kbruch-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kbruch-20.12.2.tar.xz"; + sha256 = "0hjwmzsdlpg8przlmpp0xsa19v7376bpjk5kwyajywhayzzw99xp"; + name = "kbruch-20.12.2.tar.xz"; }; }; kcachegrind = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kcachegrind-20.12.1.tar.xz"; - sha256 = "0v06y1mybda4rmvjrjxhmxp7bj0wp6v45xahn08j253d20k7qixi"; - name = "kcachegrind-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kcachegrind-20.12.2.tar.xz"; + sha256 = "0ich4hxfmq909zkn06p8pgxpf7sg9ndq51b533h2clbq3m9qwy2w"; + name = "kcachegrind-20.12.2.tar.xz"; }; }; kcalc = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kcalc-20.12.1.tar.xz"; - sha256 = "1p59i6k0kq4xgcfsgcsb9z3yrrzgk564fh0apwmbawrmg6pp78dw"; - name = "kcalc-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kcalc-20.12.2.tar.xz"; + sha256 = "0dv8519wnlfdp2d2ml2r5qx3gjh8g6im742vqqk7m1660ijgc8zx"; + name = "kcalc-20.12.2.tar.xz"; }; }; kcalutils = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kcalutils-20.12.1.tar.xz"; - sha256 = "0b7w9n8sf31qbpxiw998xd4dls46mxf2bvl4n937vgzisfwb5sxs"; - name = "kcalutils-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kcalutils-20.12.2.tar.xz"; + sha256 = "1k4cr1iq945zs6c35f3s1w8kfm3kh7aybmk5py3lsz0zmlab36hc"; + name = "kcalutils-20.12.2.tar.xz"; }; }; kcharselect = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kcharselect-20.12.1.tar.xz"; - sha256 = "1ss5zwp0zggk9phdccj7bcn8h49p9avzg8qm38c3wnwddgaw1pdb"; - name = "kcharselect-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kcharselect-20.12.2.tar.xz"; + sha256 = "0fqf6bw98l499a144xk7hslxm6zdlpa0lcq0bgwnfsd0fs03wlp3"; + name = "kcharselect-20.12.2.tar.xz"; }; }; kcolorchooser = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kcolorchooser-20.12.1.tar.xz"; - sha256 = "07qvwk8amvmgiwxrl6gbyf25ms666hradmg1vl8lf3hmfxx6j40z"; - name = "kcolorchooser-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kcolorchooser-20.12.2.tar.xz"; + sha256 = "08y4qzr43nikgzli14yzj7w8vqzl905f0rwx0ri5247259jna3rk"; + name = "kcolorchooser-20.12.2.tar.xz"; }; }; kcron = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kcron-20.12.1.tar.xz"; - sha256 = "01xabwaxhxgwk6kh44rz3fm20jis2f6g9mrska5s03gxk7n0p1dc"; - name = "kcron-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kcron-20.12.2.tar.xz"; + sha256 = "025a647zl125568l8vqnljir110jbnkxd4921a892ip7pnhp0v95"; + name = "kcron-20.12.2.tar.xz"; }; }; kdebugsettings = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kdebugsettings-20.12.1.tar.xz"; - sha256 = "1jlxp6v6yci4cff1mcz0w7dz0hfjig0wck9cc9maaw1a9swqc3r1"; - name = "kdebugsettings-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kdebugsettings-20.12.2.tar.xz"; + sha256 = "1dzdvscklgbcfjalcc1mfh3vgiai2dvbsz00b4c96r8jxpm7bvcn"; + name = "kdebugsettings-20.12.2.tar.xz"; }; }; kdeconnect-kde = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kdeconnect-kde-20.12.1.tar.xz"; - sha256 = "0q11319ydibn1jgch98r66gzh3n6nb67l7xgzg0crdalm3dvf5gw"; - name = "kdeconnect-kde-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kdeconnect-kde-20.12.2.tar.xz"; + sha256 = "0wcx1bn121b62pwdkf7k24sa03kgixvrbp5y5iy11im7kj5i3ji1"; + name = "kdeconnect-kde-20.12.2.tar.xz"; }; }; kde-dev-scripts = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kde-dev-scripts-20.12.1.tar.xz"; - sha256 = "0hlabgf75qmww1161nd4ggqccp6h9ibsfkzpxdqvgxr9f1f31zz5"; - name = "kde-dev-scripts-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kde-dev-scripts-20.12.2.tar.xz"; + sha256 = "03kqd01yhii2b6g4gsjg09vwmzv53vr5d7y3d4db13kgg0f1z352"; + name = "kde-dev-scripts-20.12.2.tar.xz"; }; }; kde-dev-utils = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kde-dev-utils-20.12.1.tar.xz"; - sha256 = "1bir6ifq5wlwgdna48s5c1al7hfq6vl9pi2yvbnzf0rz4ix1sw4r"; - name = "kde-dev-utils-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kde-dev-utils-20.12.2.tar.xz"; + sha256 = "105pp4yhgynn3gq0bi7q1vyy1qn8pcd0hgx17v674hf8afy4627r"; + name = "kde-dev-utils-20.12.2.tar.xz"; }; }; kdeedu-data = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kdeedu-data-20.12.1.tar.xz"; - sha256 = "1hzrwkb2333dkvp1n50p18gfci21klafibaknm4hdrk96b3s4fxp"; - name = "kdeedu-data-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kdeedu-data-20.12.2.tar.xz"; + sha256 = "04x8papz62m5kanrqpjddzijda761i4j8y4cmqpnxkg2jrwfqqls"; + name = "kdeedu-data-20.12.2.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kdegraphics-mobipocket-20.12.1.tar.xz"; - sha256 = "1n3x4cf5ck0lfn70d9g0iiy4pddc0r49gwir71q5six5l4pz21hd"; - name = "kdegraphics-mobipocket-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kdegraphics-mobipocket-20.12.2.tar.xz"; + sha256 = "02a4ivpvfziaa464l8c9ivydagcb912ld95isgvc5jl4g85lm166"; + name = "kdegraphics-mobipocket-20.12.2.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kdegraphics-thumbnailers-20.12.1.tar.xz"; - sha256 = "0lrijvphyc6wbkb499zf0gjpmqrjgrx5li93kvpsil1ivfpflv7w"; - name = "kdegraphics-thumbnailers-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kdegraphics-thumbnailers-20.12.2.tar.xz"; + sha256 = "1p47fvb6mdk23rx9jhm9x60sny9z6plgdjih5lzy9k3hvl0sl8zk"; + name = "kdegraphics-thumbnailers-20.12.2.tar.xz"; }; }; kdenetwork-filesharing = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kdenetwork-filesharing-20.12.1.tar.xz"; - sha256 = "0axi5vdgqkjdcbq0x34b3lnh1497vk54p9aca9d2wfhkd55zjbcv"; - name = "kdenetwork-filesharing-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kdenetwork-filesharing-20.12.2.tar.xz"; + sha256 = "0y60az09hkhd1hvwa7h7c834dc0mfnd89f78v8m31il8g2xniziz"; + name = "kdenetwork-filesharing-20.12.2.tar.xz"; }; }; kdenlive = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kdenlive-20.12.1.tar.xz"; - sha256 = "0n543nswn0gxasc1445nqg35z5466a3ssivigxz4acqw66nj4vlv"; - name = "kdenlive-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kdenlive-20.12.2.tar.xz"; + sha256 = "0gh1cjhakdl7hx236rsxiv62mafd2vvvpg5ndwlp0zfpsx7kzjrz"; + name = "kdenlive-20.12.2.tar.xz"; }; }; kdepim-addons = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kdepim-addons-20.12.1.tar.xz"; - sha256 = "1dc5sl9ksk5i2sgs2vf41blb5cdpl8fv3vzmrrz9sl3r75pga5m0"; - name = "kdepim-addons-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kdepim-addons-20.12.2.tar.xz"; + sha256 = "0zj22ggn98sqz3nnvzffhbv2cq672j885f2p8qla6swhyw91cq8n"; + name = "kdepim-addons-20.12.2.tar.xz"; }; }; kdepim-runtime = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kdepim-runtime-20.12.1.tar.xz"; - sha256 = "1np7xbdhm2wczm04cmsr25a74421i28iln39myiybq01im2ahapq"; - name = "kdepim-runtime-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kdepim-runtime-20.12.2.tar.xz"; + sha256 = "0p5c4l4xixcvpzx7mri2jxa3nwk4824lp5sy93sspf2nlgdv3zsn"; + name = "kdepim-runtime-20.12.2.tar.xz"; }; }; kdesdk-kioslaves = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kdesdk-kioslaves-20.12.1.tar.xz"; - sha256 = "18yy2s39sxfzi5lcky1jvlv7z77ygidhnfa4zhwas27yhcc6h0w4"; - name = "kdesdk-kioslaves-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kdesdk-kioslaves-20.12.2.tar.xz"; + sha256 = "1xgp3fi6nnygjw2p832ylmhsj70dm33c4rf3h79sc2dp7aihnapy"; + name = "kdesdk-kioslaves-20.12.2.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kdesdk-thumbnailers-20.12.1.tar.xz"; - sha256 = "1hgqd2d2a9iwaxvd4xd7sdj7pyf3p3v2xg6v9dyy9y39q2f1qs23"; - name = "kdesdk-thumbnailers-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kdesdk-thumbnailers-20.12.2.tar.xz"; + sha256 = "0jk2x2b8qwhfbf9hy8j0yslggn3zwp18q21ip299b4cpx1w72bgq"; + name = "kdesdk-thumbnailers-20.12.2.tar.xz"; }; }; kdf = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kdf-20.12.1.tar.xz"; - sha256 = "0ba67hs4vlb3qyvdzhnpmf8p62df12s8aqw4hzf9vnxff3qix5k1"; - name = "kdf-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kdf-20.12.2.tar.xz"; + sha256 = "0fx9b5njsmvzznrgz2r9xz8yh977v865zvsih60hdrz6gaflg1rx"; + name = "kdf-20.12.2.tar.xz"; }; }; kdialog = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kdialog-20.12.1.tar.xz"; - sha256 = "13n6bc3aqi9v6i4p4vkwzjv4rsqinx45n028ls6ndlapayd750f4"; - name = "kdialog-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kdialog-20.12.2.tar.xz"; + sha256 = "1v2yflxpqg2h2jgxql1mnk8c1v1n4ljard5bgh1dw898r7b8g2xd"; + name = "kdialog-20.12.2.tar.xz"; }; }; kdiamond = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kdiamond-20.12.1.tar.xz"; - sha256 = "0iaq3cai1sn3vlym4zshfziviy9k4s7pm92c7bzwa9adfak6y9h4"; - name = "kdiamond-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kdiamond-20.12.2.tar.xz"; + sha256 = "17z1g2jxz26pqx5xjc5h7w5s2xy72p00ydnfhsv1bi1kfd79ry8k"; + name = "kdiamond-20.12.2.tar.xz"; }; }; keditbookmarks = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/keditbookmarks-20.12.1.tar.xz"; - sha256 = "1a41zpl2wzqdmp13m915agcc2nlxndyamy5aqyn98y3s8k5n6d9p"; - name = "keditbookmarks-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/keditbookmarks-20.12.2.tar.xz"; + sha256 = "0slma1vrm0cmr2v970ingbckqa3viw6jgfss0z7fpx4bilw65bd7"; + name = "keditbookmarks-20.12.2.tar.xz"; }; }; kfind = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kfind-20.12.1.tar.xz"; - sha256 = "0rlxq4dl221ycxcybav7yf88wz23v07n5yzp7jgrd602lk5k8jdp"; - name = "kfind-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kfind-20.12.2.tar.xz"; + sha256 = "0vfi5ipwncq7d4z1gbilw6kyyrn5d986wr3f2zhsyhpwmsh9ycnb"; + name = "kfind-20.12.2.tar.xz"; }; }; kfloppy = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kfloppy-20.12.1.tar.xz"; - sha256 = "1wpcv2ipx0izg60rbgf8qwhys3bhw8i36qpsvh8bihkzij28xc84"; - name = "kfloppy-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kfloppy-20.12.2.tar.xz"; + sha256 = "1sz6bgw54w8s4bdyyajy0zgxw5kcm45p0gizf7ghw33x5vxryg4g"; + name = "kfloppy-20.12.2.tar.xz"; }; }; kfourinline = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kfourinline-20.12.1.tar.xz"; - sha256 = "1fv68smci1f59xzqzqj36qry2ibgr0ps731vhvafn210q8h2f5b5"; - name = "kfourinline-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kfourinline-20.12.2.tar.xz"; + sha256 = "1ld2srgmriab70j08nvqbaswjp2miljwd8rbpy2dyvzfprmci3xk"; + name = "kfourinline-20.12.2.tar.xz"; }; }; kgeography = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kgeography-20.12.1.tar.xz"; - sha256 = "13jsrfv17lzlwi9rg7i8q2sfl8n19k15qdbv1y5lggykvf8prp8h"; - name = "kgeography-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kgeography-20.12.2.tar.xz"; + sha256 = "0v1355y3fwzq63hq0wz9rskzncnlfdybmqcx23pk57jazsmv6ndi"; + name = "kgeography-20.12.2.tar.xz"; }; }; kget = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kget-20.12.1.tar.xz"; - sha256 = "03s8wpfrzl3j6whxbfbmbydghaghcnr8xbskf4wkyk9kvyk4bqha"; - name = "kget-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kget-20.12.2.tar.xz"; + sha256 = "1xya4raai9jqqzb3kga3mrm7jznkaa0fr4sq8j28qd45bgx2385p"; + name = "kget-20.12.2.tar.xz"; }; }; kgoldrunner = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kgoldrunner-20.12.1.tar.xz"; - sha256 = "0n96clxf0bmhm8hlyvd7q9w1zhjn5irvh2vrf9d79ng44zgygjvh"; - name = "kgoldrunner-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kgoldrunner-20.12.2.tar.xz"; + sha256 = "1ai5hfhwlsiw6ywpmwg9q85hsn3ih44v7n3wj70fsrldh87cn9ps"; + name = "kgoldrunner-20.12.2.tar.xz"; }; }; kgpg = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kgpg-20.12.1.tar.xz"; - sha256 = "05wwdbx90wg3rm6hcin1dykbrbzz82g01dxnkgh21zzab72wmx8a"; - name = "kgpg-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kgpg-20.12.2.tar.xz"; + sha256 = "1szg6fmmnxi94s5r2gxn4mlsiqahharyh05bisy5w7cl9w9c70xg"; + name = "kgpg-20.12.2.tar.xz"; }; }; khangman = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/khangman-20.12.1.tar.xz"; - sha256 = "0ljavjbh69qyp2323pqlkibzjkwgddmdjd35m0m5n4nwvnz3l5y7"; - name = "khangman-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/khangman-20.12.2.tar.xz"; + sha256 = "1bhcdr2v6zgawn819vbqnvgrm52xymgjyr396qbx5mc0srz88bzk"; + name = "khangman-20.12.2.tar.xz"; }; }; khelpcenter = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/khelpcenter-20.12.1.tar.xz"; - sha256 = "1cba8siq3g78xjap4mhfkgvk9n031qy81ir08fpwk6zp9fkkgqb6"; - name = "khelpcenter-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/khelpcenter-20.12.2.tar.xz"; + sha256 = "1mxs0imw64av8dybh91xxy4mmdcikjkqv6apsw29pp3s29irxpdx"; + name = "khelpcenter-20.12.2.tar.xz"; }; }; kidentitymanagement = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kidentitymanagement-20.12.1.tar.xz"; - sha256 = "1f8l8xbwy7qk5hadvknr45ihhg1j7zpqvpf5wxj3h6zg9fmadly9"; - name = "kidentitymanagement-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kidentitymanagement-20.12.2.tar.xz"; + sha256 = "1vcpfcriinx0ywz3jz26810h2cqmlfvyyxd0mzh3jp7rl0kkasgj"; + name = "kidentitymanagement-20.12.2.tar.xz"; }; }; kig = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kig-20.12.1.tar.xz"; - sha256 = "0ns4rhk822p7jjqy9wnhkbrbais4ih1viw405rl5r5xlqn9bvsiz"; - name = "kig-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kig-20.12.2.tar.xz"; + sha256 = "08wvgykrhzf2j4qb0fz4irbyaxjp5ka7jmmjn8y27srz0x4zgkrz"; + name = "kig-20.12.2.tar.xz"; }; }; kigo = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kigo-20.12.1.tar.xz"; - sha256 = "0lvcc423mw3gs6c5x4lrlny07q93pa8ivaqphq6y4771n5y5dqqa"; - name = "kigo-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kigo-20.12.2.tar.xz"; + sha256 = "1a4hv5g2wdpvf56zrr0rna6hdvm2cy6sz1jlhj7hf1lcx3lgfj9g"; + name = "kigo-20.12.2.tar.xz"; }; }; killbots = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/killbots-20.12.1.tar.xz"; - sha256 = "0cdlixd7rakcxa8f5pf3pmq86mlipg7yhygnii858165v0gwkpx3"; - name = "killbots-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/killbots-20.12.2.tar.xz"; + sha256 = "01lmkflndqmrzyrabmh5jqrk2zywcn5s82aag3m0wdqbyrqc5pas"; + name = "killbots-20.12.2.tar.xz"; }; }; kimagemapeditor = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kimagemapeditor-20.12.1.tar.xz"; - sha256 = "0vj2w3bgkq020gdi5q1zh650ipf4zc0hvzx5fpjknx4hd8b52rf8"; - name = "kimagemapeditor-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kimagemapeditor-20.12.2.tar.xz"; + sha256 = "06awvhcjg8nd0wjcqqzccnlpci6cd35flvfs3k05czk70sgqzysq"; + name = "kimagemapeditor-20.12.2.tar.xz"; }; }; kimap = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kimap-20.12.1.tar.xz"; - sha256 = "1x6lapmb3srw3pddi7rmlzjdsw54x94pkr6jyrncpfpqqsgb3l4v"; - name = "kimap-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kimap-20.12.2.tar.xz"; + sha256 = "14kjgn6b1qnfr3zsr3r73wf15n47qqx9vw5z11yv161andrr105d"; + name = "kimap-20.12.2.tar.xz"; }; }; kio-extras = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kio-extras-20.12.1.tar.xz"; - sha256 = "1ym07jzy4w21frf3j5aadxg8ny7bgrm5dbhrc3xdyyj2rwh3iygg"; - name = "kio-extras-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kio-extras-20.12.2.tar.xz"; + sha256 = "1r2sw8i7lf0zyb5bvz4002vdi2bf9jv01735caiw9smxr1lgcz93"; + name = "kio-extras-20.12.2.tar.xz"; }; }; kio-gdrive = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kio-gdrive-20.12.1.tar.xz"; - sha256 = "0axh8138rcfpa0a7s5w8zi8i6chz3z1q7560v497x6rd3d1z2zp0"; - name = "kio-gdrive-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kio-gdrive-20.12.2.tar.xz"; + sha256 = "0rwwakhsn9bnmxxnr0620jyp00x7iqqsaz5nd2lmhyjkc4mqv2km"; + name = "kio-gdrive-20.12.2.tar.xz"; }; }; kipi-plugins = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kipi-plugins-20.12.1.tar.xz"; - sha256 = "0pv5f6v37n75vrz4vaw755bjyyqk1mm9dla26k0jy3qr76g8bg9d"; - name = "kipi-plugins-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kipi-plugins-20.12.2.tar.xz"; + sha256 = "120yi7kfqv74368c78s4gfg7fp2h32v1c3jic2lnsy5y3iad22l8"; + name = "kipi-plugins-20.12.2.tar.xz"; }; }; kirigami-gallery = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kirigami-gallery-20.12.1.tar.xz"; - sha256 = "00f3alhlvlphcz81465nfrdvvabbzy5n1s06bvwzsvf290h5chbh"; - name = "kirigami-gallery-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kirigami-gallery-20.12.2.tar.xz"; + sha256 = "039ddgrvw1l4jvc3yjs0c6fi8kss5ma8hs6cbs8xvw0cyi9604qw"; + name = "kirigami-gallery-20.12.2.tar.xz"; }; }; kiriki = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kiriki-20.12.1.tar.xz"; - sha256 = "07qsmyf1ylgcwy704s8x9g1h4kalsipqz4z3bj1z5m5a2y9l8y8q"; - name = "kiriki-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kiriki-20.12.2.tar.xz"; + sha256 = "0bslysqnnxkjfyxv8vkfmvwjhlw2zdlghbngg21k1ljvgr2jfx6j"; + name = "kiriki-20.12.2.tar.xz"; }; }; kiten = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kiten-20.12.1.tar.xz"; - sha256 = "0dfz2wdscgn0f967lnhzpyb3iz1iw068x0l10542pm5dh32afs4m"; - name = "kiten-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kiten-20.12.2.tar.xz"; + sha256 = "18p4g9cqn25s2zjygwvi9s81ma0b8rhfj9z0i2kd415b2sxalk3y"; + name = "kiten-20.12.2.tar.xz"; }; }; kitinerary = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kitinerary-20.12.1.tar.xz"; - sha256 = "07zjd3ikbx6rw39ndy04aia8q35r75p5n52fijwnc4fkfc40xyxz"; - name = "kitinerary-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kitinerary-20.12.2.tar.xz"; + sha256 = "0z9jyj9wlda44qdncjnp6cyp7dwk89dl9nj68j5birmn83ykaawp"; + name = "kitinerary-20.12.2.tar.xz"; }; }; kjumpingcube = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kjumpingcube-20.12.1.tar.xz"; - sha256 = "0li9bq7j30fbdzg981i6jkpxgrv1z84bpig8m5mxfyfhs5c55j69"; - name = "kjumpingcube-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kjumpingcube-20.12.2.tar.xz"; + sha256 = "04qry2b82yk2k4v1pj8pvqi27my42k5ssmc5rpzkh0vq8pzwgkjh"; + name = "kjumpingcube-20.12.2.tar.xz"; }; }; kldap = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kldap-20.12.1.tar.xz"; - sha256 = "02w4hk9j1f1d81k0j8dzrj4hxwk2xwrf48305hzmm658wjvkv4k3"; - name = "kldap-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kldap-20.12.2.tar.xz"; + sha256 = "1njgsxbqgz0grqagf695qv285x8slgnp4rg377jz1cnz597nzl6b"; + name = "kldap-20.12.2.tar.xz"; }; }; kleopatra = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kleopatra-20.12.1.tar.xz"; - sha256 = "1g06mq8vl1jhkyrjfrgsbl44v7yq04m8xbb8dxlyhyv40dwlz7l6"; - name = "kleopatra-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kleopatra-20.12.2.tar.xz"; + sha256 = "12ayl3gar9bi06v418sflr6fr5k86m8x2ls4laig1ymansbvnwlz"; + name = "kleopatra-20.12.2.tar.xz"; }; }; klettres = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/klettres-20.12.1.tar.xz"; - sha256 = "0k66xdkyv6i1zgk9nvz9633pmxygv1bwm4nkbg3izlh4g23rn3kk"; - name = "klettres-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/klettres-20.12.2.tar.xz"; + sha256 = "0ixykb36a7hgz89zxc8x7fp0di67vmalvpa9rivdff3lp7il87n3"; + name = "klettres-20.12.2.tar.xz"; }; }; klickety = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/klickety-20.12.1.tar.xz"; - sha256 = "17ml80p02sndhac5q6lkf7bb1kz9snsia991fghhahcjvd1g2qn6"; - name = "klickety-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/klickety-20.12.2.tar.xz"; + sha256 = "0dgv6bnz7aw95nxjqkhcanl06hpdx4g8qwkrvnfsiphjbldhfig7"; + name = "klickety-20.12.2.tar.xz"; }; }; klines = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/klines-20.12.1.tar.xz"; - sha256 = "1ba71n90x0s8nf300p53libzfjd0j9r6m0fng636m1qjaz6z9a3c"; - name = "klines-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/klines-20.12.2.tar.xz"; + sha256 = "14mrqfw7y5xcq237a6prfqy8pj34iz5mnfqs373p0jbvdqkc5843"; + name = "klines-20.12.2.tar.xz"; }; }; kmag = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kmag-20.12.1.tar.xz"; - sha256 = "0m4zy1ybk2p4wzdfrdf64n06ck39sn7s0nb82miizcpscaxqswhj"; - name = "kmag-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kmag-20.12.2.tar.xz"; + sha256 = "1vwn5n3c8kq3d3d7sssqpq8iz9g0af4xnvcvjqh4s7fcxmsr3ryv"; + name = "kmag-20.12.2.tar.xz"; }; }; kmahjongg = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kmahjongg-20.12.1.tar.xz"; - sha256 = "1hszrp81pffg7rp0rk54qx49v3acmqfdi0if47kh9w124iicsi3z"; - name = "kmahjongg-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kmahjongg-20.12.2.tar.xz"; + sha256 = "055nihkvfij6a71qn6lw3sbb74zz5r7cp2dghlkai9405ri4gdyc"; + name = "kmahjongg-20.12.2.tar.xz"; }; }; kmail = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kmail-20.12.1.tar.xz"; - sha256 = "128l57x29mqg3fcx50hviqydl7gw6n2zbjnmzrj7fzgl6gafcdgw"; - name = "kmail-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kmail-20.12.2.tar.xz"; + sha256 = "09idfdh04687jzh125jw2244ymaqhx6j3563m2cbf2spph0r1vqj"; + name = "kmail-20.12.2.tar.xz"; }; }; kmail-account-wizard = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kmail-account-wizard-20.12.1.tar.xz"; - sha256 = "1gl4pvn7lyyc9rsk70yp5mikpdbakp4zgwx3plypqhmqd1z92pin"; - name = "kmail-account-wizard-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kmail-account-wizard-20.12.2.tar.xz"; + sha256 = "0a9pz1m3jabi21nrlcj0fqrj1hsgmarw91sxx5qvs74fp2b59368"; + name = "kmail-account-wizard-20.12.2.tar.xz"; }; }; kmailtransport = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kmailtransport-20.12.1.tar.xz"; - sha256 = "08i4fmhkpxil7q6vn045xha54x00jkm19kibphx2q3sb3c6s3plm"; - name = "kmailtransport-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kmailtransport-20.12.2.tar.xz"; + sha256 = "11knn52fc5r637s1w3fzbkapjx6xs1n9v9933ji17zhry7c5rlzv"; + name = "kmailtransport-20.12.2.tar.xz"; }; }; kmbox = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kmbox-20.12.1.tar.xz"; - sha256 = "1w172gqanhpkmcd9hc62lsmrkylg8mlfyk3nq3n89k6m2dkcfvqd"; - name = "kmbox-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kmbox-20.12.2.tar.xz"; + sha256 = "0r76s03g4da2sds6y632gvg228gwsl7gs8ml9rf0fdjb8ymql1hl"; + name = "kmbox-20.12.2.tar.xz"; }; }; kmime = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kmime-20.12.1.tar.xz"; - sha256 = "0hr5mh8a4b9bi0dqs055x4mpig7awqy9sd6j0i8lxix4cngcb6a2"; - name = "kmime-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kmime-20.12.2.tar.xz"; + sha256 = "1jpfhsac2pji80cad0yab59lq7q7c1han0gajvwys1j15jyj11gi"; + name = "kmime-20.12.2.tar.xz"; }; }; kmines = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kmines-20.12.1.tar.xz"; - sha256 = "18jzzn03c6mlmc02qg5fimid77b8gs0h4lci6wmj11fmb94g1hic"; - name = "kmines-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kmines-20.12.2.tar.xz"; + sha256 = "0378cd1zh6w8slap4wry8m69l27nvi7j2dwz2vwkl76zh31q4pwi"; + name = "kmines-20.12.2.tar.xz"; }; }; kmix = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kmix-20.12.1.tar.xz"; - sha256 = "1q1jz33mwnr5nr2mw92g40g7paclaxhwcvqik91la6dnvl0vpi8p"; - name = "kmix-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kmix-20.12.2.tar.xz"; + sha256 = "12kij1y2lbyx71bg32pwb9s9p928pyw44flz9bv2jrzkkf4zwfxk"; + name = "kmix-20.12.2.tar.xz"; }; }; kmousetool = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kmousetool-20.12.1.tar.xz"; - sha256 = "1nahq9cgffcd4llqc8lwkicxjw8nwphvpws9xkalwsswb7ai9jrk"; - name = "kmousetool-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kmousetool-20.12.2.tar.xz"; + sha256 = "0ybrczxsmfrj43nr931ylbdgpqmcfx47ifbv2qjn72i8iggrv0cl"; + name = "kmousetool-20.12.2.tar.xz"; }; }; kmouth = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kmouth-20.12.1.tar.xz"; - sha256 = "0qhparw2qszv7z7lrzb76kyvkcgr9sgry9ir9965dd0sp4c1fhgc"; - name = "kmouth-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kmouth-20.12.2.tar.xz"; + sha256 = "1vq41r1vhr5iaxlb5dzpq3vwqk1rn1zxw3k4j7g2xq5xxmibj944"; + name = "kmouth-20.12.2.tar.xz"; }; }; kmplot = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kmplot-20.12.1.tar.xz"; - sha256 = "0iz61jjr7z0j5bh5nqdv9nbdbiz0jhda89bxjds0n9636q42rifm"; - name = "kmplot-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kmplot-20.12.2.tar.xz"; + sha256 = "0l6j68zg9xdrgglw7gnji0spjf7pcggym90cccw67jdn2wxc8g6q"; + name = "kmplot-20.12.2.tar.xz"; }; }; knavalbattle = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/knavalbattle-20.12.1.tar.xz"; - sha256 = "0k7kqnc8zp3n0ckrmmih12x6h1vgn9s7hrgp7n37bns2g39ij0xn"; - name = "knavalbattle-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/knavalbattle-20.12.2.tar.xz"; + sha256 = "0x47rzs7afqygcy45crc10ix4dsivnpmxis9r0w4lpzbq3qzd585"; + name = "knavalbattle-20.12.2.tar.xz"; }; }; knetwalk = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/knetwalk-20.12.1.tar.xz"; - sha256 = "0px8yfi5h9nipgdjcgskrm66dr23yg5ks0kyxjsly6mv41qxjiw8"; - name = "knetwalk-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/knetwalk-20.12.2.tar.xz"; + sha256 = "11h7b5amm4bcng0h8hfcn1r1nkd82h0rl47wvnqczsgjqp2r9h6a"; + name = "knetwalk-20.12.2.tar.xz"; }; }; knights = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/knights-20.12.1.tar.xz"; - sha256 = "098ywblshbr3qx7b8m4qj0036dq3c3mackmsbjnr85acb0204bjb"; - name = "knights-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/knights-20.12.2.tar.xz"; + sha256 = "1p5w61x4ldb5sp77l1c0v7aczi62xpvf1084316byhb5cqmxsqm9"; + name = "knights-20.12.2.tar.xz"; }; }; knotes = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/knotes-20.12.1.tar.xz"; - sha256 = "11gfk2p240a2gqxgkn9ymf7ds2zpij8h2vbbkax6ariddmhmlqk0"; - name = "knotes-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/knotes-20.12.2.tar.xz"; + sha256 = "11dvczl04lmzlhbmqp508bqrsrqqmmprp3nsvakmmidpgnvcm26l"; + name = "knotes-20.12.2.tar.xz"; }; }; kolf = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kolf-20.12.1.tar.xz"; - sha256 = "12b424dl6rizj2pdcd4cr01lmp4kmirii79k40v22hn0yn6a9qdv"; - name = "kolf-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kolf-20.12.2.tar.xz"; + sha256 = "1jw22m7a2jdw9zmssiihwm35zpq7bg8zk0a68fh5nxbyv43q8fj5"; + name = "kolf-20.12.2.tar.xz"; }; }; kollision = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kollision-20.12.1.tar.xz"; - sha256 = "1hxv4qd5dl61d5440r4hnd9r24prn78ibmnk3m06c15zc3hfdsdn"; - name = "kollision-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kollision-20.12.2.tar.xz"; + sha256 = "0g0mf9p1pz9wahc92k9iw1vb8v64y1kj7zgiyzmil6qr1pjyzlgm"; + name = "kollision-20.12.2.tar.xz"; }; }; kolourpaint = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kolourpaint-20.12.1.tar.xz"; - sha256 = "1a2wgrf9hirvj61k2nd8x7rv5v8i9r1vrvpdmi9ik4qdg6lpvqay"; - name = "kolourpaint-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kolourpaint-20.12.2.tar.xz"; + sha256 = "13pb09r9qrgwaii9x3a6qk3qgk288a821p4xgiwaiv9lcbjz56fn"; + name = "kolourpaint-20.12.2.tar.xz"; }; }; kompare = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kompare-20.12.1.tar.xz"; - sha256 = "13di8dzp7xzlfacas5f92h1vwiqf64cd0rkc4yv4l2g8aq2jzcqh"; - name = "kompare-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kompare-20.12.2.tar.xz"; + sha256 = "18n5sw52kwwmbgyb2q5lizpa57by8gmx665bj68wi2hvzdihmxmv"; + name = "kompare-20.12.2.tar.xz"; }; }; konqueror = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/konqueror-20.12.1.tar.xz"; - sha256 = "026f8fybr8azq3diw2k3p3qpmqj9lk6n9ipcl3xkwdss7i5v5w3y"; - name = "konqueror-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/konqueror-20.12.2.tar.xz"; + sha256 = "0zvr71yz2053y341b12zw92v0yk5whgivcr0iyz488lfw9wq0n4d"; + name = "konqueror-20.12.2.tar.xz"; }; }; konquest = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/konquest-20.12.1.tar.xz"; - sha256 = "1s08mvj7z91r86i0zwkcv05fnnr4lzhp596qr38d2yv6rxf5vr57"; - name = "konquest-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/konquest-20.12.2.tar.xz"; + sha256 = "0p4y7s37a3vchplpidlv4bc94gwnsm4k7sl4s2ra0prqga83yxbj"; + name = "konquest-20.12.2.tar.xz"; }; }; konsole = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/konsole-20.12.1.tar.xz"; - sha256 = "1v39sx00c115apnm32wn00yir69z1h0y3lblmjmvbjk24hwvx45n"; - name = "konsole-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/konsole-20.12.2.tar.xz"; + sha256 = "0wq8xbppg4fla8x669rvkz4mrpbpaplr0ysdvnc4djbwnzabs6zw"; + name = "konsole-20.12.2.tar.xz"; }; }; kontact = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kontact-20.12.1.tar.xz"; - sha256 = "0dr59jj97zxkgc61zgwa8i26m81sfxvymxcrh5midwd24z8nslkz"; - name = "kontact-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kontact-20.12.2.tar.xz"; + sha256 = "05pvrbsbrz39znim2jrcslnji8n4imig8f717jv89nlmllp5sk2i"; + name = "kontact-20.12.2.tar.xz"; }; }; kontactinterface = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kontactinterface-20.12.1.tar.xz"; - sha256 = "0sdlgmwvir2s9ys466i4bj4raf2af43w838and64jwsr9qb1hg4j"; - name = "kontactinterface-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kontactinterface-20.12.2.tar.xz"; + sha256 = "0i3kxim4rc4mvqlq06g0a8h106gb93v4s0kymysd4a4yw3pq4fas"; + name = "kontactinterface-20.12.2.tar.xz"; }; }; kontrast = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kontrast-20.12.1.tar.xz"; - sha256 = "0cs31sn4va2hhfi7ps3bz9sy2hlxb8cawn5vijfdhzb9mmc962br"; - name = "kontrast-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kontrast-20.12.2.tar.xz"; + sha256 = "0cqqclyqm0z59n296jh6pnb2zdzligmvsd2icb1qzxn2r69inipa"; + name = "kontrast-20.12.2.tar.xz"; }; }; konversation = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/konversation-20.12.1.tar.xz"; - sha256 = "1x6pyiv73avc3qmxlbnwwzk3gz6qbr991p896f9yb4rqfqj8j7j4"; - name = "konversation-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/konversation-20.12.2.tar.xz"; + sha256 = "0m13qpvzxm5arawsqh2hygs266jv9915lhc3xhs0b1wbhjb3ii8l"; + name = "konversation-20.12.2.tar.xz"; }; }; kopete = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kopete-20.12.1.tar.xz"; - sha256 = "1cfbl3jalmaphwrzw443l4q5k1fx4nja65ajgrv3nly8rfabfnfl"; - name = "kopete-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kopete-20.12.2.tar.xz"; + sha256 = "0ahcxkvi5ibdl3krm3aw5gamcyfi4s4af2wl6r3sk73l7q4kpxvi"; + name = "kopete-20.12.2.tar.xz"; }; }; korganizer = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/korganizer-20.12.1.tar.xz"; - sha256 = "1ci6ca6w3a77gf3d7fh9rjkblm5qa2jic176rwmax79qgvjjq8wm"; - name = "korganizer-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/korganizer-20.12.2.tar.xz"; + sha256 = "1f2j60gdx3hxz64lhx9cyi7sa75s2qr8zghhk8h1wgdwaz9hvjz8"; + name = "korganizer-20.12.2.tar.xz"; }; }; kosmindoormap = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kosmindoormap-20.12.1.tar.xz"; - sha256 = "186kfqaznxyxqchwqsrb4dvk4v69rhqwfg93fcjsp43l14ml5rnx"; - name = "kosmindoormap-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kosmindoormap-20.12.2.tar.xz"; + sha256 = "0rr6lgfbjdvnxipx0dnzp4hlrvq61ha015mz7qkly88ckwp6m05q"; + name = "kosmindoormap-20.12.2.tar.xz"; }; }; kpat = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kpat-20.12.1.tar.xz"; - sha256 = "1kd3i7qhjwxi04x8dkc7q9rgx73zyx3njm5rhq0hc1v32m8nn659"; - name = "kpat-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kpat-20.12.2.tar.xz"; + sha256 = "1gcv343aabwcgx3kb9khkvilnxipq200pz14d8qdj41lsa71cynx"; + name = "kpat-20.12.2.tar.xz"; }; }; kpimtextedit = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kpimtextedit-20.12.1.tar.xz"; - sha256 = "15m26qssw80nxv1m51jq3q629nginhh4hb69a5y15jgvrv4k59b4"; - name = "kpimtextedit-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kpimtextedit-20.12.2.tar.xz"; + sha256 = "1ccvzwbxbsbb4b5hfjvf30fv44b1byjzb08x4vagbrqb47ck763y"; + name = "kpimtextedit-20.12.2.tar.xz"; }; }; kpkpass = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kpkpass-20.12.1.tar.xz"; - sha256 = "09idbgf9gnzyr520indlzhwb9pr5hx3dag26qrfi7l8ywzdkrsr2"; - name = "kpkpass-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kpkpass-20.12.2.tar.xz"; + sha256 = "1m0cqlrpjmfam0lyjjzpd8wgsv9v0x6fr76qr5ndyrfbfcv0qin3"; + name = "kpkpass-20.12.2.tar.xz"; }; }; kpmcore = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kpmcore-20.12.1.tar.xz"; - sha256 = "0nyqz1jfr9h9n80npvp7yyizbyga6iv8yljq52myk6b40vs9q41v"; - name = "kpmcore-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kpmcore-20.12.2.tar.xz"; + sha256 = "1z8fln51jsgar69m2x8rb95zxbq6r28cycpa7y52gaiywahbsin4"; + name = "kpmcore-20.12.2.tar.xz"; }; }; kpublictransport = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kpublictransport-20.12.1.tar.xz"; - sha256 = "0saqykqb9rrm3ngvcx910dmhyh1hc3n0x3qfzlzrxlq678ag94hq"; - name = "kpublictransport-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kpublictransport-20.12.2.tar.xz"; + sha256 = "1n7gy9pnykxd39ralfxrrvbsgxn68f1jzvbmkyvj759xrl2na1kq"; + name = "kpublictransport-20.12.2.tar.xz"; }; }; kqtquickcharts = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kqtquickcharts-20.12.1.tar.xz"; - sha256 = "0025vj4n0k3g5bsmjq6ydx80izvpx6g73jxz27hp69vbl8p4ylpc"; - name = "kqtquickcharts-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kqtquickcharts-20.12.2.tar.xz"; + sha256 = "06lrvckmddyxl11kyic99dhfn8il88hs1vsnr89y3m8543ij885n"; + name = "kqtquickcharts-20.12.2.tar.xz"; }; }; krdc = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/krdc-20.12.1.tar.xz"; - sha256 = "067xrhs55di2ff0lxvcl2x7qblmv2pbrgjkc5bjsx6ai6w9bv4dh"; - name = "krdc-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/krdc-20.12.2.tar.xz"; + sha256 = "0wzv25pdalwgcb74dav4jkxpvak0nix46njn04w2vhy3rdlgplzr"; + name = "krdc-20.12.2.tar.xz"; }; }; kreversi = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kreversi-20.12.1.tar.xz"; - sha256 = "1yw9lxzqyxk6fsh2lzsrp2cmdw545hszdz9253lm6b5ppax6z42a"; - name = "kreversi-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kreversi-20.12.2.tar.xz"; + sha256 = "1c0xisbbq6p6ghl5rvhiddpgsa91m4bq8hmrpdw8s02j4g8aix39"; + name = "kreversi-20.12.2.tar.xz"; }; }; krfb = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/krfb-20.12.1.tar.xz"; - sha256 = "0pfxd0nci9g4wkh4qcgk3yhm9rl9yx2d4jpfxgdmiacfp9hkqxj6"; - name = "krfb-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/krfb-20.12.2.tar.xz"; + sha256 = "0js84sc9s8h7b1zkdg2k83qhh2q3dz5yfk17am480b3889pyjyd8"; + name = "krfb-20.12.2.tar.xz"; }; }; kross-interpreters = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kross-interpreters-20.12.1.tar.xz"; - sha256 = "1csk3xkkkqvffms5ivy08hyd2mizg7ywcrdapxx40m5kwsn6vpxs"; - name = "kross-interpreters-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kross-interpreters-20.12.2.tar.xz"; + sha256 = "04g8fqcr88k7b8sivkqasj8d5fywhmm69g4spv1rpm4m89gr70jn"; + name = "kross-interpreters-20.12.2.tar.xz"; }; }; kruler = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kruler-20.12.1.tar.xz"; - sha256 = "1jiz9s647bndpi4gg3f7wwg0c0cv8wf1myjxwdpx5a0ggdr2xh3q"; - name = "kruler-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kruler-20.12.2.tar.xz"; + sha256 = "0xayhfav4723m5z5bgv4zxa95zvsfgvfh0wf80y8c7wwfgsyn9ja"; + name = "kruler-20.12.2.tar.xz"; }; }; kshisen = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kshisen-20.12.1.tar.xz"; - sha256 = "1awnpj66080g2y41014g2pgb5llyqw56b54z6ydhfya4a0a8gsds"; - name = "kshisen-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kshisen-20.12.2.tar.xz"; + sha256 = "079sr9k8zg01imy2c54wx371fcxlzsm122ng0zl4cn69dndczjkf"; + name = "kshisen-20.12.2.tar.xz"; }; }; ksirk = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/ksirk-20.12.1.tar.xz"; - sha256 = "11bcmxjjyf095i790f5r3cr5hskw2x9458vwfm7yd57qx3r01axz"; - name = "ksirk-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/ksirk-20.12.2.tar.xz"; + sha256 = "10ksb77ljwfm25m8jrxh4cbss0lrjdmiigjbmyppxcls1rz8a6cn"; + name = "ksirk-20.12.2.tar.xz"; }; }; ksmtp = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/ksmtp-20.12.1.tar.xz"; - sha256 = "1yahcgchfhk742n6hmpr2b2fll6jrw0vs1hrfvms3n7w7vxnkyxg"; - name = "ksmtp-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/ksmtp-20.12.2.tar.xz"; + sha256 = "0rcs5zcrj8sscr0h0vx4ndbj3ziyxns5glk5bzpj1092b11pwllw"; + name = "ksmtp-20.12.2.tar.xz"; }; }; ksnakeduel = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/ksnakeduel-20.12.1.tar.xz"; - sha256 = "1647m2a918kr762fmvffj2ipamhvcihc8yg8z80b8lwinpspcdfc"; - name = "ksnakeduel-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/ksnakeduel-20.12.2.tar.xz"; + sha256 = "1cd1nldrmhimc1f059hqjkb8g8yjri7gf9cyxz7j0p48dxg93ns4"; + name = "ksnakeduel-20.12.2.tar.xz"; }; }; kspaceduel = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kspaceduel-20.12.1.tar.xz"; - sha256 = "17i2saa48xq62j0aca555lqjxf6ry3wkxw5vm5v32g3kwkr10m78"; - name = "kspaceduel-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kspaceduel-20.12.2.tar.xz"; + sha256 = "0mz3s5q8fyl76ck8b9s65w2q90a5cz2p4clnbxam8f72fk2g0g1v"; + name = "kspaceduel-20.12.2.tar.xz"; }; }; ksquares = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/ksquares-20.12.1.tar.xz"; - sha256 = "085bvcx5p13j32017c0vm3zvcr0r0dzcbxpp21mvrp1xzy2dw7v2"; - name = "ksquares-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/ksquares-20.12.2.tar.xz"; + sha256 = "11mfyyjrdlh8dzpzwvyr48rfg758hr14sb0cw1zvd7d7cz86dr31"; + name = "ksquares-20.12.2.tar.xz"; }; }; ksudoku = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/ksudoku-20.12.1.tar.xz"; - sha256 = "0a0i87ddxa75admnxl181dsqmab4cwbb6pncl34z4sppf272z8km"; - name = "ksudoku-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/ksudoku-20.12.2.tar.xz"; + sha256 = "01i4niy1nlikbw1j7qlwldcaniwb1pl4hr4p6icgsvfzr8pjl09z"; + name = "ksudoku-20.12.2.tar.xz"; }; }; ksystemlog = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/ksystemlog-20.12.1.tar.xz"; - sha256 = "0535s6sq4wccdxv0xw12x3zzjkp0746s3hmlk93sginwq5fixxc0"; - name = "ksystemlog-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/ksystemlog-20.12.2.tar.xz"; + sha256 = "1fyrpkk5ipp5q8sairmyx9bayndbbr9srrwdhp7grhbiw8kbjlc7"; + name = "ksystemlog-20.12.2.tar.xz"; }; }; kteatime = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kteatime-20.12.1.tar.xz"; - sha256 = "0j9c3wy398z61ciyf91hv7l3bxski827di9ib94wyjkwqd6516zx"; - name = "kteatime-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kteatime-20.12.2.tar.xz"; + sha256 = "18rpnvagrcmd62qss31rkv81kkjcz9kcisj9q0j41p770jvan8id"; + name = "kteatime-20.12.2.tar.xz"; }; }; ktimer = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/ktimer-20.12.1.tar.xz"; - sha256 = "0iac06mzszg6g1flbs0mzj8ddnvh6kdgbhakjxl969in4c1frz9w"; - name = "ktimer-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/ktimer-20.12.2.tar.xz"; + sha256 = "17sw7wl9844sg180h0x2skaj4bnkv6qin6cwklsp058wyf06w5wy"; + name = "ktimer-20.12.2.tar.xz"; }; }; ktnef = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/ktnef-20.12.1.tar.xz"; - sha256 = "1pq4mabh7glpxl2iwj5rrfwim4x6xfg2vlpx7z0d0n13gh85b4fd"; - name = "ktnef-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/ktnef-20.12.2.tar.xz"; + sha256 = "147dxalzgqfmacr0f44pbxg0ks5p7ck607gkbzf5asxgn4dlvgxq"; + name = "ktnef-20.12.2.tar.xz"; }; }; ktorrent = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/ktorrent-20.12.1.tar.xz"; - sha256 = "0m43wsz0k87ncvg3zdffsp06nwdrlfnw52fi1ry12z2rnkcm4pwc"; - name = "ktorrent-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/ktorrent-20.12.2.tar.xz"; + sha256 = "1fvbg3700my5algzif4dyy7zsc74qrby7ldfbj7snlxa4scws042"; + name = "ktorrent-20.12.2.tar.xz"; }; }; ktouch = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/ktouch-20.12.1.tar.xz"; - sha256 = "10lm2p8w26c9n6lhvw3301myfss0dq7hl7rawzb3hsy1lqvmvdib"; - name = "ktouch-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/ktouch-20.12.2.tar.xz"; + sha256 = "0j3xzm5ghnfvqb98xwrjzkrdm991af8rgnay38s081ykvj2hxj3n"; + name = "ktouch-20.12.2.tar.xz"; }; }; ktp-accounts-kcm = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/ktp-accounts-kcm-20.12.1.tar.xz"; - sha256 = "0440s2rrh03x8h5bp6xywidngrb1pinndsigaj4k4yvz122j2y53"; - name = "ktp-accounts-kcm-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/ktp-accounts-kcm-20.12.2.tar.xz"; + sha256 = "0dyr3600yrd2hjs2s54210h1kj95w5mz9pl2fpwzcqgkmmd9vss5"; + name = "ktp-accounts-kcm-20.12.2.tar.xz"; }; }; ktp-approver = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/ktp-approver-20.12.1.tar.xz"; - sha256 = "14ygpqvjhyzryrlinz0i2a6nyn1gnxs0hwx35imiz8hg4sb9402k"; - name = "ktp-approver-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/ktp-approver-20.12.2.tar.xz"; + sha256 = "1h3fi19qqmik6f7h12manb8yval0qqj7jdhrpp07ck67m7mibwzr"; + name = "ktp-approver-20.12.2.tar.xz"; }; }; ktp-auth-handler = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/ktp-auth-handler-20.12.1.tar.xz"; - sha256 = "1bysipq957kqbl33zj88m1g987b02v25gmh5lpnmrnlqznxw0ws7"; - name = "ktp-auth-handler-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/ktp-auth-handler-20.12.2.tar.xz"; + sha256 = "158n88pcxj7hdmsmhcqbfpqc4lhrpzighxgb4wdrzizi9dwpxb3h"; + name = "ktp-auth-handler-20.12.2.tar.xz"; }; }; ktp-call-ui = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/ktp-call-ui-20.12.1.tar.xz"; - sha256 = "154zgg84ln823al40s5fwxf10k3p73mz4fjn2lyhdqgsx68l08sy"; - name = "ktp-call-ui-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/ktp-call-ui-20.12.2.tar.xz"; + sha256 = "0xhf79gqr6b8hiscv6jnmjnl8nb7c6vsvxn7hzvri9nm7hfmldya"; + name = "ktp-call-ui-20.12.2.tar.xz"; }; }; ktp-common-internals = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/ktp-common-internals-20.12.1.tar.xz"; - sha256 = "1f8l1ywccxga3ff8qvf4ybabkd57apidkx7ky49dfi785kgvym16"; - name = "ktp-common-internals-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/ktp-common-internals-20.12.2.tar.xz"; + sha256 = "06m8g80lj2cnx5cnfi6m1fy6pg6rm78kxg7v1493xcsfzizlc276"; + name = "ktp-common-internals-20.12.2.tar.xz"; }; }; ktp-contact-list = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/ktp-contact-list-20.12.1.tar.xz"; - sha256 = "122p2xp6wqmvk7mbplgnilsbnk6hfzrgbxpr39n462pkwbmvs44j"; - name = "ktp-contact-list-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/ktp-contact-list-20.12.2.tar.xz"; + sha256 = "037si47l8nc18d7yzh6d7i3gy710y5npxv4wcal6yg8mlr2qzjli"; + name = "ktp-contact-list-20.12.2.tar.xz"; }; }; ktp-contact-runner = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/ktp-contact-runner-20.12.1.tar.xz"; - sha256 = "1w8jp1nmjwaaqpim2jfpbv3d7w9asn93qi2ag2d6wx6mcc2q84jb"; - name = "ktp-contact-runner-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/ktp-contact-runner-20.12.2.tar.xz"; + sha256 = "1pv7smf5mld5rgld2nsqjwgl7vwsf99f3z4hamlbq6bpdg02w936"; + name = "ktp-contact-runner-20.12.2.tar.xz"; }; }; ktp-desktop-applets = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/ktp-desktop-applets-20.12.1.tar.xz"; - sha256 = "0z3vv7q5kk27fm32bmhffpj6w72mldcdxsq6p3d33zf6rkz2rb74"; - name = "ktp-desktop-applets-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/ktp-desktop-applets-20.12.2.tar.xz"; + sha256 = "1mx1q1gk756pkbpwghsvkspj3npgfzp2lf4jqldkyygvyqn3gxx4"; + name = "ktp-desktop-applets-20.12.2.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/ktp-filetransfer-handler-20.12.1.tar.xz"; - sha256 = "0b8ha1jxhrdk67mzwrd0ypz99shlfr6sanxbbv0j3xh77sjcqpq3"; - name = "ktp-filetransfer-handler-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/ktp-filetransfer-handler-20.12.2.tar.xz"; + sha256 = "16ys5cyx1pzcv0affy8agp0sbci9rkvpknfffldrvlgqppxza5rd"; + name = "ktp-filetransfer-handler-20.12.2.tar.xz"; }; }; ktp-kded-module = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/ktp-kded-module-20.12.1.tar.xz"; - sha256 = "1hbb5pj3gaw9sg5rj2rb7a8xqrixfhr040rcdjsln337zyy98iqf"; - name = "ktp-kded-module-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/ktp-kded-module-20.12.2.tar.xz"; + sha256 = "1wkvi5l9fvq24c3vdflg0azjxykid61i6mi59cnrnr866a1rbgrg"; + name = "ktp-kded-module-20.12.2.tar.xz"; }; }; ktp-send-file = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/ktp-send-file-20.12.1.tar.xz"; - sha256 = "1vgfqa062h5yxdsz71h2zz247mzv6mn0zm7dz1v8p4pzns9kscq1"; - name = "ktp-send-file-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/ktp-send-file-20.12.2.tar.xz"; + sha256 = "0j32c81rabbxh3m0jnnahny01qz2h7yc7l90w39r2jkv9r5f3yvf"; + name = "ktp-send-file-20.12.2.tar.xz"; }; }; ktp-text-ui = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/ktp-text-ui-20.12.1.tar.xz"; - sha256 = "13cx2pv4wqmrgbi4sg51fhp418r50ajjhc9yz5mv7ad2gxml5c61"; - name = "ktp-text-ui-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/ktp-text-ui-20.12.2.tar.xz"; + sha256 = "09wkpyadf3dvnrbxrasr66yw4hqnb3kbk6va9bs836fvcaiwagwd"; + name = "ktp-text-ui-20.12.2.tar.xz"; }; }; ktuberling = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/ktuberling-20.12.1.tar.xz"; - sha256 = "06la1cvwvpiqjdwv7icdg55dd8pkc587bfwwjdq2fhp2pyh3ws6j"; - name = "ktuberling-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/ktuberling-20.12.2.tar.xz"; + sha256 = "0yndqhgw9s2hydfsz2x3lr1m22ii2whc4kcp2jbkj9ssiymp8s68"; + name = "ktuberling-20.12.2.tar.xz"; }; }; kturtle = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kturtle-20.12.1.tar.xz"; - sha256 = "12jr4sbchjpvc730cy4bp2cccdsd8vw901dgyq0nar8p0pvg4ybb"; - name = "kturtle-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kturtle-20.12.2.tar.xz"; + sha256 = "1a46c6j7jng9l789wdpp7qj639872dfj268hj8nq63n27f82whr0"; + name = "kturtle-20.12.2.tar.xz"; }; }; kubrick = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kubrick-20.12.1.tar.xz"; - sha256 = "1hdkm9vw9wpc8b3mw0yy9cz5ylm0h75zbg51rw4glai48bb3gs8i"; - name = "kubrick-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kubrick-20.12.2.tar.xz"; + sha256 = "0g3zxdbj5l28msvs8gpn15g739pwwids7wxmky6w3b4qyn427j8m"; + name = "kubrick-20.12.2.tar.xz"; }; }; kwalletmanager = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kwalletmanager-20.12.1.tar.xz"; - sha256 = "0nsg2xjzz6qvjqpxj1bbzzikvcl1ipqjwwab2kdwg71vlp99ravj"; - name = "kwalletmanager-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kwalletmanager-20.12.2.tar.xz"; + sha256 = "02lx3p7860pigslx6s3bjg54sjjv1q93f9aknv5d32iblv2gaxiw"; + name = "kwalletmanager-20.12.2.tar.xz"; }; }; kwave = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kwave-20.12.1.tar.xz"; - sha256 = "1w5r7di9401dm60p3bkp8qg41pvlz4226szki5s6pmmq89dixdgq"; - name = "kwave-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kwave-20.12.2.tar.xz"; + sha256 = "0nankggamy1jxllnsv642kav57kwkbxpkd2mz6rarjinfnnqi7kd"; + name = "kwave-20.12.2.tar.xz"; }; }; kwordquiz = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/kwordquiz-20.12.1.tar.xz"; - sha256 = "1dvbvfwaja4n2v9binj8pbdjizqz4zp49fiq8b4k5jxygcsgnx2p"; - name = "kwordquiz-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/kwordquiz-20.12.2.tar.xz"; + sha256 = "1iik5khnsarxjipmd8znbiqs20bd65hanhmdmp7awqs7p0k4a0sq"; + name = "kwordquiz-20.12.2.tar.xz"; }; }; libgravatar = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/libgravatar-20.12.1.tar.xz"; - sha256 = "12byf7p0fwsfy61gcv112bhq3zczjy5n1dm32x2lrjyis2dh2z9j"; - name = "libgravatar-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/libgravatar-20.12.2.tar.xz"; + sha256 = "07pnj708wrvfmmy7j2vsx9j1sl9wx3hd7vfnpqa4zd24ci7x7y3d"; + name = "libgravatar-20.12.2.tar.xz"; }; }; libkcddb = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/libkcddb-20.12.1.tar.xz"; - sha256 = "07ky4ly72689gb58jxqqzq5bgmb9wslxkqj0ldam6v82ldk8ss7k"; - name = "libkcddb-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/libkcddb-20.12.2.tar.xz"; + sha256 = "1px7cgc75ypxaqknamqgxps4796388j99ycrbgrlyrhzws1mva8k"; + name = "libkcddb-20.12.2.tar.xz"; }; }; libkcompactdisc = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/libkcompactdisc-20.12.1.tar.xz"; - sha256 = "101szps2js8dhxdn913mj9b2z953rp47ikkbrrdjl1fq1i8dh6ib"; - name = "libkcompactdisc-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/libkcompactdisc-20.12.2.tar.xz"; + sha256 = "0yj2gkl1d76mf2lp02apxh4lmb9rnzvp0c8y0992ssnfsrivalp4"; + name = "libkcompactdisc-20.12.2.tar.xz"; }; }; libkdcraw = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/libkdcraw-20.12.1.tar.xz"; - sha256 = "1vkjyccyax622a3jvqdfnppansabxaxplyk9prn302zqmgvl05h3"; - name = "libkdcraw-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/libkdcraw-20.12.2.tar.xz"; + sha256 = "1hgw087frq9yzzwp2mkl3xqz2gd4v82kyiym2316i1xpmbkgcqfm"; + name = "libkdcraw-20.12.2.tar.xz"; }; }; libkdegames = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/libkdegames-20.12.1.tar.xz"; - sha256 = "1zy44k98xjjydsa35bagf152kfb394wxpdx0c06vcf404jkhk7ng"; - name = "libkdegames-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/libkdegames-20.12.2.tar.xz"; + sha256 = "0fcl06z5zl1hycj8f8q9dz6fc9lb0dqd5ciha4yig98ybzi3zn8r"; + name = "libkdegames-20.12.2.tar.xz"; }; }; libkdepim = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/libkdepim-20.12.1.tar.xz"; - sha256 = "0kp2xssl1qbl3ziskxl3hhvyp8nc35d2fijk6hl99j3sxpdi2s4f"; - name = "libkdepim-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/libkdepim-20.12.2.tar.xz"; + sha256 = "0f9c96w7ijlvfg9dr0w9wwaf05fn0z32zx8nn8jp42pzcbn6yr56"; + name = "libkdepim-20.12.2.tar.xz"; }; }; libkeduvocdocument = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/libkeduvocdocument-20.12.1.tar.xz"; - sha256 = "0kqnhaabfi91clqg7nlnjcybl5ca0p3ysn5zlwhxz1fcjxm83g4w"; - name = "libkeduvocdocument-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/libkeduvocdocument-20.12.2.tar.xz"; + sha256 = "0lki60mv82ygss2bxgwg178xabvfn85zlg0pwk2gj30zg0jiaw66"; + name = "libkeduvocdocument-20.12.2.tar.xz"; }; }; libkexiv2 = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/libkexiv2-20.12.1.tar.xz"; - sha256 = "1vylyl3gxk3xais7c640kdnp4s4jwd9y2xxkwmf36ax0dv8wdcv0"; - name = "libkexiv2-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/libkexiv2-20.12.2.tar.xz"; + sha256 = "10j82xk7y7vf9y9ss83hc9fd9c1dbd55nwjf28bj7myqaji4wdpb"; + name = "libkexiv2-20.12.2.tar.xz"; }; }; libkgapi = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/libkgapi-20.12.1.tar.xz"; - sha256 = "0cx8lbzq8ambz2lbslakczzcfmhri4268p7zf7hnf3ymd17a5y8d"; - name = "libkgapi-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/libkgapi-20.12.2.tar.xz"; + sha256 = "1yaas07ixxjnb5a37dq93skqs0vk08rdr9ll30jr7kdll311s5ni"; + name = "libkgapi-20.12.2.tar.xz"; }; }; libkipi = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/libkipi-20.12.1.tar.xz"; - sha256 = "1ln4f1n9ghiqb9h4lpw6qcwz7wrvm8jlcqn1ingjh9s58zw8wqsg"; - name = "libkipi-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/libkipi-20.12.2.tar.xz"; + sha256 = "1axjvkrmjszxyh0fdm9k25g4gpzmn4hsw222k2qj3smvnhdj37zk"; + name = "libkipi-20.12.2.tar.xz"; }; }; libkleo = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/libkleo-20.12.1.tar.xz"; - sha256 = "0dq86pg0jchlpsynk0355wwq3pggqkj0mxhyvgi6a0xb2riy2r4a"; - name = "libkleo-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/libkleo-20.12.2.tar.xz"; + sha256 = "0xsljfiqqggdp31c7irjn6lgacdds5kb7sr3khg24bsgip9488k1"; + name = "libkleo-20.12.2.tar.xz"; }; }; libkmahjongg = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/libkmahjongg-20.12.1.tar.xz"; - sha256 = "0cq0bcl7hkgj1v7giqzbrvlds2933ji52fg53cakz29fkgxibj3x"; - name = "libkmahjongg-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/libkmahjongg-20.12.2.tar.xz"; + sha256 = "1yl2smx0ybr164pl8nv5a7jibq3pmpf0v4ijvardp53j51bs2c2q"; + name = "libkmahjongg-20.12.2.tar.xz"; }; }; libkomparediff2 = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/libkomparediff2-20.12.1.tar.xz"; - sha256 = "04klqvhh8zl5lyblpqgm92wycq4r0hh6gx18nqnsgx6lknlrx9y3"; - name = "libkomparediff2-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/libkomparediff2-20.12.2.tar.xz"; + sha256 = "03fn3l1qhzivck7jzfp7fwpgix701paj03rzvc46rs4f1bfmb1d9"; + name = "libkomparediff2-20.12.2.tar.xz"; }; }; libksane = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/libksane-20.12.1.tar.xz"; - sha256 = "07xsfs0lkh35nj0fy7y1r46nkdmm26nbpsm846v18lh7wflxi36j"; - name = "libksane-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/libksane-20.12.2.tar.xz"; + sha256 = "1bhwfsyfd2z4hagfggz3ckxbyqrifcbwyn79h59qpng7nkzsgw4b"; + name = "libksane-20.12.2.tar.xz"; }; }; libksieve = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/libksieve-20.12.1.tar.xz"; - sha256 = "07zgcsdl38fdy5pskp51rj5p7m3pz9szwidyg24mdyzb08k5xpdz"; - name = "libksieve-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/libksieve-20.12.2.tar.xz"; + sha256 = "0rjchcpc4sx53siv3b9hq6s12qh96rrb4xmnk3gjhsvqq9gmyq3j"; + name = "libksieve-20.12.2.tar.xz"; }; }; libktorrent = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/libktorrent-20.12.1.tar.xz"; - sha256 = "18mcrb064gizqb699cs9bvm918gg06wm6sq33pi87kwki5cniamv"; - name = "libktorrent-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/libktorrent-20.12.2.tar.xz"; + sha256 = "15ywv00vklvqw7x6id4vycf4rmi4j3s6z70c68h1b6v8n9j3rz3b"; + name = "libktorrent-20.12.2.tar.xz"; }; }; lokalize = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/lokalize-20.12.1.tar.xz"; - sha256 = "0mxzk9s0yrjf8gj70dpl1wbvnrkzc3ncqab2bj3yx0xk05hagjlx"; - name = "lokalize-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/lokalize-20.12.2.tar.xz"; + sha256 = "1ms7x5aw5z63q2xy6f3x8dl1k39yjqbabzh8qznaqs172bwmwzz7"; + name = "lokalize-20.12.2.tar.xz"; }; }; lskat = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/lskat-20.12.1.tar.xz"; - sha256 = "0p8n2cgfdxxjbx4jcpqf85h6k36nggj32h982yj3ig5dh1csym5d"; - name = "lskat-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/lskat-20.12.2.tar.xz"; + sha256 = "087zrwy5pabyy7zpkplxn9is2msr9kpa8r7bpc6kxylx85sd4nsr"; + name = "lskat-20.12.2.tar.xz"; }; }; mailcommon = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/mailcommon-20.12.1.tar.xz"; - sha256 = "191d6l314njlj227qhz7qqmkjkz9zm7xnvm9rlfj302san90a338"; - name = "mailcommon-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/mailcommon-20.12.2.tar.xz"; + sha256 = "0qbbr5m5glcp7rh3aljkrfs27ypdcb5b72q602irivhbgv56c6v5"; + name = "mailcommon-20.12.2.tar.xz"; }; }; mailimporter = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/mailimporter-20.12.1.tar.xz"; - sha256 = "0jqdckpwlipc4zxxwnvysl44ri19h0hgr37dp36k99sxa3688jxc"; - name = "mailimporter-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/mailimporter-20.12.2.tar.xz"; + sha256 = "16alrfyvgwih9i7fzvmfhbmlsp0l942qml43w2rwkg974g8188yv"; + name = "mailimporter-20.12.2.tar.xz"; }; }; marble = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/marble-20.12.1.tar.xz"; - sha256 = "0w398igxx7pmyd4bj65ppbxfc4fiz4hsjmcffya88dnxxz73djb5"; - name = "marble-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/marble-20.12.2.tar.xz"; + sha256 = "0kgiwsx58yhng92v5c90bz02vsn70p6y7gf6qr5fvljbldrxq3a2"; + name = "marble-20.12.2.tar.xz"; }; }; markdownpart = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/markdownpart-20.12.1.tar.xz"; - sha256 = "1389hswbhcssl9ybb605h9i50fv6jajggldkiyfwqxbi7aysghwk"; - name = "markdownpart-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/markdownpart-20.12.2.tar.xz"; + sha256 = "08fifhw40q2xhi3lp76a3b7jgipq3v1gvp1f5id83jvv9bg5m85k"; + name = "markdownpart-20.12.2.tar.xz"; }; }; mbox-importer = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/mbox-importer-20.12.1.tar.xz"; - sha256 = "1kgbiq933f93sb8m2nqmpp1x6qkqqcm2hcb3ihk5741dcpdmxx9n"; - name = "mbox-importer-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/mbox-importer-20.12.2.tar.xz"; + sha256 = "1jiapp7pblanra83p720nj1rzqd566ij28za9jrkn3nj3xv2zm62"; + name = "mbox-importer-20.12.2.tar.xz"; }; }; messagelib = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/messagelib-20.12.1.tar.xz"; - sha256 = "0yjh7s80ksyyi78vxjw4i5f1bmsfziphwm6flgnw18gfzj3pyyy7"; - name = "messagelib-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/messagelib-20.12.2.tar.xz"; + sha256 = "07mzwsn0bmfsrsn6wlmz7kwrix4d33b007jvx37nckmarr6xcx54"; + name = "messagelib-20.12.2.tar.xz"; }; }; minuet = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/minuet-20.12.1.tar.xz"; - sha256 = "13jlz2m57x379zyv4x5zk2h6jc0qcz1zymkyrzs431bfmhyhdna2"; - name = "minuet-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/minuet-20.12.2.tar.xz"; + sha256 = "00d08qwfa4pvlcysp1af3n91bwb8idkl6gjwxrin3kliwns0ivfj"; + name = "minuet-20.12.2.tar.xz"; }; }; okular = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/okular-20.12.1.tar.xz"; - sha256 = "0gpm7n47yijsjg4yba561j5pbvd98hgvr93w1kvzk851nb87m89c"; - name = "okular-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/okular-20.12.2.tar.xz"; + sha256 = "1959flll9rrwsgb3gpifvsciyvl70j46xb0acfx9zrvsddvbpabq"; + name = "okular-20.12.2.tar.xz"; }; }; palapeli = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/palapeli-20.12.1.tar.xz"; - sha256 = "05d3f0snbg0iz78ggxk7hv1qn3blvpnpclhrhzcw1c5znr7al2xm"; - name = "palapeli-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/palapeli-20.12.2.tar.xz"; + sha256 = "1z80892gp6hg75vl6aicfvf5013412b5xglrpsp86lbx2r7d6ikw"; + name = "palapeli-20.12.2.tar.xz"; }; }; parley = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/parley-20.12.1.tar.xz"; - sha256 = "00xc1dv3fj783brfqh3ggvrwv26m840k35vrx2izzq5lqx2g1p5a"; - name = "parley-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/parley-20.12.2.tar.xz"; + sha256 = "16lymvvwglzvrfl74p7w9l2vahhrkm58fn6iicn5w1751bavjiq7"; + name = "parley-20.12.2.tar.xz"; }; }; partitionmanager = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/partitionmanager-20.12.1.tar.xz"; - sha256 = "1zypkah2smmqclni2r8571sd6qd5cbc0915r6gzf800yyccsfb65"; - name = "partitionmanager-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/partitionmanager-20.12.2.tar.xz"; + sha256 = "1f0nmz99fhp6c48sg92fwssxdvmwx2bj4l7phb0gqfnfqk4sw1xd"; + name = "partitionmanager-20.12.2.tar.xz"; }; }; picmi = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/picmi-20.12.1.tar.xz"; - sha256 = "0aiaq99sb57vvz5wjwdwm0jj456nj26qs4m6vwibb1f0f8js4i03"; - name = "picmi-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/picmi-20.12.2.tar.xz"; + sha256 = "024afpylfb6n6dd0g1iif257a0mgzmmmjl24h2riz4cyfvd26mkc"; + name = "picmi-20.12.2.tar.xz"; }; }; pimcommon = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/pimcommon-20.12.1.tar.xz"; - sha256 = "1w5avmvssqnvxl31xrlh1xfns6q386w8ixlzfbzjkz5m95m4wr57"; - name = "pimcommon-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/pimcommon-20.12.2.tar.xz"; + sha256 = "0fbmahp9m1jzi626rggmp09j3338z8f86hszvwfnk7ydn16hy5rs"; + name = "pimcommon-20.12.2.tar.xz"; }; }; pim-data-exporter = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/pim-data-exporter-20.12.1.tar.xz"; - sha256 = "0k9lh3llkzx0n5x8q14hkbjjrkczm10kr246bzr1zz8lcv1za1jc"; - name = "pim-data-exporter-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/pim-data-exporter-20.12.2.tar.xz"; + sha256 = "13z8r2rq1453zprvpjnf5y5v3x1828l8gyvbivf0dmfhb3hi1bih"; + name = "pim-data-exporter-20.12.2.tar.xz"; }; }; pim-sieve-editor = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/pim-sieve-editor-20.12.1.tar.xz"; - sha256 = "0lifarfkpcpdvwmn61gmfd45k5i0dbf3sjrb0z1yaqsq7m158di1"; - name = "pim-sieve-editor-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/pim-sieve-editor-20.12.2.tar.xz"; + sha256 = "11ji1033yq4lwpi2b331i4f5kpak66h6zyviv344wyab05ljkyhd"; + name = "pim-sieve-editor-20.12.2.tar.xz"; }; }; poxml = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/poxml-20.12.1.tar.xz"; - sha256 = "1smjvblx0jcv3afs2sr4qcmvhqd44iw24hvr9fppa3nxhrmjwmlk"; - name = "poxml-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/poxml-20.12.2.tar.xz"; + sha256 = "1hnm13x102fq7g4pginhdpq473dw9y52kw497773b72my94yj2zz"; + name = "poxml-20.12.2.tar.xz"; }; }; print-manager = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/print-manager-20.12.1.tar.xz"; - sha256 = "1nx442bi41gd64i4j0nc8hx0wdv6ayvnp2wydn4l7sgsf0ms4x6y"; - name = "print-manager-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/print-manager-20.12.2.tar.xz"; + sha256 = "1r19fsgnqdlmrpgbby13nj4v97nqlxlx8c0f7yv3izgncpavr0id"; + name = "print-manager-20.12.2.tar.xz"; }; }; rocs = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/rocs-20.12.1.tar.xz"; - sha256 = "11gg2pmx21wfrw63qv7w8bjzcsxf86j5ripa2dwqfl3355wvi5mb"; - name = "rocs-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/rocs-20.12.2.tar.xz"; + sha256 = "06sy6g32cigls1znvh5wvs7gw9h492d8zjqm6b50wsw0hbx61kvz"; + name = "rocs-20.12.2.tar.xz"; }; }; signon-kwallet-extension = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/signon-kwallet-extension-20.12.1.tar.xz"; - sha256 = "0m48a5mqmwrjl4wc4m30n5csl7fwp8g70pv0nib0v36lp0424xjb"; - name = "signon-kwallet-extension-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/signon-kwallet-extension-20.12.2.tar.xz"; + sha256 = "0ycr0dn8bp51dc510gqxik0rm0wk5728px7cps9csy33izfjpx9p"; + name = "signon-kwallet-extension-20.12.2.tar.xz"; }; }; spectacle = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/spectacle-20.12.1.tar.xz"; - sha256 = "04jsm0ipfaccc80qxnhhbfc9fn009cxa7dys89iqfqza6ssvq51l"; - name = "spectacle-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/spectacle-20.12.2.tar.xz"; + sha256 = "0v0vzspr0vwqi7m7yhnhavxzkfqdnz1g06ispfl1lmpjg1xh90by"; + name = "spectacle-20.12.2.tar.xz"; }; }; step = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/step-20.12.1.tar.xz"; - sha256 = "05xj4zv4r82nnz5rzb0rmrps4dagnkw9f5lapil5mi1i1gwqfi2k"; - name = "step-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/step-20.12.2.tar.xz"; + sha256 = "1drdv95rimdsgarcc00jlfm3jmcan2ln32yq0q2nbbxsj0c502k7"; + name = "step-20.12.2.tar.xz"; }; }; svgpart = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/svgpart-20.12.1.tar.xz"; - sha256 = "09n0pf5saww8gppmd501i3dfr13yvn4r2rfbdz42zlvcpcpgxdry"; - name = "svgpart-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/svgpart-20.12.2.tar.xz"; + sha256 = "1v1qd5sgb89gkvb62jad8ava2y599a4acb6hkqyh758y798ylgwj"; + name = "svgpart-20.12.2.tar.xz"; }; }; sweeper = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/sweeper-20.12.1.tar.xz"; - sha256 = "06a9a9vbkfhmlcc927ysa0qnp5qqbl5iywhkgbvyz90nsdaw3jjl"; - name = "sweeper-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/sweeper-20.12.2.tar.xz"; + sha256 = "0yh6dqw37v8l54635k7g27dnsrl319kfxrkiiy09cx6pjzf87k1h"; + name = "sweeper-20.12.2.tar.xz"; }; }; umbrello = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/umbrello-20.12.1.tar.xz"; - sha256 = "07fxxyw5zn1xj05kjr16rkgpj7ms9xvgpj4zlg428037gfa8g9vl"; - name = "umbrello-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/umbrello-20.12.2.tar.xz"; + sha256 = "0zzic469brh0w41w4ni66mfrj0p44xm1h32iwbb7imgnpw6dqksf"; + name = "umbrello-20.12.2.tar.xz"; }; }; yakuake = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/yakuake-20.12.1.tar.xz"; - sha256 = "02pal9xx1wbpw7dimvs2aw1xnyjqlvbjlybkkfhf8x7c6m1r63aa"; - name = "yakuake-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/yakuake-20.12.2.tar.xz"; + sha256 = "16irzxl6xfyanr7lrvap0ng911lml10bbjr0axk2a7m0gc1llrn4"; + name = "yakuake-20.12.2.tar.xz"; }; }; zeroconf-ioslave = { - version = "20.12.1"; + version = "20.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.1/src/zeroconf-ioslave-20.12.1.tar.xz"; - sha256 = "1lx94qgrqhyva3nv7sgzy0blbdgx3b6m0g0i0psg74qckdh8glas"; - name = "zeroconf-ioslave-20.12.1.tar.xz"; + url = "${mirror}/stable/release-service/20.12.2/src/zeroconf-ioslave-20.12.2.tar.xz"; + sha256 = "0yqni8vwwwya3cv006cf5svs1jhn6369clvrl6m79iacy0iirynk"; + name = "zeroconf-ioslave-20.12.2.tar.xz"; }; }; } From 203534dde46ec0130a903612e26319608843cfba Mon Sep 17 00:00:00 2001 From: ajs124 <git@ajs124.de> Date: Sat, 13 Feb 2021 18:34:22 +0100 Subject: [PATCH 009/188] lapack: remove python dependency 90326ba624ddfbd3b7f9eb3995994644cee804fb mentions enabling them and did set doCheck = true, but that doesn't actually work --- pkgs/development/libraries/science/math/liblapack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix index c742cc60b27f..cb29e721de18 100644 --- a/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/pkgs/development/libraries/science/math/liblapack/default.nix @@ -3,7 +3,6 @@ fetchFromGitHub, gfortran, cmake, - python2, shared ? true }: let @@ -22,12 +21,13 @@ stdenv.mkDerivation { sha256 = "0sxnc97z67i7phdmcnq8f8lmxgw10wdwvr8ami0w3pb179cgrbpb"; }; - nativeBuildInputs = [ gfortran python2 cmake ]; + nativeBuildInputs = [ gfortran cmake ]; cmakeFlags = [ "-DCMAKE_Fortran_FLAGS=-fPIC" "-DLAPACKE=ON" "-DCBLAS=ON" + "-DBUILD_TESTING=ON" ] ++ optional shared "-DBUILD_SHARED_LIBS=ON"; From 2e76fa453f5f9487eaa50a715bc1d77c22397fa5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu> Date: Thu, 18 Feb 2021 09:17:28 +0100 Subject: [PATCH 010/188] maturin: add passthru test that uses maturinBuildHook The test builds the PyO3 word_count example module using maturinBuildHook. The motivation is to have a trivial test that does not regress for reasons unrelated to maturin or hook updates. --- .../tools/rust/maturin/default.nix | 5 +- .../rust/maturin/pyo3-test/Cargo.lock.patch | 688 ++++++++++++++++++ .../tools/rust/maturin/pyo3-test/default.nix | 12 + .../tools/rust/maturin/pyo3-test/generic.nix | 45 ++ 4 files changed, 749 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/tools/rust/maturin/pyo3-test/Cargo.lock.patch create mode 100644 pkgs/development/tools/rust/maturin/pyo3-test/default.nix create mode 100644 pkgs/development/tools/rust/maturin/pyo3-test/generic.nix diff --git a/pkgs/development/tools/rust/maturin/default.nix b/pkgs/development/tools/rust/maturin/default.nix index 52993b3790d8..ea39efdd163f 100644 --- a/pkgs/development/tools/rust/maturin/default.nix +++ b/pkgs/development/tools/rust/maturin/default.nix @@ -1,4 +1,5 @@ -{ lib +{ callPackage +, lib , stdenv , fetchFromGitHub , rustPlatform @@ -28,6 +29,8 @@ rustPlatform.buildRustPackage rec { # Requires network access, fails in sandbox. doCheck = false; + passthru.tests.pyo3 = callPackage ./pyo3-test {}; + meta = with lib; { description = "Build and publish Rust crates Python packages"; longDescription = '' diff --git a/pkgs/development/tools/rust/maturin/pyo3-test/Cargo.lock.patch b/pkgs/development/tools/rust/maturin/pyo3-test/Cargo.lock.patch new file mode 100644 index 000000000000..3aca2e4803a9 --- /dev/null +++ b/pkgs/development/tools/rust/maturin/pyo3-test/Cargo.lock.patch @@ -0,0 +1,688 @@ +diff --git a/Cargo.lock b/Cargo.lock +new file mode 100644 +index 000000000..5e698d4ff +--- /dev/null ++++ b/Cargo.lock +@@ -0,0 +1,682 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. ++[[package]] ++name = "ahash" ++version = "0.4.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e" ++ ++[[package]] ++name = "assert_approx_eq" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3c07dab4369547dbe5114677b33fbbf724971019f3818172d59a97a61c774ffd" ++ ++[[package]] ++name = "autocfg" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" ++ ++[[package]] ++name = "bitflags" ++version = "1.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" ++ ++[[package]] ++name = "byteorder" ++version = "1.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ae44d1a3d5a19df61dd0c8beb138458ac2a53a7ac09eba97d55592540004306b" ++ ++[[package]] ++name = "cfg-if" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" ++ ++[[package]] ++name = "const_fn" ++version = "0.4.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "28b9d6de7f49e22cf97ad17fc4036ece69300032f45f78f30b4a4482cdc3f4a6" ++ ++[[package]] ++name = "crossbeam-channel" ++version = "0.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775" ++dependencies = [ ++ "cfg-if", ++ "crossbeam-utils", ++] ++ ++[[package]] ++name = "crossbeam-deque" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9" ++dependencies = [ ++ "cfg-if", ++ "crossbeam-epoch", ++ "crossbeam-utils", ++] ++ ++[[package]] ++name = "crossbeam-epoch" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a1aaa739f95311c2c7887a76863f500026092fb1dce0161dab577e559ef3569d" ++dependencies = [ ++ "cfg-if", ++ "const_fn", ++ "crossbeam-utils", ++ "lazy_static", ++ "memoffset", ++ "scopeguard", ++] ++ ++[[package]] ++name = "crossbeam-utils" ++version = "0.8.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "02d96d1e189ef58269ebe5b97953da3274d83a93af647c2ddd6f9dab28cedb8d" ++dependencies = [ ++ "autocfg", ++ "cfg-if", ++ "lazy_static", ++] ++ ++[[package]] ++name = "ctor" ++version = "0.1.19" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e8f45d9ad417bcef4817d614a501ab55cdd96a6fdb24f49aab89a54acfd66b19" ++dependencies = [ ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "either" ++version = "1.6.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" ++ ++[[package]] ++name = "getrandom" ++version = "0.1.16" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" ++dependencies = [ ++ "cfg-if", ++ "libc", ++ "wasi", ++] ++ ++[[package]] ++name = "ghost" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1a5bcf1bbeab73aa4cf2fde60a846858dc036163c7c33bec309f8d17de785479" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "glob" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" ++ ++[[package]] ++name = "hashbrown" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" ++dependencies = [ ++ "ahash", ++] ++ ++[[package]] ++name = "hermit-abi" ++version = "0.1.18" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "indoc" ++version = "0.3.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "47741a8bc60fb26eb8d6e0238bbb26d8575ff623fdc97b1a2c00c050b9684ed8" ++dependencies = [ ++ "indoc-impl", ++ "proc-macro-hack", ++] ++ ++[[package]] ++name = "indoc-impl" ++version = "0.3.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ce046d161f000fffde5f432a0d034d0341dc152643b2598ed5bfce44c4f3a8f0" ++dependencies = [ ++ "proc-macro-hack", ++ "proc-macro2", ++ "quote", ++ "syn", ++ "unindent", ++] ++ ++[[package]] ++name = "instant" ++version = "0.1.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec" ++dependencies = [ ++ "cfg-if", ++] ++ ++[[package]] ++name = "inventory" ++version = "0.1.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0f0f7efb804ec95e33db9ad49e4252f049e37e8b0a4652e3cd61f7999f2eff7f" ++dependencies = [ ++ "ctor", ++ "ghost", ++ "inventory-impl", ++] ++ ++[[package]] ++name = "inventory-impl" ++version = "0.1.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "75c094e94816723ab936484666968f5b58060492e880f3c8d00489a1e244fa51" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "itoa" ++version = "0.4.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" ++ ++[[package]] ++name = "lazy_static" ++version = "1.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" ++ ++[[package]] ++name = "libc" ++version = "0.2.86" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b7282d924be3275cec7f6756ff4121987bc6481325397dde6ba3e7802b1a8b1c" ++ ++[[package]] ++name = "lock_api" ++version = "0.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dd96ffd135b2fd7b973ac026d28085defbe8983df057ced3eb4f2130b0831312" ++dependencies = [ ++ "scopeguard", ++] ++ ++[[package]] ++name = "memoffset" ++version = "0.6.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "157b4208e3059a8f9e78d559edc658e13df41410cb3ae03979c83130067fdd87" ++dependencies = [ ++ "autocfg", ++] ++ ++[[package]] ++name = "num-bigint" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5e9a41747ae4633fce5adffb4d2e81ffc5e89593cb19917f8fb2cc5ff76507bf" ++dependencies = [ ++ "autocfg", ++ "num-integer", ++ "num-traits", ++] ++ ++[[package]] ++name = "num-complex" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "747d632c0c558b87dbabbe6a82f3b4ae03720d0646ac5b7b4dae89394be5f2c5" ++dependencies = [ ++ "num-traits", ++] ++ ++[[package]] ++name = "num-integer" ++version = "0.1.44" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" ++dependencies = [ ++ "autocfg", ++ "num-traits", ++] ++ ++[[package]] ++name = "num-traits" ++version = "0.2.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" ++dependencies = [ ++ "autocfg", ++] ++ ++[[package]] ++name = "num_cpus" ++version = "1.13.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" ++dependencies = [ ++ "hermit-abi", ++ "libc", ++] ++ ++[[package]] ++name = "parking_lot" ++version = "0.11.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb" ++dependencies = [ ++ "instant", ++ "lock_api", ++ "parking_lot_core", ++] ++ ++[[package]] ++name = "parking_lot_core" ++version = "0.8.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018" ++dependencies = [ ++ "cfg-if", ++ "instant", ++ "libc", ++ "redox_syscall", ++ "smallvec", ++ "winapi", ++] ++ ++[[package]] ++name = "paste" ++version = "0.1.18" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880" ++dependencies = [ ++ "paste-impl", ++ "proc-macro-hack", ++] ++ ++[[package]] ++name = "paste-impl" ++version = "0.1.18" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6" ++dependencies = [ ++ "proc-macro-hack", ++] ++ ++[[package]] ++name = "ppv-lite86" ++version = "0.2.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" ++ ++[[package]] ++name = "proc-macro-hack" ++version = "0.5.19" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" ++ ++[[package]] ++name = "proc-macro2" ++version = "1.0.24" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71" ++dependencies = [ ++ "unicode-xid", ++] ++ ++[[package]] ++name = "proptest" ++version = "0.10.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "12e6c80c1139113c28ee4670dc50cc42915228b51f56a9e407f0ec60f966646f" ++dependencies = [ ++ "bitflags", ++ "byteorder", ++ "lazy_static", ++ "num-traits", ++ "quick-error", ++ "rand", ++ "rand_chacha", ++ "rand_xorshift", ++ "regex-syntax", ++] ++ ++[[package]] ++name = "pyo3" ++version = "0.13.2" ++dependencies = [ ++ "assert_approx_eq", ++ "cfg-if", ++ "ctor", ++ "hashbrown", ++ "indoc", ++ "inventory", ++ "libc", ++ "num-bigint", ++ "num-complex", ++ "parking_lot", ++ "paste", ++ "proptest", ++ "pyo3", ++ "pyo3-macros", ++ "rustversion", ++ "serde", ++ "serde_json", ++ "trybuild", ++ "unindent", ++] ++ ++[[package]] ++name = "pyo3-macros" ++version = "0.13.2" ++dependencies = [ ++ "pyo3-macros-backend", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "pyo3-macros-backend" ++version = "0.13.2" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "quick-error" ++version = "1.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" ++ ++[[package]] ++name = "quote" ++version = "1.0.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" ++dependencies = [ ++ "proc-macro2", ++] ++ ++[[package]] ++name = "rand" ++version = "0.7.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" ++dependencies = [ ++ "getrandom", ++ "libc", ++ "rand_chacha", ++ "rand_core", ++ "rand_hc", ++] ++ ++[[package]] ++name = "rand_chacha" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" ++dependencies = [ ++ "ppv-lite86", ++ "rand_core", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" ++dependencies = [ ++ "getrandom", ++] ++ ++[[package]] ++name = "rand_hc" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" ++dependencies = [ ++ "rand_core", ++] ++ ++[[package]] ++name = "rand_xorshift" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "77d416b86801d23dde1aa643023b775c3a462efc0ed96443add11546cdf1dca8" ++dependencies = [ ++ "rand_core", ++] ++ ++[[package]] ++name = "rayon" ++version = "1.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674" ++dependencies = [ ++ "autocfg", ++ "crossbeam-deque", ++ "either", ++ "rayon-core", ++] ++ ++[[package]] ++name = "rayon-core" ++version = "1.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a" ++dependencies = [ ++ "crossbeam-channel", ++ "crossbeam-deque", ++ "crossbeam-utils", ++ "lazy_static", ++ "num_cpus", ++] ++ ++[[package]] ++name = "redox_syscall" ++version = "0.2.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "94341e4e44e24f6b591b59e47a8a027df12e008d73fd5672dbea9cc22f4507d9" ++dependencies = [ ++ "bitflags", ++] ++ ++[[package]] ++name = "regex-syntax" ++version = "0.6.22" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b5eb417147ba9860a96cfe72a0b93bf88fee1744b5636ec99ab20c1aa9376581" ++ ++[[package]] ++name = "rustapi-module" ++version = "0.1.0" ++dependencies = [ ++ "pyo3", ++] ++ ++[[package]] ++name = "rustversion" ++version = "1.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cb5d2a036dc6d2d8fd16fde3498b04306e29bd193bf306a57427019b823d5acd" ++ ++[[package]] ++name = "ryu" ++version = "1.0.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" ++ ++[[package]] ++name = "scopeguard" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" ++ ++[[package]] ++name = "serde" ++version = "1.0.123" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "92d5161132722baa40d802cc70b15262b98258453e85e5d1d365c757c73869ae" ++dependencies = [ ++ "serde_derive", ++] ++ ++[[package]] ++name = "serde_derive" ++version = "1.0.123" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9391c295d64fc0abb2c556bad848f33cb8296276b1ad2677d1ae1ace4f258f31" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "serde_json" ++version = "1.0.62" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ea1c6153794552ea7cf7cf63b1231a25de00ec90db326ba6264440fa08e31486" ++dependencies = [ ++ "itoa", ++ "ryu", ++ "serde", ++] ++ ++[[package]] ++name = "smallvec" ++version = "1.6.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" ++ ++[[package]] ++name = "syn" ++version = "1.0.60" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c700597eca8a5a762beb35753ef6b94df201c81cca676604f547495a0d7f0081" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "unicode-xid", ++] ++ ++[[package]] ++name = "termcolor" ++version = "1.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" ++dependencies = [ ++ "winapi-util", ++] ++ ++[[package]] ++name = "toml" ++version = "0.5.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" ++dependencies = [ ++ "serde", ++] ++ ++[[package]] ++name = "trybuild" ++version = "1.0.41" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "99471a206425fba51842a9186315f32d91c56eadc21ea4c21f847b59cf778f8b" ++dependencies = [ ++ "glob", ++ "lazy_static", ++ "serde", ++ "serde_json", ++ "termcolor", ++ "toml", ++] ++ ++[[package]] ++name = "unicode-xid" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" ++ ++[[package]] ++name = "unindent" ++version = "0.1.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f14ee04d9415b52b3aeab06258a3f07093182b88ba0f9b8d203f211a7a7d41c7" ++ ++[[package]] ++name = "wasi" ++version = "0.9.0+wasi-snapshot-preview1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" ++ ++[[package]] ++name = "winapi" ++version = "0.3.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" ++dependencies = [ ++ "winapi-i686-pc-windows-gnu", ++ "winapi-x86_64-pc-windows-gnu", ++] ++ ++[[package]] ++name = "winapi-i686-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" ++ ++[[package]] ++name = "winapi-util" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" ++dependencies = [ ++ "winapi", ++] ++ ++[[package]] ++name = "winapi-x86_64-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" ++ ++[[package]] ++name = "word-count" ++version = "0.1.0" ++dependencies = [ ++ "pyo3", ++ "rayon", ++] diff --git a/pkgs/development/tools/rust/maturin/pyo3-test/default.nix b/pkgs/development/tools/rust/maturin/pyo3-test/default.nix new file mode 100644 index 000000000000..b118309b36d7 --- /dev/null +++ b/pkgs/development/tools/rust/maturin/pyo3-test/default.nix @@ -0,0 +1,12 @@ +{ callPackage +, rustPlatform +}: + +callPackage ./generic.nix { + buildAndTestSubdir = "examples/word-count"; + + nativeBuildInputs = with rustPlatform; [ + cargoSetupHook + maturinBuildHook + ]; +} diff --git a/pkgs/development/tools/rust/maturin/pyo3-test/generic.nix b/pkgs/development/tools/rust/maturin/pyo3-test/generic.nix new file mode 100644 index 000000000000..f82c988fc512 --- /dev/null +++ b/pkgs/development/tools/rust/maturin/pyo3-test/generic.nix @@ -0,0 +1,45 @@ +# Derivation prototype, used by maturin and setuptools-rust +# passthrough tests. + +{ lib +, fetchFromGitHub +, python3Packages +, rustPlatform + +, nativeBuildInputs + +, buildAndTestSubdir ? null +, format ? "pyproject" +, sourceRoot ? "source" +}: + +python3Packages.buildPythonPackage rec { + pname = "word-count"; + version = "0.13.2"; + + src = fetchFromGitHub { + owner = "PyO3"; + repo = "pyo3"; + rev = "v${version}"; + hash = "sha256-NOMrrfo8WjlPhtGxWUOPJS/UDDdbLQRCXR++Zd6JmIA="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src sourceRoot patches; + name = "${pname}-${version}"; + hash = "sha256-//TmozgWy9zrSpMKX92XdHj4fw/T1Elfgn4YhhR7ot0="; + }; + + patches = [ ./Cargo.lock.patch ]; + + inherit buildAndTestSubdir format nativeBuildInputs sourceRoot; + + pythonImportsCheck = [ "word_count" ]; + + meta = with lib; { + description = "PyO3 word count example"; + homepage = "https://github.com/PyO3/pyo3"; + license = licenses.asl20; + maintainers = [ maintainers.danieldk ]; + }; +} From 3bdae33948e227cf6db84b037fc8788bb49c85d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu> Date: Thu, 18 Feb 2021 09:23:03 +0100 Subject: [PATCH 011/188] python3Packages.setuptools-rust: add passthru test that uses maturinBuildHook The test builds the PyO3 word_count example module using setuptools-rust. The motivation is to have a trivial test that does not regress for reasons unrelated to setuptools-rust or hook updates. --- .../setuptools-rust/default.nix | 5 ++++- .../setuptools-rust/pyo3-test/default.nix | 21 +++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/setuptools-rust/pyo3-test/default.nix diff --git a/pkgs/development/python-modules/setuptools-rust/default.nix b/pkgs/development/python-modules/setuptools-rust/default.nix index ee4a3b551649..cdf5e5aa27fc 100644 --- a/pkgs/development/python-modules/setuptools-rust/default.nix +++ b/pkgs/development/python-modules/setuptools-rust/default.nix @@ -1,4 +1,5 @@ -{ lib +{ callPackage +, lib , buildPythonPackage , fetchPypi , isPy27 @@ -23,6 +24,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ semantic-version setuptools toml ]; + passthru.tests.pyo3 = callPackage ./pyo3-test {}; + meta = with lib; { description = "Setuptools plugin for Rust support"; homepage = "https://github.com/PyO3/setuptools-rust"; diff --git a/pkgs/development/python-modules/setuptools-rust/pyo3-test/default.nix b/pkgs/development/python-modules/setuptools-rust/pyo3-test/default.nix new file mode 100644 index 000000000000..9af17aa5159c --- /dev/null +++ b/pkgs/development/python-modules/setuptools-rust/pyo3-test/default.nix @@ -0,0 +1,21 @@ +{ callPackage +, rustPlatform +, setuptools-rust +}: + +callPackage ../../../tools/rust/maturin/pyo3-test/generic.nix { + # Isolated builds break for this package, because PyO3 is not + # in the build root of the Python Package: + # + # https://github.com/pypa/pip/issues/6276 + # + format = "setuptools"; + + nativeBuildInputs = [ setuptools-rust ] ++ (with rustPlatform; [ + cargoSetupHook + rust.cargo + rust.rustc + ]); + + sourceRoot = "source/examples/word-count"; +} From 916f9d8e46ff26b01e7d7c51dcc92bbf45d157c8 Mon Sep 17 00:00:00 2001 From: TredwellGit <tredwell@tutanota.com> Date: Thu, 18 Feb 2021 23:28:31 +0000 Subject: [PATCH 012/188] newt: use python3 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bc5c1b88046f..fd203bbedbd6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15999,7 +15999,7 @@ in newman = callPackage ../development/web/newman {}; - newt = callPackage ../development/libraries/newt { }; + newt = callPackage ../development/libraries/newt { python = python3; }; nghttp2 = callPackage ../development/libraries/nghttp2 { }; libnghttp2 = nghttp2.lib; From d84c45d40763d9c622e885c87701e6fb71f7e604 Mon Sep 17 00:00:00 2001 From: Ryan Burns <rtburns@protonmail.com> Date: Fri, 19 Feb 2021 17:15:00 -0800 Subject: [PATCH 013/188] numactl: enable on all linux platforms This is a dependency of building VMs for e.g. ppc64 and riscv64 platform. Also fixed an issue with linking libatomic on riscv. --- pkgs/os-specific/linux/numactl/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/numactl/default.nix b/pkgs/os-specific/linux/numactl/default.nix index d796bf579f12..2f8a4feb0301 100644 --- a/pkgs/os-specific/linux/numactl/default.nix +++ b/pkgs/os-specific/linux/numactl/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { patchShebangs test ''; + LDFLAGS = lib.optionalString stdenv.hostPlatform.isRiscV "-latomic"; + # You probably shouldn't ever run these! They will reconfigure Linux # NUMA settings, which on my build machine makes the rest of package # building ~5% slower until reboot. Ugh! @@ -26,6 +28,6 @@ stdenv.mkDerivation rec { description = "Library and tools for non-uniform memory access (NUMA) machines"; homepage = "https://github.com/numactl/numactl"; license = with licenses; [ gpl2 lgpl21 ]; # libnuma is lgpl21 - platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ]; + platforms = platforms.linux; }; } From 7369d9eef722d4bacc99fa0cffd10882c3068deb Mon Sep 17 00:00:00 2001 From: Martin Weinelt <hexa@darmstadt.ccc.de> Date: Tue, 2 Feb 2021 15:41:09 +0100 Subject: [PATCH 014/188] python3Packages.sqlalchemy: 1.3.20 -> 1.3.23 --- pkgs/development/python-modules/sqlalchemy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 83fd3e7b10b3..9ac9c689632b 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "SQLAlchemy"; - version = "1.3.20"; + version = "1.3.23"; src = fetchPypi { inherit pname version; - sha256 = "d2f25c7f410338d31666d7ddedfa67570900e248b940d186b48461bd4e5569a1"; + sha256 = "12wi4vxjsx4ra76phks9drhc2yc9xz25458kgijnyrkq4mkk7jkg"; }; checkInputs = [ From 6904fe3b1503d45f93b81ae60bfbae5a67f47118 Mon Sep 17 00:00:00 2001 From: Martin Weinelt <hexa@darmstadt.ccc.de> Date: Tue, 2 Feb 2021 15:41:16 +0100 Subject: [PATCH 015/188] python3Packages.sqlalchemy: parallelize tests with xdist Cuts down the test phase from 11 to 4 minutes on my remote builder. --- pkgs/development/python-modules/sqlalchemy/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 9ac9c689632b..9b71cb8eff96 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -2,6 +2,7 @@ , mock , pysqlite , pytestCheckHook +, pytest_xdist }: buildPythonPackage rec { @@ -15,9 +16,12 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook + pytest_xdist mock ] ++ lib.optional (!isPy3k) pysqlite; + pytestFlagsArray = [ "-n auto" ]; + postInstall = '' sed -e 's:--max-worker-restart=5::g' -i setup.cfg ''; From 2bf3a1face1ffeac8d489029dcba0fadc34333a6 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel <ttuegel@mailbox.org> Date: Sat, 20 Feb 2021 06:26:19 -0600 Subject: [PATCH 016/188] threadweaver: broken with Qt < 5.14 --- pkgs/development/libraries/kde-frameworks/threadweaver.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/threadweaver.nix b/pkgs/development/libraries/kde-frameworks/threadweaver.nix index b95f70dd6743..70e948afda94 100644 --- a/pkgs/development/libraries/kde-frameworks/threadweaver.nix +++ b/pkgs/development/libraries/kde-frameworks/threadweaver.nix @@ -8,7 +8,7 @@ mkDerivation { name = "threadweaver"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.7.0" < 0; + broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ qtbase ]; From fd65b0f575ad078952357d1132a85093fb43ee2b Mon Sep 17 00:00:00 2001 From: Thomas Tuegel <ttuegel@mailbox.org> Date: Sat, 20 Feb 2021 06:38:11 -0600 Subject: [PATCH 017/188] syntax-highlighting: broken with Qt < 5.14 --- .../libraries/kde-frameworks/syntax-highlighting.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix b/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix index ceb8200d4c63..4b3f8440c568 100644 --- a/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix +++ b/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix @@ -6,7 +6,7 @@ mkDerivation { name = "syntax-highlighting"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.7.0" < 0; + broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules perl ]; buildInputs = [ qttools ]; From ed9b08d57b10943bc4152ea0121e404fcf71e75b Mon Sep 17 00:00:00 2001 From: Thomas Tuegel <ttuegel@mailbox.org> Date: Sat, 20 Feb 2021 08:13:08 -0600 Subject: [PATCH 018/188] kconfig: broken with Qt < 5.14 --- pkgs/development/libraries/kde-frameworks/kconfig.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/kconfig.nix b/pkgs/development/libraries/kde-frameworks/kconfig.nix index 2650843aa55d..94f4cb04807b 100644 --- a/pkgs/development/libraries/kde-frameworks/kconfig.nix +++ b/pkgs/development/libraries/kde-frameworks/kconfig.nix @@ -4,7 +4,7 @@ mkDerivation { name = "kconfig"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.7.0" < 0; + broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qttools ]; From f7f9b84975611ed843a4bb100799ee68787d794a Mon Sep 17 00:00:00 2001 From: Thomas Tuegel <ttuegel@mailbox.org> Date: Sat, 20 Feb 2021 08:13:39 -0600 Subject: [PATCH 019/188] karchive: broken with Qt < 5.14 --- pkgs/development/libraries/kde-frameworks/karchive.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/karchive.nix b/pkgs/development/libraries/kde-frameworks/karchive.nix index 8c55f8da6a0c..a5f499e67444 100644 --- a/pkgs/development/libraries/kde-frameworks/karchive.nix +++ b/pkgs/development/libraries/kde-frameworks/karchive.nix @@ -8,7 +8,7 @@ mkDerivation { name = "karchive"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.7.0" < 0; + broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ bzip2 lzma zlib ]; From 7ee37e4c15714588118cf1d6c73bde60d845d335 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel <ttuegel@mailbox.org> Date: Sat, 20 Feb 2021 08:14:02 -0600 Subject: [PATCH 020/188] kcodecs: broken with Qt < 5.14 --- pkgs/development/libraries/kde-frameworks/kcodecs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/kcodecs.nix b/pkgs/development/libraries/kde-frameworks/kcodecs.nix index 978db644a56f..357c0e1d11cb 100644 --- a/pkgs/development/libraries/kde-frameworks/kcodecs.nix +++ b/pkgs/development/libraries/kde-frameworks/kcodecs.nix @@ -4,7 +4,7 @@ mkDerivation { name = "kcodecs"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.7.0" < 0; + broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qttools gperf ]; From 101023293cbabb2fac24f93d5863063b435829e3 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel <ttuegel@mailbox.org> Date: Sat, 20 Feb 2021 08:16:02 -0600 Subject: [PATCH 021/188] attica: broken with Qt < 5.14 --- pkgs/development/libraries/kde-frameworks/attica.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/attica.nix b/pkgs/development/libraries/kde-frameworks/attica.nix index 0766a589a2e0..4cb2e8e958aa 100644 --- a/pkgs/development/libraries/kde-frameworks/attica.nix +++ b/pkgs/development/libraries/kde-frameworks/attica.nix @@ -4,7 +4,7 @@ mkDerivation { name = "attica"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.7.0" < 0; + broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtbase ]; From ea01ec6c6016cfeadb8475ca9fb3995c04c4979e Mon Sep 17 00:00:00 2001 From: Thomas Tuegel <ttuegel@mailbox.org> Date: Sat, 20 Feb 2021 08:16:21 -0600 Subject: [PATCH 022/188] kcoreaddons: broken with Qt < 5.14 --- pkgs/development/libraries/kde-frameworks/kcoreaddons.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix index d5a407ee16f2..6f2e3f923871 100644 --- a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix @@ -8,7 +8,7 @@ mkDerivation { name = "kcoreaddons"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.7.0" < 0; + broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qttools shared-mime-info ]; From 7b5af9e7852c9b4820986f78caec812405ca84ba Mon Sep 17 00:00:00 2001 From: Thomas Tuegel <ttuegel@mailbox.org> Date: Sat, 20 Feb 2021 08:16:31 -0600 Subject: [PATCH 023/188] kdbusaddons: broken with Qt < 5.14 --- pkgs/development/libraries/kde-frameworks/kdbusaddons.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix b/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix index c94167d5d76d..b497ebe1c80e 100644 --- a/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix @@ -8,7 +8,7 @@ mkDerivation { name = "kdbusaddons"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.7.0" < 0; + broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qttools qtx11extras ]; From 6d8c6a28956e302350a0f0f4047bc8cf3511419a Mon Sep 17 00:00:00 2001 From: Thomas Tuegel <ttuegel@mailbox.org> Date: Sat, 20 Feb 2021 08:16:54 -0600 Subject: [PATCH 024/188] kdnssd: broken with Qt < 5.14 --- pkgs/development/libraries/kde-frameworks/kdnssd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/kdnssd.nix b/pkgs/development/libraries/kde-frameworks/kdnssd.nix index 9e2f827eff59..b4dabba624a0 100644 --- a/pkgs/development/libraries/kde-frameworks/kdnssd.nix +++ b/pkgs/development/libraries/kde-frameworks/kdnssd.nix @@ -8,7 +8,7 @@ mkDerivation { name = "kdnssd"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.7.0" < 0; + broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ avahi qttools ]; From 5cb4e68d1d938cbf49130777d4c372d310783ae5 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel <ttuegel@mailbox.org> Date: Sat, 20 Feb 2021 08:17:10 -0600 Subject: [PATCH 025/188] kguiaddons: broken with Qt < 5.14 --- pkgs/development/libraries/kde-frameworks/kguiaddons.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/kguiaddons.nix b/pkgs/development/libraries/kde-frameworks/kguiaddons.nix index a9b3c416624d..4bd907021016 100644 --- a/pkgs/development/libraries/kde-frameworks/kguiaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kguiaddons.nix @@ -8,7 +8,7 @@ mkDerivation { name = "kguiaddons"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.7.0" < 0; + broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtx11extras wayland ]; From 5413f4c627834fdba5e94e280ac02c3c7a6a9491 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel <ttuegel@mailbox.org> Date: Sat, 20 Feb 2021 08:17:27 -0600 Subject: [PATCH 026/188] ki18n: broken with Qt < 5.14 --- pkgs/development/libraries/kde-frameworks/ki18n.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/ki18n.nix b/pkgs/development/libraries/kde-frameworks/ki18n.nix index 69ad2fbc737e..0733abc86920 100644 --- a/pkgs/development/libraries/kde-frameworks/ki18n.nix +++ b/pkgs/development/libraries/kde-frameworks/ki18n.nix @@ -8,7 +8,7 @@ mkDerivation { name = "ki18n"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.7.0" < 0; + broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; propagatedNativeBuildInputs = [ gettext python3 ]; From 0fe04dfa12ffa5349386920e7b6cf2f2aa271c89 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel <ttuegel@mailbox.org> Date: Sat, 20 Feb 2021 08:17:45 -0600 Subject: [PATCH 027/188] kidletime: broken with Qt < 5.14 --- pkgs/development/libraries/kde-frameworks/kidletime.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/kidletime.nix b/pkgs/development/libraries/kde-frameworks/kidletime.nix index a1e53bb408bd..883ef2862e49 100644 --- a/pkgs/development/libraries/kde-frameworks/kidletime.nix +++ b/pkgs/development/libraries/kde-frameworks/kidletime.nix @@ -8,7 +8,7 @@ mkDerivation { name = "kidletime"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.7.0" < 0; + broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtx11extras ]; From 0b344b033abc97a8dd0a69485ffa1b05faf5432f Mon Sep 17 00:00:00 2001 From: Thomas Tuegel <ttuegel@mailbox.org> Date: Sat, 20 Feb 2021 08:17:59 -0600 Subject: [PATCH 028/188] kirigami2: broken with Qt < 5.14 --- pkgs/development/libraries/kde-frameworks/kirigami2.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/kirigami2.nix b/pkgs/development/libraries/kde-frameworks/kirigami2.nix index 751e3d7b73f1..60cef704865c 100644 --- a/pkgs/development/libraries/kde-frameworks/kirigami2.nix +++ b/pkgs/development/libraries/kde-frameworks/kirigami2.nix @@ -3,7 +3,7 @@ mkDerivation { name = "kirigami2"; meta = { - broken = builtins.compareVersions qtbase.version "5.7.0" < 0; + broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtbase qtquickcontrols2 qttranslations qtgraphicaleffects ]; From e0d7a92e23e52d2c877c6b27a27594b345038499 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel <ttuegel@mailbox.org> Date: Sat, 20 Feb 2021 08:18:16 -0600 Subject: [PATCH 029/188] kitemmodels: broken with Qt < 5.14 --- pkgs/development/libraries/kde-frameworks/kitemmodels.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/kitemmodels.nix b/pkgs/development/libraries/kde-frameworks/kitemmodels.nix index 91bc3e2b98d4..c3266a21c064 100644 --- a/pkgs/development/libraries/kde-frameworks/kitemmodels.nix +++ b/pkgs/development/libraries/kde-frameworks/kitemmodels.nix @@ -8,7 +8,7 @@ mkDerivation { name = "kitemmodels"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.7.0" < 0; + broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ qtbase ]; From 279f662fe4166e643df58ea433fe9f75ca968d84 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel <ttuegel@mailbox.org> Date: Sat, 20 Feb 2021 08:18:34 -0600 Subject: [PATCH 030/188] kitemviews: broken with Qt < 5.14 --- pkgs/development/libraries/kde-frameworks/kitemviews.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/kitemviews.nix b/pkgs/development/libraries/kde-frameworks/kitemviews.nix index 004d1ac77a6d..eeed5c703a29 100644 --- a/pkgs/development/libraries/kde-frameworks/kitemviews.nix +++ b/pkgs/development/libraries/kde-frameworks/kitemviews.nix @@ -8,7 +8,7 @@ mkDerivation { name = "kitemviews"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.7.0" < 0; + broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qttools ]; From d2c6cdef9d97797f1a5acc1ca5bdd8d58a774bb1 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel <ttuegel@mailbox.org> Date: Sat, 20 Feb 2021 08:18:58 -0600 Subject: [PATCH 031/188] kwayland: broken with Qt < 5.14 --- pkgs/development/libraries/kde-frameworks/kwayland.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/kwayland.nix b/pkgs/development/libraries/kde-frameworks/kwayland.nix index 36e0ddc3f94c..5b73cc7fceab 100644 --- a/pkgs/development/libraries/kde-frameworks/kwayland.nix +++ b/pkgs/development/libraries/kde-frameworks/kwayland.nix @@ -8,7 +8,7 @@ mkDerivation { name = "kwayland"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.7.0" < 0; + broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ plasma-wayland-protocols wayland wayland-protocols ]; From 111aaff23a422dc253f81d4eb0936cbb60393728 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel <ttuegel@mailbox.org> Date: Sat, 20 Feb 2021 08:19:18 -0600 Subject: [PATCH 032/188] kplotting: broken with Qt < 5.14 --- pkgs/development/libraries/kde-frameworks/kplotting.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/kplotting.nix b/pkgs/development/libraries/kde-frameworks/kplotting.nix index 1774b044b165..f1c99e0c93bb 100644 --- a/pkgs/development/libraries/kde-frameworks/kplotting.nix +++ b/pkgs/development/libraries/kde-frameworks/kplotting.nix @@ -6,7 +6,7 @@ mkDerivation { name = "kplotting"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.7.0" < 0; + broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ qtbase qttools ]; From 5ab8bacc7f742516f8599641c0f39d2c1203b4e2 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel <ttuegel@mailbox.org> Date: Sat, 20 Feb 2021 08:19:36 -0600 Subject: [PATCH 033/188] kwidgetsaddons: broken with Qt < 5.14 --- pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix b/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix index 63a95bc217c8..821c703a5899 100644 --- a/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix @@ -8,7 +8,7 @@ mkDerivation { name = "kwidgetsaddons"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.7.0" < 0; + broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qttools ]; From 3f055705500c7f4d6e192343bb9a3206eb6307f0 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel <ttuegel@mailbox.org> Date: Sat, 20 Feb 2021 08:19:57 -0600 Subject: [PATCH 034/188] kwindowsystem: broken with Qt < 5.14 --- .../libraries/kde-frameworks/kwindowsystem/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix index ab93966c0ac9..c418ca39433e 100644 --- a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix @@ -9,7 +9,7 @@ mkDerivation { name = "kwindowsystem"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = lib.versionOlder qtbase.version "5.7.0"; + broken = lib.versionOlder qtbase.version "5.14.0"; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ libpthreadstubs libXdmcp qttools qtx11extras ]; From 7216a30d90e8000bef34bd9a0f3022d3111b1e4e Mon Sep 17 00:00:00 2001 From: Thomas Tuegel <ttuegel@mailbox.org> Date: Sat, 20 Feb 2021 08:20:15 -0600 Subject: [PATCH 035/188] solid: broken with Qt < 5.14 --- pkgs/development/libraries/kde-frameworks/solid.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/solid.nix b/pkgs/development/libraries/kde-frameworks/solid.nix index d1beb03fa620..f769f76854af 100644 --- a/pkgs/development/libraries/kde-frameworks/solid.nix +++ b/pkgs/development/libraries/kde-frameworks/solid.nix @@ -8,7 +8,7 @@ mkDerivation { name = "solid"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.7.0" < 0; + broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ bison extra-cmake-modules flex media-player-info ]; buildInputs = [ qtdeclarative qttools ]; From 3738f64446882810e0de65b3620bedf29d2ee917 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel <ttuegel@mailbox.org> Date: Sat, 20 Feb 2021 08:20:30 -0600 Subject: [PATCH 036/188] sonnet: broken with Qt < 5.14 --- pkgs/development/libraries/kde-frameworks/sonnet.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/sonnet.nix b/pkgs/development/libraries/kde-frameworks/sonnet.nix index 5659aaf69607..431e4b810580 100644 --- a/pkgs/development/libraries/kde-frameworks/sonnet.nix +++ b/pkgs/development/libraries/kde-frameworks/sonnet.nix @@ -7,7 +7,7 @@ mkDerivation { name = "sonnet"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.7.0" < 0; + broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ aspell qttools ]; From 3242c2f8aeb12697318b83b13d30574cae8c0cbf Mon Sep 17 00:00:00 2001 From: Jan Tojnar <jtojnar@gmail.com> Date: Sat, 20 Feb 2021 15:25:04 +0100 Subject: [PATCH 037/188] =?UTF-8?q?meson:=200.56.0=20=E2=86=92=200.57.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - https://mesonbuild.com/Release-notes-for-0-57-0.html - https://github.com/mesonbuild/meson/releases/tag/0.57.0 - https://github.com/mesonbuild/meson/releases/tag/0.57.1 --- .../meson/allow-dirs-outside-of-prefix.patch | 8 ++++---- .../development/tools/build-managers/meson/default.nix | 4 ++-- .../tools/build-managers/meson/more-env-vars.patch | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch b/pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch index e5ac95d0b9dc..4eb292a2e529 100644 --- a/pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch +++ b/pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch @@ -1,14 +1,14 @@ --- a/mesonbuild/coredata.py +++ b/mesonbuild/coredata.py -@@ -491,7 +491,6 @@ class CoreData: +@@ -506,7 +506,6 @@ class CoreData: return value - if option.endswith('dir') and value.is_absolute() and \ - option not in builtin_dir_noprefix_options: + if option.name.endswith('dir') and value.is_absolute() and \ + option not in BULITIN_DIR_NOPREFIX_OPTIONS: - # Value must be a subdir of the prefix # commonpath will always return a path in the native format, so we # must use pathlib.PurePath to do the same conversion before # comparing. -@@ -503,7 +502,7 @@ class CoreData: +@@ -518,7 +517,7 @@ class CoreData: try: value = value.relative_to(prefix) except ValueError: diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 7009aa4898fa..de82609a5486 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -9,11 +9,11 @@ python3.pkgs.buildPythonApplication rec { pname = "meson"; - version = "0.56.0"; + version = "0.57.1"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "04vj250bwrzq7c0z1r96b0z0vgirvn0m367wm3ygqmfdy67x6799"; + sha256 = "19n8alcpzv6npgp27iqljkmvdmr7s2c7zm8y997j1nlvpa1cgqbj"; }; patches = [ diff --git a/pkgs/development/tools/build-managers/meson/more-env-vars.patch b/pkgs/development/tools/build-managers/meson/more-env-vars.patch index ada58fff6d41..4b2606e2d694 100644 --- a/pkgs/development/tools/build-managers/meson/more-env-vars.patch +++ b/pkgs/development/tools/build-managers/meson/more-env-vars.patch @@ -1,8 +1,8 @@ -diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py -index 219b62ec8..e3ceaddbd 100644 ---- a/mesonbuild/envconfig.py -+++ b/mesonbuild/envconfig.py -@@ -94,7 +94,7 @@ def get_env_var_pair(for_machine: MachineChoice, +diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py +index 756dd8193..a5cc6ef8b 100644 +--- a/mesonbuild/environment.py ++++ b/mesonbuild/environment.py +@@ -151,7 +151,7 @@ def _get_env_var(for_machine: MachineChoice, is_cross: bool, var_name: str) -> T # compiling we fall back on the unprefixed host version. This # allows native builds to never need to worry about the 'BUILD_*' # ones. From d3c0bb58c85a3332025629322f66f7fc4eaae9e5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" <ryantm-bot@ryantm.com> Date: Sat, 20 Feb 2021 01:39:06 +0000 Subject: [PATCH 038/188] phoronix-test-suite: 10.2.1 -> 10.2.2 --- pkgs/tools/misc/phoronix-test-suite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/phoronix-test-suite/default.nix b/pkgs/tools/misc/phoronix-test-suite/default.nix index 348670c3bb1b..971f924faaac 100644 --- a/pkgs/tools/misc/phoronix-test-suite/default.nix +++ b/pkgs/tools/misc/phoronix-test-suite/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "phoronix-test-suite"; - version = "10.2.1"; + version = "10.2.2"; src = fetchurl { url = "https://phoronix-test-suite.com/releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-2HB4TPbyG+cTY6O1k0tRPrnKyg41SYnVM919Hii3gpg="; + sha256 = "sha256-g5hUmsn01Msopxzmi/G4LcZISXMD2wFqreaHMkFzF1Y="; }; buildInputs = [ php ]; From 7b63dbf9d3e5adbb71985645e4bd28d854cc7803 Mon Sep 17 00:00:00 2001 From: Ivan Babrou <github@ivan.computer> Date: Sat, 20 Feb 2021 11:06:26 -0800 Subject: [PATCH 039/188] bzip2: 1.0.6.0.1 -> 1.0.6.0.2 --- pkgs/tools/compression/bzip2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix index bfaf359522f4..245441c760bf 100644 --- a/pkgs/tools/compression/bzip2/default.nix +++ b/pkgs/tools/compression/bzip2/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "bzip2"; - version = "1.0.6.0.1"; + version = "1.0.6.0.2"; /* We use versions patched to use autotools style properly, saving lots of trouble. */ @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { "ftp://ftp.mplayerhq.hu/pub/linux/suse" "http://ftp.suse.com/pub" # the original patched version but slow ]; - sha256 = "0b5b5p8c7bslc6fslcr1nj9136412v3qcvbg6yxi9argq9g72v8c"; + sha256 = "sha256-FnhwNy4OHe8d5M6iYCClkxzcB/EHXg0veXwv43ZlxbA="; }; nativeBuildInputs = [ autoreconfHook ]; From 127733211e03cb0763246a2ebc0c99e2a438a6ce Mon Sep 17 00:00:00 2001 From: Ben Siraphob <bensiraphob@gmail.com> Date: Sat, 20 Feb 2021 21:01:53 +0000 Subject: [PATCH 040/188] treewide: unzip buildInputs to nativeBuildInputs (#112302) --- pkgs/applications/audio/espeak/default.nix | 3 ++- pkgs/applications/audio/espeak/edit.nix | 4 ++-- pkgs/applications/audio/mp3gain/default.nix | 3 ++- .../audio/pd-plugins/helmholtz/default.nix | 3 ++- .../audio/pd-plugins/puremapping/default.nix | 3 ++- .../audio/pd-plugins/timbreid/default.nix | 3 ++- pkgs/applications/audio/sunvox/default.nix | 2 +- pkgs/applications/editors/android-studio/common.nix | 2 +- pkgs/applications/editors/edit/default.nix | 2 +- pkgs/applications/editors/fte/default.nix | 3 ++- pkgs/applications/editors/monodevelop/default.nix | 4 ++-- pkgs/applications/editors/netbeans/default.nix | 4 ++-- pkgs/applications/editors/textadept/10/default.nix | 4 ++-- pkgs/applications/editors/textadept/11/default.nix | 4 ++-- pkgs/applications/editors/vscode/generic.nix | 8 +++----- pkgs/applications/graphics/avocode/default.nix | 4 ++-- pkgs/applications/graphics/imagej/default.nix | 3 +-- pkgs/applications/graphics/zgrviewer/default.nix | 3 ++- pkgs/applications/misc/avrdudess/default.nix | 2 +- pkgs/applications/misc/kdbplus/default.nix | 2 +- pkgs/applications/misc/keepass/default.nix | 4 ++-- pkgs/applications/misc/omegat.nix | 3 +-- pkgs/applications/misc/openjump/default.nix | 3 +-- .../networking/browsers/palemoon/default.nix | 4 ++-- .../networking/browsers/vivaldi/widevine.nix | 2 +- .../networking/browsers/webbrowser/default.nix | 4 ++-- .../networking/instant-messengers/torchat/default.nix | 3 ++- pkgs/applications/networking/p2p/transgui/default.nix | 4 ++-- pkgs/applications/office/ib/controller/default.nix | 3 ++- pkgs/applications/science/biology/snpeff/default.nix | 4 ++-- pkgs/applications/science/math/perseus/default.nix | 2 +- pkgs/applications/science/math/weka/default.nix | 3 +-- .../robotics/betaflight-configurator/default.nix | 4 ++-- .../applications/version-management/mercurial/4.9.nix | 4 ++-- .../version-management/mercurial/default.nix | 4 ++-- pkgs/applications/window-managers/wmii-hg/default.nix | 4 ++-- pkgs/build-support/fetchnuget/default.nix | 2 +- pkgs/build-support/release/ant-build.nix | 3 ++- .../extensions/night-theme-switcher/default.nix | 3 ++- pkgs/development/compilers/factor-lang/default.nix | 4 ++-- pkgs/development/compilers/graalvm/default.nix | 2 +- pkgs/development/compilers/gwt/2.4.0.nix | 2 +- pkgs/development/compilers/kotlin/default.nix | 3 +-- pkgs/development/compilers/openjdk/darwin/11.nix | 3 ++- pkgs/development/compilers/openjdk/darwin/8.nix | 3 ++- pkgs/development/compilers/openjdk/darwin/default.nix | 3 ++- pkgs/development/interpreters/angelscript/2.22.nix | 6 ++---- pkgs/development/interpreters/angelscript/default.nix | 6 ++---- .../interpreters/clojurescript/lumo/default.nix | 2 +- pkgs/development/interpreters/groovy/default.nix | 3 +-- pkgs/development/interpreters/maude/default.nix | 3 ++- pkgs/development/interpreters/qnial/default.nix | 3 +-- pkgs/development/interpreters/unicon-lang/default.nix | 3 ++- pkgs/development/libraries/AntTweakBar/default.nix | 3 ++- pkgs/development/libraries/amrnb/default.nix | 2 +- pkgs/development/libraries/amrwb/default.nix | 2 +- pkgs/development/libraries/boost-process/default.nix | 2 +- pkgs/development/libraries/freetts/default.nix | 3 ++- pkgs/development/libraries/gdal/2.4.nix | 3 ++- pkgs/development/libraries/gdal/default.nix | 3 +-- pkgs/development/libraries/gdal/gdal-1_11.nix | 3 ++- pkgs/development/libraries/gtdialog/default.nix | 4 ++-- pkgs/development/libraries/hawknl/default.nix | 2 +- pkgs/development/libraries/herqq/default.nix | 4 ++-- pkgs/development/libraries/hunspell/dictionaries.nix | 11 ++++++----- pkgs/development/libraries/irrlicht/default.nix | 3 ++- pkgs/development/libraries/irrlicht/mac.nix | 4 ++-- pkgs/development/libraries/jama/default.nix | 2 +- pkgs/development/libraries/java/geoipjava/default.nix | 3 ++- pkgs/development/libraries/java/rhino/default.nix | 3 ++- pkgs/development/libraries/lib3ds/default.nix | 2 +- pkgs/development/libraries/libb64/default.nix | 2 +- pkgs/development/libraries/libf2c/default.nix | 2 +- pkgs/development/libraries/libixp-hg/default.nix | 3 ++- pkgs/development/libraries/libjson/default.nix | 2 +- pkgs/development/libraries/liblangtag/default.nix | 5 ++--- pkgs/development/libraries/libspotify/default.nix | 2 +- pkgs/development/libraries/muparser/default.nix | 5 ++--- pkgs/development/libraries/mygui/default.nix | 4 ++-- .../libraries/nvidia-video-sdk/default.nix | 2 +- .../libraries/openexrid-unstable/default.nix | 3 ++- pkgs/development/libraries/openfx/default.nix | 2 +- pkgs/development/libraries/openvdb/default.nix | 3 ++- pkgs/development/libraries/python-qt/default.nix | 4 ++-- pkgs/development/libraries/slib/default.nix | 3 ++- pkgs/development/libraries/tnt/default.nix | 2 +- pkgs/development/libraries/wtk/default.nix | 2 +- pkgs/development/misc/avr8-burn-omat/default.nix | 2 +- .../mobile/titaniumenv/titaniumsdk-7.5.nix | 3 +-- .../mobile/titaniumenv/titaniumsdk-8.2.nix | 3 +-- .../mobile/titaniumenv/titaniumsdk-8.3.nix | 3 +-- .../development/ocaml-modules/ocaml-cairo/default.nix | 4 ++-- pkgs/development/pharo/launcher/default.nix | 3 ++- pkgs/development/pharo/vm/share.nix | 2 +- .../python-modules/pytest-catchlog/default.nix | 3 ++- .../python-modules/python-simple-hipchat/default.nix | 2 +- pkgs/development/tools/analysis/emma/default.nix | 2 +- pkgs/development/tools/analysis/randoop/default.nix | 2 +- .../tools/build-managers/gradle/default.nix | 4 ++-- .../continuous-integration/gocd-agent/default.nix | 2 +- .../continuous-integration/gocd-server/default.nix | 2 +- .../tools/database/sqldeveloper/default.nix | 3 +-- pkgs/development/tools/eclipse-mat/default.nix | 2 +- pkgs/development/tools/electron/generic.nix | 2 +- pkgs/development/tools/galen/default.nix | 2 +- pkgs/development/tools/misc/jscoverage/default.nix | 3 ++- pkgs/development/tools/misc/premake/3.nix | 2 +- pkgs/development/tools/misc/saleae-logic/default.nix | 2 +- pkgs/development/tools/ocaml/opam/1.2.2.nix | 4 ++-- pkgs/development/tools/ocaml/opam/default.nix | 4 ++-- pkgs/development/tools/ocaml/opam/opam.nix.pl | 3 ++- pkgs/development/tools/phantomjs/default.nix | 2 +- .../tools/react-native-debugger/default.nix | 2 +- pkgs/development/tools/sauce-connect/default.nix | 2 +- pkgs/development/tools/slimerjs/default.nix | 6 ++---- pkgs/development/tools/thrust/default.nix | 4 ++-- pkgs/development/web/grails/default.nix | 2 +- pkgs/development/web/twitter-bootstrap/default.nix | 2 +- pkgs/games/crafty/default.nix | 2 +- pkgs/games/dwarf-fortress/twbt/default.nix | 2 +- pkgs/games/exult/default.nix | 4 ++-- pkgs/games/gogui/default.nix | 3 +-- pkgs/games/keen4/default.nix | 2 +- pkgs/games/nexuiz/default.nix | 3 +-- pkgs/games/rigsofrods/default.nix | 4 ++-- pkgs/games/simutrans/default.nix | 4 ++-- pkgs/games/steam/fonts.nix | 2 +- pkgs/games/terraria-server/default.nix | 4 ++-- pkgs/games/tremulous/default.nix | 3 ++- pkgs/games/urbanterror/default.nix | 3 ++- pkgs/games/worldofgoo/default.nix | 2 +- pkgs/games/xonotic/default.nix | 3 ++- pkgs/games/zod/default.nix | 4 ++-- pkgs/misc/drivers/foo2zjs/default.nix | 3 ++- pkgs/misc/emulators/atari800/default.nix | 4 ++-- pkgs/misc/emulators/nestopia/default.nix | 2 +- pkgs/misc/source-and-tags/default.nix | 2 +- pkgs/os-specific/linux/ati-drivers/default.nix | 2 +- pkgs/os-specific/linux/lsiutil/default.nix | 2 +- pkgs/os-specific/linux/msr-tools/default.nix | 2 +- pkgs/os-specific/linux/seturgent/default.nix | 3 ++- pkgs/servers/amqp/rabbitmq-server/default.nix | 3 ++- pkgs/servers/computing/storm/default.nix | 2 +- pkgs/servers/http/jboss/default.nix | 2 +- pkgs/servers/http/tomcat/axis2/default.nix | 3 ++- pkgs/servers/jellyfin/10.5.x.nix | 2 +- pkgs/servers/jellyfin/default.nix | 2 +- pkgs/servers/monitoring/nagios/default.nix | 3 ++- pkgs/servers/monitoring/net-snmp/default.nix | 4 ++-- pkgs/servers/nosql/riak/2.2.0.nix | 3 ++- pkgs/servers/rainloop/default.nix | 2 +- pkgs/servers/search/elasticsearch/plugins.nix | 2 +- pkgs/servers/sql/mysql/jdbc/default.nix | 3 ++- pkgs/servers/web-apps/moodle/moodle-utils.nix | 5 +++-- pkgs/tools/archivers/zpaq/default.nix | 3 +-- pkgs/tools/archivers/zpaq/zpaqd.nix | 2 +- pkgs/tools/cd-dvd/uif2iso/default.nix | 3 ++- pkgs/tools/graphics/fgallery/default.nix | 4 ++-- pkgs/tools/graphics/pdfread/default.nix | 4 ++-- pkgs/tools/graphics/structure-synth/default.nix | 4 ++-- .../inputmethods/tegaki-zinnia-japanese/default.nix | 2 +- pkgs/tools/misc/debian-devscripts/default.nix | 4 ++-- pkgs/tools/misc/ent/default.nix | 2 +- pkgs/tools/misc/gams/default.nix | 3 ++- pkgs/tools/misc/graylog/plugins.nix | 2 +- pkgs/tools/misc/jdiskreport/default.nix | 3 +-- pkgs/tools/misc/megacli/default.nix | 3 ++- pkgs/tools/misc/umlet/default.nix | 2 +- pkgs/tools/misc/vorbisgain/default.nix | 3 ++- pkgs/tools/networking/dd-agent/5.nix | 2 +- pkgs/tools/networking/p2p/azureus/default.nix | 2 +- pkgs/tools/security/bmrsa/11.nix | 2 +- pkgs/tools/security/chntpw/default.nix | 4 ++-- pkgs/tools/security/pcsc-scm-scl011/default.nix | 2 +- pkgs/tools/security/rarcrack/default.nix | 3 ++- pkgs/tools/security/sonar-scanner-cli/default.nix | 2 +- pkgs/tools/text/xml/basex/default.nix | 3 ++- pkgs/tools/typesetting/tex/lkproof/default.nix | 2 +- pkgs/tools/typesetting/tex/pgf/3.x.nix | 2 +- pkgs/tools/typesetting/tex/pgfplots/default.nix | 2 +- pkgs/tools/virtualization/ec2-ami-tools/default.nix | 3 +-- pkgs/tools/virtualization/ec2-api-tools/default.nix | 3 +-- pkgs/top-level/dotnet-packages.nix | 2 +- 183 files changed, 282 insertions(+), 261 deletions(-) diff --git a/pkgs/applications/audio/espeak/default.nix b/pkgs/applications/audio/espeak/default.nix index b155c1c41b60..675f31b478ce 100644 --- a/pkgs/applications/audio/espeak/default.nix +++ b/pkgs/applications/audio/espeak/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0n86gwh9pw0jqqpdz7mxggllfr8k0r7pc67ayy7w5z6z79kig6mz"; }; - buildInputs = [ unzip portaudio ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ portaudio ]; patches = [ ./gcc6.patch diff --git a/pkgs/applications/audio/espeak/edit.nix b/pkgs/applications/audio/espeak/edit.nix index aa0dc90adf58..0b9fa3dfbe54 100644 --- a/pkgs/applications/audio/espeak/edit.nix +++ b/pkgs/applications/audio/espeak/edit.nix @@ -8,8 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0x8s7vpb7rw5x37yjzy1f98m4f2csdg89libb74fm36gn8ly0hli"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ unzip portaudio wxGTK ]; + nativeBuildInputs = [ pkg-config unzip ]; + buildInputs = [ portaudio wxGTK ]; # TODO: # Uhm, seems like espeakedit still wants espeak-data/ in $HOME, even thought diff --git a/pkgs/applications/audio/mp3gain/default.nix b/pkgs/applications/audio/mp3gain/default.nix index fb774476a2e2..bf0a347d14bd 100644 --- a/pkgs/applications/audio/mp3gain/default.nix +++ b/pkgs/applications/audio/mp3gain/default.nix @@ -7,7 +7,8 @@ stdenv.mkDerivation { sha256 = "0varr6y7k8zarr56b42r0ad9g3brhn5vv3xjg1c0v19jxwr4gh2w"; }; - buildInputs = [ unzip mpg123 ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ mpg123 ]; sourceRoot = "."; diff --git a/pkgs/applications/audio/pd-plugins/helmholtz/default.nix b/pkgs/applications/audio/pd-plugins/helmholtz/default.nix index 9b50b40a5bb5..feaf9ed70cfb 100644 --- a/pkgs/applications/audio/pd-plugins/helmholtz/default.nix +++ b/pkgs/applications/audio/pd-plugins/helmholtz/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation { sha256 = "0h1fj7lmvq9j6rmw33rb8k0byxb898bi2xhcwkqalb84avhywgvs"; }; - buildInputs = [ unzip puredata ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ puredata ]; unpackPhase = '' unzip $src diff --git a/pkgs/applications/audio/pd-plugins/puremapping/default.nix b/pkgs/applications/audio/pd-plugins/puremapping/default.nix index 1eb6eb389317..811b8c2ee9aa 100644 --- a/pkgs/applications/audio/pd-plugins/puremapping/default.nix +++ b/pkgs/applications/audio/pd-plugins/puremapping/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1h7qgqd8srrxw2y1rkdw5js4k6f5vc8x6nlm2mq9mq9vjck7n1j7"; }; - buildInputs = [ unzip puredata ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ puredata ]; unpackPhase = '' unzip $src diff --git a/pkgs/applications/audio/pd-plugins/timbreid/default.nix b/pkgs/applications/audio/pd-plugins/timbreid/default.nix index e5e67ec44dd4..7fd2adefce07 100644 --- a/pkgs/applications/audio/pd-plugins/timbreid/default.nix +++ b/pkgs/applications/audio/pd-plugins/timbreid/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "14k2xk5zrzrw1zprdbwx45hrlc7ck8vq4drpd3l455i5r8yk4y6b"; }; - buildInputs = [ unzip puredata fftw ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ puredata fftw ]; unpackPhase = '' mkdir source diff --git a/pkgs/applications/audio/sunvox/default.nix b/pkgs/applications/audio/sunvox/default.nix index abc31d9f1801..ce775abeb42f 100644 --- a/pkgs/applications/audio/sunvox/default.nix +++ b/pkgs/applications/audio/sunvox/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { sha256 = "0lqzr68n2c6aifw2vbyars91wn1chmgb9xfdk463g4vjqiava3ih"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; unpackPhase = "unzip $src"; diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index 1c3c4aade5ff..9a099d9eee10 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -65,9 +65,9 @@ let sha256 = sha256Hash; }; + nativeBuildInputs = [ unzip ]; buildInputs = [ makeWrapper - unzip ]; installPhase = '' cp -r . $out diff --git a/pkgs/applications/editors/edit/default.nix b/pkgs/applications/editors/edit/default.nix index 25e620c51e4e..94bb1a0d2863 100644 --- a/pkgs/applications/editors/edit/default.nix +++ b/pkgs/applications/editors/edit/default.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation { sha256 = "0wv8i3ii7cd9bqhjpahwp2g5fcmyk365nc7ncmvl79cxbz3f7y8v"; }; + nativeBuildInputs = [ unzip ]; buildInputs = [ - unzip pkg-config ncurses libX11 diff --git a/pkgs/applications/editors/fte/default.nix b/pkgs/applications/editors/fte/default.nix index 3814c8a879fd..4f78267dbe5d 100644 --- a/pkgs/applications/editors/fte/default.nix +++ b/pkgs/applications/editors/fte/default.nix @@ -3,7 +3,8 @@ stdenv.mkDerivation rec { name = "fte-0.50.02"; - buildInputs = [ unzip perl libX11 libXpm gpm ncurses slang ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ perl libX11 libXpm gpm ncurses slang ]; ftesrc = fetchurl { url = "mirror://sourceforge/fte/fte-20110708-src.zip"; diff --git a/pkgs/applications/editors/monodevelop/default.nix b/pkgs/applications/editors/monodevelop/default.nix index e5fde3e501ec..12b66370d506 100644 --- a/pkgs/applications/editors/monodevelop/default.nix +++ b/pkgs/applications/editors/monodevelop/default.nix @@ -34,10 +34,10 @@ stdenv.mkDerivation rec { patchFlags = [ "-p2" ]; patches = [ ./git-revert-12d610fb3f6dce121df538e36f21d8c2eeb0a6e3.patch ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config unzip ]; buildInputs = [ autoconf automake shared-mime-info intltool - mono gtk-sharp-2_0 gnome-sharp unzip + mono gtk-sharp-2_0 gnome-sharp dotnetPackages.NUnit dotnetPackages.NUnitRunners dotnetPackages.Nuget diff --git a/pkgs/applications/editors/netbeans/default.nix b/pkgs/applications/editors/netbeans/default.nix index f968b85c6ff1..c0345dbf8ec6 100644 --- a/pkgs/applications/editors/netbeans/default.nix +++ b/pkgs/applications/editors/netbeans/default.nix @@ -56,8 +56,8 @@ stdenv.mkDerivation { ln -s ${desktopItem}/share/applications/* $out/share/applications ''; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ perl python unzip libicns imagemagick ]; + nativeBuildInputs = [ makeWrapper unzip ]; + buildInputs = [ perl python libicns imagemagick ]; meta = { description = "An integrated development environment for Java, C, C++ and PHP"; diff --git a/pkgs/applications/editors/textadept/10/default.nix b/pkgs/applications/editors/textadept/10/default.nix index 9d86bdc4c5bf..fe22f3424f2e 100644 --- a/pkgs/applications/editors/textadept/10/default.nix +++ b/pkgs/applications/editors/textadept/10/default.nix @@ -4,9 +4,9 @@ stdenv.mkDerivation rec { version = "10.8"; pname = "textadept"; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config unzip ]; buildInputs = [ - gtk2 ncurses glib unzip zip + gtk2 ncurses glib zip ]; src = fetchhg { diff --git a/pkgs/applications/editors/textadept/11/default.nix b/pkgs/applications/editors/textadept/11/default.nix index a0037ca6c2bf..ec310639c364 100644 --- a/pkgs/applications/editors/textadept/11/default.nix +++ b/pkgs/applications/editors/textadept/11/default.nix @@ -4,9 +4,9 @@ stdenv.mkDerivation rec { version = "11.0_beta"; pname = "textadept11"; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config unzip ]; buildInputs = [ - gtk2 ncurses glib unzip zip + gtk2 ncurses glib zip ]; src = fetchFromGitHub { diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index 470683bad43f..39ed4e8032ea 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -60,14 +60,12 @@ in ''; }; - buildInputs = (if stdenv.isDarwin - then [ unzip ] - else [ gtk2 at-spi2-atk wrapGAppsHook ] ++ atomEnv.packages) - ++ [ libsecret libXScrnSaver ]; + buildInputs = [ libsecret libXScrnSaver ] + ++ lib.optionals (!stdenv.isDarwin) ([ gtk2 at-spi2-atk wrapGAppsHook ] ++ atomEnv.packages); runtimeDependencies = lib.optional (stdenv.isLinux) [ (lib.getLib systemd) fontconfig.lib libdbusmenu ]; - nativeBuildInputs = lib.optional (!stdenv.isDarwin) autoPatchelfHook; + nativeBuildInputs = [unzip] ++ lib.optional (!stdenv.isDarwin) autoPatchelfHook; dontBuild = true; dontConfigure = true; diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix index 902fb43047b3..2df7bc625e8d 100644 --- a/pkgs/applications/graphics/avocode/default.nix +++ b/pkgs/applications/graphics/avocode/default.nix @@ -58,8 +58,8 @@ stdenv.mkDerivation rec { comment = "The bridge between designers and developers"; }; - nativeBuildInputs = [makeWrapper wrapGAppsHook]; - buildInputs = [ unzip gtk3 gnome3.adwaita-icon-theme ]; + nativeBuildInputs = [makeWrapper wrapGAppsHook unzip]; + buildInputs = [ gtk3 gnome3.adwaita-icon-theme ]; # src is producing multiple folder on unzip so we must # override unpackCmd to extract it into newly created folder diff --git a/pkgs/applications/graphics/imagej/default.nix b/pkgs/applications/graphics/imagej/default.nix index 312316b33974..65d3c9735dfd 100644 --- a/pkgs/applications/graphics/imagej/default.nix +++ b/pkgs/applications/graphics/imagej/default.nix @@ -15,8 +15,7 @@ let url = "https://wsr.imagej.net/distros/cross-platform/ij150.zip"; sha256 = "97aba6fc5eb908f5160243aebcdc4965726693cb1353d9c0d71b8f5dd832cb7b"; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ unzip ]; + nativeBuildInputs = [ makeWrapper unzip ]; inherit jre; # JAR files that are intended to be used by other packages diff --git a/pkgs/applications/graphics/zgrviewer/default.nix b/pkgs/applications/graphics/zgrviewer/default.nix index c47c41a1cdc7..b5fc70494fcd 100644 --- a/pkgs/applications/graphics/zgrviewer/default.nix +++ b/pkgs/applications/graphics/zgrviewer/default.nix @@ -6,7 +6,8 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/zvtm/${pname}/${version}/${pname}-${version}.zip"; sha256 = "1yg2rck81sqqrgfi5kn6c1bz42dr7d0zqpcsdjhicssi1y159f23"; }; - buildInputs = [jre unzip]; + nativeBuildInputs = [ unzip ]; + buildInputs = [jre]; buildPhase = ""; installPhase = '' mkdir -p "$out"/{bin,share/java/zvtm/plugins,share/doc/zvtm} diff --git a/pkgs/applications/misc/avrdudess/default.nix b/pkgs/applications/misc/avrdudess/default.nix index 29469d9fff91..14b372d91e59 100644 --- a/pkgs/applications/misc/avrdudess/default.nix +++ b/pkgs/applications/misc/avrdudess/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "18llpvjsfhypzijrvfbzmcg3g141f307mzsrg11wcdxh9syxqak6"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; phases = [ "buildPhase" ]; diff --git a/pkgs/applications/misc/kdbplus/default.nix b/pkgs/applications/misc/kdbplus/default.nix index d27a10af20c6..8ee8337bea2a 100644 --- a/pkgs/applications/misc/kdbplus/default.nix +++ b/pkgs/applications/misc/kdbplus/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { }; dontStrip = true; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; phases = "unpackPhase installPhase"; unpackPhase = "mkdir ${pname}-${version} && cd ${pname}-${version} && unzip -qq ${src}"; diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix index 6388d005fe55..843193bba182 100644 --- a/pkgs/applications/misc/keepass/default.nix +++ b/pkgs/applications/misc/keepass/default.nix @@ -12,8 +12,8 @@ with builtins; buildDotnetPackage rec { sourceRoot = "."; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ unzip icoutils ]; + nativeBuildInputs = [ makeWrapper unzip ]; + buildInputs = [ icoutils ]; patches = [ (substituteAll { diff --git a/pkgs/applications/misc/omegat.nix b/pkgs/applications/misc/omegat.nix index 2bb3d14e1d25..0a46393bd220 100644 --- a/pkgs/applications/misc/omegat.nix +++ b/pkgs/applications/misc/omegat.nix @@ -9,8 +9,7 @@ stdenv.mkDerivation { sha256 = "0axz7r30p34z5hgvdglznc82g7yvm3g56dv5190jixskx6ba58rs"; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ unzip ]; + nativeBuildInputs = [ makeWrapper unzip ]; unpackCmd = "unzip -o $curSrc"; # tries to go interactive without -o diff --git a/pkgs/applications/misc/openjump/default.nix b/pkgs/applications/misc/openjump/default.nix index b3e93ce51271..d6b20a7f01e5 100644 --- a/pkgs/applications/misc/openjump/default.nix +++ b/pkgs/applications/misc/openjump/default.nix @@ -18,8 +18,7 @@ stdenv.mkDerivation { cd $out; unzip $src ''; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ unzip ]; + nativeBuildInputs = [ makeWrapper unzip ]; installPhase = '' dir=$(echo $out/OpenJUMP-*) diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index 8207040f1b8c..bf551c59a7ab 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -43,14 +43,14 @@ in stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - desktop-file-utils file gnum4 perl pkg-config python2 wget which wrapGAppsHook + desktop-file-utils file gnum4 perl pkg-config python2 wget which wrapGAppsHook unzip ]; buildInputs = [ alsaLib bzip2 cairo dbus dbus-glib ffmpeg fontconfig freetype gnome2.GConf gtk2 hunspell libevent libjpeg libnotify libstartup_notification libGLU libGL - libpulseaudio unzip yasm zip zlib + libpulseaudio yasm zip zlib ] ++ (with xorg; [ libX11 libXext libXft libXi libXrender libXScrnSaver diff --git a/pkgs/applications/networking/browsers/vivaldi/widevine.nix b/pkgs/applications/networking/browsers/vivaldi/widevine.nix index 3b3a0a858907..81c95418e691 100644 --- a/pkgs/applications/networking/browsers/vivaldi/widevine.nix +++ b/pkgs/applications/networking/browsers/vivaldi/widevine.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0l743f2yyaq1vvc3iicajgnfpjxjsfvjcqvanndbxs23skgjcv6r"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; unpackPhase = '' unzip $src diff --git a/pkgs/applications/networking/browsers/webbrowser/default.nix b/pkgs/applications/networking/browsers/webbrowser/default.nix index d9e997f514b6..327fc5f31e2f 100644 --- a/pkgs/applications/networking/browsers/webbrowser/default.nix +++ b/pkgs/applications/networking/browsers/webbrowser/default.nix @@ -41,12 +41,12 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ - gnum4 makeWrapper perl pkg-config python2 + gnum4 makeWrapper perl pkg-config python2 unzip ]; buildInputs = [ alsaLib dbus dbus-glib ffmpeg fontconfig freetype yasm zip jack2 gtk2 - unzip gnome2.GConf xorg.libXt + gnome2.GConf xorg.libXt ]; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/instant-messengers/torchat/default.nix b/pkgs/applications/networking/instant-messengers/torchat/default.nix index 087dd502946d..dfc2613d3e9e 100644 --- a/pkgs/applications/networking/instant-messengers/torchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/torchat/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0rb4lvv40pz6ab5kxq40ycvh7kh1yxn7swzgv2ff2nbhi62xnzp0"; }; - buildInputs = [ python unzip wxPython wrapPython ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ python wxPython wrapPython ]; pythonPath = [ wxPython ]; preConfigure = "cd torchat/src; rm portable.txt"; diff --git a/pkgs/applications/networking/p2p/transgui/default.nix b/pkgs/applications/networking/p2p/transgui/default.nix index 809e4528df9a..ceccf44819fc 100644 --- a/pkgs/applications/networking/p2p/transgui/default.nix +++ b/pkgs/applications/networking/p2p/transgui/default.nix @@ -12,9 +12,9 @@ stdenv.mkDerivation rec { sha256 = "1dyx778756zhvz5sxgdvy49p2c0x44w4nmcfd90wqrmgfknncnf5"; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config unzip ]; buildInputs = [ - unzip fpc lazarus stdenv.cc + fpc lazarus stdenv.cc libX11 glib gtk2 gdk-pixbuf pango atk cairo openssl ]; diff --git a/pkgs/applications/office/ib/controller/default.nix b/pkgs/applications/office/ib/controller/default.nix index 35aebf232606..0815dfc8982f 100644 --- a/pkgs/applications/office/ib/controller/default.nix +++ b/pkgs/applications/office/ib/controller/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { phases = [ "unpackPhase" "installPhase" ]; - buildInputs = [ unzip jdk ib-tws ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ jdk ib-tws ]; installPhase = '' mkdir -p $out $out/bin $out/etc/ib/controller $out/share/IBController diff --git a/pkgs/applications/science/biology/snpeff/default.nix b/pkgs/applications/science/biology/snpeff/default.nix index b48e13ecf003..4c32516b29f6 100644 --- a/pkgs/applications/science/biology/snpeff/default.nix +++ b/pkgs/applications/science/biology/snpeff/default.nix @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0i12mv93bfv8xjwc3rs2x73d6hkvi7kgbbbx3ry984l3ly4p6nnm"; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ unzip jre ]; + nativeBuildInputs = [ makeWrapper unzip ]; + buildInputs = [ jre ]; sourceRoot = "snpEff"; diff --git a/pkgs/applications/science/math/perseus/default.nix b/pkgs/applications/science/math/perseus/default.nix index 242f2e2cea5d..d53236d8070c 100644 --- a/pkgs/applications/science/math/perseus/default.nix +++ b/pkgs/applications/science/math/perseus/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "perseus-4-beta"; version = "4-beta"; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; hardeningDisable = [ "stackprotector" ]; diff --git a/pkgs/applications/science/math/weka/default.nix b/pkgs/applications/science/math/weka/default.nix index 05b95140b1bd..9d18763aa32d 100644 --- a/pkgs/applications/science/math/weka/default.nix +++ b/pkgs/applications/science/math/weka/default.nix @@ -9,8 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0zwmhspmqb0a7cm6k6i0s6q3w19ws1g9dx3cp2v3g3vsif6cdh31"; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ unzip ]; + nativeBuildInputs = [ makeWrapper unzip ]; # The -Xmx1000M comes suggested from their download page: # http://www.cs.waikato.ac.nz/ml/weka/downloading.html diff --git a/pkgs/applications/science/robotics/betaflight-configurator/default.nix b/pkgs/applications/science/robotics/betaflight-configurator/default.nix index 9a304272fe9b..2fafa2ebf875 100644 --- a/pkgs/applications/science/robotics/betaflight-configurator/default.nix +++ b/pkgs/applications/science/robotics/betaflight-configurator/default.nix @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { sha256 = "07r60n9422g5sm7x5b62p044cp961l51vx0s8ig2hy24s74hkam1"; }; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ wrapGAppsHook unzip ]; - buildInputs = [ unzip gsettings-desktop-schemas gtk3 ]; + buildInputs = [ gsettings-desktop-schemas gtk3 ]; installPhase = '' mkdir -p $out/bin \ diff --git a/pkgs/applications/version-management/mercurial/4.9.nix b/pkgs/applications/version-management/mercurial/4.9.nix index f499be17f7c8..d2511e278632 100644 --- a/pkgs/applications/version-management/mercurial/4.9.nix +++ b/pkgs/applications/version-management/mercurial/4.9.nix @@ -21,8 +21,8 @@ in python2Packages.buildPythonApplication { inherit python; # pass it so that the same version can be used in hg2git - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ docutils unzip ] + nativeBuildInputs = [ makeWrapper unzip ]; + buildInputs = [ docutils ] ++ lib.optionals stdenv.isDarwin [ ApplicationServices ]; propagatedBuildInputs = [ hg-git dulwich ]; diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 7c0a96583e70..26d263b060d4 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -19,8 +19,8 @@ in python3Packages.buildPythonApplication rec { passthru = { inherit python; }; # pass it so that the same version can be used in hg2git - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ docutils unzip ] + nativeBuildInputs = [ makeWrapper unzip ]; + buildInputs = [ docutils ] ++ lib.optionals stdenv.isDarwin [ ApplicationServices ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/window-managers/wmii-hg/default.nix b/pkgs/applications/window-managers/wmii-hg/default.nix index b78b7c015703..0acad8edbe59 100644 --- a/pkgs/applications/window-managers/wmii-hg/default.nix +++ b/pkgs/applications/window-managers/wmii-hg/default.nix @@ -29,8 +29,8 @@ stdenv.mkDerivation rec { EOF ''; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ unzip libixp_hg txt2tags dash python which + nativeBuildInputs = [ pkg-config unzip ]; + buildInputs = [ libixp_hg txt2tags dash python which libX11 libXrender libXext libXinerama libXrandr libXft ]; # For some reason including mercurial in buildInputs did not help diff --git a/pkgs/build-support/fetchnuget/default.nix b/pkgs/build-support/fetchnuget/default.nix index 960bc3c1ffb2..ad61b9a51d2b 100644 --- a/pkgs/build-support/fetchnuget/default.nix +++ b/pkgs/build-support/fetchnuget/default.nix @@ -19,7 +19,7 @@ else sourceRoot = "."; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; dontBuild = true; diff --git a/pkgs/build-support/release/ant-build.nix b/pkgs/build-support/release/ant-build.nix index 996f4f45d07b..6b59241e01ed 100644 --- a/pkgs/build-support/release/ant-build.nix +++ b/pkgs/build-support/release/ant-build.nix @@ -108,7 +108,8 @@ stdenv.mkDerivation ( { name = name + (if src ? version then "-" + src.version else ""); - buildInputs = [ant jre zip unzip] ++ lib.optional (args ? buildInputs) args.buildInputs ; + nativeBuildInputs = [ unzip ]; + buildInputs = [ant jre zip] ++ lib.optional (args ? buildInputs) args.buildInputs ; postHook = '' mkdir -p $out/nix-support diff --git a/pkgs/desktops/gnome-3/extensions/night-theme-switcher/default.nix b/pkgs/desktops/gnome-3/extensions/night-theme-switcher/default.nix index c83ad7ef4c19..f663aa8977b1 100644 --- a/pkgs/desktops/gnome-3/extensions/night-theme-switcher/default.nix +++ b/pkgs/desktops/gnome-3/extensions/night-theme-switcher/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0z11y18bgdc0y41hrrzzgi4lagm2cg06x12jgdnary1ycng7xja0"; }; - buildInputs = [ glib gnome3.gnome-shell unzip ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ glib gnome3.gnome-shell ]; uuid = "nightthemeswitcher@romainvigier.fr"; diff --git a/pkgs/development/compilers/factor-lang/default.nix b/pkgs/development/compilers/factor-lang/default.nix index 2c9999ccdb49..4ce55b5ca25c 100644 --- a/pkgs/development/compilers/factor-lang/default.nix +++ b/pkgs/development/compilers/factor-lang/default.nix @@ -19,10 +19,10 @@ stdenv.mkDerivation rec { ./fuel-dir.patch ]; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper unzip ]; buildInputs = with xorg; [ git rlwrap curl pkg-config perl libX11 pango cairo gtk2 gdk-pixbuf gtkglext - mesa libXmu libXt libICE libSM openssl unzip ]; + mesa libXmu libXt libICE libSM openssl ]; buildPhase = '' sed -ie '4i GIT_LABEL = heads/master-${rev}' GNUmakefile diff --git a/pkgs/development/compilers/graalvm/default.nix b/pkgs/development/compilers/graalvm/default.nix index fc30e37e4b7c..b54f57e9b646 100644 --- a/pkgs/development/compilers/graalvm/default.nix +++ b/pkgs/development/compilers/graalvm/default.nix @@ -89,7 +89,7 @@ let makeMxCache = list: stdenv.mkDerivation { name = "mx-cache"; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; buildCommand = with lib; '' mkdir $out ${lib.concatMapStrings diff --git a/pkgs/development/compilers/gwt/2.4.0.nix b/pkgs/development/compilers/gwt/2.4.0.nix index e10d10120347..011a7979df7f 100644 --- a/pkgs/development/compilers/gwt/2.4.0.nix +++ b/pkgs/development/compilers/gwt/2.4.0.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1gvyg00vx7fdqgfl2w7nhql78clg3abs6fxxy7m03pprdm5qmm17"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; installPhase = '' mkdir -p $out diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index 2ddc5b3d3a89..9154b7d76a64 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -12,8 +12,7 @@ in stdenv.mkDerivation { }; propagatedBuildInputs = [ jre ] ; - buildInputs = [ unzip ] ; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper unzip ]; installPhase = '' mkdir -p $out diff --git a/pkgs/development/compilers/openjdk/darwin/11.nix b/pkgs/development/compilers/openjdk/darwin/11.nix index 64654351886f..e63587333765 100644 --- a/pkgs/development/compilers/openjdk/darwin/11.nix +++ b/pkgs/development/compilers/openjdk/darwin/11.nix @@ -15,7 +15,8 @@ let curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/zulu-mac/"; }; - buildInputs = [ unzip freetype ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ freetype ]; installPhase = '' mkdir -p $out diff --git a/pkgs/development/compilers/openjdk/darwin/8.nix b/pkgs/development/compilers/openjdk/darwin/8.nix index 4df180c1f5a7..a5cd15817e9a 100644 --- a/pkgs/development/compilers/openjdk/darwin/8.nix +++ b/pkgs/development/compilers/openjdk/darwin/8.nix @@ -18,7 +18,8 @@ let curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/zulu-linux/"; }; - buildInputs = [ unzip freetype ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ freetype ]; installPhase = '' mkdir -p $out diff --git a/pkgs/development/compilers/openjdk/darwin/default.nix b/pkgs/development/compilers/openjdk/darwin/default.nix index 8885db4115ea..361bfdeb3c28 100644 --- a/pkgs/development/compilers/openjdk/darwin/default.nix +++ b/pkgs/development/compilers/openjdk/darwin/default.nix @@ -15,7 +15,8 @@ let curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/"; }; - buildInputs = [ unzip freetype ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ freetype ]; installPhase = '' mkdir -p $out diff --git a/pkgs/development/interpreters/angelscript/2.22.nix b/pkgs/development/interpreters/angelscript/2.22.nix index 922d964e8abe..4c35f065cb5c 100644 --- a/pkgs/development/interpreters/angelscript/2.22.nix +++ b/pkgs/development/interpreters/angelscript/2.22.nix @@ -8,13 +8,11 @@ let url="http://www.angelcode.com/angelscript/sdk/files/angelscript_${version}.zip"; sha256 = "1pp853lbnz383ilp9wbgc3wv1dn7lpx3idz8dmzda94rckl7sd43"; }; - buildInputs = [ - unzip - ]; in stdenv.mkDerivation { inherit (s) name version; - inherit buildInputs; + nativeBuildInputs = [ unzip ]; + src = fetchurl { inherit (s) url sha256; }; diff --git a/pkgs/development/interpreters/angelscript/default.nix b/pkgs/development/interpreters/angelscript/default.nix index fb8c6b2844d6..3fbd64467fec 100644 --- a/pkgs/development/interpreters/angelscript/default.nix +++ b/pkgs/development/interpreters/angelscript/default.nix @@ -8,13 +8,11 @@ let url="http://www.angelcode.com/angelscript/sdk/files/angelscript_${version}.zip"; sha256 = "sha256-AQ3UXiPnNNRvWJHXDiaGB6EsuasSUD3aQvhC2dt+iFc="; }; - buildInputs = [ - unzip - ]; + in stdenv.mkDerivation { inherit (s) name version; - inherit buildInputs; + nativeBuildInputs = [ unzip ]; src = fetchurl { inherit (s) url sha256; }; diff --git a/pkgs/development/interpreters/clojurescript/lumo/default.nix b/pkgs/development/interpreters/clojurescript/lumo/default.nix index a269d0b158e2..7bd3913260d4 100644 --- a/pkgs/development/interpreters/clojurescript/lumo/default.nix +++ b/pkgs/development/interpreters/clojurescript/lumo/default.nix @@ -149,11 +149,11 @@ stdenv.mkDerivation { sha256 = "12agi6bacqic2wq6q3l28283badzamspajmajzqm7fbdl2aq1a4p"; }; + nativeBuildInputs = [ unzip ]; buildInputs = [ nodejs clojure jre - unzip python openssl gnutar diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix index 114bc13f5d8a..9d2b9a8f0387 100644 --- a/pkgs/development/interpreters/groovy/default.nix +++ b/pkgs/development/interpreters/groovy/default.nix @@ -11,8 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1xdpjqx7qaq0syw448b32q36g12pgh1hn6knyqi3k5isp0f09qmr"; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ unzip ]; + nativeBuildInputs = [ makeWrapper unzip ]; installPhase = '' mkdir -p $out diff --git a/pkgs/development/interpreters/maude/default.nix b/pkgs/development/interpreters/maude/default.nix index 6dcb697d7639..860f9ac3a5eb 100644 --- a/pkgs/development/interpreters/maude/default.nix +++ b/pkgs/development/interpreters/maude/default.nix @@ -22,8 +22,9 @@ stdenv.mkDerivation { sha256 = "b112d7843f65217e3b5a9d40461698ef8dab7cbbe830af21216dfb924dc88a2f"; }; + nativeBuildInputs = [ unzip ]; buildInputs = [ - flex bison ncurses buddy tecla gmpxx libsigsegv makeWrapper unzip cln yices + flex bison ncurses buddy tecla gmpxx libsigsegv makeWrapper cln yices ]; hardeningDisable = [ "stackprotector" ] ++ diff --git a/pkgs/development/interpreters/qnial/default.nix b/pkgs/development/interpreters/qnial/default.nix index ba46989c94a7..1173315192e1 100644 --- a/pkgs/development/interpreters/qnial/default.nix +++ b/pkgs/development/interpreters/qnial/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { owner = "vrthra"; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper unzip ]; preConfigure = '' cd build; @@ -25,7 +25,6 @@ stdenv.mkDerivation { ''; buildInputs = [ - unzip pkg-config ncurses ]; diff --git a/pkgs/development/interpreters/unicon-lang/default.nix b/pkgs/development/interpreters/unicon-lang/default.nix index ac0a944f2105..e64db1b109e9 100644 --- a/pkgs/development/interpreters/unicon-lang/default.nix +++ b/pkgs/development/interpreters/unicon-lang/default.nix @@ -7,7 +7,8 @@ stdenv.mkDerivation { url = "http://unicon.org/dist/uni-2-4-2010.zip"; sha256 = "1g9l2dfp99dqih2ir2limqfjgagh3v9aqly6x0l3qavx3qkkwf61"; }; - buildInputs = [ libnsl libX11 libXt unzip ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ libnsl libX11 libXt ]; hardeningDisable = [ "fortify" ]; diff --git a/pkgs/development/libraries/AntTweakBar/default.nix b/pkgs/development/libraries/AntTweakBar/default.nix index c26672c1dabc..d46c7a6bcd85 100644 --- a/pkgs/development/libraries/AntTweakBar/default.nix +++ b/pkgs/development/libraries/AntTweakBar/default.nix @@ -3,7 +3,8 @@ stdenv.mkDerivation { name = "AntTweakBar-1.16"; - buildInputs = [ unzip xorg.libX11 libGLU libGL ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ xorg.libX11 libGLU libGL ]; src = fetchurl { url = "mirror://sourceforge/project/anttweakbar/AntTweakBar_116.zip"; diff --git a/pkgs/development/libraries/amrnb/default.nix b/pkgs/development/libraries/amrnb/default.nix index b226c9e36d24..2316961e3994 100644 --- a/pkgs/development/libraries/amrnb/default.nix +++ b/pkgs/development/libraries/amrnb/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { sha256 = "1qgiw02n2a6r32pimnd97v2jkvnw449xrqmaxiivjy2jcr5h141q"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; configureFlags = [ "--cache-file=config.cache" "--with-downloader=true" ]; diff --git a/pkgs/development/libraries/amrwb/default.nix b/pkgs/development/libraries/amrwb/default.nix index 776065b28bc7..81938bb4cba7 100644 --- a/pkgs/development/libraries/amrwb/default.nix +++ b/pkgs/development/libraries/amrwb/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "1p6m9nd08mv525w14py9qzs9zwsa5i3vxf5bgcmcvc408jqmkbsw"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; configureFlags = [ "--cache-file=config.cache" "--with-downloader=true" ]; diff --git a/pkgs/development/libraries/boost-process/default.nix b/pkgs/development/libraries/boost-process/default.nix index 97e879809528..148e27faa2b6 100644 --- a/pkgs/development/libraries/boost-process/default.nix +++ b/pkgs/development/libraries/boost-process/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1v9y9pffb2b7p642kp9ic4z6kg42ziizmyvbgrqd1ci0i4gn0831"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; unpackPhase = '' mkdir $name diff --git a/pkgs/development/libraries/freetts/default.nix b/pkgs/development/libraries/freetts/default.nix index f7a605ea872b..dc5f43860305 100644 --- a/pkgs/development/libraries/freetts/default.nix +++ b/pkgs/development/libraries/freetts/default.nix @@ -6,7 +6,8 @@ stdenv.mkDerivation { url = "mirror://sourceforge/freetts/freetts-1.2.2-src.zip"; sha256 = "0mnikqhpf4f4jdr0irmibr8yy0dnffx1i257y22iamxi7a6by2r7"; }; - buildInputs = [ apacheAnt unzip sharutils jdk ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ apacheAnt sharutils jdk ]; unpackPhase = '' unzip $src -x META-INF/* ''; diff --git a/pkgs/development/libraries/gdal/2.4.nix b/pkgs/development/libraries/gdal/2.4.nix index 5df29b38a263..76c92dd9a3b5 100644 --- a/pkgs/development/libraries/gdal/2.4.nix +++ b/pkgs/development/libraries/gdal/2.4.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { sha256 = "1n6w0m2603q9cldlz0wyscp75ci561dipc36jqbf3mjmylybv0x3"; }; - buildInputs = [ unzip libjpeg libtiff libgeotiff libpng proj openssl sqlite + nativeBuildInputs = [ unzip ]; + buildInputs = [ libjpeg libtiff libgeotiff libpng proj openssl sqlite libspatialite poppler hdf4 qhull giflib expat libxml2 proj ] ++ (with pythonPackages; [ python numpy wrapPython ]) ++ lib.optional stdenv.isDarwin libiconv diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 8c02919126ba..edd3971c1f58 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -19,10 +19,9 @@ stdenv.mkDerivation rec { sourceRoot = "source/gdal"; - nativeBuildInputs = [ autoreconfHook pkg-config ]; + nativeBuildInputs = [ autoreconfHook pkg-config unzip ]; buildInputs = [ - unzip libjpeg libtiff libpng diff --git a/pkgs/development/libraries/gdal/gdal-1_11.nix b/pkgs/development/libraries/gdal/gdal-1_11.nix index 92d17452c941..47be58c50511 100644 --- a/pkgs/development/libraries/gdal/gdal-1_11.nix +++ b/pkgs/development/libraries/gdal/gdal-1_11.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0hphxzvy23v3vqxx1y22hhhg4cypihrb8555y12nb4mrhzlw7zfl"; }; - buildInputs = [ unzip libjpeg libtiff libgeotiff libpng python pythonPackages.numpy proj openssl ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ libjpeg libtiff libgeotiff libpng python pythonPackages.numpy proj openssl ]; patches = [ # This ensures that the python package is installed into gdal's prefix, diff --git a/pkgs/development/libraries/gtdialog/default.nix b/pkgs/development/libraries/gtdialog/default.nix index 0e467b294330..ac925477adb3 100644 --- a/pkgs/development/libraries/gtdialog/default.nix +++ b/pkgs/development/libraries/gtdialog/default.nix @@ -9,9 +9,9 @@ let url="https://foicica.com/gtdialog/download/gtdialog_1.4.zip"; sha256="1lhsaz56s8m838fi6vnfcd2r6djymvy3n2pbqhii88hraapq3rfk"; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config unzip ]; buildInputs = [ - cdk unzip gtk2 glib ncurses + cdk gtk2 glib ncurses ]; in stdenv.mkDerivation { diff --git a/pkgs/development/libraries/hawknl/default.nix b/pkgs/development/libraries/hawknl/default.nix index 0525fcd0eba6..aacdf0ee933e 100644 --- a/pkgs/development/libraries/hawknl/default.nix +++ b/pkgs/development/libraries/hawknl/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "11shn2fbxj3w0j77w0234pqyj1368x686kkgv09q5yqhi1cdp028"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; makefile = "makefile.linux"; diff --git a/pkgs/development/libraries/herqq/default.nix b/pkgs/development/libraries/herqq/default.nix index 265289f06f38..f35d7528f4e8 100644 --- a/pkgs/development/libraries/herqq/default.nix +++ b/pkgs/development/libraries/herqq/default.nix @@ -4,8 +4,8 @@ mkDerivation rec { version = "unstable-20-06-26"; pname = "herqq"; - nativeBuildInputs = [ qmake ]; - buildInputs = [ qtbase unzip qtmultimedia ]; + nativeBuildInputs = [ qmake unzip ]; + buildInputs = [ qtbase qtmultimedia ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix index 00d0933bdd70..37b567896359 100644 --- a/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/pkgs/development/libraries/hunspell/dictionaries.nix @@ -45,7 +45,8 @@ let platforms = platforms.all; }; phases = "unpackPhase patchPhase buildPhase installPhase"; - buildInputs = [ bash coreutils unzip which zip ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ bash coreutils which zip ]; patchPhase = '' substituteInPlace ortograf/herramientas/make_dict.sh \ --replace /bin/bash bash \ @@ -86,7 +87,7 @@ let license = licenses.lgpl3; platforms = platforms.all; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; phases = "unpackPhase installPhase"; sourceRoot = "."; unpackCmd = '' @@ -126,7 +127,7 @@ let maintainers = with maintainers; [ renzo ]; platforms = platforms.all; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; phases = "unpackPhase installPhase"; sourceRoot = "."; unpackCmd = '' @@ -155,7 +156,7 @@ let maintainers = with maintainers; [ renzo ]; platforms = platforms.all; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; phases = "unpackPhase installPhase"; sourceRoot = "."; unpackCmd = '' @@ -182,7 +183,7 @@ let maintainers = with maintainers; [ renzo ]; platforms = platforms.all; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; phases = "unpackPhase patchPhase installPhase"; sourceRoot = "."; prePatch = '' diff --git a/pkgs/development/libraries/irrlicht/default.nix b/pkgs/development/libraries/irrlicht/default.nix index e283a2909474..633108459713 100644 --- a/pkgs/development/libraries/irrlicht/default.nix +++ b/pkgs/development/libraries/irrlicht/default.nix @@ -27,7 +27,8 @@ stdenv.mkDerivation rec { mkdir -p $out/lib ''; - buildInputs = [ unzip libGLU libGL libXrandr libX11 libXxf86vm ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ libGLU libGL libXrandr libX11 libXxf86vm ]; meta = { homepage = "http://irrlicht.sourceforge.net/"; diff --git a/pkgs/development/libraries/irrlicht/mac.nix b/pkgs/development/libraries/irrlicht/mac.nix index b41486ce9dd6..1235941b2dc3 100644 --- a/pkgs/development/libraries/irrlicht/mac.nix +++ b/pkgs/development/libraries/irrlicht/mac.nix @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { "-DIRRLICHT_BUILD_TOOLS=OFF" ]; - nativeBuildInputs = [ cmake ]; - buildInputs = [ unzip OpenGL Cocoa IOKit ]; + nativeBuildInputs = [ cmake unzip ]; + buildInputs = [ OpenGL Cocoa IOKit ]; meta = { homepage = "http://irrlicht.sourceforge.net/"; diff --git a/pkgs/development/libraries/jama/default.nix b/pkgs/development/libraries/jama/default.nix index 02dd4a5635b5..30044eb2cc05 100644 --- a/pkgs/development/libraries/jama/default.nix +++ b/pkgs/development/libraries/jama/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "031ns526fvi2nv7jzzv02i7i5sjcyr0gj884i3an67qhsx8vyckl"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; propagatedBuildInputs = [ tnt ]; unpackPhase = '' diff --git a/pkgs/development/libraries/java/geoipjava/default.nix b/pkgs/development/libraries/java/geoipjava/default.nix index 4d9902cbbe9a..0e5b1084b49c 100644 --- a/pkgs/development/libraries/java/geoipjava/default.nix +++ b/pkgs/development/libraries/java/geoipjava/default.nix @@ -6,7 +6,8 @@ stdenv.mkDerivation { url = "https://geolite.maxmind.com/download/geoip/api/java/GeoIPJava-1.2.5.zip"; sha256 = "1gb2d0qvvq7xankz7l7ymbr3qprwk9bifpy4hlgw0sq4i6a55ypd"; }; - buildInputs = [ jdk unzip ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ jdk ]; buildPhase = '' cd source diff --git a/pkgs/development/libraries/java/rhino/default.nix b/pkgs/development/libraries/java/rhino/default.nix index d34787d8b1f0..bc50f0206598 100644 --- a/pkgs/development/libraries/java/rhino/default.nix +++ b/pkgs/development/libraries/java/rhino/default.nix @@ -31,7 +31,8 @@ stdenv.mkDerivation { ln -sv "${xbeans}" "build/tmp-xbean/xbean.zip" ''; - buildInputs = [ unzip ant javac jvm ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ ant javac jvm ]; buildPhase = "ant jar"; doCheck = false; diff --git a/pkgs/development/libraries/lib3ds/default.nix b/pkgs/development/libraries/lib3ds/default.nix index db0bd26f4d29..6e926dfb421c 100644 --- a/pkgs/development/libraries/lib3ds/default.nix +++ b/pkgs/development/libraries/lib3ds/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1qr9arfdkjf7q11xhvxwzmhxqz3nhcjkyb8zzfjpz9jm54q0rc7m"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; meta = { description = "Library for managing 3D-Studio Release 3 and 4 \".3DS\" files"; diff --git a/pkgs/development/libraries/libb64/default.nix b/pkgs/development/libraries/libb64/default.nix index f524e9321f9d..41d07d58cba2 100644 --- a/pkgs/development/libraries/libb64/default.nix +++ b/pkgs/development/libraries/libb64/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1lxzi6v10qsl2r6633dx0zwqyvy0j19nmwclfd0d7qybqmhqsg9l"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; installPhase = '' mkdir -p $out $out/lib $out/bin $out/include diff --git a/pkgs/development/libraries/libf2c/default.nix b/pkgs/development/libraries/libf2c/default.nix index 85ff493ca04e..ce1c35c7ec60 100644 --- a/pkgs/development/libraries/libf2c/default.nix +++ b/pkgs/development/libraries/libf2c/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { cp f2c.h $out/include ''; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/libraries/libixp-hg/default.nix b/pkgs/development/libraries/libixp-hg/default.nix index 489f526248aa..77df340a55f8 100644 --- a/pkgs/development/libraries/libixp-hg/default.nix +++ b/pkgs/development/libraries/libixp-hg/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { sed -i -e "s|^PREFIX.*=.*$|PREFIX = $out|" config.mk ''; - buildInputs = [ unzip txt2tags ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ txt2tags ]; meta = { homepage = "http://repo.cat-v.org/libixp/"; # see also https://libs.suckless.org/deprecated/libixp diff --git a/pkgs/development/libraries/libjson/default.nix b/pkgs/development/libraries/libjson/default.nix index 42d723b3b1b4..16a69f6da653 100644 --- a/pkgs/development/libraries/libjson/default.nix +++ b/pkgs/development/libraries/libjson/default.nix @@ -9,7 +9,7 @@ in stdenv.mkDerivation { sha256 = "0xkk5qc7kjcdwz9l04kmiz1nhmi7iszl3k165phf53h3a4wpl9h7"; }; patches = [ ./install-fix.patch ]; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; makeFlags = [ "prefix=$(out)" ]; preInstall = "mkdir -p $out/lib"; diff --git a/pkgs/development/libraries/liblangtag/default.nix b/pkgs/development/libraries/liblangtag/default.nix index 5a7f2fe4b36f..5c31197ebff2 100644 --- a/pkgs/development/libraries/liblangtag/default.nix +++ b/pkgs/development/libraries/liblangtag/default.nix @@ -35,9 +35,8 @@ stdenv.mkDerivation rec { "--with-locale-alias=${stdenv.cc.libc}/share/locale/locale.alias" ]; - buildInputs = [ gettext glib libxml2 gobject-introspection gnome-common - unzip ]; - nativeBuildInputs = [ autoreconfHook gtk-doc gettext pkg-config ]; + buildInputs = [ gettext glib libxml2 gobject-introspection gnome-common ]; + nativeBuildInputs = [ autoreconfHook gtk-doc gettext pkg-config unzip ]; meta = { inherit version; diff --git a/pkgs/development/libraries/libspotify/default.nix b/pkgs/development/libraries/libspotify/default.nix index b39944d13dca..004460abe312 100644 --- a/pkgs/development/libraries/libspotify/default.nix +++ b/pkgs/development/libraries/libspotify/default.nix @@ -47,7 +47,7 @@ else stdenv.mkDerivation { # darwin-specific - buildInputs = lib.optional (stdenv.hostPlatform.system == "x86_64-darwin") unzip; + nativeBuildInputs = lib.optional (stdenv.hostPlatform.system == "x86_64-darwin") unzip; # linux-specific installFlags = lib.optional isLinux diff --git a/pkgs/development/libraries/muparser/default.nix b/pkgs/development/libraries/muparser/default.nix index 85c9f781cc60..f213f39c06d3 100644 --- a/pkgs/development/libraries/muparser/default.nix +++ b/pkgs/development/libraries/muparser/default.nix @@ -10,9 +10,8 @@ stdenv.mkDerivation rec { sha256 = "00l92k231yb49wijzkspa2l58mapn6vh2dlxnlg0pawjjfv33s6z"; }; - buildInputs = [ - unzip - ] ++ lib.optionals stdenv.isDarwin [setfile]; + nativeBuildInputs = [ unzip ]; + buildInputs = lib.optionals stdenv.isDarwin [setfile]; meta = { homepage = "http://muparser.sourceforge.net"; diff --git a/pkgs/development/libraries/mygui/default.nix b/pkgs/development/libraries/mygui/default.nix index 4260e30561b4..8e63cb681203 100644 --- a/pkgs/development/libraries/mygui/default.nix +++ b/pkgs/development/libraries/mygui/default.nix @@ -14,8 +14,8 @@ in stdenv.mkDerivation rec { sha256 = "0a4zi8w18pjj813n7kmxldl1d9r1jp0iyhkw7pbqgl8f7qaq994w"; }; - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ libX11 unzip ois freetype libuuid boost ] + nativeBuildInputs = [ cmake pkg-config unzip ]; + buildInputs = [ libX11 ois freetype libuuid boost ] ++ (if withOgre then [ ogre ] else [ libGL libGLU ]); # Tools are disabled due to compilation failures. diff --git a/pkgs/development/libraries/nvidia-video-sdk/default.nix b/pkgs/development/libraries/nvidia-video-sdk/default.nix index 3a63bad03dcb..22161e3dc1d6 100644 --- a/pkgs/development/libraries/nvidia-video-sdk/default.nix +++ b/pkgs/development/libraries/nvidia-video-sdk/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "08h1vnqsv22js9v3pyim5yb80z87baxb7s2g5gsvvjax07j7w8h5"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; # We only need the header files. The library files are # in the nvidia_x11 driver. diff --git a/pkgs/development/libraries/openexrid-unstable/default.nix b/pkgs/development/libraries/openexrid-unstable/default.nix index ce35aa1c655e..1e3ee9896447 100644 --- a/pkgs/development/libraries/openexrid-unstable/default.nix +++ b/pkgs/development/libraries/openexrid-unstable/default.nix @@ -25,7 +25,8 @@ stdenv.mkDerivation { -I${openfx.dev}/include/OpenFX ''; - buildInputs = [ unzip re2 openfx zlib ilmbase libGLU libGL openexr ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ re2 openfx zlib ilmbase libGLU libGL openexr ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/openfx/default.nix b/pkgs/development/libraries/openfx/default.nix index 0d8afe53df8b..a26e97798aef 100644 --- a/pkgs/development/libraries/openfx/default.nix +++ b/pkgs/development/libraries/openfx/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "0k9ggzr6bisn77mipjfvawg3mv4bz50b63v8f7w1jhldi1sfy548"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; outputs = [ "dev" "out" ]; diff --git a/pkgs/development/libraries/openvdb/default.nix b/pkgs/development/libraries/openvdb/default.nix index 5f3a03a3f5bf..b5317ce9aae8 100644 --- a/pkgs/development/libraries/openvdb/default.nix +++ b/pkgs/development/libraries/openvdb/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec outputs = [ "out" ]; - buildInputs = [ unzip openexr boost tbb jemalloc c-blosc ilmbase ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ openexr boost tbb jemalloc c-blosc ilmbase ]; setSourceRoot = '' sourceRoot=$(echo */openvdb) diff --git a/pkgs/development/libraries/python-qt/default.nix b/pkgs/development/libraries/python-qt/default.nix index 0fe0806b1ebe..2be89b3b7534 100644 --- a/pkgs/development/libraries/python-qt/default.nix +++ b/pkgs/development/libraries/python-qt/default.nix @@ -13,9 +13,9 @@ stdenv.mkDerivation rec { hardeningDisable = [ "all" ]; - nativeBuildInputs = [ qmake qtwebengine qtxmlpatterns qttools ]; + nativeBuildInputs = [ qmake qtwebengine qtxmlpatterns qttools unzip ]; - buildInputs = [ python unzip ]; + buildInputs = [ python ]; qmakeFlags = [ "PythonQt.pro" "INCLUDEPATH+=${python}/include/python3.6" diff --git a/pkgs/development/libraries/slib/default.nix b/pkgs/development/libraries/slib/default.nix index 47f633f5096b..9973e04a670b 100644 --- a/pkgs/development/libraries/slib/default.nix +++ b/pkgs/development/libraries/slib/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { patches = [ ./catalog-in-library-vicinity.patch ]; - buildInputs = [ unzip scheme texinfo ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ scheme texinfo ]; postInstall = '' ln -s mklibcat{.scm,} diff --git a/pkgs/development/libraries/tnt/default.nix b/pkgs/development/libraries/tnt/default.nix index 932239a485fd..f4787271c039 100644 --- a/pkgs/development/libraries/tnt/default.nix +++ b/pkgs/development/libraries/tnt/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "1bzkfdb598584qlc058n8wqq9vbz714gr5r57401rsa9qaxhk5j7"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; installPhase = '' mkdir -p $out/include diff --git a/pkgs/development/libraries/wtk/default.nix b/pkgs/development/libraries/wtk/default.nix index 9ddc95a9ccc7..0bded9d92ddd 100644 --- a/pkgs/development/libraries/wtk/default.nix +++ b/pkgs/development/libraries/wtk/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { builder = ./builder.sh; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; libraries = [ xorg.libXpm xorg.libXt xorg.libX11 xorg.libICE xorg.libSM stdenv.cc.cc ]; diff --git a/pkgs/development/misc/avr8-burn-omat/default.nix b/pkgs/development/misc/avr8-burn-omat/default.nix index 0a9d666f8b7f..3364fe796e72 100644 --- a/pkgs/development/misc/avr8-burn-omat/default.nix +++ b/pkgs/development/misc/avr8-burn-omat/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "02k0fd0cd3y1yqip36wr3bkxbywp8913w4y7jdg6qwqxjnii58ln"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; phases = "unpackPhase installPhase"; diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix index 601cac372c8c..89fd34bb5a3d 100644 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix @@ -64,8 +64,7 @@ stdenv.mkDerivation { } else throw "Platform: ${stdenv.system} not supported!"; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ unzip ]; + nativeBuildInputs = [ makeWrapper unzip ]; buildCommand = '' mkdir -p $out diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix index 52257bfd4611..fb462cc27fe6 100644 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix @@ -64,8 +64,7 @@ stdenv.mkDerivation { } else throw "Platform: ${stdenv.system} not supported!"; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ unzip ]; + nativeBuildInputs = [ makeWrapper unzip ]; buildCommand = '' mkdir -p $out diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix index 78044752b54c..c207b112fae2 100644 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix @@ -64,8 +64,7 @@ stdenv.mkDerivation { } else throw "Platform: ${stdenv.system} not supported!"; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ unzip ]; + nativeBuildInputs = [ makeWrapper unzip ]; buildCommand = '' mkdir -p $out diff --git a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix index 49c8fe5470b6..7d2960fc5a66 100644 --- a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { patches = [ ./META.patch ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ocaml automake gnum4 autoconf unzip + nativeBuildInputs = [ pkg-config unzip ]; + buildInputs = [ ocaml automake gnum4 autoconf findlib freetype lablgtk cairo gdk-pixbuf gtk2 pango ]; createFindlibDestdir = true; diff --git a/pkgs/development/pharo/launcher/default.nix b/pkgs/development/pharo/launcher/default.nix index 45531b551761..23afd44b67d9 100644 --- a/pkgs/development/pharo/launcher/default.nix +++ b/pkgs/development/pharo/launcher/default.nix @@ -23,7 +23,8 @@ stdenv.mkDerivation rec { # because upstream tarball has no top-level directory. sourceRoot = "."; - buildInputs = [ bash pharo unzip ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ bash pharo ]; installPhase = '' mkdir -p $prefix/share/pharo-launcher diff --git a/pkgs/development/pharo/vm/share.nix b/pkgs/development/pharo/vm/share.nix index 720f2e39a7d3..a2a55f2eb437 100644 --- a/pkgs/development/pharo/vm/share.nix +++ b/pkgs/development/pharo/vm/share.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { sha256 = "0xbdi679ryb2zg412xy6zkh22l20pmbl92m3qhfgzjvgybna8z2a"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; installPhase = '' mkdir -p $prefix/lib diff --git a/pkgs/development/python-modules/pytest-catchlog/default.nix b/pkgs/development/python-modules/pytest-catchlog/default.nix index 39c26a3e0f36..58b69c4ce560 100644 --- a/pkgs/development/python-modules/pytest-catchlog/default.nix +++ b/pkgs/development/python-modules/pytest-catchlog/default.nix @@ -10,7 +10,8 @@ buildPythonPackage rec { extension = "zip"; }; - buildInputs = [ pytest unzip ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ pytest ]; checkPhase = "make test"; # Requires pytest < 3.1 diff --git a/pkgs/development/python-modules/python-simple-hipchat/default.nix b/pkgs/development/python-modules/python-simple-hipchat/default.nix index 3162a0326288..904437bdcf66 100644 --- a/pkgs/development/python-modules/python-simple-hipchat/default.nix +++ b/pkgs/development/python-modules/python-simple-hipchat/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "0zy6prrj85jjc4xmxgfg8h94j81k6zhfxfffcbvq9b10jis1rgav"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; meta = with lib; { description = "Easy peasy wrapper for HipChat's v1 API"; diff --git a/pkgs/development/tools/analysis/emma/default.nix b/pkgs/development/tools/analysis/emma/default.nix index 97f93722a182..a1e88d8ebfb8 100644 --- a/pkgs/development/tools/analysis/emma/default.nix +++ b/pkgs/development/tools/analysis/emma/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "0xxy39s2lvgs56vicjzpcz936l1vjaplliwa0dm7v3iyvw6jn7vj"; }; - buildInputs = [unzip]; + nativeBuildInputs = [ unzip ]; installPhase = '' mkdir -p $out/lib/jars diff --git a/pkgs/development/tools/analysis/randoop/default.nix b/pkgs/development/tools/analysis/randoop/default.nix index 0d10d6d6b277..ed060d847ec8 100644 --- a/pkgs/development/tools/analysis/randoop/default.nix +++ b/pkgs/development/tools/analysis/randoop/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0v3vla3k6csfb8w0j9njrhcjj4n7yh172n9wv6z397f1sa0fs202"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; installPhase = '' mkdir -p $out/lib $out/doc diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 4735a7559cfd..502b411f15d1 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -33,8 +33,8 @@ rec { echo ${stdenv.cc.cc} > $out/nix-support/manual-runtime-dependencies ''; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ unzip java ]; + nativeBuildInputs = [ makeWrapper unzip ]; + buildInputs = [ java ]; meta = { description = "Enterprise-grade build system"; diff --git a/pkgs/development/tools/continuous-integration/gocd-agent/default.nix b/pkgs/development/tools/continuous-integration/gocd-agent/default.nix index 6e58b74654da..3041a0317370 100644 --- a/pkgs/development/tools/continuous-integration/gocd-agent/default.nix +++ b/pkgs/development/tools/continuous-integration/gocd-agent/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ grahamc swarren83 ]; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; buildCommand = " unzip $src -d $out diff --git a/pkgs/development/tools/continuous-integration/gocd-server/default.nix b/pkgs/development/tools/continuous-integration/gocd-server/default.nix index 90eb61dbff8d..4b3f61cf4b4b 100644 --- a/pkgs/development/tools/continuous-integration/gocd-server/default.nix +++ b/pkgs/development/tools/continuous-integration/gocd-server/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ grahamc swarren83 ]; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; buildCommand = " unzip $src -d $out diff --git a/pkgs/development/tools/database/sqldeveloper/default.nix b/pkgs/development/tools/database/sqldeveloper/default.nix index 8fb7677f5845..2e361076ae48 100644 --- a/pkgs/development/tools/database/sqldeveloper/default.nix +++ b/pkgs/development/tools/database/sqldeveloper/default.nix @@ -49,8 +49,7 @@ in sha256 = "1h53gl41ydr7kim6q9ckg3xyhb0rhmwj7jnis0xz6vms52b3h59k"; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ unzip ]; + nativeBuildInputs = [ makeWrapper unzip ]; unpackCmd = "unzip $curSrc"; diff --git a/pkgs/development/tools/eclipse-mat/default.nix b/pkgs/development/tools/eclipse-mat/default.nix index 633e13d25f77..c05e775d95cd 100644 --- a/pkgs/development/tools/eclipse-mat/default.nix +++ b/pkgs/development/tools/eclipse-mat/default.nix @@ -80,6 +80,7 @@ stdenv.mkDerivation rec { mv $out/share/pixmaps/eclipse64.png $out/share/pixmaps/eclipse.png ''; + nativeBuildInputs = [ unzip ]; buildInputs = [ fontconfig freetype @@ -92,7 +93,6 @@ stdenv.mkDerivation rec { libXtst makeWrapper zlib - unzip shared-mime-info webkitgtk ]; diff --git a/pkgs/development/tools/electron/generic.nix b/pkgs/development/tools/electron/generic.nix index e29064e673ad..4337434485fd 100644 --- a/pkgs/development/tools/electron/generic.nix +++ b/pkgs/development/tools/electron/generic.nix @@ -95,7 +95,7 @@ let }; darwin = { - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; buildCommand = '' mkdir -p $out/Applications diff --git a/pkgs/development/tools/galen/default.nix b/pkgs/development/tools/galen/default.nix index 00831c05691a..df7e58bde457 100644 --- a/pkgs/development/tools/galen/default.nix +++ b/pkgs/development/tools/galen/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "13dq8cf0yy24vym6z7p8hb0mybgpcl4j5crsaq8a6pjfxz6d17mq"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; buildPhase = '' mkdir -p $out/bin diff --git a/pkgs/development/tools/misc/jscoverage/default.nix b/pkgs/development/tools/misc/jscoverage/default.nix index a978c31c34d1..042d085c1e0c 100644 --- a/pkgs/development/tools/misc/jscoverage/default.nix +++ b/pkgs/development/tools/misc/jscoverage/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { ./jsfalse_to_null.patch ]; - buildInputs = [ autoconf makedepend perl python unzip zip ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ autoconf makedepend perl python zip ]; # It works without MOZ_FIX_LINK_PATHS, circumventing an impurity # issue. Maybe we could kick js/ (spidermonkey) completely and diff --git a/pkgs/development/tools/misc/premake/3.nix b/pkgs/development/tools/misc/premake/3.nix index 9176842d75d0..d72cca0e785b 100644 --- a/pkgs/development/tools/misc/premake/3.nix +++ b/pkgs/development/tools/misc/premake/3.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { sha256 = "b59841a519e75d5b6566848a2c5be2f91455bf0cc6ae4d688fcbd4c40db934d5"; }; - buildInputs = [unzip]; + nativeBuildInputs = [ unzip ]; installPhase = '' install -Dm755 bin/premake $out/bin/premake diff --git a/pkgs/development/tools/misc/saleae-logic/default.nix b/pkgs/development/tools/misc/saleae-logic/default.nix index c26e834ee0f7..5943b57d8088 100644 --- a/pkgs/development/tools/misc/saleae-logic/default.nix +++ b/pkgs/development/tools/misc/saleae-logic/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { categories = "Development"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; installPhase = '' # Copy prebuilt app to $out diff --git a/pkgs/development/tools/ocaml/opam/1.2.2.nix b/pkgs/development/tools/ocaml/opam/1.2.2.nix index 610093af19ff..60804684ccbc 100644 --- a/pkgs/development/tools/ocaml/opam/1.2.2.nix +++ b/pkgs/development/tools/ocaml/opam/1.2.2.nix @@ -47,8 +47,8 @@ in stdenv.mkDerivation { pname = "opam"; version = "1.2.2"; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ unzip curl ncurses ocaml ]; + nativeBuildInputs = [ makeWrapper unzip ]; + buildInputs = [ curl ncurses ocaml ]; src = srcs.opam; diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix index 30bc089ee0fe..bd33d4cc1d34 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -63,8 +63,8 @@ in stdenv.mkDerivation { pname = "opam"; version = "2.0.8"; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ unzip curl ncurses ocaml getconf ] ++ lib.optional stdenv.isLinux bubblewrap; + nativeBuildInputs = [ makeWrapper unzip ]; + buildInputs = [ curl ncurses ocaml getconf ] ++ lib.optional stdenv.isLinux bubblewrap; src = srcs.opam; diff --git a/pkgs/development/tools/ocaml/opam/opam.nix.pl b/pkgs/development/tools/ocaml/opam/opam.nix.pl index b94aa7dd9a2f..bfaea0c7ef30 100755 --- a/pkgs/development/tools/ocaml/opam/opam.nix.pl +++ b/pkgs/development/tools/ocaml/opam/opam.nix.pl @@ -68,7 +68,8 @@ in stdenv.mkDerivation { pname = "opam"; version = "$OPAM_RELEASE"; - buildInputs = [ unzip curl ncurses ocaml makeWrapper getconf ] ++ lib.optional stdenv.isLinux bubblewrap; + nativeBuildInputs = [ unzip ]; + buildInputs = [ curl ncurses ocaml makeWrapper getconf ] ++ lib.optional stdenv.isLinux bubblewrap; src = srcs.opam; diff --git a/pkgs/development/tools/phantomjs/default.nix b/pkgs/development/tools/phantomjs/default.nix index 66cdb09cf15a..4cd49b884ce6 100644 --- a/pkgs/development/tools/phantomjs/default.nix +++ b/pkgs/development/tools/phantomjs/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { sha256 = "0j0aq8dgzmb210xdrh0v3d4nblskl3zsckl8bzf1a603wcx085cg"; }; - buildInputs = lib.optional stdenv.isDarwin unzip; + nativeBuildInputs = lib.optional stdenv.isDarwin unzip; buildPhase = lib.optionalString (!stdenv.isDarwin) '' patchelf \ diff --git a/pkgs/development/tools/react-native-debugger/default.nix b/pkgs/development/tools/react-native-debugger/default.nix index d1c86d9248a3..ae1ac3e39f3e 100644 --- a/pkgs/development/tools/react-native-debugger/default.nix +++ b/pkgs/development/tools/react-native-debugger/default.nix @@ -44,7 +44,7 @@ in stdenv.mkDerivation rec { sha256 = "sha256-UXKObJKk9UUgWtm8U+nXWvIJUr4NLm2f//pGTHJISYA="; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; buildCommand = '' shopt -s extglob mkdir -p $out diff --git a/pkgs/development/tools/sauce-connect/default.nix b/pkgs/development/tools/sauce-connect/default.nix index 12082de98422..64517d865cdf 100644 --- a/pkgs/development/tools/sauce-connect/default.nix +++ b/pkgs/development/tools/sauce-connect/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { } ); - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; patchPhase = lib.optionalString stdenv.isLinux '' patchelf \ diff --git a/pkgs/development/tools/slimerjs/default.nix b/pkgs/development/tools/slimerjs/default.nix index 76728c5f2d80..473f24b1b55b 100644 --- a/pkgs/development/tools/slimerjs/default.nix +++ b/pkgs/development/tools/slimerjs/default.nix @@ -10,13 +10,11 @@ let sha256="1w4sfrv520isbs7r1rlzl5y3idrpad7znw9fc92yz40jlwz7sxs4"; rev = version; }; - buildInputs = [ - unzip zip - ]; in stdenv.mkDerivation { inherit (s) name version; - inherit buildInputs; + buildInputs = [ zip ]; + nativeBuildInputs = [ unzip ]; #src = fetchurl { # inherit (s) url sha256; #}; diff --git a/pkgs/development/tools/thrust/default.nix b/pkgs/development/tools/thrust/default.nix index 02183282ce16..fcb1edf153ac 100644 --- a/pkgs/development/tools/thrust/default.nix +++ b/pkgs/development/tools/thrust/default.nix @@ -22,8 +22,8 @@ in stdenv.mkDerivation rec { sha256 = "07rrnlj0gk500pvar4b1wdqm05p4n9yjwn911x93bd2qwc8r5ymc"; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ thrustEnv unzip ]; + nativeBuildInputs = [ makeWrapper unzip ]; + buildInputs = [ thrustEnv ]; phases = [ "installPhase" "fixupPhase" ]; diff --git a/pkgs/development/web/grails/default.nix b/pkgs/development/web/grails/default.nix index 944520b47e2f..2a888b8056d0 100644 --- a/pkgs/development/web/grails/default.nix +++ b/pkgs/development/web/grails/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "0l99x3g485qjpdd7ga553xpi1s6rq21p8v16qjzqwdhyld961qsr"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; dontBuild = true; diff --git a/pkgs/development/web/twitter-bootstrap/default.nix b/pkgs/development/web/twitter-bootstrap/default.nix index ca211ccf2d9b..b8a9f94a23f0 100644 --- a/pkgs/development/web/twitter-bootstrap/default.nix +++ b/pkgs/development/web/twitter-bootstrap/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-CiEUUa0mCrUSp+XCoWNs8plJxhWHZZD+K+UBJSDu1CM="; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; dontBuild = true; installPhase = '' diff --git a/pkgs/games/crafty/default.nix b/pkgs/games/crafty/default.nix index 1328488dde3a..b5b53aa3c413 100644 --- a/pkgs/games/crafty/default.nix +++ b/pkgs/games/crafty/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "12g70mgfifwssfvndzq94pin34dizlixhsga75vgj7dakysi2p7f"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; unpackPhase = '' mkdir "craftysrc" diff --git a/pkgs/games/dwarf-fortress/twbt/default.nix b/pkgs/games/dwarf-fortress/twbt/default.nix index 48826ca91609..bee2c28e5308 100644 --- a/pkgs/games/dwarf-fortress/twbt/default.nix +++ b/pkgs/games/dwarf-fortress/twbt/default.nix @@ -71,7 +71,7 @@ stdenvNoCC.mkDerivation rec { outputs = [ "lib" "art" "out" ]; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; installPhase = '' mkdir -p $lib/hack/{plugins,lua} $art/data/art diff --git a/pkgs/games/exult/default.nix b/pkgs/games/exult/default.nix index e16e62f82fb4..40d7300e9c5a 100644 --- a/pkgs/games/exult/default.nix +++ b/pkgs/games/exult/default.nix @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-tools" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ SDL2 libogg libvorbis zlib unzip ]; + nativeBuildInputs = [ pkg-config unzip ]; + buildInputs = [ SDL2 libogg libvorbis zlib ]; enableParallelBuilding = true; diff --git a/pkgs/games/gogui/default.nix b/pkgs/games/gogui/default.nix index fa901c14f819..c7b37b31c355 100644 --- a/pkgs/games/gogui/default.nix +++ b/pkgs/games/gogui/default.nix @@ -5,8 +5,7 @@ let in stdenv.mkDerivation { pname = "gogui"; inherit version; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ unzip ]; + nativeBuildInputs = [ makeWrapper unzip ]; src = fetchurl { url = "mirror://sourceforge/project/gogui/gogui/${version}/gogui-${version}.zip"; sha256 = "0qk6p1bhi1816n638bg11ljyj6zxvm75jdf02aabzdmmd9slns1j"; diff --git a/pkgs/games/keen4/default.nix b/pkgs/games/keen4/default.nix index c91cc486118f..59bb30d627f7 100644 --- a/pkgs/games/keen4/default.nix +++ b/pkgs/games/keen4/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "12rnc9ksl7v6l8wsxvr26ylkafzq80dbsa7yafzw9pqc8pafkhx1"; }; - buildInputs = [unzip]; + nativeBuildInputs = [ unzip ]; inherit dosbox; diff --git a/pkgs/games/nexuiz/default.nix b/pkgs/games/nexuiz/default.nix index 60085d5c85b3..84d8a6200015 100644 --- a/pkgs/games/nexuiz/default.nix +++ b/pkgs/games/nexuiz/default.nix @@ -21,9 +21,8 @@ in stdenv.mkDerivation { sha256 = "0010jrxc68qqinkvdh1qn2b8z3sa5v1kcd8d1m4llp3pr6y7xqm5"; }; + nativeBuildInputs = [ unzip ]; buildInputs = [ - # required for both - unzip # glx libX11 libGLU libGL libXpm libXext libXxf86vm libXxf86dga alsaLib # sdl diff --git a/pkgs/games/rigsofrods/default.nix b/pkgs/games/rigsofrods/default.nix index 01dd1f0c04f3..72c8a49939d3 100644 --- a/pkgs/games/rigsofrods/default.nix +++ b/pkgs/games/rigsofrods/default.nix @@ -23,9 +23,9 @@ stdenv.mkDerivation rec { ln -s $out/share/rigsofrods/{RoR,RoRConfig} $out/bin ''; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ cmake pkg-config unzip ]; buildInputs = [ wxGTK30 freeimage zziplib libGLU libGL boost - libuuid openal ogre ois curl gtk2 mygui unzip angelscript + libuuid openal ogre ois curl gtk2 mygui angelscript ogrepaged mysocketw libxcb ]; meta = with lib; { diff --git a/pkgs/games/simutrans/default.nix b/pkgs/games/simutrans/default.nix index 942c93ec043f..fc2654fd8e9b 100644 --- a/pkgs/games/simutrans/default.nix +++ b/pkgs/games/simutrans/default.nix @@ -115,8 +115,8 @@ let sourceRoot = "."; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ zlib libpng bzip2 SDL SDL_mixer unzip ]; + nativeBuildInputs = [ pkg-config unzip ]; + buildInputs = [ zlib libpng bzip2 SDL SDL_mixer ]; configurePhase = let # Configuration as per the readme.txt and config.template diff --git a/pkgs/games/steam/fonts.nix b/pkgs/games/steam/fonts.nix index 44dde01a8a83..9cf68f2c29b0 100644 --- a/pkgs/games/steam/fonts.nix +++ b/pkgs/games/steam/fonts.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1cgygmwich5f1jhhbmbkkpnzasjl8gy36xln76n6r2gjh6awqfx0"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; sourceRoot = "."; diff --git a/pkgs/games/terraria-server/default.nix b/pkgs/games/terraria-server/default.nix index 94fb9d063b32..de430d296222 100644 --- a/pkgs/games/terraria-server/default.nix +++ b/pkgs/games/terraria-server/default.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { sha256 = "18hcy7jfizyyp0h66rga8z948xg3nyk32rzl7hgv7ar1w43airhh"; }; - buildInputs = [ file unzip ]; - nativeBuildInputs = [ autoPatchelfHook ]; + buildInputs = [ file ]; + nativeBuildInputs = [ autoPatchelfHook unzip ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/games/tremulous/default.nix b/pkgs/games/tremulous/default.nix index a4bf47b5e362..e07697f7c0e1 100644 --- a/pkgs/games/tremulous/default.nix +++ b/pkgs/games/tremulous/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { url = "http://releases.mercenariesguild.net/tremded/mg_tremded_source_1.01.tar.gz"; sha256 = "1njrqlhzjvy9myddzkagszwdcf3m4h08wip888w2rmbshs6kz6ql"; }; - buildInputs = [ unzip libGLU libGL libX11 SDL openal ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ libGLU libGL libX11 SDL openal ]; unpackPhase = '' unzip $src1 cd tremulous diff --git a/pkgs/games/urbanterror/default.nix b/pkgs/games/urbanterror/default.nix index 10553d483a50..dfbad29fa9e0 100644 --- a/pkgs/games/urbanterror/default.nix +++ b/pkgs/games/urbanterror/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ unzip SDL libGL libGLU openal curl libXxf86vm ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ SDL libGL libGLU openal curl libXxf86vm ]; sourceRoot = "ioq3-for-UrbanTerror-4-release-${version}"; configurePhase = '' diff --git a/pkgs/games/worldofgoo/default.nix b/pkgs/games/worldofgoo/default.nix index 27a270fcf8f3..a9938cfcbc04 100644 --- a/pkgs/games/worldofgoo/default.nix +++ b/pkgs/games/worldofgoo/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { sha256 = "175e4b0499a765f1564942da4bd65029f8aae1de8231749c56bec672187d53ee"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; sourceRoot = pname; phases = [ "unpackPhase installPhase" ]; diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix index 54ec25c8cf79..fb6cb93f7f24 100644 --- a/pkgs/games/xonotic/default.nix +++ b/pkgs/games/xonotic/default.nix @@ -62,7 +62,8 @@ let sha256 = "0axxw04fyz6jlfqd0kp7hdrqa0li31sx1pbipf2j5qp9wvqicsay"; }; - buildInputs = [ unzip libjpeg zlib libvorbis curl ] + nativeBuildInputs = [ unzip ]; + buildInputs = [ libjpeg zlib libvorbis curl ] ++ lib.optional withGLX [ libX11.dev libGLU.dev libGL.dev libXpm.dev libXext.dev libXxf86vm.dev alsaLib.dev ] ++ lib.optional withSDL [ SDL2.dev ]; diff --git a/pkgs/games/zod/default.nix b/pkgs/games/zod/default.nix index 6c48caf8756a..c358e599924a 100644 --- a/pkgs/games/zod/default.nix +++ b/pkgs/games/zod/default.nix @@ -24,8 +24,8 @@ stdenv.mkDerivation { sourceRoot=`pwd`/src ''; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ unrar unzip SDL SDL_image SDL_ttf SDL_mixer libmysqlclient ]; + nativeBuildInputs = [ makeWrapper unrar unzip ]; + buildInputs = [ SDL SDL_image SDL_ttf SDL_mixer libmysqlclient ]; NIX_LDFLAGS = "-L${libmysqlclient}/lib/mysql"; diff --git a/pkgs/misc/drivers/foo2zjs/default.nix b/pkgs/misc/drivers/foo2zjs/default.nix index deea3bd25f50..e25deb4c7795 100644 --- a/pkgs/misc/drivers/foo2zjs/default.nix +++ b/pkgs/misc/drivers/foo2zjs/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1rmw4jmxn2lqp124mapvnic0ma8ipyvisx2vj848mvad5g5w9x3z"; }; - buildInputs = [ foomatic-filters bc unzip ghostscript systemd vim ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ foomatic-filters bc ghostscript systemd vim ]; patches = [ ./no-hardcode-fw.diff ]; diff --git a/pkgs/misc/emulators/atari800/default.nix b/pkgs/misc/emulators/atari800/default.nix index 163b81922c2b..53f1009cfad5 100644 --- a/pkgs/misc/emulators/atari800/default.nix +++ b/pkgs/misc/emulators/atari800/default.nix @@ -13,9 +13,9 @@ stdenv.mkDerivation rec { sha256 = "15l08clqqayi9izrgsz9achan6gl4x57wqsc8mad3yn0xayzz3qy"; }; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook unzip ]; - buildInputs = [ unzip zlib SDL readline libGLU libGL libX11 ]; + buildInputs = [ zlib SDL readline libGLU libGL libX11 ]; configureFlags = [ "--target=default" diff --git a/pkgs/misc/emulators/nestopia/default.nix b/pkgs/misc/emulators/nestopia/default.nix index d1b18f12a844..70e5d94def6f 100644 --- a/pkgs/misc/emulators/nestopia/default.nix +++ b/pkgs/misc/emulators/nestopia/default.nix @@ -28,7 +28,6 @@ stdenv.mkDerivation rec { libGLU libGL libarchive libao - unzip xdg-utils gnome3.adwaita-icon-theme ]; @@ -37,6 +36,7 @@ stdenv.mkDerivation rec { pkg-config makeWrapper wrapGAppsHook + unzip ]; installPhase = '' diff --git a/pkgs/misc/source-and-tags/default.nix b/pkgs/misc/source-and-tags/default.nix index c82b96b82f95..966a451c060c 100644 --- a/pkgs/misc/source-and-tags/default.nix +++ b/pkgs/misc/source-and-tags/default.nix @@ -15,7 +15,7 @@ phases = "unpackPhase buildPhase"; inherit src srcDir tagSuffix; name = "${name}-source-with-tags"; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; # using separate tag directory so that you don't have to glob that much files when starting your editor # is this a good choice? buildPhase = diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix index b73018370266..768aa7d7e7d9 100644 --- a/pkgs/os-specific/linux/ati-drivers/default.nix +++ b/pkgs/os-specific/linux/ati-drivers/default.nix @@ -85,11 +85,11 @@ stdenv.mkDerivation rec { (lib.versionAtLeast kernel.version "4.9") ) [ ./patches/4.9-get_user_pages.patch ]; + nativeBuildInputs = [ unzip ]; buildInputs = [ xorg.libXrender xorg.libXext xorg.libX11 xorg.libXinerama xorg.libSM xorg.libXrandr xorg.libXxf86vm xorg.xorgproto xorg.imake xorg.libICE patchelf - unzip libGLU libGL fontconfig freetype diff --git a/pkgs/os-specific/linux/lsiutil/default.nix b/pkgs/os-specific/linux/lsiutil/default.nix index 4cb70faee966..1b1acdb535f5 100644 --- a/pkgs/os-specific/linux/lsiutil/default.nix +++ b/pkgs/os-specific/linux/lsiutil/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { srcs = [ src "Source/lsiutil.tar.gz" ]; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; sourceRoot = "lsiutil"; diff --git a/pkgs/os-specific/linux/msr-tools/default.nix b/pkgs/os-specific/linux/msr-tools/default.nix index 67356719ffdb..1e6a55a4d656 100644 --- a/pkgs/os-specific/linux/msr-tools/default.nix +++ b/pkgs/os-specific/linux/msr-tools/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "07hxmddg0l31kjfmaq84ni142lbbvgq6391r8bd79wpm819pnigr"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; preInstall = '' mkdir -p $out/bin diff --git a/pkgs/os-specific/linux/seturgent/default.nix b/pkgs/os-specific/linux/seturgent/default.nix index a2ffcae3d6bf..2e9e445eddc5 100644 --- a/pkgs/os-specific/linux/seturgent/default.nix +++ b/pkgs/os-specific/linux/seturgent/default.nix @@ -8,8 +8,9 @@ stdenv.mkDerivation { sha256 = "0q1sr6aljkw2jr9b4xxzbc01qvnd5vk3pxrypif9yd8xjw4wqwri"; }; + nativeBuildInputs = [ unzip ]; buildInputs = [ - libX11 xorgproto unzip + libX11 xorgproto ]; installPhase = '' diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index 6100498f9bf8..c2d13b00aa83 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -16,8 +16,9 @@ stdenv.mkDerivation rec { sha256 = "0b252l9r45h8r5gibdqcn6hhbm8g6rfzhm1k9d39pwhs5x77cjqv"; }; + nativeBuildInputs = [ unzip ]; buildInputs = - [ erlang elixir python libxml2 libxslt xmlto docbook_xml_dtd_45 docbook_xsl zip unzip rsync glibcLocales ] + [ erlang elixir python libxml2 libxslt xmlto docbook_xml_dtd_45 docbook_xsl zip rsync glibcLocales ] ++ lib.optionals stdenv.isDarwin [ AppKit Carbon Cocoa ]; outputs = [ "out" "man" "doc" ]; diff --git a/pkgs/servers/computing/storm/default.nix b/pkgs/servers/computing/storm/default.nix index daebf174fafd..07c636b6e5ba 100644 --- a/pkgs/servers/computing/storm/default.nix +++ b/pkgs/servers/computing/storm/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "0xc6lfilfkkjyds59b6c770gj21v9srzpln31c9qb3ls6hzic8gn"; }; - buildInputs = [ zip unzip ]; + nativeBuildInputs = [ zip unzip ]; installPhase = '' mkdir -p $out/share/${name} diff --git a/pkgs/servers/http/jboss/default.nix b/pkgs/servers/http/jboss/default.nix index ba89d19db34b..fda57cb9a549 100644 --- a/pkgs/servers/http/jboss/default.nix +++ b/pkgs/servers/http/jboss/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { sha256 = "1bdjw0ib9qr498vpfbg8klqw6rl11vbz7vwn6gp1r5gpqkd3zzc8"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; diff --git a/pkgs/servers/http/tomcat/axis2/default.nix b/pkgs/servers/http/tomcat/axis2/default.nix index e383d8f0d1b0..ab05d8cbb0ed 100644 --- a/pkgs/servers/http/tomcat/axis2/default.nix +++ b/pkgs/servers/http/tomcat/axis2/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0dh0s9bfh95wmmw8nyf2yw95biq7d9zmrbg8k4vzcyz1if228lac"; }; - buildInputs = [ unzip apacheAnt jdk ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ apacheAnt jdk ]; builder = ./builder.sh; meta = { diff --git a/pkgs/servers/jellyfin/10.5.x.nix b/pkgs/servers/jellyfin/10.5.x.nix index da4d2c4c1d58..9bece72566f8 100644 --- a/pkgs/servers/jellyfin/10.5.x.nix +++ b/pkgs/servers/jellyfin/10.5.x.nix @@ -26,8 +26,8 @@ in stdenv.mkDerivation rec { sha256 = "1s3hva1j5w74qc9wyqnmr5clk4smzfi7wvx8qrzrwy81mx7r5w27"; }; + nativeBuildInputs = [ unzip ]; buildInputs = [ - unzip makeWrapper ]; diff --git a/pkgs/servers/jellyfin/default.nix b/pkgs/servers/jellyfin/default.nix index caca89bfd0db..a4c47948a640 100644 --- a/pkgs/servers/jellyfin/default.nix +++ b/pkgs/servers/jellyfin/default.nix @@ -26,8 +26,8 @@ in stdenv.mkDerivation rec { sha256 = "OqN070aUKPk0dXAy8R/lKUnSWen+si/AJ6tkYh5ibqo="; }; + nativeBuildInputs = [ unzip ]; buildInputs = [ - unzip makeWrapper ]; diff --git a/pkgs/servers/monitoring/nagios/default.nix b/pkgs/servers/monitoring/nagios/default.nix index 09af13951c9d..a58ec2bf7b29 100644 --- a/pkgs/servers/monitoring/nagios/default.nix +++ b/pkgs/servers/monitoring/nagios/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { }; patches = [ ./nagios.patch ]; - buildInputs = [ php perl gd libpng zlib unzip ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ php perl gd libpng zlib ]; configureFlags = [ "--localstatedir=/var/lib/nagios" ]; buildFlags = [ "all" ]; diff --git a/pkgs/servers/monitoring/net-snmp/default.nix b/pkgs/servers/monitoring/net-snmp/default.nix index 8f354d4bb46f..27a6e01dba3d 100644 --- a/pkgs/servers/monitoring/net-snmp/default.nix +++ b/pkgs/servers/monitoring/net-snmp/default.nix @@ -37,8 +37,8 @@ stdenv.mkDerivation rec { substituteInPlace testing/fulltests/support/simple_TESTCONF.sh --replace "/bin/netstat" "${nettools}/bin/netstat" ''; - nativeBuildInputs = [ autoreconfHook nettools removeReferencesTo ]; - buildInputs = with perlPackages; [ file perl unzip openssl ncurses JSON Tk TermReadKey ]; + nativeBuildInputs = [ autoreconfHook nettools removeReferencesTo unzip ]; + buildInputs = with perlPackages; [ file perl openssl ncurses JSON Tk TermReadKey ]; enableParallelBuilding = true; doCheck = false; # tries to use networking diff --git a/pkgs/servers/nosql/riak/2.2.0.nix b/pkgs/servers/nosql/riak/2.2.0.nix index efa43f7a844f..a9a74f0b75f3 100644 --- a/pkgs/servers/nosql/riak/2.2.0.nix +++ b/pkgs/servers/nosql/riak/2.2.0.nix @@ -28,8 +28,9 @@ in stdenv.mkDerivation { name = "riak-2.2.0"; + nativeBuildInputs = [ unzip ]; buildInputs = [ - which unzip erlang pam + which erlang pam ]; src = srcs.riak; diff --git a/pkgs/servers/rainloop/default.nix b/pkgs/servers/rainloop/default.nix index 681a9dd38ca3..f86254e93b18 100644 --- a/pkgs/servers/rainloop/default.nix +++ b/pkgs/servers/rainloop/default.nix @@ -4,7 +4,7 @@ pname = "rainloop${lib.optionalString (edition != "") "-${edition}"}"; version = "1.14.0"; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; unpackPhase = '' mkdir rainloop diff --git a/pkgs/servers/search/elasticsearch/plugins.nix b/pkgs/servers/search/elasticsearch/plugins.nix index c51b0d209845..19aac337057f 100644 --- a/pkgs/servers/search/elasticsearch/plugins.nix +++ b/pkgs/servers/search/elasticsearch/plugins.nix @@ -21,7 +21,7 @@ let # Work around the "unpacker appears to have produced no directories" # case that happens when the archive doesn't have a subdirectory. setSourceRoot = "sourceRoot=$(pwd)"; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; meta = a.meta // { platforms = elasticsearch.meta.platforms; maintainers = (a.meta.maintainers or []) ++ (with lib.maintainers; [ offline ]); diff --git a/pkgs/servers/sql/mysql/jdbc/default.nix b/pkgs/servers/sql/mysql/jdbc/default.nix index 5aab3000f374..6b22185cd800 100644 --- a/pkgs/servers/sql/mysql/jdbc/default.nix +++ b/pkgs/servers/sql/mysql/jdbc/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0dfjshrrx0ndfb6xbdpwhn1f1jkw0km57rgpar0ny8ixmgdnlwnm"; }; - buildInputs = [ unzip ant ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ ant ]; meta = { platforms = lib.platforms.unix; diff --git a/pkgs/servers/web-apps/moodle/moodle-utils.nix b/pkgs/servers/web-apps/moodle/moodle-utils.nix index 168482bffe65..090d87cb1ee8 100644 --- a/pkgs/servers/web-apps/moodle/moodle-utils.nix +++ b/pkgs/servers/web-apps/moodle/moodle-utils.nix @@ -8,15 +8,16 @@ let configurePhase ? ":", buildPhase ? ":", buildInputs ? [ ], + nativeBuildInputs ? [ ], ... }: stdenv.mkDerivation (a // { name = name; inherit pluginType; - inherit configurePhase buildPhase; + inherit configurePhase buildPhase buildInputs; - buildInputs = [ unzip ] ++ buildInputs; + nativeBuildInputs = [ unzip ] ++ nativeBuildInputs; installPhase = '' runHook preInstall diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix index 7c9f9ac7d632..a7663bbd2315 100644 --- a/pkgs/tools/archivers/zpaq/default.nix +++ b/pkgs/tools/archivers/zpaq/default.nix @@ -11,8 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0v44rlg9gvwc4ggr2lhcqll8ppal3dk7zsg5bqwcc5lg3ynk2pz4"; }; - nativeBuildInputs = [ perl /* for pod2man */ ]; - buildInputs = [ unzip ]; + nativeBuildInputs = [ perl /* for pod2man */ unzip ]; preBuild = let CPPFLAGS = with stdenv; "" diff --git a/pkgs/tools/archivers/zpaq/zpaqd.nix b/pkgs/tools/archivers/zpaq/zpaqd.nix index 1ff204babc12..c2f214ea2a62 100644 --- a/pkgs/tools/archivers/zpaq/zpaqd.nix +++ b/pkgs/tools/archivers/zpaq/zpaqd.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { sourceRoot = "."; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; buildPhase = '' g++ ${compileFlags} -fPIC --shared libzpaq.cpp -o libzpaq.so diff --git a/pkgs/tools/cd-dvd/uif2iso/default.nix b/pkgs/tools/cd-dvd/uif2iso/default.nix index d37cc649d386..ac0879e32172 100644 --- a/pkgs/tools/cd-dvd/uif2iso/default.nix +++ b/pkgs/tools/cd-dvd/uif2iso/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1v18fmlzhkkhv8xdc9dyvl8vamwg3ka4dsrg7vvmk1f2iczdx3dp"; }; - buildInputs = [unzip zlib]; + nativeBuildInputs = [ unzip ]; + buildInputs = [zlib]; installPhase = '' make -C . prefix="$out" install; diff --git a/pkgs/tools/graphics/fgallery/default.nix b/pkgs/tools/graphics/fgallery/default.nix index 865e0f141ff0..28deabb98d14 100644 --- a/pkgs/tools/graphics/fgallery/default.nix +++ b/pkgs/tools/graphics/fgallery/default.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { sha256 = "18wlvqbxcng8pawimbc8f2422s8fnk840hfr6946lzsxr0ijakvf"; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ unzip ] ++ (with perlPackages; [ perl ImageExifTool CpanelJSONXS ]); + nativeBuildInputs = [ makeWrapper unzip ]; + buildInputs = (with perlPackages; [ perl ImageExifTool CpanelJSONXS ]); installPhase = '' mkdir -p "$out/bin" diff --git a/pkgs/tools/graphics/pdfread/default.nix b/pkgs/tools/graphics/pdfread/default.nix index 6201b2d5888e..8350e95188d3 100644 --- a/pkgs/tools/graphics/pdfread/default.nix +++ b/pkgs/tools/graphics/pdfread/default.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation { sha256 = "0mzxpnk97f0ww5ds7h4wsval3g4lnrhv6rhspjs7cy4i41gmk8an"; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ unzip python ]; + nativeBuildInputs = [ makeWrapper unzip ]; + buildInputs = [ python ]; broken = true; # Not found. diff --git a/pkgs/tools/graphics/structure-synth/default.nix b/pkgs/tools/graphics/structure-synth/default.nix index a4772cad3c49..5f6e655882ab 100644 --- a/pkgs/tools/graphics/structure-synth/default.nix +++ b/pkgs/tools/graphics/structure-synth/default.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation { sha256 = "1kiammx46719az6jzrav8yrwz82nk4m72ybj0kpbnvp9wfl3swbb"; }; - buildInputs = [ qt4 unzip libGLU ]; - nativeBuildInputs = [ qmake4Hook makeWrapper ]; + buildInputs = [ qt4 libGLU ]; + nativeBuildInputs = [ qmake4Hook makeWrapper unzip ]; # Thanks to https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=672000#15: patches = [ ./gcc47.patch ]; diff --git a/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix b/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix index 6829de9241b4..627445136410 100644 --- a/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix +++ b/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { maintainers = [ maintainers.gebner ]; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; makeFlags = [ "installpath=$(out)/share/tegaki/models/zinnia/" ]; } diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix index cbeede0cc305..b2e753342d98 100644 --- a/pkgs/tools/misc/debian-devscripts/default.nix +++ b/pkgs/tools/misc/debian-devscripts/default.nix @@ -16,8 +16,8 @@ in stdenv.mkDerivation rec { sha256 = "0xy1nvqrnifx46g8ch69pk31by0va6hn10wpi1fkrsrgncanjjh1"; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ unzip xz dpkg libxslt python setuptools curl gnupg diffutils ] ++ + nativeBuildInputs = [ makeWrapper unzip ]; + buildInputs = [ xz dpkg libxslt python setuptools curl gnupg diffutils ] ++ (with perlPackages; [ perl CryptSSLeay LWP TimeDate DBFile FileDesktopEntry ParseDebControl LWPProtocolHttps ]); preConfigure = '' diff --git a/pkgs/tools/misc/ent/default.nix b/pkgs/tools/misc/ent/default.nix index 05dcd36c40ce..b0dc4f1e3df9 100644 --- a/pkgs/tools/misc/ent/default.nix +++ b/pkgs/tools/misc/ent/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { # case that happens when the archive doesn't have a subdirectory. setSourceRoot = "sourceRoot=`pwd`"; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; buildFlags = lib.optional stdenv.cc.isClang "CC=clang"; diff --git a/pkgs/tools/misc/gams/default.nix b/pkgs/tools/misc/gams/default.nix index f91acbf264a5..c6bd2c53844c 100644 --- a/pkgs/tools/misc/gams/default.nix +++ b/pkgs/tools/misc/gams/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "4f95389579f33ff7c2586838a2c19021aa0746279555cbb51aa6e0efd09bd297"; }; unpackCmd = "unzip $src"; - buildInputs = [ unzip file ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ file ]; dontBuild = true; installPhase = '' diff --git a/pkgs/tools/misc/graylog/plugins.nix b/pkgs/tools/misc/graylog/plugins.nix index 0355fe58f485..8df7f34bb234 100644 --- a/pkgs/tools/misc/graylog/plugins.nix +++ b/pkgs/tools/misc/graylog/plugins.nix @@ -15,7 +15,7 @@ let stdenv.mkDerivation (a // { inherit installPhase; dontUnpack = true; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; meta = a.meta // { platforms = graylog.meta.platforms; maintainers = (a.meta.maintainers or []) ++ [ maintainers.fadenb ]; diff --git a/pkgs/tools/misc/jdiskreport/default.nix b/pkgs/tools/misc/jdiskreport/default.nix index 117199617e14..abd8398601cd 100644 --- a/pkgs/tools/misc/jdiskreport/default.nix +++ b/pkgs/tools/misc/jdiskreport/default.nix @@ -18,8 +18,7 @@ stdenv.mkDerivation { sha256 = "0d5mzkwsbh9s9b1vyvpaawqc09b0q41l2a7pmwf7386b1fsx6d58"; }; - nativeBuildInputs = [ copyDesktopItems ]; - buildInputs = [ unzip ]; + nativeBuildInputs = [ copyDesktopItems unzip ]; inherit jre; installPhase = '' diff --git a/pkgs/tools/misc/megacli/default.nix b/pkgs/tools/misc/megacli/default.nix index 7cf1e14dc18e..3f86a073c096 100644 --- a/pkgs/tools/misc/megacli/default.nix +++ b/pkgs/tools/misc/megacli/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1sdn58fbmd3fj4nzbajq3gcyw71ilgdh45r5p4sa6xmb7np55cfr"; }; - buildInputs = [rpmextract ncurses5 unzip]; + nativeBuildInputs = [ unzip ]; + buildInputs = [rpmextract ncurses5]; libPath = lib.makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc ncurses5 ]; diff --git a/pkgs/tools/misc/umlet/default.nix b/pkgs/tools/misc/umlet/default.nix index a073417be7d2..d88e0bdea15e 100644 --- a/pkgs/tools/misc/umlet/default.nix +++ b/pkgs/tools/misc/umlet/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0jfyxjxsjx29xhs3fl0f574nyncmk9j5jp8zlgd401mcaznn9c7l"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; installPhase = '' mkdir -p "$out/bin" diff --git a/pkgs/tools/misc/vorbisgain/default.nix b/pkgs/tools/misc/vorbisgain/default.nix index fe405b0eaa40..6cc13e6f87e6 100644 --- a/pkgs/tools/misc/vorbisgain/default.nix +++ b/pkgs/tools/misc/vorbisgain/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - buildInputs = [ unzip libogg libvorbis ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ libogg libvorbis ]; patchPhase = '' chmod -v +x configure diff --git a/pkgs/tools/networking/dd-agent/5.nix b/pkgs/tools/networking/dd-agent/5.nix index c220f24046fc..5964c9de3ebf 100644 --- a/pkgs/tools/networking/dd-agent/5.nix +++ b/pkgs/tools/networking/dd-agent/5.nix @@ -51,8 +51,8 @@ in stdenv.mkDerivation rec { patches = [ ./40103-iostat-fix.patch ]; + nativeBuildInputs = [ unzip ]; buildInputs = [ - unzip makeWrapper ] ++ (with python'.pkgs; [ requests diff --git a/pkgs/tools/networking/p2p/azureus/default.nix b/pkgs/tools/networking/p2p/azureus/default.nix index 6453b2fbb16b..1c72be0c5100 100644 --- a/pkgs/tools/networking/p2p/azureus/default.nix +++ b/pkgs/tools/networking/p2p/azureus/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { url = "http://tarballs.nixos.org/Azureus2.3.0.6.jar"; sha256 = "1hwrh3n0b0jbpsdk15zrs7pw175418phhmg6pn4xi1bvilxq1wrd"; }; -# buildInputs = [unzip]; + inherit jdk swt; meta = { diff --git a/pkgs/tools/security/bmrsa/11.nix b/pkgs/tools/security/bmrsa/11.nix index c8188fe4216a..71bdfae4e42e 100644 --- a/pkgs/tools/security/bmrsa/11.nix +++ b/pkgs/tools/security/bmrsa/11.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0ksd9xkvm9lkvj4yl5sl0zmydp1wn3xhc55b28gj70gi4k75kcl4"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; unpackPhase = '' mkdir bmrsa diff --git a/pkgs/tools/security/chntpw/default.nix b/pkgs/tools/security/chntpw/default.nix index ef462f5bf2dc..5bda55c418aa 100644 --- a/pkgs/tools/security/chntpw/default.nix +++ b/pkgs/tools/security/chntpw/default.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1k1cxsj0221dpsqi5yibq2hr7n8xywnicl8yyaicn91y8h2hkqln"; }; - buildInputs = [ unzip ] - ++ lib.optionals stdenv.isLinux [ stdenv.glibc.out stdenv.glibc.static ]; + nativeBuildInputs = [ unzip ]; + buildInputs = lib.optionals stdenv.isLinux [ stdenv.glibc.out stdenv.glibc.static ]; patches = [ ./00-chntpw-build-arch-autodetect.patch diff --git a/pkgs/tools/security/pcsc-scm-scl011/default.nix b/pkgs/tools/security/pcsc-scm-scl011/default.nix index b7c4319fa058..aa1580e24598 100644 --- a/pkgs/tools/security/pcsc-scm-scl011/default.nix +++ b/pkgs/tools/security/pcsc-scm-scl011/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0ik26sxgqgsqplksl87z61vwmx51k7plaqmrkdid7xidgfhfxr42"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; unpackPhase = '' unzip $src diff --git a/pkgs/tools/security/rarcrack/default.nix b/pkgs/tools/security/rarcrack/default.nix index 94800ca8c04f..3745a9520f1c 100644 --- a/pkgs/tools/security/rarcrack/default.nix +++ b/pkgs/tools/security/rarcrack/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation { sha256 = "134fq84896w5vp8vg4qg0ybpb466njibigyd7bqqm1xydr07qrgn"; }; - buildInputs = [ libxml2 file p7zip unrar unzip ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ libxml2 file p7zip unrar ]; buildFlags = lib.optional stdenv.cc.isClang "CC=clang"; installFlags = [ "PREFIX=\${out}" ]; diff --git a/pkgs/tools/security/sonar-scanner-cli/default.nix b/pkgs/tools/security/sonar-scanner-cli/default.nix index f5ae475a45b0..95db01370b44 100644 --- a/pkgs/tools/security/sonar-scanner-cli/default.nix +++ b/pkgs/tools/security/sonar-scanner-cli/default.nix @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { src = fetchurl sonarScannerArchPackage.${stdenv.hostPlatform.system}; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; installPhase = '' mkdir -p $out/lib diff --git a/pkgs/tools/text/xml/basex/default.nix b/pkgs/tools/text/xml/basex/default.nix index 9256abf3cbdb..30482196322f 100644 --- a/pkgs/tools/text/xml/basex/default.nix +++ b/pkgs/tools/text/xml/basex/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { hash = "sha256-IZhRg2JcYQXQKU/lYZpLLcsSdjZZO+toY5yvk+RKUCY="; }; - buildInputs = [ unzip jre ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ jre ]; desktopItem = makeDesktopItem { name = "basex"; diff --git a/pkgs/tools/typesetting/tex/lkproof/default.nix b/pkgs/tools/typesetting/tex/lkproof/default.nix index d5b6a7f9f973..4f896ef32baf 100644 --- a/pkgs/tools/typesetting/tex/lkproof/default.nix +++ b/pkgs/tools/typesetting/tex/lkproof/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1qjkjhpc4rm62qxn18r83zdlwnj1wvnkcpdiqlv7w4bakh0gvjly"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; installPhase = " mkdir -p $out/share/texmf-nix/tex/generic/lkproof diff --git a/pkgs/tools/typesetting/tex/pgf/3.x.nix b/pkgs/tools/typesetting/tex/pgf/3.x.nix index 42320b49b3d8..b33f05d34a78 100644 --- a/pkgs/tools/typesetting/tex/pgf/3.x.nix +++ b/pkgs/tools/typesetting/tex/pgf/3.x.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "0kj769hyp4z2zmdv3f8xv443wcfqn5nkkbzxzqgfxjizlz81aav7"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; # Multiple files problem unpackPhase = '' diff --git a/pkgs/tools/typesetting/tex/pgfplots/default.nix b/pkgs/tools/typesetting/tex/pgfplots/default.nix index aecf32c58747..fe928615eb42 100644 --- a/pkgs/tools/typesetting/tex/pgfplots/default.nix +++ b/pkgs/tools/typesetting/tex/pgfplots/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1xajrmq35i0qlsfwydy5zzg6f1jg88hqqh5b3xsmglzrarnllbdi"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; unpackPhase = "unzip $src"; diff --git a/pkgs/tools/virtualization/ec2-ami-tools/default.nix b/pkgs/tools/virtualization/ec2-ami-tools/default.nix index 00df6bd97e11..8e6d7b06d170 100644 --- a/pkgs/tools/virtualization/ec2-ami-tools/default.nix +++ b/pkgs/tools/virtualization/ec2-ami-tools/default.nix @@ -5,8 +5,7 @@ stdenv.mkDerivation rec { version = "1.5.7"; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ unzip ]; + nativeBuildInputs = [ makeWrapper unzip ]; src = fetchurl { url = "https://s3.amazonaws.com/ec2-downloads/${pname}-${version}.zip"; diff --git a/pkgs/tools/virtualization/ec2-api-tools/default.nix b/pkgs/tools/virtualization/ec2-api-tools/default.nix index 0c3aec2aadf9..475b97abdcc1 100644 --- a/pkgs/tools/virtualization/ec2-api-tools/default.nix +++ b/pkgs/tools/virtualization/ec2-api-tools/default.nix @@ -8,8 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0figmvcm82ghmpz3018ihysz8zpxpysgbpdx7rmciq9y80qbw6l5"; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ unzip ]; + nativeBuildInputs = [ makeWrapper unzip ]; installPhase = '' diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index 0b2b6af80383..660ba01bcd44 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -897,7 +897,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { sha256 = "07r63xam6icm17pf6amh1qkmna13nxa3ncdan7a3ql307i5isriz"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; phases = [ "unpackPhase" "installPhase" ]; From 2355078132863da71c6ea91d8287fcbd24f4439e Mon Sep 17 00:00:00 2001 From: andreoss <andreoss@sdf.org> Date: Sun, 14 Feb 2021 08:30:52 -0500 Subject: [PATCH 041/188] adoptopenjdk-bin: 11.0.9 -> 11.0.10, 15.0.1 -> 15.0.2, 8.0.272 -> 8.0.282 --- .../compilers/adoptopenjdk-bin/sources.json | 410 +++++++++--------- 1 file changed, 205 insertions(+), 205 deletions(-) diff --git a/pkgs/development/compilers/adoptopenjdk-bin/sources.json b/pkgs/development/compilers/adoptopenjdk-bin/sources.json index 14c887554f89..87ca2b767d33 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/sources.json +++ b/pkgs/development/compilers/adoptopenjdk-bin/sources.json @@ -4,92 +4,92 @@ "jdk": { "hotspot": { "aarch64": { - "build": "11", - "sha256": "f90c6f941a95e20e305870700328804e5b48acb69d4928dc9c4627b3c755ae8a", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11.1/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.9_11.tar.gz", - "version": "11.0.9" + "build": "9", + "sha256": "420c5d1e5dc66b2ed7dedd30a7bdf94bfaed10d5e1b07dc579722bf60a8114a9", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.10_9.tar.gz", + "version": "11.0.10" }, "armv6l": { - "build": "11", - "sha256": "082a13a9a5fbcf7ca45e67ab39e9682a9ef9e3779395e37aa0bf235e42a8eaf5", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11/OpenJDK11U-jdk_arm_linux_hotspot_11.0.9_11.tar.gz", - "version": "11.0.9" + "build": "9", + "sha256": "34908da9c200f5ef71b8766398b79fd166f8be44d87f97510667698b456c8d44", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_arm_linux_hotspot_11.0.10_9.tar.gz", + "version": "11.0.10" }, "armv7l": { - "build": "11", - "sha256": "082a13a9a5fbcf7ca45e67ab39e9682a9ef9e3779395e37aa0bf235e42a8eaf5", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11/OpenJDK11U-jdk_arm_linux_hotspot_11.0.9_11.tar.gz", - "version": "11.0.9" + "build": "9", + "sha256": "34908da9c200f5ef71b8766398b79fd166f8be44d87f97510667698b456c8d44", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_arm_linux_hotspot_11.0.10_9.tar.gz", + "version": "11.0.10" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "11", - "sha256": "a3c52b73a76bed0f113604165eb4f2020b767e188704d8cc0bfc8bc4eb596712", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11.1/OpenJDK11U-jdk_x64_linux_hotspot_11.0.9_11.tar.gz", - "version": "11.0.9" + "build": "9", + "sha256": "ae78aa45f84642545c01e8ef786dfd700d2226f8b12881c844d6a1f71789cb99", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.10_9.tar.gz", + "version": "11.0.10" } }, "openj9": { "aarch64": { - "build": "11", - "sha256": "f0426b6d37085d471a7f577ce6f28af7cc8fe35b9b0b09a5111eccaed80a0447", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11_openj9-0.23.0/OpenJDK11U-jdk_aarch64_linux_openj9_11.0.9_11_openj9-0.23.0.tar.gz", - "version": "11.0.9" + "build": "9", + "sha256": "0ce9a8c38d154540610dfe03e59389734deb91c5cb9258408404c5026d4afa41", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jdk_aarch64_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz", + "version": "11.0.10-ea" }, "packageType": "jdk", "vmType": "openj9", "x86_64": { - "build": "11", - "sha256": "812d58fac39465802039291a1bc530b4feaaa61b58664d9c458a075921ae8091", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11_openj9-0.23.0/OpenJDK11U-jdk_x64_linux_openj9_11.0.9_11_openj9-0.23.0.tar.gz", - "version": "11.0.9" + "build": "9", + "sha256": "941d5df125d2ad426391340f539408b13d61d00ed31dd79142ff1ac84864a79f", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jdk_x64_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz", + "version": "11.0.10" } } }, "jre": { "hotspot": { "aarch64": { - "build": "11", - "sha256": "89b9b3108afda968a97961c5602a896bae31fea7c95195b54be5ad68b3af9e45", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11.1/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.9_11.tar.gz", - "version": "11.0.9" + "build": "9", + "sha256": "5f9a894bd694f598f2befa4a605169685ac8bcb8ec68d25e587e8db4d2307b74", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.10_9.tar.gz", + "version": "11.0.10" }, "armv6l": { - "build": "11", - "sha256": "8e52de3c7a24edb74e423631fa90a09f7af3193aa9e6e4837b337192669530b0", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11/OpenJDK11U-jre_arm_linux_hotspot_11.0.9_11.tar.gz", - "version": "11.0.9" + "build": "9", + "sha256": "2f2da2149c089c84f00b0eda63c31b77c8b51a1c080e18a70ecb5a78ba40d8c6", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_arm_linux_hotspot_11.0.10_9.tar.gz", + "version": "11.0.10" }, "armv7l": { - "build": "11", - "sha256": "8e52de3c7a24edb74e423631fa90a09f7af3193aa9e6e4837b337192669530b0", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11/OpenJDK11U-jre_arm_linux_hotspot_11.0.9_11.tar.gz", - "version": "11.0.9" + "build": "9", + "sha256": "2f2da2149c089c84f00b0eda63c31b77c8b51a1c080e18a70ecb5a78ba40d8c6", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_arm_linux_hotspot_11.0.10_9.tar.gz", + "version": "11.0.10" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "11", - "sha256": "2ed263b662afb8b5d2964d1c9941d20031d07e5af68679ebefdca35d40bb91b1", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11.1/OpenJDK11U-jre_x64_linux_hotspot_11.0.9_11.tar.gz", - "version": "11.0.9" + "build": "9", + "sha256": "25fdcf9427095ac27c8bdfc82096ad2e615693a3f6ea06c700fca7ffb271131a", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_x64_linux_hotspot_11.0.10_9.tar.gz", + "version": "11.0.10" } }, "openj9": { "aarch64": { - "build": "11", - "sha256": "b73f406dba1560dc194ac891452a1aacc2ba3b3e5e7b55e91a64559f8c2d9539", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11_openj9-0.23.0/OpenJDK11U-jre_aarch64_linux_openj9_11.0.9_11_openj9-0.23.0.tar.gz", - "version": "11.0.9" + "build": "9", + "sha256": "c48d2b19bf7040c74dfdcac9e395ba7b8f937522ee756c820465f2e8e3dffec2", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jre_aarch64_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz", + "version": "11.0.10-ea" }, "packageType": "jre", "vmType": "openj9", "x86_64": { - "build": "11", - "sha256": "54c845c167c197ba789eb6c3508faa5b1c95c9abe2ac26878123b6eecc87a111", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11_openj9-0.23.0/OpenJDK11U-jre_x64_linux_openj9_11.0.9_11_openj9-0.23.0.tar.gz", - "version": "11.0.9" + "build": "9", + "sha256": "7e5f97071f8b86c22c36ddfd7f821c3e8ec531c1128e2e6c931b2e64118a517a", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jre_x64_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz", + "version": "11.0.10" } } } @@ -100,20 +100,20 @@ "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "11", - "sha256": "7b21961ffb2649e572721a0dfad64169b490e987937b661cb4e13a594c21e764", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11.1/OpenJDK11U-jdk_x64_mac_hotspot_11.0.9_11.tar.gz", - "version": "11.0.9" + "build": "9", + "sha256": "ee7c98c9d79689aca6e717965747b8bf4eec5413e89d5444cc2bd6dbd59e3811", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_x64_mac_hotspot_11.0.10_9.tar.gz", + "version": "11.0.10" } }, "openj9": { "packageType": "jdk", "vmType": "openj9", "x86_64": { - "build": "11", - "sha256": "382238443d4495d976f9e1a66b0f6e3bc250d3d009b64d2c29d44022afd7e418", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11.1_openj9-0.23.0/OpenJDK11U-jdk_x64_mac_openj9_11.0.9_11_openj9-0.23.0.tar.gz", - "version": "11.0.9" + "build": "9", + "sha256": "58f931dc30160b04da2d94af32e0dfa384f4b2cf92b7217c0937fd057e668d54", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jdk_x64_mac_openj9_11.0.10_9_openj9-0.24.0.tar.gz", + "version": "11.0.10" } } }, @@ -122,20 +122,20 @@ "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "11", - "sha256": "cd8965dc8dbd0b5b3b25b6a336857d9bb622965e039b77e3048bc825e5512e95", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11.1/OpenJDK11U-jre_x64_mac_hotspot_11.0.9_11.tar.gz", - "version": "11.0.9" + "build": "9", + "sha256": "215e94323d7c74fe31e5383261e3bfc8e9ca3dc03212738c48d29868b02fe875", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_x64_mac_hotspot_11.0.10_9.tar.gz", + "version": "11.0.10" } }, "openj9": { "packageType": "jre", "vmType": "openj9", "x86_64": { - "build": "11", - "sha256": "33a868f12bbe9326f658e60abe48dac658df33578b3719f551355855a87d1911", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11.1_openj9-0.23.0/OpenJDK11U-jre_x64_mac_openj9_11.0.9_11_openj9-0.23.0.tar.gz", - "version": "11.0.9" + "build": "9", + "sha256": "6e353f0b38a7192ad3e0522009065c7c24356e0d9329899477b21e39d2a7a8da", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jre_x64_mac_openj9_11.0.10_9_openj9-0.24.0.tar.gz", + "version": "11.0.10" } } } @@ -146,19 +146,19 @@ "jdk": { "hotspot": { "aarch64": { - "build": "8", + "build": "8.1", "sha256": "0e6081cb51f8a6f3062bef4f4c45dbe1fccfd3f3b4b5d52522a3edb76581e3af", "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_aarch64_linux_hotspot_13.0.2_8.tar.gz", "version": "13.0.2" }, "armv6l": { - "build": "8", + "build": "8.1", "sha256": "9beec080f2b2a7f6883b024272f4e8d5a0b027325e83647be318215781af1d1a", "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_arm_linux_hotspot_13.0.2_8.tar.gz", "version": "13.0.2" }, "armv7l": { - "build": "8", + "build": "8.1", "sha256": "9beec080f2b2a7f6883b024272f4e8d5a0b027325e83647be318215781af1d1a", "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_arm_linux_hotspot_13.0.2_8.tar.gz", "version": "13.0.2" @@ -166,7 +166,7 @@ "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "8", + "build": "8.1", "sha256": "9ccc063569f19899fd08e41466f8c4cd4e05058abdb5178fa374cb365dcf5998", "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_x64_linux_hotspot_13.0.2_8.tar.gz", "version": "13.0.2" @@ -176,7 +176,7 @@ "packageType": "jdk", "vmType": "openj9", "x86_64": { - "build": "8", + "build": "8.1", "sha256": "aeecf6d30d0c847db81d07793cf97e5dc44890c29366d7d9f8f9f397f6c52590", "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8_openj9-0.18.0/OpenJDK13U-jdk_x64_linux_openj9_13.0.2_8_openj9-0.18.0.tar.gz", "version": "13.0.2" @@ -186,7 +186,7 @@ "jre": { "hotspot": { "aarch64": { - "build": "8", + "build": "8.1", "sha256": "6c4b69d1609f4c65c576c80d6aa101de80048f8ce5566f890e8fff5349228bae", "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jre_aarch64_linux_hotspot_13.0.2_8.tar.gz", "version": "13.0.2" @@ -194,7 +194,7 @@ "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "8", + "build": "8.1", "sha256": "897f16fe8e056395209e35d2384013bd1ff250e717465769079e3f4793628c34", "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jre_x64_linux_hotspot_13.0.2_8.tar.gz", "version": "13.0.2" @@ -204,7 +204,7 @@ "packageType": "jre", "vmType": "openj9", "x86_64": { - "build": "8", + "build": "8.1", "sha256": "a0ab38607811e282f64082edc68a2dea3fa6a5113391efb124a6d7d02883110a", "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8_openj9-0.18.0/OpenJDK13U-jre_x64_linux_openj9_13.0.2_8_openj9-0.18.0.tar.gz", "version": "13.0.2" @@ -218,7 +218,7 @@ "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "8", + "build": "8.1", "sha256": "0ddb24efdf5aab541898d19b7667b149a1a64a8bd039b708fc58ee0284fa7e07", "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_x64_mac_hotspot_13.0.2_8.tar.gz", "version": "13.0.2" @@ -228,7 +228,7 @@ "packageType": "jdk", "vmType": "openj9", "x86_64": { - "build": "8", + "build": "8.1", "sha256": "dd8d92eec98a3455ec5cd065a0a6672cc1aef280c6a68c507c372ccc1d98fbaa", "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8_openj9-0.18.0/OpenJDK13U-jdk_x64_mac_openj9_13.0.2_8_openj9-0.18.0.tar.gz", "version": "13.0.2" @@ -240,7 +240,7 @@ "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "8", + "build": "8.1", "sha256": "3149b9ebf0db1eaf2dc152df9efae82003e7971efb1cf550060e6a4798fe8c5c", "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jre_x64_mac_hotspot_13.0.2_8.tar.gz", "version": "13.0.2" @@ -250,7 +250,7 @@ "packageType": "jre", "vmType": "openj9", "x86_64": { - "build": "8", + "build": "8.1", "sha256": "6a8a636fca4c7e368241e232a37cd73c9867cdec8f0869fd158b1f58c6128cc2", "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8_openj9-0.18.0/OpenJDK13U-jre_x64_mac_openj9_13.0.2_8_openj9-0.18.0.tar.gz", "version": "13.0.2" @@ -394,92 +394,92 @@ "jdk": { "hotspot": { "aarch64": { - "build": "9", - "sha256": "84398a1566d66ee5a88f3326fb7f0b70504eb510190f8f798bdb386481a3900e", - "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jdk_aarch64_linux_hotspot_15.0.1_9.tar.gz", - "version": "15.0.1" + "build": "7", + "sha256": "6e8b6b037148cf20a284b5b257ec7bfdf9cc31ccc87778d0dfd95a2fddf228d4", + "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_aarch64_linux_hotspot_15.0.2_7.tar.gz", + "version": "15.0.2" }, "armv6l": { - "build": "9", - "sha256": "bef5e9f4ab8a87645fa2b3d0ffb9f2b97374caa03cd1296597e8c86e8360d5a2", - "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jdk_arm_linux_hotspot_15.0.1_9.tar.gz", - "version": "15.0.1" + "build": "7", + "sha256": "ff39c0380224e419d940382c4d651cb1e6297a794854e0cc459c1fd4973b3368", + "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_arm_linux_hotspot_15.0.2_7.tar.gz", + "version": "15.0.2" }, "armv7l": { - "build": "9", - "sha256": "bef5e9f4ab8a87645fa2b3d0ffb9f2b97374caa03cd1296597e8c86e8360d5a2", - "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jdk_arm_linux_hotspot_15.0.1_9.tar.gz", - "version": "15.0.1" + "build": "7", + "sha256": "ff39c0380224e419d940382c4d651cb1e6297a794854e0cc459c1fd4973b3368", + "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_arm_linux_hotspot_15.0.2_7.tar.gz", + "version": "15.0.2" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "9", - "sha256": "61045ecb9434e3320dbc2c597715f9884586b7a18a56d29851b4d4a4d48a2a5e", - "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jdk_x64_linux_hotspot_15.0.1_9.tar.gz", - "version": "15.0.1" + "build": "7", + "sha256": "94f20ca8ea97773571492e622563883b8869438a015d02df6028180dd9acc24d", + "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_x64_linux_hotspot_15.0.2_7.tar.gz", + "version": "15.0.2" } }, "openj9": { "aarch64": { - "build": "9", - "sha256": "6206643ec4a57597f73880423b72fc06c1018d92cc6b02972ec3ea3fe4d853a2", - "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9_openj9-0.23.0/OpenJDK15U-jdk_aarch64_linux_openj9_15.0.1_9_openj9-0.23.0.tar.gz", - "version": "15.0.1" + "build": "7", + "sha256": "b69a4bc87ed2e985d252cff02d53f1a11b8d83d39e0800cd4a1cab4521375314", + "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jdk_aarch64_linux_openj9_15.0.2_7_openj9-0.24.0.tar.gz", + "version": "15.0.2-ea" }, "packageType": "jdk", "vmType": "openj9", "x86_64": { - "build": "9", - "sha256": "b1561f7a69c977bfc9991e61e96dcb200c39300dd9ad423254af117c189e4a8d", - "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9_openj9-0.23.0/OpenJDK15U-jdk_x64_linux_openj9_15.0.1_9_openj9-0.23.0.tar.gz", - "version": "15.0.1" + "build": "7", + "sha256": "5515ccd79b1b5e8d8a615b80d5fe1272f7bb41100e46d94fb78ee611ea014816", + "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jdk_x64_linux_openj9_15.0.2_7_openj9-0.24.0.tar.gz", + "version": "15.0.2" } } }, "jre": { "hotspot": { "aarch64": { - "build": "9", - "sha256": "9eecdd39239545b922878abf51015030ba9aed4dda5c4574ddbc669a71ddab31", - "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jre_aarch64_linux_hotspot_15.0.1_9.tar.gz", - "version": "15.0.1" + "build": "7", + "sha256": "1c1fc968d76004b0be0042027712835dcbe3570a6fc3a208157a4ab6adabbef2", + "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jre_aarch64_linux_hotspot_15.0.2_7.tar.gz", + "version": "15.0.2" }, "armv6l": { - "build": "9", - "sha256": "f289d1b9fc05099889eaa9a52d352275d44698f3448153cc2ef05f2fa1c04cca", - "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jre_arm_linux_hotspot_15.0.1_9.tar.gz", - "version": "15.0.1" + "build": "7", + "sha256": "304be224952dbea7000cda6223b2978b3eefdf2e3749032c3b381a213c8d9c5e", + "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jre_arm_linux_hotspot_15.0.2_7.tar.gz", + "version": "15.0.2" }, "armv7l": { - "build": "9", - "sha256": "f289d1b9fc05099889eaa9a52d352275d44698f3448153cc2ef05f2fa1c04cca", - "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jre_arm_linux_hotspot_15.0.1_9.tar.gz", - "version": "15.0.1" + "build": "7", + "sha256": "304be224952dbea7000cda6223b2978b3eefdf2e3749032c3b381a213c8d9c5e", + "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jre_arm_linux_hotspot_15.0.2_7.tar.gz", + "version": "15.0.2" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "9", - "sha256": "e619197c7a5757631f6ea9c912ab47528ebf64c27cf788cdad22bc9245779411", - "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jre_x64_linux_hotspot_15.0.1_9.tar.gz", - "version": "15.0.1" + "build": "7", + "sha256": "31af7efdb1cc0ffd001bc145c3d255266889ad6b502133283ae8bf233d11334c", + "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jre_x64_linux_hotspot_15.0.2_7.tar.gz", + "version": "15.0.2" } }, "openj9": { "aarch64": { - "build": "9", - "sha256": "1db3c28e8c423d005fcf3b0c8a081061e56c51966273e32e3930d4c57c21bf49", - "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9_openj9-0.23.0/OpenJDK15U-jre_aarch64_linux_openj9_15.0.1_9_openj9-0.23.0.tar.gz", - "version": "15.0.1" + "build": "7", + "sha256": "37492012e75d75021dfb2b25fe5cc73664c03fee85532cec30ce4f5a4e5389c6", + "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jre_aarch64_linux_openj9_15.0.2_7_openj9-0.24.0.tar.gz", + "version": "15.0.2-ea" }, "packageType": "jre", "vmType": "openj9", "x86_64": { - "build": "9", - "sha256": "e47fdadfe91f554f3e343b24e678b6862673f9b1dce3703efd1447950188357b", - "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9_openj9-0.23.0/OpenJDK15U-jre_x64_linux_openj9_15.0.1_9_openj9-0.23.0.tar.gz", - "version": "15.0.1" + "build": "7", + "sha256": "a4ae1b7275fcfd6d87a3387edacc8e353dc95ee44f00ca5a348ea90331ec2084", + "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jre_x64_linux_openj9_15.0.2_7_openj9-0.24.0.tar.gz", + "version": "15.0.2" } } } @@ -490,20 +490,20 @@ "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "9", - "sha256": "d32f9429c4992cef7be559a15c542011503d6bc38c89379800cd209a9d7ec539", - "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jdk_x64_mac_hotspot_15.0.1_9.tar.gz", - "version": "15.0.1" + "build": "7", + "sha256": "d358a7ff03905282348c6c80562a4da2e04eb377b60ad2152be4c90f8d580b7f", + "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_x64_mac_hotspot_15.0.2_7.tar.gz", + "version": "15.0.2" } }, "openj9": { "packageType": "jdk", "vmType": "openj9", "x86_64": { - "build": "9", - "sha256": "c9b19fd1fda9c581aa0bcddbf5f821204c351a1de29da1c5aa51cb680ee99517", - "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9.1_openj9-0.23.0/OpenJDK15U-jdk_x64_mac_openj9_15.0.1_9_openj9-0.23.0.tar.gz", - "version": "15.0.1" + "build": "7", + "sha256": "1336ae5529af3a0e35ae569e4188944831aeed7080a482f2490fc619380cbe53", + "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jdk_x64_mac_openj9_15.0.2_7_openj9-0.24.0.tar.gz", + "version": "15.0.2" } } }, @@ -512,20 +512,20 @@ "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "9", - "sha256": "fde1713fc51e824a08f8eeb5e2b8a2acf21424d5f9a0e70cfd2e85a77c827bc4", - "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jre_x64_mac_hotspot_15.0.1_9.tar.gz", - "version": "15.0.1" + "build": "7", + "sha256": "6a7150fa3ca8277394ff5bae6f56a70f61d2144a5dbbea4f008d86a3e5498795", + "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jre_x64_mac_hotspot_15.0.2_7.tar.gz", + "version": "15.0.2" } }, "openj9": { "packageType": "jre", "vmType": "openj9", "x86_64": { - "build": "9", - "sha256": "e7c3710d6cc23480ac66eba79b48d9e2bebec34ba688f3053bb5eba406a2c315", - "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9.1_openj9-0.23.0/OpenJDK15U-jre_x64_mac_openj9_15.0.1_9_openj9-0.23.0.tar.gz", - "version": "15.0.1" + "build": "7", + "sha256": "2c0ba5e66764d660037343db4bf32f1ed75ad27661e54e9a4df23d40cae448b0", + "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jre_x64_mac_openj9_15.0.2_7_openj9-0.24.0.tar.gz", + "version": "15.0.2" } } } @@ -536,92 +536,92 @@ "jdk": { "hotspot": { "aarch64": { - "build": "10", - "sha256": "cfbde5191027c6d25af44af8a3d64625c6e22422dea8c4af6fe9240e7e249baa", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jdk_aarch64_linux_hotspot_8u272b10.tar.gz", - "version": "8.0.272" + "build": "8", + "sha256": "9c07cf2099bbc6c850c46fd870bd243f5fcb6635181eabb312bdffe43ffc5080", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_jdk8u282-b08.tar.gz", + "version": "8.0.282" }, "armv6l": { - "build": "10", - "sha256": "b005e9e8a912aa6605debdea3685a223c077d5a4ba7c90bca02d804c5f39d0b9", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jdk_arm_linux_hotspot_8u272b10.tar.gz", - "version": "8.0.272" + "build": "1", + "sha256": "e2e41a8705061dfcc766bfb6b7edd4c699e94aac68e4deeb28c8e76734a46fb7", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u275-b01/OpenJDK8U-jdk_arm_linux_hotspot_8u275b01.tar.gz", + "version": "8.0.275" }, "armv7l": { - "build": "10", - "sha256": "b005e9e8a912aa6605debdea3685a223c077d5a4ba7c90bca02d804c5f39d0b9", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jdk_arm_linux_hotspot_8u272b10.tar.gz", - "version": "8.0.272" + "build": "1", + "sha256": "e2e41a8705061dfcc766bfb6b7edd4c699e94aac68e4deeb28c8e76734a46fb7", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u275-b01/OpenJDK8U-jdk_arm_linux_hotspot_8u275b01.tar.gz", + "version": "8.0.275" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "10", - "sha256": "6f124b69d07d8d3edf39b9aa5c58473f63a380b686ddb73a5495e01d25c2939a", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jdk_x64_linux_hotspot_8u272b10.tar.gz", - "version": "8.0.272" + "build": "8", + "sha256": "e6e6e0356649b9696fa5082cfcb0663d4bef159fc22d406e3a012e71fce83a5c", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u282b08.tar.gz", + "version": "8.0.282" } }, "openj9": { "aarch64": { - "build": "10", - "sha256": "bbc78dc8caf25372578a95287bcf672c4bf62af23939d4a988634b2a1356cd89", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10_openj9-0.23.0/OpenJDK8U-jdk_aarch64_linux_openj9_8u272b10_openj9-0.23.0.tar.gz", - "version": "8.0.272" + "build": "8", + "sha256": "e107d3b8092f71ee042284b0fc0f0430ef214916812ce02aa6d549aa81b6dc70", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jdk_aarch64_linux_openj9_8u282b08_openj9-0.24.0.tar.gz", + "version": "8.0.282-ea" }, "packageType": "jdk", "vmType": "openj9", "x86_64": { - "build": "10", - "sha256": "ca852f976e5b27ccd9b73a527a517496bda865b2ae2a85517ca74486fb8de7da", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10_openj9-0.23.0/OpenJDK8U-jdk_x64_linux_openj9_8u272b10_openj9-0.23.0.tar.gz", - "version": "8.0.272" + "build": "8", + "sha256": "ef10c776dccdff02da6222002a3c023c1cc47d50dd1f6f81314da3d1fe28d13e", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jdk_x64_linux_openj9_8u282b08_openj9-0.24.0.tar.gz", + "version": "8.0.282" } } }, "jre": { "hotspot": { "aarch64": { - "build": "10", - "sha256": "ed3a862d83dd1f19037fc6ccf73500f2ecf453eb245af8b70bec3fb80d084289", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jre_aarch64_linux_hotspot_8u272b10.tar.gz", - "version": "8.0.272" + "build": "8", + "sha256": "5ffa116636b90bac486faba2882a2121aca1398a5426ef3e4ad0d913985e680d", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_aarch64_linux_hotspot_jdk8u282-b08.tar.gz", + "version": "8.0.282" }, "armv6l": { - "build": "10", - "sha256": "906113d909d81b930c4eb519512d1cc9f9be9789dfd349128d6e7efaeeb36e1c", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jre_arm_linux_hotspot_8u272b10.tar.gz", - "version": "8.0.272" + "build": "1", + "sha256": "2e228d39d00ba8d974fd8ccdaaee0225833e79594251b64c724485c4fc94870f", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u275-b01/OpenJDK8U-jre_arm_linux_hotspot_8u275b01.tar.gz", + "version": "8.0.275" }, "armv7l": { - "build": "10", - "sha256": "906113d909d81b930c4eb519512d1cc9f9be9789dfd349128d6e7efaeeb36e1c", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jre_arm_linux_hotspot_8u272b10.tar.gz", - "version": "8.0.272" + "build": "1", + "sha256": "2e228d39d00ba8d974fd8ccdaaee0225833e79594251b64c724485c4fc94870f", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u275-b01/OpenJDK8U-jre_arm_linux_hotspot_8u275b01.tar.gz", + "version": "8.0.275" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "10", - "sha256": "e6894601a559c5226c6dc337308df263444d356a6430f4aabb66e02607c82956", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jre_x64_linux_hotspot_8u272b10.tar.gz", - "version": "8.0.272" + "build": "8", + "sha256": "3b2e2c6ad3ee04a58ffb8d629e3e242b0ae87b38cfd06425e4446b1f9490f521", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_x64_linux_hotspot_8u282b08.tar.gz", + "version": "8.0.282" } }, "openj9": { "aarch64": { - "build": "10", - "sha256": "b0891c3493a9fc6135700d065a826fc67223d54e9d0da3c41b57e6cb6897b726", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10_openj9-0.23.0/OpenJDK8U-jre_aarch64_linux_openj9_8u272b10_openj9-0.23.0.tar.gz", - "version": "8.0.272" + "build": "8", + "sha256": "1ffc7ac14546ee5e16e0efd616073baaf1b80f55abf61257095f132ded9da1e5", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jre_aarch64_linux_openj9_8u282b08_openj9-0.24.0.tar.gz", + "version": "8.0.282-ea" }, "packageType": "jre", "vmType": "openj9", "x86_64": { - "build": "10", - "sha256": "a4e58f3c15ca3bc15cb3aaa9f116de972809ca52ae81e0726f84c059442174d5", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10_openj9-0.23.0/OpenJDK8U-jre_x64_linux_openj9_8u272b10_openj9-0.23.0.tar.gz", - "version": "8.0.272" + "build": "8", + "sha256": "4fad259c32eb23ec98925c8b2cf28aaacbdb55e034db74c31a7636e75b6af08d", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jre_x64_linux_openj9_8u282b08_openj9-0.24.0.tar.gz", + "version": "8.0.282" } } } @@ -632,20 +632,20 @@ "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "10", - "sha256": "091f9ee39b0bdbc8af8ec19f51aaa0f73e416c2e93a8fb2c79b82f4caac83ab6", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jdk_x64_mac_hotspot_8u272b10.tar.gz", - "version": "8.0.272" + "build": "8", + "sha256": "1766d756f6e4a5d41b539f2ecf83e5a33e9336bd75f1602e8f4b4afbb8f47aaa", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_mac_hotspot_8u282b08.tar.gz", + "version": "8.0.282" } }, "openj9": { "packageType": "jdk", "vmType": "openj9", "x86_64": { - "build": "10", - "sha256": "bbd66ec27a4ea9b0b0952f501e1837e69c24262f64b316dab0408d1a8633a527", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10.1_openj9-0.23.0/OpenJDK8U-jdk_x64_mac_openj9_8u272b10_openj9-0.23.0.tar.gz", - "version": "8.0.272" + "build": "8", + "sha256": "265d4fb01b61ed7a3a9fae6a50bcf6322687b5f08de8598d8e42263cbd8b5772", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jdk_x64_mac_openj9_8u282b08_openj9-0.24.0.tar.gz", + "version": "8.0.282" } } }, @@ -654,23 +654,23 @@ "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "10", - "sha256": "afb9c08cb8b93d8e7d4f1e48ced3d43cfb3082491595a2eaf1f00c48abd25428", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jre_x64_mac_hotspot_8u272b10.tar.gz", - "version": "8.0.272" + "build": "8", + "sha256": "9e7a40d570d5151aae23a2fb017359248f5fb82c547c3ecd860c992770228afb", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_x64_mac_hotspot_8u282b08.tar.gz", + "version": "8.0.282" } }, "openj9": { "packageType": "jre", "vmType": "openj9", "x86_64": { - "build": "10", - "sha256": "4d90e85240113189d897a86731e672b37a6e345c056f35c7719cb27f3d08385b", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10.1_openj9-0.23.0/OpenJDK8U-jre_x64_mac_openj9_8u272b10_openj9-0.23.0.tar.gz", - "version": "8.0.272" + "build": "8", + "sha256": "884aa20b3aaed504b18ee21575c8da20838f80fb96036e78e70ff6ef613a5283", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jre_x64_mac_openj9_8u282b08_openj9-0.24.0.tar.gz", + "version": "8.0.282" } } } } } -} +} \ No newline at end of file From 8c025ae92f516699b76f529884e4f0920418a6c5 Mon Sep 17 00:00:00 2001 From: andreoss <andreoss@sdf.org> Date: Sun, 14 Feb 2021 09:24:25 -0500 Subject: [PATCH 042/188] adoptopenjdk-bin: write new line according to .editorconfig --- pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py | 1 + pkgs/development/compilers/adoptopenjdk-bin/sources.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py b/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py index 63b807bd8005..b39090b16707 100755 --- a/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py +++ b/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py @@ -63,3 +63,4 @@ for release in releases: with open("sources.json", "w") as f: json.dump(out, f, indent=2, sort_keys=True) + f.write('\n') diff --git a/pkgs/development/compilers/adoptopenjdk-bin/sources.json b/pkgs/development/compilers/adoptopenjdk-bin/sources.json index 87ca2b767d33..36d1f62123c8 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/sources.json +++ b/pkgs/development/compilers/adoptopenjdk-bin/sources.json @@ -673,4 +673,4 @@ } } } -} \ No newline at end of file +} From 963513e6540cb5ef85c1d6410bc7cdd937f95bdb Mon Sep 17 00:00:00 2001 From: Antonio Nuno Monteiro <anmonteiro@gmail.com> Date: Sat, 20 Feb 2021 11:30:47 -0800 Subject: [PATCH 043/188] Fix tzdata cross-compilation --- pkgs/data/misc/tzdata/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix index 82dd336e5e50..795c5cb681cc 100644 --- a/pkgs/data/misc/tzdata/default.nix +++ b/pkgs/data/misc/tzdata/default.nix @@ -42,10 +42,11 @@ stdenv.mkDerivation rec { installFlags = [ "ZIC=./zic-native" ]; + # NOTE: in cross-compilation scenarios, this is built for the build platform. preInstall = '' mv zic.o zic.o.orig mv zic zic.orig - make $makeFlags cc=${stdenv.cc.targetPrefix}cc AR=${stdenv.cc.targetPrefix}ar zic + make $makeFlags cc=cc AR=ar zic mv zic zic-native mv zic.o.orig zic.o mv zic.orig zic From acde9a01a3f5cd12b769385880bab90281ab8361 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <Mic92@users.noreply.github.com> Date: Sun, 21 Feb 2021 07:30:48 +0000 Subject: [PATCH 044/188] Apply suggestions from code review Co-authored-by: Sandro <sandro.jaeckel@gmail.com> --- pkgs/data/misc/tzdata/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix index 795c5cb681cc..a2db4d0d9684 100644 --- a/pkgs/data/misc/tzdata/default.nix +++ b/pkgs/data/misc/tzdata/default.nix @@ -42,10 +42,10 @@ stdenv.mkDerivation rec { installFlags = [ "ZIC=./zic-native" ]; - # NOTE: in cross-compilation scenarios, this is built for the build platform. preInstall = '' mv zic.o zic.o.orig mv zic zic.orig + # NOTE: in cross-compilation scenarios, this is built for the build platform. make $makeFlags cc=cc AR=ar zic mv zic zic-native mv zic.o.orig zic.o From 45bdf88043a818f47ba8e256995c31e3b2f52524 Mon Sep 17 00:00:00 2001 From: WORLDofPEACE <worldofpeace@protonmail.ch> Date: Sun, 21 Feb 2021 07:43:13 -0500 Subject: [PATCH 045/188] gtk: use one clean-immodules-cache setup-hook Use one hook with substituteAll instead of duplicating the hook for every version. --- pkgs/development/libraries/gtk/2.x.nix | 14 ++++++++++++-- pkgs/development/libraries/gtk/3.x.nix | 16 ++++++++++++++-- pkgs/development/libraries/gtk/4.x.nix | 13 ++++++++++++- .../libraries/gtk/hooks/clean-immodules-cache.sh | 15 +++++++++++++++ .../gtk/hooks/gtk2-clean-immodules-cache.sh | 12 ------------ .../gtk/hooks/gtk3-clean-immodules-cache.sh | 11 ----------- .../gtk/hooks/gtk4-clean-immodules-cache.sh | 11 ----------- 7 files changed, 53 insertions(+), 39 deletions(-) create mode 100644 pkgs/development/libraries/gtk/hooks/clean-immodules-cache.sh delete mode 100644 pkgs/development/libraries/gtk/hooks/gtk2-clean-immodules-cache.sh delete mode 100644 pkgs/development/libraries/gtk/hooks/gtk3-clean-immodules-cache.sh delete mode 100644 pkgs/development/libraries/gtk/hooks/gtk4-clean-immodules-cache.sh diff --git a/pkgs/development/libraries/gtk/2.x.nix b/pkgs/development/libraries/gtk/2.x.nix index 4304cb388d1a..8f50c922f514 100644 --- a/pkgs/development/libraries/gtk/2.x.nix +++ b/pkgs/development/libraries/gtk/2.x.nix @@ -1,4 +1,4 @@ -{ config, lib, stdenv, fetchurl, pkg-config, gettext, glib, atk, pango, cairo, perl, xorg +{ config, lib, substituteAll, stdenv, fetchurl, pkg-config, gettext, glib, atk, pango, cairo, perl, xorg , gdk-pixbuf, xlibsWrapper, gobject-introspection , xineramaSupport ? stdenv.isLinux , cupsSupport ? config.gtk2.cups or stdenv.isLinux, cups ? null @@ -12,6 +12,16 @@ assert cupsSupport -> cups != null; with lib; +let + + gtkCleanImmodulesCache = substituteAll { + src = ./hooks/clean-immodules-cache.sh; + gtk_module_path = "gtk-2.0"; + gtk_binary_version = "2.10.0"; + }; + +in + stdenv.mkDerivation rec { pname = "gtk+"; version = "2.24.32"; @@ -27,8 +37,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; setupHooks = [ - ./hooks/gtk2-clean-immodules-cache.sh ./hooks/drop-icon-theme-cache.sh + gtkCleanImmodulesCache ]; nativeBuildInputs = setupHooks ++ [ perl pkg-config gettext gobject-introspection ]; diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index 159b03a26e1f..f9d739a43ea7 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -1,4 +1,6 @@ -{ lib, stdenv +{ lib +, stdenv +, substituteAll , fetchurl , fetchpatch , pkg-config @@ -48,6 +50,16 @@ assert cupsSupport -> cups != null; +let + + gtkCleanImmodulesCache = substituteAll { + src = ./hooks/clean-immodules-cache.sh; + gtk_module_path = "gtk-3.0"; + gtk_binary_version = "3.0.0"; + }; + +in + stdenv.mkDerivation rec { pname = "gtk+3"; version = "3.24.24"; @@ -56,8 +68,8 @@ stdenv.mkDerivation rec { outputBin = "dev"; setupHooks = [ - ./hooks/gtk3-clean-immodules-cache.sh ./hooks/drop-icon-theme-cache.sh + gtkCleanImmodulesCache ]; src = fetchurl { diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix index b05e9ea03933..28247d6c9728 100644 --- a/pkgs/development/libraries/gtk/4.x.nix +++ b/pkgs/development/libraries/gtk/4.x.nix @@ -1,5 +1,6 @@ { lib , stdenv +, substituteAll , fetchurl , pkg-config , gettext @@ -53,6 +54,16 @@ assert cupsSupport -> cups != null; +let + + gtkCleanImmodulesCache = substituteAll { + src = ./hooks/clean-immodules-cache.sh; + gtk_module_path = "gtk-4.0"; + gtk_binary_version = "4.0.0"; + }; + +in + stdenv.mkDerivation rec { pname = "gtk4"; version = "4.0.3"; @@ -61,8 +72,8 @@ stdenv.mkDerivation rec { outputBin = "dev"; setupHooks = [ - ./hooks/gtk4-clean-immodules-cache.sh ./hooks/drop-icon-theme-cache.sh + gtkCleanImmodulesCache ]; src = fetchurl { diff --git a/pkgs/development/libraries/gtk/hooks/clean-immodules-cache.sh b/pkgs/development/libraries/gtk/hooks/clean-immodules-cache.sh new file mode 100644 index 000000000000..0868a4a39101 --- /dev/null +++ b/pkgs/development/libraries/gtk/hooks/clean-immodules-cache.sh @@ -0,0 +1,15 @@ +# shellcheck shell=bash + +fixupOutputHooks+=(_gtkCleanImmodulesCache) + +# Clean comments that link to generator of the file +_gtkCleanImmodulesCache() { + # gtk_module_path is where the modules are installed + # https://gitlab.gnome.org/GNOME/gtk/-/blob/3.24.24/gtk/gtkmodules.c#L68 + # gtk_binary_version can be retrived with: + # pkg-config --variable=gtk_binary_version gtk+-3.0 + local f="${prefix:?}/lib/@gtk_module_path@/@gtk_binary_version@/immodules.cache" + if [ -f "$f" ]; then + sed 's|Created by .*bin/gtk-query-|Created by bin/gtk-query-|' -i "$f" + fi +} diff --git a/pkgs/development/libraries/gtk/hooks/gtk2-clean-immodules-cache.sh b/pkgs/development/libraries/gtk/hooks/gtk2-clean-immodules-cache.sh deleted file mode 100644 index dde991fd27cd..000000000000 --- a/pkgs/development/libraries/gtk/hooks/gtk2-clean-immodules-cache.sh +++ /dev/null @@ -1,12 +0,0 @@ -# shellcheck shell=bash - -fixupOutputHooks+=(_gtk2CleanComments) - -# Clean comments that link to generator of the file -_gtk2CleanComments() { - local f="${prefix:?}/lib/gtk-2.0/2.10.0/immodules.cache" - if [ -f "$f" ]; then - sed 's|Created by .*bin/gtk-query-|Created by bin/gtk-query-|' -i "$f" - fi -} - diff --git a/pkgs/development/libraries/gtk/hooks/gtk3-clean-immodules-cache.sh b/pkgs/development/libraries/gtk/hooks/gtk3-clean-immodules-cache.sh deleted file mode 100644 index d2d5287831a0..000000000000 --- a/pkgs/development/libraries/gtk/hooks/gtk3-clean-immodules-cache.sh +++ /dev/null @@ -1,11 +0,0 @@ -# shellcheck shell=bash - -fixupOutputHooks+=(_gtk3CleanComments) - -# Clean comments that link to generator of the file -_gtk3CleanComments() { - local f="${prefix:?}/lib/gtk-3.0/3.0.0/immodules.cache" - if [ -f "$f" ]; then - sed 's|Created by .*bin/gtk-query-|Created by bin/gtk-query-|' -i "$f" - fi -} diff --git a/pkgs/development/libraries/gtk/hooks/gtk4-clean-immodules-cache.sh b/pkgs/development/libraries/gtk/hooks/gtk4-clean-immodules-cache.sh deleted file mode 100644 index 49f7051aabb6..000000000000 --- a/pkgs/development/libraries/gtk/hooks/gtk4-clean-immodules-cache.sh +++ /dev/null @@ -1,11 +0,0 @@ -# shellcheck shell=bash - -fixupOutputHooks+=(_gtk4CleanComments) - -# Clean comments that link to generator of the file -_gtk4CleanComments() { - local f="${prefix:?}/lib/gtk-4.0/4.0.0/immodules.cache" - if [ -f "$f" ]; then - sed 's|Created by .*bin/gtk-query-|Created by bin/gtk-query-|' -i "$f" - fi -} From 65b08e41492bed0dbf691a52eab46cbda6bc15fd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" <ryantm-bot@ryantm.com> Date: Sun, 21 Feb 2021 15:30:49 +0000 Subject: [PATCH 046/188] geos: 3.9.0 -> 3.9.1 --- pkgs/development/libraries/geos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix index f96707b549f7..91c179b28e9f 100644 --- a/pkgs/development/libraries/geos/default.nix +++ b/pkgs/development/libraries/geos/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, python }: stdenv.mkDerivation rec { - name = "geos-3.9.0"; + name = "geos-3.9.1"; src = fetchurl { url = "https://download.osgeo.org/geos/${name}.tar.bz2"; - sha256 = "sha256-vYCCzxL0XydjAZPHi9taPLqEe4HnKyAmg1bCpPwGUmk="; + sha256 = "sha256-fmMFB9ysncB1ZdJJom8GoVyfWwxS3SkSmg49OB1+OCo="; }; enableParallelBuilding = true; From 10fafe98ffed5a39c682265979bbc80273f961d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io> Date: Sun, 21 Feb 2021 20:22:12 +0100 Subject: [PATCH 047/188] bzip2: add homepage + changelog --- pkgs/tools/compression/bzip2/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix index 245441c760bf..da37cf9fbd8c 100644 --- a/pkgs/tools/compression/bzip2/default.nix +++ b/pkgs/tools/compression/bzip2/default.nix @@ -46,6 +46,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "High-quality data compression program"; + homepage = "https://www.sourceware.org/bzip2"; + changelog = "https://sourceware.org/git/?p=bzip2.git;a=blob;f=CHANGES;hb=HEAD"; license = licenses.bsdOriginal; platforms = platforms.all; maintainers = with maintainers; [ mic92 ]; From 5269ed23f2f5b9f9f4618f962a7b3d2efacb4d8e Mon Sep 17 00:00:00 2001 From: Ivan Babrou <github@ivan.computer> Date: Sun, 21 Feb 2021 19:29:45 -0800 Subject: [PATCH 048/188] cmake: remove obsolete substituteInPlace (#113843) This `substituteInPlace` was introduced in 2016 when cmake was at v3.4: * https://github.com/NixOS/nixpkgs/commit/5286c0aebb In 2018 cmake v3.12.0 changed the code to make it not match anything: * https://github.com/Kitware/CMake/commit/50b5e9ed13 ``` substituteStream(): WARNING: pattern '${PYTHON_EXECUTABLE}' doesn't match anything in file 'Modules/FindCxxTest.cmake' ``` Having it around in 2021 with cmake v3.19.3 doesn't help, and tests are disabled anyway. --- pkgs/development/tools/build-managers/cmake/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 7c2e5372e731..c899647f6aae 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -64,8 +64,6 @@ stdenv.mkDerivation (rec { --subst-var-by libc_bin ${lib.getBin stdenv.cc.libc} \ --subst-var-by libc_dev ${lib.getDev stdenv.cc.libc} \ --subst-var-by libc_lib ${lib.getLib stdenv.cc.libc} - substituteInPlace Modules/FindCxxTest.cmake \ - --replace "$""{PYTHON_EXECUTABLE}" ${stdenv.shell} '' # CC_FOR_BUILD and CXX_FOR_BUILD are used to bootstrap cmake + '' From 9db5a83465a173fef7204302ac08533b411d6359 Mon Sep 17 00:00:00 2001 From: Mario Rodas <marsam@users.noreply.github.com> Date: Mon, 22 Feb 2021 04:20:00 +0000 Subject: [PATCH 049/188] ruby_2_5: remove patchset ruby_2_5 was removed from nixpkgs in 1c33c0ad6b1b9a335c9a2c6747849309fb817eca --- pkgs/development/interpreters/ruby/patchsets.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index 246d44e20d16..3abba61bc246 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -1,11 +1,6 @@ { patchSet, useRailsExpress, ops, patchLevel, fetchpatch }: { - "2.5.8" = ops useRailsExpress [ - "${patchSet}/patches/ruby/2.5/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch" - "${patchSet}/patches/ruby/2.5/head/railsexpress/02-improve-gc-stats.patch" - "${patchSet}/patches/ruby/2.5/head/railsexpress/03-more-detailed-stacktrace.patch" - ]; "2.6.6" = ops useRailsExpress [ "${patchSet}/patches/ruby/2.6/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch" "${patchSet}/patches/ruby/2.6/head/railsexpress/02-improve-gc-stats.patch" From 7121ef61da4ddd36f81480322bc2ae984c575b1d Mon Sep 17 00:00:00 2001 From: Mario Rodas <marsam@users.noreply.github.com> Date: Mon, 22 Feb 2021 04:20:00 +0000 Subject: [PATCH 050/188] buildRubyGem: update CFLAGS for ruby 3.0 on Clang --- pkgs/development/ruby-modules/gem/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/ruby-modules/gem/default.nix b/pkgs/development/ruby-modules/gem/default.nix index 9e64b120af85..02af8eaa9672 100644 --- a/pkgs/development/ruby-modules/gem/default.nix +++ b/pkgs/development/ruby-modules/gem/default.nix @@ -129,6 +129,12 @@ stdenv.mkDerivation ((builtins.removeAttrs attrs ["source"]) // { runHook postUnpack ''; + # As of ruby 3.0, ruby headers require -fdeclspec when building with clang + # Introduced in https://github.com/ruby/ruby/commit/0958e19ffb047781fe1506760c7cbd8d7fe74e57 + NIX_CFLAGS_COMPILE = lib.optionals (stdenv.cc.isClang && lib.versionAtLeast ruby.version.major "3") [ + "-fdeclspec" + ]; + buildPhase = attrs.buildPhase or '' runHook preBuild From 014132877366133be201706d7e44a72f8bdc5737 Mon Sep 17 00:00:00 2001 From: Mario Rodas <marsam@users.noreply.github.com> Date: Tue, 23 Feb 2021 04:20:00 +0000 Subject: [PATCH 051/188] protobuf: 3.15.1 -> 3.15.2 https://github.com/protocolbuffers/protobuf/releases/tag/v3.15.2 --- pkgs/development/libraries/protobuf/3.15.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/protobuf/3.15.nix b/pkgs/development/libraries/protobuf/3.15.nix index 6bb4edd2e461..d23adeb1db93 100644 --- a/pkgs/development/libraries/protobuf/3.15.nix +++ b/pkgs/development/libraries/protobuf/3.15.nix @@ -1,6 +1,6 @@ { callPackage, ... }: callPackage ./generic-v3.nix { - version = "3.15.1"; - sha256 = "0rxl0vkv532x85q9cf11njw12vmp9kxqb1i8hdg4lfmi55waa9wr"; + version = "3.15.2"; + sha256 = "12da2h5ds8yjyssqansvhd2vy72kw6b60j9l6va21ghs8xzyihqi"; } From 8b099bd61ceace5f770560dd1ac3cc16504faca0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" <ryantm-bot@ryantm.com> Date: Tue, 23 Feb 2021 06:01:44 +0000 Subject: [PATCH 052/188] libgphoto2: 2.5.26 -> 2.5.27 --- pkgs/development/libraries/libgphoto2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix index 4dec3151a7cd..3e3fa1a725bf 100644 --- a/pkgs/development/libraries/libgphoto2/default.nix +++ b/pkgs/development/libraries/libgphoto2/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "libgphoto2"; - version = "2.5.26"; + version = "2.5.27"; src = fetchFromGitHub { owner = "gphoto"; repo = "libgphoto2"; rev = "libgphoto2-${builtins.replaceStrings [ "." ] [ "_" ] version}-release"; - sha256 = "0lnlxflj04ng9a0hm2nb2067kqs4kp9kx1z4gg395cgbfd7lx6j6"; + sha256 = "sha256-c7fBl6GBLAU+RL5WFC4PL+n/nEHZUfqIJ9qq1+qNNCg="; }; patches = []; From 38a1dd323ed9687766ccca49f5197f0765637609 Mon Sep 17 00:00:00 2001 From: Mario Rodas <marsam@users.noreply.github.com> Date: Mon, 22 Feb 2021 04:20:00 +0000 Subject: [PATCH 053/188] protobuf3_15: init at 3.15.1 https://github.com/protocolbuffers/protobuf/releases/tag/v3.15.0 https://github.com/protocolbuffers/protobuf/releases/tag/v3.15.1 --- pkgs/development/libraries/protobuf/3.15.nix | 6 ++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 7 insertions(+) create mode 100644 pkgs/development/libraries/protobuf/3.15.nix diff --git a/pkgs/development/libraries/protobuf/3.15.nix b/pkgs/development/libraries/protobuf/3.15.nix new file mode 100644 index 000000000000..6bb4edd2e461 --- /dev/null +++ b/pkgs/development/libraries/protobuf/3.15.nix @@ -0,0 +1,6 @@ +{ callPackage, ... }: + +callPackage ./generic-v3.nix { + version = "3.15.1"; + sha256 = "0rxl0vkv532x85q9cf11njw12vmp9kxqb1i8hdg4lfmi55waa9wr"; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6dd2f6c42ac5..f0987727c9d5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16362,6 +16362,7 @@ in protobuf = protobuf3_14; + protobuf3_15 = callPackage ../development/libraries/protobuf/3.15.nix { }; protobuf3_14 = callPackage ../development/libraries/protobuf/3.14.nix { }; protobuf3_13 = callPackage ../development/libraries/protobuf/3.13.nix { }; protobuf3_12 = callPackage ../development/libraries/protobuf/3.12.nix { }; From 1e0845f86100f1f64ae60f2ffff77047dc02b5ba Mon Sep 17 00:00:00 2001 From: Mario Rodas <marsam@users.noreply.github.com> Date: Mon, 22 Feb 2021 04:20:00 +0000 Subject: [PATCH 054/188] protobuf: 3.14.0 -> 3.15.1 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f0987727c9d5..3b1c53b2950c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16360,7 +16360,7 @@ in python = python37; }; - protobuf = protobuf3_14; + protobuf = protobuf3_15; protobuf3_15 = callPackage ../development/libraries/protobuf/3.15.nix { }; protobuf3_14 = callPackage ../development/libraries/protobuf/3.14.nix { }; From 25d851f93b469c5b1ac597c9348a758105553f70 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" <ryantm-bot@ryantm.com> Date: Tue, 23 Feb 2021 14:33:58 +0000 Subject: [PATCH 055/188] bluez: 5.55 -> 5.56 --- pkgs/os-specific/linux/bluez/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index 29dceecad6ed..6cb23de50a99 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -19,11 +19,11 @@ ]; in stdenv.mkDerivation rec { pname = "bluez"; - version = "5.55"; + version = "5.56"; src = fetchurl { url = "mirror://kernel/linux/bluetooth/${pname}-${version}.tar.xz"; - sha256 = "124v9s4y1s7s6klx5vlmzpk1jlr4x84ch7r7scm7x2f42dqp2qw8"; + sha256 = "sha256-WcTbqfyKripqX48S8ZvBsMLcJzVcfKMSPu0/5r19C50="; }; buildInputs = [ From 99d7debd02aab61a2950b0ad669d983252b5e81a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" <ryantm-bot@ryantm.com> Date: Tue, 23 Feb 2021 23:58:23 +0000 Subject: [PATCH 056/188] hwloc: 2.4.0 -> 2.4.1 --- pkgs/development/libraries/hwloc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix index 6a939835cf56..a6fb316d659f 100644 --- a/pkgs/development/libraries/hwloc/default.nix +++ b/pkgs/development/libraries/hwloc/default.nix @@ -7,7 +7,7 @@ assert x11Support -> libX11 != null && cairo != null; with lib; let - version = "2.4.0"; + version = "2.4.1"; versmm = versions.major version + "." + versions.minor version; name = "hwloc-${version}"; @@ -16,7 +16,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.open-mpi.org/software/hwloc/v${versmm}/downloads/${name}.tar.bz2"; - sha256 = "1s9q70mrr4igbjw4m26din81i68f4wbfpv6wdc4i2aalvd51n7rb"; + sha256 = "sha256-OSQh5p8mEgyKuV0VH+mJ8rS2nas8dzV0HE4KbX3l3mM="; }; configureFlags = [ From 884a83cacb6907063e827ad589a68bb622c84394 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io> Date: Wed, 24 Feb 2021 10:31:18 +0000 Subject: [PATCH 057/188] glib: fix cross-compiling --- pkgs/development/libraries/glib/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 0e8ed605a2d6..abf880c19944 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -92,6 +92,7 @@ stdenv.mkDerivation rec { buildInputs = [ libelf setupHook pcre bash gnum4 # install glib-gettextize and m4 macros for other apps to use + gtk-doc ] ++ optionals stdenv.isLinux [ libselinux util-linuxMinimal # for libmount @@ -99,8 +100,10 @@ stdenv.mkDerivation rec { AppKit Carbon Cocoa CoreFoundation CoreServices Foundation ]); + strictDeps = true; + nativeBuildInputs = [ - meson ninja pkg-config perl python3 gettext gtk-doc docbook_xsl docbook_xml_dtd_45 + meson ninja pkg-config perl python3 gettext gtk-doc docbook_xsl docbook_xml_dtd_45 libxml2 ]; propagatedBuildInputs = [ zlib libffi gettext libiconv ]; @@ -144,7 +147,7 @@ stdenv.mkDerivation rec { cp -r ${buildPackages.glib.devdoc} $devdoc ''; - checkInputs = [ tzdata libxml2 desktop-file-utils shared-mime-info ]; + checkInputs = [ tzdata desktop-file-utils shared-mime-info ]; preCheck = optionalString doCheck '' export LD_LIBRARY_PATH="$NIX_BUILD_TOP/${pname}-${version}/glib/.libs''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" From 74e0aaaa30c1751450cddf055a5eb4ca64d7e33b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io> Date: Wed, 24 Feb 2021 10:49:35 +0000 Subject: [PATCH 058/188] glib: fix musl build --- pkgs/development/libraries/glib/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index abf880c19944..b18ce099dced 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -123,6 +123,8 @@ stdenv.mkDerivation rec { "-DG_DISABLE_CAST_CHECKS" ]; + hardeningDisable = [ "pie" ]; + postPatch = '' chmod +x gio/tests/gengiotypefuncs.py patchShebangs gio/tests/gengiotypefuncs.py From ea63f9a4dad8d4fe43049d43ec672dfd8560a20c Mon Sep 17 00:00:00 2001 From: ajs124 <git@ajs124.de> Date: Tue, 23 Feb 2021 17:25:14 +0100 Subject: [PATCH 059/188] nss: 3.60 -> 3.61 --- pkgs/development/libraries/nss/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 7b02e3497f0a..10f3c785c422 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -18,7 +18,7 @@ let # It will rebuild itself using the version of this package (NSS) and if # an update is required do the required changes to the expression. # Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert - version = "3.60"; + version = "3.61"; underscoreVersion = builtins.replaceStrings ["."] ["_"] version; in stdenv.mkDerivation rec { @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz"; - sha256 = "0ggyj3ax3kal65sl1vl4nfhx2s08blg4dg8iwlxcax5qb9bxbaw4"; + sha256 = "0w0k1v6pn2mv1vim7pv0xn63z1dcss6cymqbqzzg1k1l9f02sbii"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; From d9ff1b4a4dd9a62b543d85e6e36789167a41c614 Mon Sep 17 00:00:00 2001 From: Martin Weinelt <hexa@darmstadt.ccc.de> Date: Tue, 23 Feb 2021 18:14:32 +0100 Subject: [PATCH 060/188] rust-cbindgen: 0.15.0 -> 0.17.0 https://github.com/eqrion/cbindgen/releases/tag/v0.16.0 https://github.com/eqrion/cbindgen/releases/tag/v0.17.0 --- .../development/tools/rust/cbindgen/default.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix index 508090553375..da552600cdc2 100644 --- a/pkgs/development/tools/rust/cbindgen/default.nix +++ b/pkgs/development/tools/rust/cbindgen/default.nix @@ -1,23 +1,32 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, python3Packages, Security }: rustPlatform.buildRustPackage rec { pname = "rust-cbindgen"; - version = "0.15.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "eqrion"; repo = "cbindgen"; rev = "v${version}"; - sha256 = "19bwllrajks286wl4zc5axgh4m9qqxdnc5024c30hyk0xnjffd0c"; + sha256 = "1w9gf6fl1ncm2zlh0p29lislfsd35zd1mhns2mrxl2n734zavaqf"; }; - cargoSha256 = "1lzzckzcgj496chbfd6lhwxcangv0krx8m5k2jwffnb9mfgac7hx"; + cargoSha256 = "12jw1m842gzy0ma4drgmwk1jac663vysllfpl9cglr039j1sfsx2"; buildInputs = lib.optional stdenv.isDarwin Security; + checkInputs = [ + python3Packages.cython + ]; + checkFlags = [ + # Disable tests that require rust unstable features # https://github.com/eqrion/cbindgen/issues/338 "--skip test_expand" + "--skip test_bitfield" + "--skip lib_default_uses_debug_build" + "--skip lib_explicit_debug_build" + "--skip lib_explicit_release_build" ]; meta = with lib; { From 841fcbdb17b00364f8605e35e022359849f8764a Mon Sep 17 00:00:00 2001 From: Martin Weinelt <hexa@darmstadt.ccc.de> Date: Tue, 23 Feb 2021 18:18:23 +0100 Subject: [PATCH 061/188] firefox-esr: 78.7.1esr -> 78.8.0esr --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index bbc3f7308f91..86d91d21e3c9 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -32,10 +32,10 @@ rec { firefox-esr-78 = common rec { pname = "firefox-esr"; - ffversion = "78.7.1esr"; + ffversion = "78.8.0esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "138dcfpdkp78yqgygac212vg5fm5ich2a82p7258ch8hk6bpvpdxbws4sdqwljs92x831dblcsshwkl06vh48899489gx87mdkqd0nm"; + sha512 = "0160aa6c408c2af66d24b74cf98e1a07ab1604e7b93ffcde79201f9d68e41e896ef965f1904de52d5dd82ffedae33ac96e93b871727bf5dd5983c5af2f1f439f"; }; meta = { From 059e818b2f11e81edf4168052d978f93a00a935e Mon Sep 17 00:00:00 2001 From: Martin Weinelt <hexa@darmstadt.ccc.de> Date: Tue, 23 Feb 2021 18:18:47 +0100 Subject: [PATCH 062/188] firefox: 85.0.2 -> 86.0 --- .../networking/browsers/firefox/common.nix | 3 ++- ...atch => env_var_for_system_dir-ff85.patch} | 0 .../firefox/env_var_for_system_dir-ff86.patch | 21 +++++++++++++++++++ .../networking/browsers/firefox/packages.nix | 4 ++-- 4 files changed, 25 insertions(+), 3 deletions(-) rename pkgs/applications/networking/browsers/firefox/{env_var_for_system_dir.patch => env_var_for_system_dir-ff85.patch} (100%) create mode 100644 pkgs/applications/networking/browsers/firefox/env_var_for_system_dir-ff86.patch diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index fb340ee1acee..732f9fa08720 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -120,8 +120,9 @@ buildStdenv.mkDerivation ({ inherit src unpackPhase meta; patches = [ - ./env_var_for_system_dir.patch ] ++ + lib.optional (lib.versionOlder ffversion "86") ./env_var_for_system_dir-ff85.patch ++ + lib.optional (lib.versionAtLeast ffversion "86") ./env_var_for_system_dir-ff86.patch ++ lib.optional (lib.versionOlder ffversion "83") ./no-buildconfig-ffx76.patch ++ lib.optional (lib.versionAtLeast ffversion "84") ./no-buildconfig-ffx84.patch ++ lib.optional (ltoSupport && lib.versionOlder ffversion "84") ./lto-dependentlibs-generation-ffx83.patch ++ diff --git a/pkgs/applications/networking/browsers/firefox/env_var_for_system_dir.patch b/pkgs/applications/networking/browsers/firefox/env_var_for_system_dir-ff85.patch similarity index 100% rename from pkgs/applications/networking/browsers/firefox/env_var_for_system_dir.patch rename to pkgs/applications/networking/browsers/firefox/env_var_for_system_dir-ff85.patch diff --git a/pkgs/applications/networking/browsers/firefox/env_var_for_system_dir-ff86.patch b/pkgs/applications/networking/browsers/firefox/env_var_for_system_dir-ff86.patch new file mode 100644 index 000000000000..f7a9cb773455 --- /dev/null +++ b/pkgs/applications/networking/browsers/firefox/env_var_for_system_dir-ff86.patch @@ -0,0 +1,21 @@ +diff -r 22fc47c968f2 toolkit/xre/nsXREDirProvider.cpp +--- a/toolkit/xre/nsXREDirProvider.cpp Mon Dec 14 15:09:17 2020 +0000 ++++ b/toolkit/xre/nsXREDirProvider.cpp Tue Feb 23 23:38:56 2021 +0100 +@@ -11,6 +11,7 @@ + + #include "jsapi.h" + #include "xpcpublic.h" ++#include "prenv.h" + + #include "nsIAppStartup.h" + #include "nsIFile.h" +@@ -305,7 +306,8 @@ + "/usr/lib/mozilla"_ns + # endif + ; +- rv = NS_NewNativeLocalFile(dirname, false, getter_AddRefs(localDir)); ++ const char* pathVar = PR_GetEnv("MOZ_SYSTEM_DIR"); ++ rv = NS_NewNativeLocalFile((pathVar && *pathVar) ? nsDependentCString(pathVar) : reinterpret_cast<const nsCString&>(dirname), false, getter_AddRefs(localDir)); + # endif + + if (NS_SUCCEEDED(rv)) { diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 86d91d21e3c9..1bcaecdfbb89 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -7,10 +7,10 @@ in rec { firefox = common rec { pname = "firefox"; - ffversion = "85.0.2"; + ffversion = "86.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "2m46li5ni1m4xv42h99rn2hhhv2mqy229wihmzxmgvws1rh2h11yf6x2a07akkjrsp2dmwxmmkhmf9dhakgj9i55z5qqi99azyx07df"; + sha512 = "f5a7b9aa53e2955e972e30cc62ae64ae955127eab951d7a1102d5ac8a73804982e01b917787c00a6e0a0ed03594567d29a24808271283ef61a9383bc4bb39e3f"; }; meta = { From b0c1c1b8d9d608b35403331b82c86463bc54ce3f Mon Sep 17 00:00:00 2001 From: Michael Weiss <dev.primeos@gmail.com> Date: Wed, 24 Feb 2021 16:55:55 +0100 Subject: [PATCH 063/188] iproute2: 5.10.0 -> 5.11.0 (#114144) "Most of the changes in this release are updates for new functionality for Data Center Bridging (dcb) utility. Also several updates for bridge, and devlink." [0] [0]: https://lore.kernel.org/netdev/20210223195857.3de03c2a@hermes.local/ --- pkgs/os-specific/linux/iproute/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index afd495dd6d1d..affc18e8f37d 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "iproute2"; - version = "5.10.0"; + version = "5.11.0"; src = fetchurl { url = "mirror://kernel/linux/utils/net/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1sakmhvh40gh4x55vzgy6cyvizqkhqalcfpvs6r0c14w62p38jm5"; + sha256 = "0m2wa14rhmdb6k07minmw5lk97vz4vn56ndka5849cqjh88fmqn5"; }; preConfigure = '' From 5dcd93de335f51542d672a989a8375f0aca8f586 Mon Sep 17 00:00:00 2001 From: Michael Weiss <dev.primeos@gmail.com> Date: Wed, 24 Feb 2021 16:56:37 +0100 Subject: [PATCH 064/188] dav1d: 0.8.1 -> 0.8.2 (#114141) --- pkgs/development/libraries/dav1d/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/dav1d/default.nix b/pkgs/development/libraries/dav1d/default.nix index 2b9357e3ef0f..51df5a9254a5 100644 --- a/pkgs/development/libraries/dav1d/default.nix +++ b/pkgs/development/libraries/dav1d/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchFromGitLab , meson, ninja, nasm, pkg-config +, xxHash , withTools ? false # "dav1d" binary , withExamples ? false, SDL2 # "dav1dplay" binary , useVulkan ? false, libplacebo, vulkan-loader, vulkan-headers @@ -9,19 +10,20 @@ assert useVulkan -> withExamples; stdenv.mkDerivation rec { pname = "dav1d"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitLab { domain = "code.videolan.org"; owner = "videolan"; repo = pname; rev = version; - sha256 = "1820fpmmq1vxjzjmza6ydk4fgxipb8gmcc5skybki64qn7410v7x"; + sha256 = "0plmnxpz66yv3nqv1kgbyyfnwfqi9dqs0zbsdj488i6464a1m6si"; }; nativeBuildInputs = [ meson ninja nasm pkg-config ]; # TODO: doxygen (currently only HTML and not build by default). - buildInputs = lib.optional withExamples SDL2 + buildInputs = [ xxHash ] + ++ lib.optional withExamples SDL2 ++ lib.optionals useVulkan [ libplacebo vulkan-loader vulkan-headers ]; mesonFlags= [ From ce9b57bc3949333318bfa207074c9f3e9f4905cf Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com> Date: Wed, 24 Feb 2021 10:23:35 -0500 Subject: [PATCH 065/188] pythonPackages.psutils: use pytestCheckHook --- .../python-modules/psutil/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix index 6760ff168e56..0871ca6a2087 100644 --- a/pkgs/development/python-modules/psutil/default.nix +++ b/pkgs/development/python-modules/psutil/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, buildPythonPackage, fetchPypi, isPy27, python , darwin -, pytest +, pytestCheckHook , mock , ipaddress , unittest2 @@ -18,15 +18,19 @@ buildPythonPackage rec { # arch doesn't report frequency is the same way # tests segfaults on darwin https://github.com/giampaolo/psutil/issues/1715 doCheck = !stdenv.isDarwin && stdenv.isx86_64; - checkInputs = [ pytest ] + checkInputs = [ pytestCheckHook ] ++ lib.optionals isPy27 [ mock ipaddress unittest2 ]; - # out must be referenced as test import paths are relative + pytestFlagsArray = [ + "$out/${python.sitePackages}/psutil/tests/test_system.py" + ]; # disable tests which don't work in sandbox # cpu_times is flakey on darwin - checkPhase = '' - pytest $out/${python.sitePackages}/psutil/tests/test_system.py \ - -k 'not user and not disk_io_counters and not sensors_battery and not cpu_times' - ''; + disabledTests = [ + "user" + "disk_io_counters" + "sensors_battery" + "cpu_times" + ]; buildInputs = lib.optionals stdenv.isDarwin [ darwin.IOKit ]; From 4f702f7e3063c655eb3daff7aeef6d10b09fae74 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com> Date: Wed, 24 Feb 2021 10:29:39 -0500 Subject: [PATCH 066/188] pythonPackages.psutil: disable impure cpu_freq test Tries to reach into /sys/devices/system/cpu, which may fail on non-NixOS. --- pkgs/development/python-modules/psutil/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix index 0871ca6a2087..a53005c7426a 100644 --- a/pkgs/development/python-modules/psutil/default.nix +++ b/pkgs/development/python-modules/psutil/default.nix @@ -30,6 +30,7 @@ buildPythonPackage rec { "disk_io_counters" "sensors_battery" "cpu_times" + "cpu_freq" ]; buildInputs = lib.optionals stdenv.isDarwin [ darwin.IOKit ]; From ea301fc230324b62035e4b9a8f174d0f0960ee51 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" <ryantm-bot@ryantm.com> Date: Mon, 22 Feb 2021 10:26:57 +0000 Subject: [PATCH 067/188] poppler: 21.01.0 -> 21.02.0 --- pkgs/development/libraries/poppler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index f3fae283e87c..fd2a8ab92cfa 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { name = "poppler-${suffix}-${version}"; - version = "21.01.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too! + version = "21.02.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too! src = fetchurl { url = "${meta.homepage}/poppler-${version}.tar.xz"; - sha256 = "sha256-AW3eNOX4aOqYoyypm2QzJaloIoFQCUK3ET9OyI0g4vM="; + sha256 = "sha256-XBR1nJmJHm5HKs7W1fD/Haz4XYDNkCbTZcVcZT7feSw="; }; outputs = [ "out" "dev" ]; From b4976c28fa8527965015a1e6580c874fa32ea918 Mon Sep 17 00:00:00 2001 From: Ivan Babrou <github@ivan.computer> Date: Wed, 24 Feb 2021 09:02:59 -0800 Subject: [PATCH 068/188] python3Packages.parso: fix flaky test due to slow moving time --- pkgs/development/python-modules/parso/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/python-modules/parso/default.nix b/pkgs/development/python-modules/parso/default.nix index f9a87fa5f65f..ad0bd3dc10c1 100644 --- a/pkgs/development/python-modules/parso/default.nix +++ b/pkgs/development/python-modules/parso/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , pythonOlder , pytestCheckHook }: @@ -15,6 +16,15 @@ buildPythonPackage rec { sha256 = "2b6db14759c528d857eeb9eac559c2166b2554548af39f5198bdfb976f72aa64"; }; + patches = [ + # Fix the flaky test due to slow moving time on Apple Silicon chips. + # Remove when https://github.com/davidhalter/parso/pull/177 is in the next release. + (fetchpatch { + url = "https://github.com/davidhalter/parso/pull/177/commits/2799a7a3c2cf87fdc2d0c19a0890acea425091ce.patch"; + sha256 = "sha256-A5EQly1wR/7lo+L8Pp0UPSUIhC0WcblXEWQNvRMlZYA="; + }) + ]; + checkInputs = [ pytestCheckHook ]; meta = with lib; { From 62e729bf88b89f6484630f95371916a673657e14 Mon Sep 17 00:00:00 2001 From: Ivan Babrou <github@ivan.computer> Date: Wed, 24 Feb 2021 08:58:34 -0800 Subject: [PATCH 069/188] python3Packages.curio: fix flaky test due to slow moving time --- pkgs/development/python-modules/curio/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/python-modules/curio/default.nix b/pkgs/development/python-modules/curio/default.nix index 31875abd1e83..31bab8d8fa2e 100644 --- a/pkgs/development/python-modules/curio/default.nix +++ b/pkgs/development/python-modules/curio/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , isPy3k , pytestCheckHook , sphinx @@ -16,6 +17,15 @@ buildPythonPackage rec { sha256 = "57edce81c837f3c2cf42fbb346dee26e537d1659e6605269fb13bd179e068744"; }; + patches = [ + # Fix the flaky test due to slow moving time on Apple Silicon chips. + # Remove when https://github.com/dabeaz/curio/pull/339 is in the next release. + (fetchpatch { + url = "https://github.com/dabeaz/curio/commit/132376724bbfaa0a52d3d63d0791aa4ac1eb6f5f.patch"; + sha256 = "sha256-AxO0xRcR9l9/NKEJFwyZIoYcyZxpqOhpdNaeaYokVb4="; + }) + ]; + disabled = !isPy3k; checkInputs = [ pytestCheckHook sphinx ]; From 488fa68e1f17f7f7fd1940b57e1bc2ee6edc32fa Mon Sep 17 00:00:00 2001 From: "R. RyanTM" <ryantm-bot@ryantm.com> Date: Thu, 25 Feb 2021 12:19:51 +0000 Subject: [PATCH 070/188] libwacom: 1.8 -> 1.9 --- pkgs/development/libraries/libwacom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/development/libraries/libwacom/default.nix index 88b1f3271456..c17b8be592aa 100644 --- a/pkgs/development/libraries/libwacom/default.nix +++ b/pkgs/development/libraries/libwacom/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "libwacom"; - version = "1.8"; + version = "1.9"; outputs = [ "out" "dev" ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "linuxwacom"; repo = "libwacom"; rev = "libwacom-${version}"; - sha256 = "sha256-vkBkOE4aVX/6xKjslkqlZkh5jdYVEawvvBLpj8PpuiA="; + sha256 = "sha256-o1xCSrWKPzz1GePEVB1jgx2cGzRtw0I6c4wful08Vx4="; }; nativeBuildInputs = [ pkg-config meson ninja doxygen ]; From 60c5cf9cea56ffd607b48fe07ff1174ea6a13afc Mon Sep 17 00:00:00 2001 From: Moritz Angermann <moritz.angermann@gmail.com> Date: Fri, 26 Feb 2021 10:07:27 +0800 Subject: [PATCH 071/188] Update pkgs/build-support/cc-wrapper/cc-wrapper.sh Co-authored-by: Matthew Bauer <mjbauer95@gmail.com> --- pkgs/build-support/cc-wrapper/cc-wrapper.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh index d26b284ed3f8..b3e42c838a5e 100644 --- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh @@ -182,13 +182,10 @@ PATH="$path_backup" # Old bash workaround, see above. if (( "${NIX_CC_USE_RESPONSE_FILE:-@use_response_file_by_default@}" >= 1 )); then - RESPONSE_FILE=$(mktemp) - printf "%q\n" \ + exec @prog@ "@<(printf "%q\n" \ ${extraBefore+"${extraBefore[@]}"} \ ${params+"${params[@]}"} \ - ${extraAfter+"${extraAfter[@]}"} \ - > "${RESPONSE_FILE}" - exec @prog@ "@${RESPONSE_FILE}" + ${extraAfter+"${extraAfter[@]}"})" else exec @prog@ \ ${extraBefore+"${extraBefore[@]}"} \ From 5208d8953df1984041c45da2bbbcde617dbbbdb5 Mon Sep 17 00:00:00 2001 From: Yaroslav Bolyukin <iam@lach.pw> Date: Fri, 22 Jan 2021 22:46:45 +0300 Subject: [PATCH 072/188] plasma5: 5.20.5 -> 5.20.90 Signed-off-by: Yaroslav Bolyukin <iam@lach.pw> --- pkgs/desktops/plasma-5/fetch.sh | 2 +- pkgs/desktops/plasma-5/srcs.nix | 416 +++++++++++++++++--------------- 2 files changed, 221 insertions(+), 197 deletions(-) diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index 43ea2d692818..e6f0d185fc86 100644 --- a/pkgs/desktops/plasma-5/fetch.sh +++ b/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma/5.20.5/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/unstable/plasma/5.20.90/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index cfd7e5733993..6aa0b4a6dfe0 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -4,395 +4,419 @@ { bluedevil = { - version = "5.20.5"; + version = "5.20.90"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.5/bluedevil-5.20.5.tar.xz"; - sha256 = "0bpbvfd6m3ddax484p33a1chvf9mf2mi61cli0vacsan7j84xpmk"; - name = "bluedevil-5.20.5.tar.xz"; + url = "${mirror}/unstable/plasma/5.20.90/bluedevil-5.20.90.tar.xz"; + sha256 = "0fqnwkg666kqai9wb8rprjbpf4fd2rirl9p14249z635y37nxigx"; + name = "bluedevil-5.20.90.tar.xz"; }; }; breeze = { - version = "5.20.5"; + version = "5.20.90"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.5/breeze-5.20.5.tar.xz"; - sha256 = "01zm5hcal6flihd89wn70zi363cmcglfvnc2q6x97lq89silaf6l"; - name = "breeze-5.20.5.tar.xz"; + url = "${mirror}/unstable/plasma/5.20.90/breeze-5.20.90.tar.xz"; + sha256 = "1f14kl70yzpcirgcc9absp15hkkcs1md49hj8zd8cyqfy2va9ppp"; + name = "breeze-5.20.90.tar.xz"; }; }; breeze-grub = { - version = "5.20.5"; + version = "5.20.90"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.5/breeze-grub-5.20.5.tar.xz"; - sha256 = "17g2jac96sj6pfacmyi6vvn74lfi9yhmigprcm2pwqg9z093n1m2"; - name = "breeze-grub-5.20.5.tar.xz"; + url = "${mirror}/unstable/plasma/5.20.90/breeze-grub-5.20.90.tar.xz"; + sha256 = "1sy4245bhsr0gvdj75d1v7gahsmiz6p5jviai77m4c2vshh8s1g8"; + name = "breeze-grub-5.20.90.tar.xz"; }; }; breeze-gtk = { - version = "5.20.5"; + version = "5.20.90"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.5/breeze-gtk-5.20.5.tar.xz"; - sha256 = "1jknfswjcd4abbf249i3gclip4m4v8bp9b5x050zafyjkdcwxd5l"; - name = "breeze-gtk-5.20.5.tar.xz"; + url = "${mirror}/unstable/plasma/5.20.90/breeze-gtk-5.20.90.tar.xz"; + sha256 = "14khgqgp7j14y1l1pxpmp6n39jzzyn5ma76m8xn901hqv9638c63"; + name = "breeze-gtk-5.20.90.tar.xz"; }; }; breeze-plymouth = { - version = "5.20.5"; + version = "5.20.90"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.5/breeze-plymouth-5.20.5.tar.xz"; - sha256 = "0yiqqwms0qrnbxqb8nwmgssrp1f92jwjg8rfzapaq5jxdycl1d9m"; - name = "breeze-plymouth-5.20.5.tar.xz"; + url = "${mirror}/unstable/plasma/5.20.90/breeze-plymouth-5.20.90.tar.xz"; + sha256 = "0r5yvlmwm3dxz140npk93b45rmy4vhhip1sy7xcm89q03v4y1j8r"; + name = "breeze-plymouth-5.20.90.tar.xz"; }; }; discover = { - version = "5.20.5"; + version = "5.20.90"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.5/discover-5.20.5.tar.xz"; - sha256 = "08dmc8rvbfi1zyk9if588h6948xqcqm9jxdp26q84mzq517x9fn5"; - name = "discover-5.20.5.tar.xz"; + url = "${mirror}/unstable/plasma/5.20.90/discover-5.20.90.tar.xz"; + sha256 = "01apxnlkk6hzwx23k334jj6qnpdywp7bymrmh55pf61hn7rj7n25"; + name = "discover-5.20.90.tar.xz"; }; }; drkonqi = { - version = "5.20.5"; + version = "5.20.90"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.5/drkonqi-5.20.5.tar.xz"; - sha256 = "1rl212qmmikbnkyryibpp6gxh4jpklynhgr45ym5gcn3903i3vh9"; - name = "drkonqi-5.20.5.tar.xz"; + url = "${mirror}/unstable/plasma/5.20.90/drkonqi-5.20.90.tar.xz"; + sha256 = "0ksz1z6p3axq70z252gkwa70kvg200hyw6sn18mha2h6g9hw46gw"; + name = "drkonqi-5.20.90.tar.xz"; }; }; kactivitymanagerd = { - version = "5.20.5"; + version = "5.20.90"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.5/kactivitymanagerd-5.20.5.tar.xz"; - sha256 = "1jzss3waq8jjzbs3rrxxk9dmr974pj5ryw4rdj8bpkc451wc4068"; - name = "kactivitymanagerd-5.20.5.tar.xz"; + url = "${mirror}/unstable/plasma/5.20.90/kactivitymanagerd-5.20.90.tar.xz"; + sha256 = "00d7m71z5jgbbmsgyhawsqp8fzsqa062z1dmhvx0jjkdvrgvc04s"; + name = "kactivitymanagerd-5.20.90.tar.xz"; }; }; kde-cli-tools = { - version = "5.20.5"; + version = "5.20.90"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.5/kde-cli-tools-5.20.5.tar.xz"; - sha256 = "0z32fwc9l8c3xfy1l7v0i26ay8icnxqwrnxz6h8qgjlv6p8b4h04"; - name = "kde-cli-tools-5.20.5.tar.xz"; + url = "${mirror}/unstable/plasma/5.20.90/kde-cli-tools-5.20.90.tar.xz"; + sha256 = "1syq034ikyhc3bhqx946jw71j7bngkppg3i9swlr7w19pb68g4nv"; + name = "kde-cli-tools-5.20.90.tar.xz"; }; }; kdecoration = { - version = "5.20.5"; + version = "5.20.90"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.5/kdecoration-5.20.5.tar.xz"; - sha256 = "1kc166f2gqgspsnvxyk8k3k3mmd1ndhgr1dyjzknqdys32dkm5vf"; - name = "kdecoration-5.20.5.tar.xz"; + url = "${mirror}/unstable/plasma/5.20.90/kdecoration-5.20.90.tar.xz"; + sha256 = "144wby86zbz3npbk7m3zf18aap05spxv79wn2vddb6n1d7722ryb"; + name = "kdecoration-5.20.90.tar.xz"; }; }; kde-gtk-config = { - version = "5.20.5"; + version = "5.20.90"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.5/kde-gtk-config-5.20.5.tar.xz"; - sha256 = "1f3fvr201wr7jdh1hg8ff7yis7hnv7653hvx0531hx1x2hfdva1r"; - name = "kde-gtk-config-5.20.5.tar.xz"; + url = "${mirror}/unstable/plasma/5.20.90/kde-gtk-config-5.20.90.tar.xz"; + sha256 = "1qan8d9ird6svp8c8l7x01ssx76ckmyq5wdwvlsp94kbm8590gsj"; + name = "kde-gtk-config-5.20.90.tar.xz"; }; }; kdeplasma-addons = { - version = "5.20.5"; + version = "5.20.90"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.5/kdeplasma-addons-5.20.5.tar.xz"; - sha256 = "1sypmn72fp6l57px3pq9ivzj2r2l3k9vy5006idnfgblzahvpi2n"; - name = "kdeplasma-addons-5.20.5.tar.xz"; + url = "${mirror}/unstable/plasma/5.20.90/kdeplasma-addons-5.20.90.tar.xz"; + sha256 = "0vjw0750fkigvzrdbzl4zdjbyvrb0q5lxzywkhz38qwrs60k3hyi"; + name = "kdeplasma-addons-5.20.90.tar.xz"; }; }; kgamma5 = { - version = "5.20.5"; + version = "5.20.90"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.5/kgamma5-5.20.5.tar.xz"; - sha256 = "1gy0pgsk3xi129y8h78lcif60ajs3y5fxzj1pl7mn6g72f7mwxld"; - name = "kgamma5-5.20.5.tar.xz"; + url = "${mirror}/unstable/plasma/5.20.90/kgamma5-5.20.90.tar.xz"; + sha256 = "0060g40lxzycww1kh18qncygbxgf66vva10yqr1ibhkip806jcm8"; + name = "kgamma5-5.20.90.tar.xz"; }; }; khotkeys = { - version = "5.20.5"; + version = "5.20.90"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.5/khotkeys-5.20.5.tar.xz"; - sha256 = "1iw8rxdl9q45jqsnmqdm1lkymzkyxkrfgch51kxfj34vd4mi66h8"; - name = "khotkeys-5.20.5.tar.xz"; + url = "${mirror}/unstable/plasma/5.20.90/khotkeys-5.20.90.tar.xz"; + sha256 = "1clbbzrj0ixz8xzjnd2agmjmxvs6r61kgykfk9ihagnv6varbffq"; + name = "khotkeys-5.20.90.tar.xz"; }; }; kinfocenter = { - version = "5.20.5"; + version = "5.20.90"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.5/kinfocenter-5.20.5.tar.xz"; - sha256 = "0k3vvfwrfwmmicw8p81fpqljvmj3n8342avavc49ajmnygls7ssm"; - name = "kinfocenter-5.20.5.tar.xz"; + url = "${mirror}/unstable/plasma/5.20.90/kinfocenter-5.20.90.tar.xz"; + sha256 = "1k4r8aia60g5mki2490c9xrlnqgvibdnyk1lpcmin8r474yg2b15"; + name = "kinfocenter-5.20.90.tar.xz"; }; }; kmenuedit = { - version = "5.20.5"; + version = "5.20.90"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.5/kmenuedit-5.20.5.tar.xz"; - sha256 = "0apmhglw74ppps52fhspjdsiy19b219lf68aj8jlpiiqcn80mggf"; - name = "kmenuedit-5.20.5.tar.xz"; + url = "${mirror}/unstable/plasma/5.20.90/kmenuedit-5.20.90.tar.xz"; + sha256 = "0jq9hjjmpg47ca675rnss3sagvxgxwpr525nngp8ivc7aa154wmf"; + name = "kmenuedit-5.20.90.tar.xz"; }; }; kscreen = { - version = "5.20.5"; + version = "5.20.90"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.5/kscreen-5.20.5.tar.xz"; - sha256 = "1njjkrdgdd6g8avf7ik9fd7j9g4zdbjghli7svcfz2z8h6na626y"; - name = "kscreen-5.20.5.tar.xz"; + url = "${mirror}/unstable/plasma/5.20.90/kscreen-5.20.90.tar.xz"; + sha256 = "1rlvgxyly3s2g1iplqqz5irj9987y4gd6jbngrap1mc47kdbvr3a"; + name = "kscreen-5.20.90.tar.xz"; }; }; kscreenlocker = { - version = "5.20.5"; + version = "5.20.90"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.5/kscreenlocker-5.20.5.tar.xz"; - sha256 = "07y0lhwh4pc5rsdfr5yqb645v37ya97vh3dmy2riw9908hiyybw0"; - name = "kscreenlocker-5.20.5.tar.xz"; + url = "${mirror}/unstable/plasma/5.20.90/kscreenlocker-5.20.90.tar.xz"; + sha256 = "1hxllh1fg87gq6wa8lwawvakwxvbhlj2lmk9mlqg41hwh48g24ah"; + name = "kscreenlocker-5.20.90.tar.xz"; }; }; ksshaskpass = { - version = "5.20.5"; + version = "5.20.90"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.5/ksshaskpass-5.20.5.tar.xz"; - sha256 = "1xk55ampbrz56pl739m6r150qcsjq0nw2sxxkpqykgwjh275y4ry"; - name = "ksshaskpass-5.20.5.tar.xz"; + url = "${mirror}/unstable/plasma/5.20.90/ksshaskpass-5.20.90.tar.xz"; + sha256 = "1zia38ji2mcrv79l4wda38d3cvhipnsnj12j2s1c1l3bmz93n2q1"; + name = "ksshaskpass-5.20.90.tar.xz"; }; }; ksysguard = { - version = "5.20.5"; + version = "5.20.90"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.5/ksysguard-5.20.5.tar.xz"; - sha256 = "0ddb3m6rygjisv31bc722vxzyb2q14940szfzijcv48z5ixj5x9j"; - name = "ksysguard-5.20.5.tar.xz"; + url = "${mirror}/unstable/plasma/5.20.90/ksysguard-5.20.90.tar.xz"; + sha256 = "07xsiqfqa5fbkf6x4bwrj2rmd3n7qfp1zf6gq1is05gi43zdki8q"; + name = "ksysguard-5.20.90.tar.xz"; }; }; kwallet-pam = { - version = "5.20.5"; + version = "5.20.90"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.5/kwallet-pam-5.20.5.tar.xz"; - sha256 = "1wn1zm8bfxxsjvx4rbds60v9ckizj55znpq477vnzrh2xfx13rjk"; - name = "kwallet-pam-5.20.5.tar.xz"; + url = "${mirror}/unstable/plasma/5.20.90/kwallet-pam-5.20.90.tar.xz"; + sha256 = "1zccrj4c8ay78r251v454zd10a7zg0lbxrpl47g4fcvclby29d2k"; + name = "kwallet-pam-5.20.90.tar.xz"; }; }; kwayland-integration = { - version = "5.20.5"; + version = "5.20.90"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.5/kwayland-integration-5.20.5.tar.xz"; - sha256 = "0rqzq851apw1p4c7salk7rcygjdw7ra0x95xw57vh68w19kn9wrk"; - name = "kwayland-integration-5.20.5.tar.xz"; + url = "${mirror}/unstable/plasma/5.20.90/kwayland-integration-5.20.90.tar.xz"; + sha256 = "0nl50i5wvz1rigfmzhladzjdskvs1snmx1hzhxb83ab8yn35jhsf"; + name = "kwayland-integration-5.20.90.tar.xz"; }; }; kwayland-server = { - version = "5.20.5"; + version = "5.20.90"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.5/kwayland-server-5.20.5.tar.xz"; - sha256 = "0ajxjj2cbrg6rpry3r48q3zhxxkr09498j5in0v1jwijp83n9wz0"; - name = "kwayland-server-5.20.5.tar.xz"; + url = "${mirror}/unstable/plasma/5.20.90/kwayland-server-5.20.90.tar.xz"; + sha256 = "0fmrcm35cnqk2hxs03smmp4gk3a7xa1ldizj34897lxdp10rbvrq"; + name = "kwayland-server-5.20.90.tar.xz"; }; }; kwin = { - version = "5.20.5"; + version = "5.20.90"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.5/kwin-5.20.5.tar.xz"; - sha256 = "0kiq46gdvfv2811125kw1ncnk1pmpnqkvrz7p3lry72sjd1ja57c"; - name = "kwin-5.20.5.tar.xz"; + url = "${mirror}/unstable/plasma/5.20.90/kwin-5.20.90.tar.xz"; + sha256 = "0py0xz1j8npq8iwcf3lks8xj16lj8kib7r1cij3q7ayx7l58inka"; + name = "kwin-5.20.90.tar.xz"; }; }; kwrited = { - version = "5.20.5"; + version = "5.20.90"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.5/kwrited-5.20.5.tar.xz"; - sha256 = "1h0vbb0bz4r26g4yf88jfzkbi8xbyf44c2y9nmlrmr5lws4bpcmz"; - name = "kwrited-5.20.5.tar.xz"; + url = "${mirror}/unstable/plasma/5.20.90/kwrited-5.20.90.tar.xz"; + sha256 = "0s952ib7j8pq5rhvwsxqz5yvizvfvihb45xn0rrd2x7nv7zi70qp"; + name = "kwrited-5.20.90.tar.xz"; }; }; libkscreen = { - version = "5.20.5"; + version = "5.20.90"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.5/libkscreen-5.20.5.tar.xz"; - sha256 = "0641kk7s4xy5y94rn6xzjnrp4sbl7yn9w9qzlw4925858pgrr9qv"; - name = "libkscreen-5.20.5.tar.xz"; + url = "${mirror}/unstable/plasma/5.20.90/libkscreen-5.20.90.tar.xz"; + sha256 = "06pfcaa5lylbsrdr7k14z0cf4idn90xwvqwglyq2m5gvhiqjv346"; + name = "libkscreen-5.20.90.tar.xz"; }; }; libksysguard = { - version = "5.20.5"; + version = "5.20.90"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.5/libksysguard-5.20.5.tar.xz"; - sha256 = "0v2x7sl5gg8a9i1cwx8prv03pcls4q3wfxxs5qs6g5ami1f679d8"; - name = "libksysguard-5.20.5.tar.xz"; + url = "${mirror}/unstable/plasma/5.20.90/libksysguard-5.20.90.tar.xz"; + sha256 = "0dmbr138jjpliasrglcs6kjalaix5q60m9jm23q046cgqb928d6l"; + name = "libksysguard-5.20.90.tar.xz"; }; }; milou = { - version = "5.20.5"; + version = "5.20.90"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.5/milou-5.20.5.tar.xz"; - sha256 = "1hmpdj2zi6nidm6058a6kjgzij8qy9xihv20hi2dhk0f8ys42k3h"; - name = "milou-5.20.5.tar.xz"; + url = "${mirror}/unstable/plasma/5.20.90/milou-5.20.90.tar.xz"; + sha256 = "1msjy4315503q0vsbfbj2x9raqxsg0sq2iy7zshsnbg6i8bnqvjh"; + name = "milou-5.20.90.tar.xz"; }; }; oxygen = { - version = "5.20.5"; + version = "5.20.90"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.5/oxygen-5.20.5.tar.xz"; - sha256 = "166jk8ix0dnv92svymaxjwbc08k6q8nag9xr2dc033x5lr2l59qr"; - name = "oxygen-5.20.5.tar.xz"; + url = "${mirror}/unstable/plasma/5.20.90/oxygen-5.20.90.tar.xz"; + sha256 = "12vnjdv14065p737plzly0921sww53lj5haa2bvd53nnxwf06ikc"; + name = "oxygen-5.20.90.tar.xz"; }; }; plasma-browser-integration = { - version = "5.20.5"; + version = "5.20.90"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.5/plasma-browser-integration-5.20.5.tar.xz"; - sha256 = "03zzmzdlc5a3nrx6izb66s7l3cmangkfjda2mf17g2097rrnb9n2"; - name = "plasma-browser-integration-5.20.5.tar.xz"; + url = "${mirror}/unstable/plasma/5.20.90/plasma-browser-integration-5.20.90.tar.xz"; + sha256 = "0l8dh06b83b98hprs0lw6n71649v0lnmgid4kdxmng415g4jizd1"; + name = "plasma-browser-integration-5.20.90.tar.xz"; }; }; plasma-desktop = { - version = "5.20.5"; + version = "5.20.90"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.5/plasma-desktop-5.20.5.tar.xz"; - sha256 = "1fc74zgxkp65pj8p58prd5rq7nqspjfcgr70say2imagyj9nwrdx"; - name = "plasma-desktop-5.20.5.tar.xz"; + url = "${mirror}/unstable/plasma/5.20.90/plasma-desktop-5.20.90.tar.xz"; + sha256 = "1a53z21k544zrn68n2m8rfdh32zpnbk1sb51a92i90z6mplmcg31"; + name = "plasma-desktop-5.20.90.tar.xz"; }; }; plasma-disks = { - version = "5.20.5"; + version = "5.20.90"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.5/plasma-disks-5.20.5.tar.xz"; - sha256 = "0bcwf3g2vy2gf0igg0dyl9x5qc0xx0d5z05n4mi7asg5acl596r1"; - name = "plasma-disks-5.20.5.tar.xz"; + url = "${mirror}/unstable/plasma/5.20.90/plasma-disks-5.20.90.tar.xz"; + sha256 = "0lklfwqg1iiya3zdn6i5ffqww1gpydygnvvlq3r6nlyfgk7zkv5a"; + name = "plasma-disks-5.20.90.tar.xz"; + }; + }; + plasma-firewall = { + version = "5.20.90"; + src = fetchurl { + url = "${mirror}/unstable/plasma/5.20.90/plasma-firewall-5.20.90.tar.xz"; + sha256 = "09z5fapd6azikh3zw361rgy77dlbvzhiq48b8rfx7bg05krgmjmk"; + name = "plasma-firewall-5.20.90.tar.xz"; }; }; plasma-integration = { - version = "5.20.5"; + version = "5.20.90"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.5/plasma-integration-5.20.5.tar.xz"; - sha256 = "1wydjnmryf2kvfgg6m9kafa5waimccqr531qrq3nisdjc5p1w9x8"; - name = "plasma-integration-5.20.5.tar.xz"; + url = "${mirror}/unstable/plasma/5.20.90/plasma-integration-5.20.90.tar.xz"; + sha256 = "1x58z1kify5m7j6y2xx409qdla7gi5bhj3dw6nphijc0cqi61msx"; + name = "plasma-integration-5.20.90.tar.xz"; }; }; plasma-nano = { - version = "5.20.5"; + version = "5.20.90"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.5/plasma-nano-5.20.5.tar.xz"; - sha256 = "0h276i1dxbiziw258wf6az9mnysp3xxfh7nlxv0g2w1vfnhm23v5"; - name = "plasma-nano-5.20.5.tar.xz"; + url = "${mirror}/unstable/plasma/5.20.90/plasma-nano-5.20.90.tar.xz"; + sha256 = "148jrhrf2zw4328i8rdbhpvjiivfcqwgkw6217h7sfpp6jz30y81"; + name = "plasma-nano-5.20.90.tar.xz"; }; }; plasma-nm = { - version = "5.20.5"; + version = "5.20.90"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.5/plasma-nm-5.20.5.tar.xz"; - sha256 = "060f32adr0wlv2bs9swjyxcil7n74cnk48j8b8984wwhk6zz53a6"; - name = "plasma-nm-5.20.5.tar.xz"; + url = "${mirror}/unstable/plasma/5.20.90/plasma-nm-5.20.90.tar.xz"; + sha256 = "0mgjahczf7g6xxba2c3h0h6p4121pa0mvb8xyq4d85y39gp8ljz7"; + name = "plasma-nm-5.20.90.tar.xz"; }; }; plasma-pa = { - version = "5.20.5"; + version = "5.20.90"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.5/plasma-pa-5.20.5.tar.xz"; - sha256 = "0xvkbrz3290xxfvv1rqqv7w57j3gdng8m2jyjj1j6dmaackl512d"; - name = "plasma-pa-5.20.5.tar.xz"; + url = "${mirror}/unstable/plasma/5.20.90/plasma-pa-5.20.90.tar.xz"; + sha256 = "04pcssh569yb2j3af9jgnaipwr1bggy407v5x2xc4ax8n61cpzal"; + name = "plasma-pa-5.20.90.tar.xz"; }; }; plasma-phone-components = { - version = "5.20.5"; + version = "5.20.90"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.5/plasma-phone-components-5.20.5.tar.xz"; - sha256 = "14h790b2jfs2j2lvv3dwqm20v3nlvah2909g4mhm9kwfdsmgnjms"; - name = "plasma-phone-components-5.20.5.tar.xz"; + url = "${mirror}/unstable/plasma/5.20.90/plasma-phone-components-5.20.90.tar.xz"; + sha256 = "0nnbyvsrmnmgsbryap38c3vz5xb93pc9mdbyxjv08h07x433k2as"; + name = "plasma-phone-components-5.20.90.tar.xz"; }; }; plasma-sdk = { - version = "5.20.5"; + version = "5.20.90"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.5/plasma-sdk-5.20.5.tar.xz"; - sha256 = "13cqn700nadqgmn54sy8qbf7waqkgvhzndh73jvmhb0z699z4s6y"; - name = "plasma-sdk-5.20.5.tar.xz"; + url = "${mirror}/unstable/plasma/5.20.90/plasma-sdk-5.20.90.tar.xz"; + sha256 = "1j2i1krk4w392skx29hsm2jccqnfrvjx5mnax42066bbjs4gnz10"; + name = "plasma-sdk-5.20.90.tar.xz"; + }; + }; + plasma-systemmonitor = { + version = "5.20.90"; + src = fetchurl { + url = "${mirror}/unstable/plasma/5.20.90/plasma-systemmonitor-5.20.90.tar.xz"; + sha256 = "10vlmakpbwx1vcgdnb0dfhjladizr047dr9jbryj7nwc21j5ljn3"; + name = "plasma-systemmonitor-5.20.90.tar.xz"; }; }; plasma-tests = { - version = "5.20.5"; + version = "5.20.90"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.5/plasma-tests-5.20.5.tar.xz"; - sha256 = "0h6wccqp46s3i8dqc6rrh68l8fk662yvz0fdscqv295g1zwhb45j"; - name = "plasma-tests-5.20.5.tar.xz"; + url = "${mirror}/unstable/plasma/5.20.90/plasma-tests-5.20.90.tar.xz"; + sha256 = "1p07h5qbb4hrk770kg4n9zpx2yxml5xbk3a0r2zw13awjwrnphzz"; + name = "plasma-tests-5.20.90.tar.xz"; }; }; plasma-thunderbolt = { - version = "5.20.5"; + version = "5.20.90"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.5/plasma-thunderbolt-5.20.5.tar.xz"; - sha256 = "06l5zpgn5zmid0rkp8lx228nw72nd991s2cg29yg2h51zyvff4v0"; - name = "plasma-thunderbolt-5.20.5.tar.xz"; + url = "${mirror}/unstable/plasma/5.20.90/plasma-thunderbolt-5.20.90.tar.xz"; + sha256 = "0jybgq2k45azni0csg2qijxz4zagv5j66vvwslncy2rwwapcdzs1"; + name = "plasma-thunderbolt-5.20.90.tar.xz"; }; }; plasma-vault = { - version = "5.20.5"; + version = "5.20.90"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.5/plasma-vault-5.20.5.tar.xz"; - sha256 = "0b9jnzx5040sgzqsnzjz61sxnlsmbqfsk8mvqclgqphgiqsbcnm2"; - name = "plasma-vault-5.20.5.tar.xz"; + url = "${mirror}/unstable/plasma/5.20.90/plasma-vault-5.20.90.tar.xz"; + sha256 = "0y7czrfpwja5px4lmvrjh1p5xngwbavhpk4g6h2vb4gzshz338kq"; + name = "plasma-vault-5.20.90.tar.xz"; }; }; plasma-workspace = { - version = "5.20.5"; + version = "5.20.90"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.5/plasma-workspace-5.20.5.tar.xz"; - sha256 = "0966nqyqs7hb7fp3a3jxhm64iqwbafd29sbagigx9d7gj8qg8zim"; - name = "plasma-workspace-5.20.5.tar.xz"; + url = "${mirror}/unstable/plasma/5.20.90/plasma-workspace-5.20.90.tar.xz"; + sha256 = "064qlf1jvrw9svh7sjab06vlip9x6vzv8a4rh40b09d235ci2ihb"; + name = "plasma-workspace-5.20.90.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.20.5"; + version = "5.20.90"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.5/plasma-workspace-wallpapers-5.20.5.tar.xz"; - sha256 = "03z7pcba8kkmb70dn7gsqldxgb8lky6qw040p5ik1j07516xm6z3"; - name = "plasma-workspace-wallpapers-5.20.5.tar.xz"; + url = "${mirror}/unstable/plasma/5.20.90/plasma-workspace-wallpapers-5.20.90.tar.xz"; + sha256 = "171jcdlr1zpnagqghix1m08r9jwq738mcxlzh9c4fxh122x34hk4"; + name = "plasma-workspace-wallpapers-5.20.90.tar.xz"; }; }; plymouth-kcm = { - version = "5.20.5"; + version = "5.20.90"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.5/plymouth-kcm-5.20.5.tar.xz"; - sha256 = "0lwir088h3mjdxc6zzbd74g7alfnsrhf7m0p7ma6prncdj25pcyz"; - name = "plymouth-kcm-5.20.5.tar.xz"; + url = "${mirror}/unstable/plasma/5.20.90/plymouth-kcm-5.20.90.tar.xz"; + sha256 = "1aj7w2k1m5901c7m6jsbsr041ydwgl6k630gxhva1s3p7g94mp9n"; + name = "plymouth-kcm-5.20.90.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.20.5"; + version = "1-5.20.90"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.5/polkit-kde-agent-1-5.20.5.tar.xz"; - sha256 = "1rkvnci93xvxga6cvw99aaivkn8897kyqdw7p9hmk09qvg2qb92v"; - name = "polkit-kde-agent-1-5.20.5.tar.xz"; + url = "${mirror}/unstable/plasma/5.20.90/polkit-kde-agent-1-5.20.90.tar.xz"; + sha256 = "0q4gy13gan68kv9fw81pv4k3x9cwx1zl8d0szrdcsjf99fc00y9d"; + name = "polkit-kde-agent-1-5.20.90.tar.xz"; }; }; powerdevil = { - version = "5.20.5"; + version = "5.20.90"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.5/powerdevil-5.20.5.tar.xz"; - sha256 = "1w3figagjxmrbc7hs81bllfkpq6f9mn4mwj7zjzxjf7d5fkmryrj"; - name = "powerdevil-5.20.5.tar.xz"; + url = "${mirror}/unstable/plasma/5.20.90/powerdevil-5.20.90.tar.xz"; + sha256 = "0dihcn6qyzclywnm38wj57mbwsr8cp861nj676lzwi7ijdw34y4q"; + name = "powerdevil-5.20.90.tar.xz"; + }; + }; + qqc2-breeze-style = { + version = "5.20.90"; + src = fetchurl { + url = "${mirror}/unstable/plasma/5.20.90/qqc2-breeze-style-5.20.90.tar.xz"; + sha256 = "0zm9cmw5hh47f3l0kv77zqcph610irh80ayqpj4was0jmng2v47n"; + name = "qqc2-breeze-style-5.20.90.tar.xz"; }; }; sddm-kcm = { - version = "5.20.5"; + version = "5.20.90"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.5/sddm-kcm-5.20.5.tar.xz"; - sha256 = "1zw9y6knrx848f529m45iszr0xplr9lnck242ddmzj3x7qz0x1az"; - name = "sddm-kcm-5.20.5.tar.xz"; + url = "${mirror}/unstable/plasma/5.20.90/sddm-kcm-5.20.90.tar.xz"; + sha256 = "04cm6kaww8nmbvbj6xgfhbv076kjf8hy0acwhn4dbr20d3j8sixr"; + name = "sddm-kcm-5.20.90.tar.xz"; }; }; systemsettings = { - version = "5.20.5"; + version = "5.20.90"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.5/systemsettings-5.20.5.tar.xz"; - sha256 = "1b1j9hl9nzd4qqs255yd3svsb492w8i6l6ccihllwzqwkb1kpq5j"; - name = "systemsettings-5.20.5.tar.xz"; + url = "${mirror}/unstable/plasma/5.20.90/systemsettings-5.20.90.tar.xz"; + sha256 = "1hjs4adrh6kpc4d537268fln27ah47gp9ksbaivppnx9qy884hr7"; + name = "systemsettings-5.20.90.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.20.5"; + version = "5.20.90"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.5/xdg-desktop-portal-kde-5.20.5.tar.xz"; - sha256 = "07g70517p89araa305if2xgwpfd7sdbknl880hqn2mqaqd9m83gl"; - name = "xdg-desktop-portal-kde-5.20.5.tar.xz"; + url = "${mirror}/unstable/plasma/5.20.90/xdg-desktop-portal-kde-5.20.90.tar.xz"; + sha256 = "1l1vphw5crysr912fp4nf6g1jmzbyvdkv04b4735lr0i4chk1ja0"; + name = "xdg-desktop-portal-kde-5.20.90.tar.xz"; }; }; } From e3d17ad1558503f517c78e620013b0052d090215 Mon Sep 17 00:00:00 2001 From: Yaroslav Bolyukin <iam@lach.pw> Date: Fri, 22 Jan 2021 22:47:27 +0300 Subject: [PATCH 073/188] plasma-workspace: add pipewire dependency Signed-off-by: Yaroslav Bolyukin <iam@lach.pw> --- pkgs/desktops/plasma-5/plasma-workspace/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix index e1becaab95b6..69d7d508d50c 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5/plasma-workspace/default.nix @@ -16,6 +16,8 @@ qtgraphicaleffects, qtquickcontrols, qtquickcontrols2, qtscript, qttools, qtwayland, qtx11extras, qqc2-desktop-style, + + pipewire, libdrm }: let inherit (lib) getBin getLib; in @@ -36,6 +38,8 @@ mkDerivation { qtgraphicaleffects qtquickcontrols qtquickcontrols2 qtscript qtwayland qtx11extras qqc2-desktop-style + + pipewire libdrm ]; propagatedUserEnvPkgs = [ qtgraphicaleffects ]; outputs = [ "out" "dev" ]; From dc3fa33f47fe4538c83c996e9dfb918a5a8ac474 Mon Sep 17 00:00:00 2001 From: Yaroslav Bolyukin <iam@lach.pw> Date: Fri, 22 Jan 2021 22:48:33 +0300 Subject: [PATCH 074/188] kwin: add pipewire dependency Required for window thumbnails on wayland Signed-off-by: Yaroslav Bolyukin <iam@lach.pw> --- pkgs/desktops/plasma-5/kwin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix index f0b07fba736e..f127cc37ee8c 100644 --- a/pkgs/desktops/plasma-5/kwin/default.nix +++ b/pkgs/desktops/plasma-5/kwin/default.nix @@ -12,7 +12,7 @@ kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel, ki18n, kiconthemes, kidletime, kinit, kio, knewstuff, knotifications, kpackage, kscreenlocker, kservice, kwayland, kwayland-server, kwidgetsaddons, kwindowsystem, kxmlgui, - plasma-framework, libcap, libdrm, mesa + plasma-framework, libcap, libdrm, mesa, pipewire }: # TODO (ttuegel): investigate qmlplugindump failure @@ -31,7 +31,7 @@ mkDerivation { kcoreaddons kcrash kdeclarative kdecoration kglobalaccel ki18n kiconthemes kidletime kinit kio knewstuff knotifications kpackage kscreenlocker kservice kwayland kwayland-server kwidgetsaddons kwindowsystem kxmlgui plasma-framework - libcap libdrm mesa + libcap libdrm mesa pipewire ]; outputs = [ "dev" "out" ]; patches = [ From 46804ad8ef60d30f1c2f0b2e5ee6081f22744bea Mon Sep 17 00:00:00 2001 From: Yaroslav Bolyukin <iam@lach.pw> Date: Fri, 22 Jan 2021 22:49:27 +0300 Subject: [PATCH 075/188] ksysguard: add netfilter, libnl dependencies Signed-off-by: Yaroslav Bolyukin <iam@lach.pw> --- pkgs/desktops/plasma-5/ksysguard.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/plasma-5/ksysguard.nix b/pkgs/desktops/plasma-5/ksysguard.nix index 0581b8bde74a..27d0ab8a0fba 100644 --- a/pkgs/desktops/plasma-5/ksysguard.nix +++ b/pkgs/desktops/plasma-5/ksysguard.nix @@ -3,7 +3,8 @@ extra-cmake-modules, kdoctools, libcap, libpcap, lm_sensors, kconfig, kcoreaddons, kdelibs4support, ki18n, kiconthemes, kitemviews, - knewstuff, libksysguard, qtbase + knewstuff, libksysguard, qtbase, + networkmanager-qt, libnl }: mkDerivation { @@ -12,6 +13,6 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kconfig kcoreaddons kitemviews knewstuff kiconthemes libksysguard - kdelibs4support ki18n libcap libpcap lm_sensors + kdelibs4support ki18n libcap libpcap lm_sensors networkmanager-qt libnl ]; } From b5762d6e0416776c0c7ed7c9b7497274d02ff5be Mon Sep 17 00:00:00 2001 From: Yaroslav Bolyukin <iam@lach.pw> Date: Fri, 22 Jan 2021 22:52:13 +0300 Subject: [PATCH 076/188] plasma-workspace: upgrade patches Signed-off-by: Yaroslav Bolyukin <iam@lach.pw> --- .../plasma-workspace/0001-startkde.patch | 76 +++++++++++-------- .../0002-absolute-wallpaper-install-dir.patch | 12 +-- 2 files changed, 49 insertions(+), 39 deletions(-) diff --git a/pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch b/pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch index ea8afedbe5ba..f9347de7d566 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch +++ b/pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch @@ -1,4 +1,4 @@ -From d653bc84c8aed33072237ed858194a8a73b6a2e7 Mon Sep 17 00:00:00 2001 +From 65ed69a38a9ffee21f0eb36de1f7a3f152111cad Mon Sep 17 00:00:00 2001 From: Tom Hall <tahall256@protonmail.ch> Date: Mon, 7 Sep 2020 18:09:52 +0100 Subject: [PATCH] startkde @@ -7,27 +7,27 @@ Subject: [PATCH] startkde startkde/plasma-session/startup.cpp | 2 +- startkde/startplasma-waylandsession.cpp | 2 +- startkde/startplasma-x11.cpp | 2 +- - startkde/startplasma.cpp | 22 +++++++++------------- - 4 files changed, 12 insertions(+), 16 deletions(-) + startkde/startplasma.cpp | 16 ++++++++-------- + 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/startkde/plasma-session/startup.cpp b/startkde/plasma-session/startup.cpp -index 89cc144ba..8ca9e81d2 100644 +index c3e77d4..88cb0e9 100644 --- a/startkde/plasma-session/startup.cpp +++ b/startkde/plasma-session/startup.cpp -@@ -211,7 +211,7 @@ Startup::Startup(QObject *parent): +@@ -223,7 +223,7 @@ Startup::Startup(QObject *parent) upAndRunning(QStringLiteral("ksmserver")); const AutoStart autostart; - QProcess::execute(QStringLiteral(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/start_kdeinit_wrapper"), QStringList()); + QProcess::execute(QStringLiteral(NIXPKGS_START_KDEINIT_WRAPPER), QStringList()); - KJob* phase1; + KJob *phase1; QProcessEnvironment kdedProcessEnv; diff --git a/startkde/startplasma-waylandsession.cpp b/startkde/startplasma-waylandsession.cpp -index f59654d18..5e3a93db0 100644 +index 4fbfe18..6ba916c 100644 --- a/startkde/startplasma-waylandsession.cpp +++ b/startkde/startplasma-waylandsession.cpp -@@ -61,7 +61,7 @@ int main(int argc, char** argv) +@@ -65,7 +65,7 @@ int main(int argc, char **argv) waitForKonqi(); out << "startplasma-waylandsession: Shutting down...\n"; @@ -37,10 +37,10 @@ index f59654d18..5e3a93db0 100644 cleanupX11(); out << "startplasma-waylandsession: Done.\n"; diff --git a/startkde/startplasma-x11.cpp b/startkde/startplasma-x11.cpp -index ae1c4d101..0df24b5be 100644 +index 4ddf9f8..e0e59cd 100644 --- a/startkde/startplasma-x11.cpp +++ b/startkde/startplasma-x11.cpp -@@ -110,7 +110,7 @@ int main(int argc, char** argv) +@@ -110,7 +110,7 @@ int main(int argc, char **argv) out << "startkde: Shutting down...\n"; @@ -50,10 +50,10 @@ index ae1c4d101..0df24b5be 100644 cleanupPlasmaEnvironment(); cleanupX11(); diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp -index a055d5635..62afb1513 100644 +index 9809197..1250e3e 100644 --- a/startkde/startplasma.cpp +++ b/startkde/startplasma.cpp -@@ -41,7 +41,7 @@ QTextStream out(stderr); +@@ -46,7 +46,7 @@ QTextStream out(stderr); void messageBox(const QString &text) { out << text; @@ -61,46 +61,56 @@ index a055d5635..62afb1513 100644 + runSync(QStringLiteral(NIXPKGS_XMESSAGE), {QStringLiteral("-geometry"), QStringLiteral("500x100"), text}); } - QStringList allServices(const QLatin1String& prefix) -@@ -262,15 +262,15 @@ void setupX11() - // If the user has overwritten fonts, the cursor font may be different now - // so don't move this up. + QStringList allServices(const QLatin1String &prefix) +@@ -267,8 +267,8 @@ void setupX11() + // If the user has overwritten fonts, the cursor font may be different now + // so don't move this up. - runSync(QStringLiteral("xsetroot"), {QStringLiteral("-cursor_name"), QStringLiteral("left_ptr")}); -- runSync(QStringLiteral("xprop"), {QStringLiteral("-root"), QStringLiteral("-f"), QStringLiteral("KDE_FULL_SESSION"), QStringLiteral("8t"), QStringLiteral("-set"), QStringLiteral("KDE_FULL_SESSION"), QStringLiteral("true")}); -- runSync(QStringLiteral("xprop"), {QStringLiteral("-root"), QStringLiteral("-f"), QStringLiteral("KDE_SESSION_VERSION"), QStringLiteral("32c"), QStringLiteral("-set"), QStringLiteral("KDE_SESSION_VERSION"), QStringLiteral("5")}); +- runSync(QStringLiteral("xprop"), + runSync(QStringLiteral(NIXPKGS_XSETROOT), {QStringLiteral("-cursor_name"), QStringLiteral("left_ptr")}); -+ runSync(QStringLiteral(NIXPKGS_XPROP), {QStringLiteral("-root"), QStringLiteral("-f"), QStringLiteral("KDE_FULL_SESSION"), QStringLiteral("8t"), QStringLiteral("-set"), QStringLiteral("KDE_FULL_SESSION"), QStringLiteral("true")}); -+ runSync(QStringLiteral(NIXPKGS_XPROP), {QStringLiteral("-root"), QStringLiteral("-f"), QStringLiteral("KDE_SESSION_VERSION"), QStringLiteral("32c"), QStringLiteral("-set"), QStringLiteral("KDE_SESSION_VERSION"), QStringLiteral("5")}); - } ++ runSync(QStringLiteral(NIXPKGS_XPROP), + {QStringLiteral("-root"), + QStringLiteral("-f"), + QStringLiteral("KDE_FULL_SESSION"), +@@ -276,7 +276,7 @@ void setupX11() + QStringLiteral("-set"), + QStringLiteral("KDE_FULL_SESSION"), + QStringLiteral("true")}); +- runSync(QStringLiteral("xprop"), ++ runSync(QStringLiteral(NIXPKGS_XPROP), + {QStringLiteral("-root"), + QStringLiteral("-f"), + QStringLiteral("KDE_SESSION_VERSION"), +@@ -288,8 +288,8 @@ void setupX11() void cleanupX11() { -- runSync(QStringLiteral("xprop"), { QStringLiteral("-root"), QStringLiteral("-remove"), QStringLiteral("KDE_FULL_SESSION") }); -- runSync(QStringLiteral("xprop"), { QStringLiteral("-root"), QStringLiteral("-remove"), QStringLiteral("KDE_SESSION_VERSION") }); -+ runSync(QStringLiteral(NIXPKGS_XPROP), { QStringLiteral("-root"), QStringLiteral("-remove"), QStringLiteral("KDE_FULL_SESSION") }); -+ runSync(QStringLiteral(NIXPKGS_XPROP), { QStringLiteral("-root"), QStringLiteral("-remove"), QStringLiteral("KDE_SESSION_VERSION") }); +- runSync(QStringLiteral("xprop"), {QStringLiteral("-root"), QStringLiteral("-remove"), QStringLiteral("KDE_FULL_SESSION")}); +- runSync(QStringLiteral("xprop"), {QStringLiteral("-root"), QStringLiteral("-remove"), QStringLiteral("KDE_SESSION_VERSION")}); ++ runSync(QStringLiteral(NIXPKGS_XPROP), {QStringLiteral("-root"), QStringLiteral("-remove"), QStringLiteral("KDE_FULL_SESSION")}); ++ runSync(QStringLiteral(NIXPKGS_XPROP), {QStringLiteral("-root"), QStringLiteral("-remove"), QStringLiteral("KDE_SESSION_VERSION")}); } // TODO: Check if Necessary -@@ -306,7 +302,7 @@ void setupFontDpi() - //TODO port to c++? +@@ -321,7 +321,7 @@ void setupFontDpi() + // TODO port to c++? const QByteArray input = "Xft.dpi: " + QByteArray::number(fontsCfg.readEntry("forceFontDPI", 0)); QProcess p; -- p.start(QStringLiteral("xrdb"), { QStringLiteral("-quiet"), QStringLiteral("-merge"), QStringLiteral("-nocpp") }); -+ p.start(QStringLiteral(NIXPKGS_XRDB), { QStringLiteral("-quiet"), QStringLiteral("-merge"), QStringLiteral("-nocpp") }); +- p.start(QStringLiteral("xrdb"), {QStringLiteral("-quiet"), QStringLiteral("-merge"), QStringLiteral("-nocpp")}); ++ p.start(QStringLiteral(NIXPKGS_XRDB), {QStringLiteral("-quiet"), QStringLiteral("-merge"), QStringLiteral("-nocpp")}); p.setProcessChannelMode(QProcess::ForwardedChannels); p.write(input); p.closeWriteChannel(); -@@ -328,7 +324,7 @@ QProcess* setupKSplash() +@@ -343,7 +343,7 @@ QProcess *setupKSplash() KConfigGroup ksplashCfg = cfg.group("KSplash"); if (ksplashCfg.readEntry("Engine", QStringLiteral("KSplashQML")) == QLatin1String("KSplashQML")) { p = new QProcess; -- p->start(QStringLiteral("ksplashqml"), { ksplashCfg.readEntry("Theme", QStringLiteral("Breeze")) }); -+ p->start(QStringLiteral(CMAKE_INSTALL_FULL_BINDIR "/ksplashqml"), { ksplashCfg.readEntry("Theme", QStringLiteral("Breeze")) }); +- p->start(QStringLiteral("ksplashqml"), {ksplashCfg.readEntry("Theme", QStringLiteral("Breeze"))}); ++ p->start(QStringLiteral(CMAKE_INSTALL_FULL_BINDIR "/ksplashqml"), {ksplashCfg.readEntry("Theme", QStringLiteral("Breeze"))}); } } return p; -- -2.28.0 +2.30.0 diff --git a/pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch b/pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch index 366707d27034..633551f6e3c2 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch +++ b/pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch @@ -1,23 +1,23 @@ -From f43f15870f14b8fa17ba0765c0d7e2b225fafc3f Mon Sep 17 00:00:00 2001 +From 914d2ec5e669ecf8771cc1308028990f733fb8cc Mon Sep 17 00:00:00 2001 From: Thomas Tuegel <ttuegel@mailbox.org> Date: Wed, 5 Feb 2020 05:03:11 -0600 -Subject: [PATCH 2/2] absolute-wallpaper-install-dir +Subject: [PATCH] absolute-wallpaper-install-dir --- sddm-theme/theme.conf.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sddm-theme/theme.conf.cmake b/sddm-theme/theme.conf.cmake -index 8494a5c8a..f723c1e1b 100644 +index a560da3..f723c1e 100644 --- a/sddm-theme/theme.conf.cmake +++ b/sddm-theme/theme.conf.cmake @@ -4,5 +4,5 @@ logo=${KDE_INSTALL_FULL_DATADIR}/sddm/themes/breeze/default-logo.svg type=image color=#1d99f3 fontSize=10 --background=${KDE_INSTALL_FULL_WALLPAPERDIR}/Next/contents/images/5120x2880.jpg -+background=${NIXPKGS_BREEZE_WALLPAPERS}/Next/contents/images/5120x2880.jpg +-background=${KDE_INSTALL_FULL_WALLPAPERDIR}/Next/contents/images/5120x2880.png ++background=${NIXPKGS_BREEZE_WALLPAPERS}/Next/contents/images/5120x2880.png needsFullUserModel=false -- -2.25.1 +2.30.0 From ef8e9e016381219afd1381d476494dde6a95f0e6 Mon Sep 17 00:00:00 2001 From: Yaroslav Bolyukin <iam@lach.pw> Date: Fri, 22 Jan 2021 22:52:48 +0300 Subject: [PATCH 077/188] plasma-desktop: upgrade patch Signed-off-by: Yaroslav Bolyukin <iam@lach.pw> --- pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch b/pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch index 6c04081ae29a..c85d66ad0031 100644 --- a/pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch +++ b/pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch @@ -3,14 +3,14 @@ Index: plasma-desktop-5.8.5/kcms/dateandtime/helper.cpp --- plasma-desktop-5.8.5.orig/kcms/dateandtime/helper.cpp +++ plasma-desktop-5.8.5/kcms/dateandtime/helper.cpp @@ -48,10 +48,6 @@ - #include <sys/stat.h> + #include <sys/types.h> #endif - + -// We cannot rely on the $PATH environment variable, because D-Bus activation -// clears it. So we have to use a reasonable default. -static const QString exePath = QStringLiteral("/usr/sbin:/usr/bin:/sbin:/bin"); - - int ClockHelper::ntp( const QStringList& ntpServers, bool ntpEnabled ) + int ClockHelper::ntp(const QStringList &ntpServers, bool ntpEnabled) { int ret = 0; @@ -227,7 +223,7 @@ int ClockHelper::tzreset() From b236ccbfad176ff02644e8f621310745e6964474 Mon Sep 17 00:00:00 2001 From: Yaroslav Bolyukin <iam@lach.pw> Date: Fri, 22 Jan 2021 22:53:13 +0300 Subject: [PATCH 078/188] libkscreen: upgrade patch Signed-off-by: Yaroslav Bolyukin <iam@lach.pw> --- .../plasma-5/libkscreen/libkscreen-backends-path.patch | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/plasma-5/libkscreen/libkscreen-backends-path.patch b/pkgs/desktops/plasma-5/libkscreen/libkscreen-backends-path.patch index 48be0d037df5..3d19f2d89fa1 100644 --- a/pkgs/desktops/plasma-5/libkscreen/libkscreen-backends-path.patch +++ b/pkgs/desktops/plasma-5/libkscreen/libkscreen-backends-path.patch @@ -2,7 +2,7 @@ Index: libkscreen-5.9.4/src/backendmanager.cpp =================================================================== --- libkscreen-5.9.4.orig/src/backendmanager.cpp +++ libkscreen-5.9.4/src/backendmanager.cpp -@@ -178,17 +178,11 @@ QFileInfo BackendManager::preferredBacke +@@ -172,14 +172,11 @@ QFileInfo BackendManager::preferredBackend(const QString &backend) QFileInfoList BackendManager::listBackends() { // Compile a list of installed backends first @@ -10,10 +10,7 @@ Index: libkscreen-5.9.4/src/backendmanager.cpp - const QStringList paths = QCoreApplication::libraryPaths(); - QFileInfoList finfos; - for (const QString &path : paths) { -- const QDir dir(path + QLatin1String("/kf5/kscreen/"), -- backendFilter, -- QDir::SortFlags(QDir::QDir::Name), -- QDir::NoDotAndDotDot | QDir::Files); +- const QDir dir(path + QLatin1String("/kf5/kscreen/"), backendFilter, QDir::SortFlags(QDir::QDir::Name), QDir::NoDotAndDotDot | QDir::Files); - finfos.append(dir.entryInfoList()); - } - return finfos; @@ -24,4 +21,4 @@ Index: libkscreen-5.9.4/src/backendmanager.cpp + return dir.entryInfoList(); } - KScreen::AbstractBackend *BackendManager::loadBackendPlugin(QPluginLoader *loader, const QString &name, + KScreen::AbstractBackend *BackendManager::loadBackendPlugin(QPluginLoader *loader, const QString &name, const QVariantMap &arguments) From 0fee087473c6e895e789d9e0b7c7754abb7d3238 Mon Sep 17 00:00:00 2001 From: Yaroslav Bolyukin <iam@lach.pw> Date: Fri, 22 Jan 2021 23:23:24 +0300 Subject: [PATCH 079/188] plasma-integration: add workspace dependency upstream plasma-browser-integration now depends on libtaskmanager Signed-off-by: Yaroslav Bolyukin <iam@lach.pw> --- pkgs/desktops/plasma-5/plasma-browser-integration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/plasma-5/plasma-browser-integration.nix b/pkgs/desktops/plasma-5/plasma-browser-integration.nix index f6855cb34da1..e9ad3c28c101 100644 --- a/pkgs/desktops/plasma-5/plasma-browser-integration.nix +++ b/pkgs/desktops/plasma-5/plasma-browser-integration.nix @@ -3,7 +3,7 @@ extra-cmake-modules, qtbase, kfilemetadata, kio, ki18n, kconfig , kdbusaddons, knotifications, kpurpose, - krunner, kwindowsystem, kactivities, + krunner, kwindowsystem, kactivities, plasma-workspace }: mkDerivation { @@ -13,6 +13,6 @@ mkDerivation { ]; buildInputs = [ qtbase kfilemetadata kio ki18n kconfig kdbusaddons knotifications kpurpose - krunner kwindowsystem kactivities + krunner kwindowsystem kactivities plasma-workspace ]; } From 4e25a98d4ec09bdd1bf759dff9840b6a5a23069c Mon Sep 17 00:00:00 2001 From: Yaroslav Bolyukin <iam@lach.pw> Date: Tue, 16 Feb 2021 18:24:40 +0300 Subject: [PATCH 080/188] kdeFrameworks: 5.78 -> 5.79 Signed-off-by: Yaroslav Bolyukin <iam@lach.pw> --- .../libraries/kde-frameworks/fetch.sh | 2 +- .../libraries/kde-frameworks/kcompletion.nix | 9 +- .../libraries/kde-frameworks/kio/default.nix | 7 +- .../libraries/kde-frameworks/srcs.nix | 664 +++++++++--------- 4 files changed, 335 insertions(+), 347 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index 01d6a7ba2b1e..3ce0ca063ca1 100644 --- a/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/frameworks/5.78/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.79/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/kde-frameworks/kcompletion.nix b/pkgs/development/libraries/kde-frameworks/kcompletion.nix index 26e5a83dc21b..fdfe28db6c04 100644 --- a/pkgs/development/libraries/kde-frameworks/kcompletion.nix +++ b/pkgs/development/libraries/kde-frameworks/kcompletion.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, fetchpatch, + mkDerivation, lib, extra-cmake-modules, kconfig, kwidgetsaddons, qtbase, qttools }: @@ -7,13 +7,6 @@ mkDerivation { name = "kcompletion"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - patches = [ - # https://mail.kde.org/pipermail/distributions/2021-January/000928.html - (fetchpatch { - url = "https://invent.kde.org/frameworks/kcompletion/commit/7acda936f06193e9fc85ae5cf9ccc8d65971f657.patch"; - sha256 = "150ff506rhr5pin5363ks222vhv8qd77y5s5nyylcbdjry3ljd3n"; - }) - ]; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kconfig kwidgetsaddons qttools ]; propagatedBuildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/kde-frameworks/kio/default.nix b/pkgs/development/libraries/kde-frameworks/kio/default.nix index 642151913db3..f4d771ab75f8 100644 --- a/pkgs/development/libraries/kde-frameworks/kio/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kio/default.nix @@ -24,10 +24,5 @@ mkDerivation { patches = [ ./samba-search-path.patch ./kio-debug-module-loader.patch - # https://mail.kde.org/pipermail/distributions/2021-February/000938.html - (fetchpatch { - url = "https://invent.kde.org/frameworks/kio/commit/a183dd0d1ee0659e5341c7cb4117df27edd6f125.patch"; - sha256 = "1msnzi93zggxgarx962gnlz1slx13nc3l54wib3rdlj0xnnlfdnd"; - }) - ]; + ]; } diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index 8701a43b4d77..871c15d6c1a3 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -4,667 +4,667 @@ { attica = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/attica-5.78.0.tar.xz"; - sha256 = "0xlnsh9py1v7di305qic0kzpwbq0yw41rilkq1f8p9zsixl99w8m"; - name = "attica-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/attica-5.79.0.tar.xz"; + sha256 = "1p6rcpfq3ifz8c8ws5k085mzg7fya2dpv7ryd6iqwi083ys49wla"; + name = "attica-5.79.0.tar.xz"; }; }; baloo = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/baloo-5.78.0.tar.xz"; - sha256 = "1p8s0lgbqajpzbrc2pb1vzga0bsfwqjb4pzvvgqdlb419ijcjlpi"; - name = "baloo-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/baloo-5.79.0.tar.xz"; + sha256 = "0l7z7260pjw6gmcnzp0v57dsypl2yxnm8dxfcdiln8gw2fisryc0"; + name = "baloo-5.79.0.tar.xz"; }; }; bluez-qt = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/bluez-qt-5.78.0.tar.xz"; - sha256 = "1g83sfvl8zmyc9l5kr2bb9pdfis01m1ib9pz6qq1k5zv5aq3cyz9"; - name = "bluez-qt-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/bluez-qt-5.79.0.tar.xz"; + sha256 = "0snips4ak77zpz6x9bzr5lmal712lz64xns1bwlz80svzcikznpj"; + name = "bluez-qt-5.79.0.tar.xz"; }; }; breeze-icons = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/breeze-icons-5.78.0.tar.xz"; - sha256 = "1fa9lirik0ic03nb56xmiirpbcg57l1b3q7dkn9r5h6scc0nsps2"; - name = "breeze-icons-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/breeze-icons-5.79.0.tar.xz"; + sha256 = "06sd7grh7r6wnx8p8mhp7vfhsg3bnyafy94fj6jz6gg9m0308cn6"; + name = "breeze-icons-5.79.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/extra-cmake-modules-5.78.0.tar.xz"; - sha256 = "1y8js21adfzl6g5q46gj7dl8q2jhfvx0ba3ipmbclkpj4461zppf"; - name = "extra-cmake-modules-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/extra-cmake-modules-5.79.0.tar.xz"; + sha256 = "1n5yd3ggz5pq4qs7f86aqvzvfmxx2khsn1i1m67xhrn5k7dh55mj"; + name = "extra-cmake-modules-5.79.0.tar.xz"; }; }; frameworkintegration = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/frameworkintegration-5.78.0.tar.xz"; - sha256 = "0rvi82fqck8jaxnrh5fd8m581civ174hpczanmw6n7birxvmk2wh"; - name = "frameworkintegration-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/frameworkintegration-5.79.0.tar.xz"; + sha256 = "0c0i8hqqvi65bh1ghb6ql1a8vqihxck6xhpki4g0ryipilvqmj21"; + name = "frameworkintegration-5.79.0.tar.xz"; }; }; kactivities = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/kactivities-5.78.0.tar.xz"; - sha256 = "11v7rcw6lk4xd28i9al5p7bxklw5hdm97hvszhh1qd7kfrzblkhi"; - name = "kactivities-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kactivities-5.79.0.tar.xz"; + sha256 = "0d3ds43iqqlbii9xwp7f20nz338xqmq70a4v84zb5ks1mnhkz47l"; + name = "kactivities-5.79.0.tar.xz"; }; }; kactivities-stats = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/kactivities-stats-5.78.0.tar.xz"; - sha256 = "0afnwswng85jfkpbmbmprkqfngjxv2qpds3s2xlb5nzrpl43hc7s"; - name = "kactivities-stats-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kactivities-stats-5.79.0.tar.xz"; + sha256 = "0s5r8891flkmrwga15ihqrmj4i12khxwp97kaa84j4mqva6zdx93"; + name = "kactivities-stats-5.79.0.tar.xz"; }; }; kapidox = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/kapidox-5.78.0.tar.xz"; - sha256 = "1d8ia33nrsvg8gf9mna0r2f0sdi4c37p8mxl59hcfqdimy7inkvp"; - name = "kapidox-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kapidox-5.79.0.tar.xz"; + sha256 = "0qk4ksxdaiphlpd51mgwdddxq5vq8n55dd80s2a5q93jkcywhli7"; + name = "kapidox-5.79.0.tar.xz"; }; }; karchive = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/karchive-5.78.0.tar.xz"; - sha256 = "1lqjy040c5wb76fvnvdaxsgqm63bcx9bmjinvia1caqkh11a5rw2"; - name = "karchive-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/karchive-5.79.0.tar.xz"; + sha256 = "01qf46k7gp11fh53afcpmbfx0w5bi0k8jflb2db8nss7ri3bzlhc"; + name = "karchive-5.79.0.tar.xz"; }; }; kauth = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/kauth-5.78.0.tar.xz"; - sha256 = "1c0xyv54g8gcxaaz602ai1v4jlk7xndc65qjad66qiig958b1czg"; - name = "kauth-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kauth-5.79.0.tar.xz"; + sha256 = "18bqfn47iyhf1zfkw3mgdxz154f9gqbkn41c3ca94qjm91mb40da"; + name = "kauth-5.79.0.tar.xz"; }; }; kbookmarks = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/kbookmarks-5.78.0.tar.xz"; - sha256 = "0b7g0fkyyqdwpfw53kdw73jcyk8wz5k2ipmwzlpx2fr5gs2v00c3"; - name = "kbookmarks-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kbookmarks-5.79.0.tar.xz"; + sha256 = "109rjikqxv7mbhv22p41rbfz43510y6k7p0ahggynv0x5y5xzkqd"; + name = "kbookmarks-5.79.0.tar.xz"; }; }; kcalendarcore = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/kcalendarcore-5.78.0.tar.xz"; - sha256 = "1v97swaqf9bmdvfagzif1ihsnd5d900nzv8aadic0a7ax5zqi41h"; - name = "kcalendarcore-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kcalendarcore-5.79.0.tar.xz"; + sha256 = "19vc1ji0jlk899rmr6i53l51diadn67mh6z6j787bp29jlcmnciv"; + name = "kcalendarcore-5.79.0.tar.xz"; }; }; kcmutils = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/kcmutils-5.78.0.tar.xz"; - sha256 = "1ly21k3lrn6fx1j4vp0km8z9sb2l0adx0rhp9c1sasr8aflmy5k8"; - name = "kcmutils-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kcmutils-5.79.0.tar.xz"; + sha256 = "1wry88rikj7mz460m3c7gr6fwcdpdlx9jrxna2ikybnk9aw8dlkk"; + name = "kcmutils-5.79.0.tar.xz"; }; }; kcodecs = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/kcodecs-5.78.0.tar.xz"; - sha256 = "0ypwx29v7gbcdpkvlpk0r5v7d8rd3xnqlnk1k11c75dvy3763d1n"; - name = "kcodecs-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kcodecs-5.79.0.tar.xz"; + sha256 = "1ab4dz6nvmd6fzsl7wbrvjlz0c0fk0bjb0jcklrj205pkhiaf7y8"; + name = "kcodecs-5.79.0.tar.xz"; }; }; kcompletion = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/kcompletion-5.78.0.tar.xz"; - sha256 = "1a9z252m7v2fhd71dnibczb8yjq090ylcysx5pgwhc2j3djp4fd7"; - name = "kcompletion-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kcompletion-5.79.0.tar.xz"; + sha256 = "1znp6h4pggkl1hcbbw47vjkgmpc1rj6mx01p05x0ad143mwqpzwv"; + name = "kcompletion-5.79.0.tar.xz"; }; }; kconfig = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/kconfig-5.78.0.tar.xz"; - sha256 = "1fzzrypi8pxb0vprh65bpqrpgpwlwwlspf2mz5w83s90snbiwymj"; - name = "kconfig-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kconfig-5.79.0.tar.xz"; + sha256 = "02jirbphrg6dyxd444ghzhy053s85pq4lgpppca3nmvzr2572j7r"; + name = "kconfig-5.79.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/kconfigwidgets-5.78.0.tar.xz"; - sha256 = "0fgclbyxjyjid21x2059wh7dns73acjnh4qrgzhg0nsx2h8cvm47"; - name = "kconfigwidgets-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kconfigwidgets-5.79.0.tar.xz"; + sha256 = "1lrh2dis3invj9vclpa1mca8hrks1b82c5hkf0g0lilg69lir83y"; + name = "kconfigwidgets-5.79.0.tar.xz"; }; }; kcontacts = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/kcontacts-5.78.0.tar.xz"; - sha256 = "1xjm0l8did9qmjgfvy9hsa7jbfv5mqimnwl7iiz6gxvm8sm14gcw"; - name = "kcontacts-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kcontacts-5.79.0.tar.xz"; + sha256 = "0jflvfkyd7llv54dxyd1a4h1l4xgrqggxadiqv0c6ijn4dvlsmy9"; + name = "kcontacts-5.79.0.tar.xz"; }; }; kcoreaddons = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/kcoreaddons-5.78.0.tar.xz"; - sha256 = "01rvijlb3b3s5r3213am9zyk7xhfqbnfxnq175hggq0mbm6zjpv3"; - name = "kcoreaddons-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kcoreaddons-5.79.0.tar.xz"; + sha256 = "0n9nh4vkk19crp30dac3x9mzgzl4kv38jw6dcg4fwfp77gcin8kg"; + name = "kcoreaddons-5.79.0.tar.xz"; }; }; kcrash = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/kcrash-5.78.0.tar.xz"; - sha256 = "0rrxzjxwi3kib0w86gc4gkkyzvnkg6l1x81ybclvk275zi724jkj"; - name = "kcrash-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kcrash-5.79.0.tar.xz"; + sha256 = "0w74d0j1ckbcd8q8lc57g3y7g50v222mgsvli77ql29imzx79apc"; + name = "kcrash-5.79.0.tar.xz"; }; }; kdav = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/kdav-5.78.0.tar.xz"; - sha256 = "1iqh5z5rry644mcrlppbbf72nxli607varki61m1zgvcvwvaq00j"; - name = "kdav-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kdav-5.79.0.tar.xz"; + sha256 = "1573qan4xz8k33zfghwdmlr7pgbd4sfj0pshwv6bkx78kprd3xfl"; + name = "kdav-5.79.0.tar.xz"; }; }; kdbusaddons = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/kdbusaddons-5.78.0.tar.xz"; - sha256 = "16fk4jpx93q4l0wf3vgxg7vxajjqmbxd91y08khfahr2fssx14ag"; - name = "kdbusaddons-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kdbusaddons-5.79.0.tar.xz"; + sha256 = "17sklakn9nsrjajb3nwg8ibhx64c4m86pr6ln567rdr6cahcaw90"; + name = "kdbusaddons-5.79.0.tar.xz"; }; }; kdeclarative = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/kdeclarative-5.78.0.tar.xz"; - sha256 = "15s75xfy8lvwvkd789vg6y3zcxafav46g7r97psn97ans6gk2na7"; - name = "kdeclarative-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kdeclarative-5.79.0.tar.xz"; + sha256 = "05b1apviqy3dn2isqxf0bxj86r9q40pjlcqq8y15s36d6ykijyzh"; + name = "kdeclarative-5.79.0.tar.xz"; }; }; kded = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/kded-5.78.0.tar.xz"; - sha256 = "0lmxqax0x2hxllzhbvwgywdg483zarhs7f2i0d1ffigr3nn6q59m"; - name = "kded-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kded-5.79.0.tar.xz"; + sha256 = "1gyb864rqbdi64mjc165fhcvnsw06z2zi8dg728428nzmw0dysbm"; + name = "kded-5.79.0.tar.xz"; }; }; kdelibs4support = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/portingAids/kdelibs4support-5.78.0.tar.xz"; - sha256 = "1iclzch3sh0j73prm2ccjvd3z89hp4638kxdblzqqxxdyali9ycq"; - name = "kdelibs4support-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/portingAids/kdelibs4support-5.79.0.tar.xz"; + sha256 = "049l0mlf71xan8ls4hkp8s6lrnhn2i22jcnki1d5wci01dgffhm5"; + name = "kdelibs4support-5.79.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/portingAids/kdesignerplugin-5.78.0.tar.xz"; - sha256 = "1chg3g8xc8nmlzg4niciphfrclmiqcfb6jxwajv1j8j3s3vk7wwz"; - name = "kdesignerplugin-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/portingAids/kdesignerplugin-5.79.0.tar.xz"; + sha256 = "1jgqr76sx6d3jmqc350k49lqym5jkixnl3dq66430pvlrfv47w2n"; + name = "kdesignerplugin-5.79.0.tar.xz"; }; }; kdesu = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/kdesu-5.78.0.tar.xz"; - sha256 = "072bnj6hxph864gn81hr24aklh7mq974fibglihwyak0zbml5yfm"; - name = "kdesu-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kdesu-5.79.0.tar.xz"; + sha256 = "1hlz5pr72qk64gwp30qx92jhlszri5qjsisvl4cxs01ylnrqy0c1"; + name = "kdesu-5.79.0.tar.xz"; }; }; kdewebkit = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/portingAids/kdewebkit-5.78.0.tar.xz"; - sha256 = "0mcnlc4s372ghdjypksdjh6casradsxwa47aaac4d4yg2qk7mqb1"; - name = "kdewebkit-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/portingAids/kdewebkit-5.79.0.tar.xz"; + sha256 = "0d81p49n2ryig9xp5id1dx4rpjjd2spl78m0xlq6rczyk7yf73pz"; + name = "kdewebkit-5.79.0.tar.xz"; }; }; kdnssd = { - version = "5.78.0"; + version = "5.79.1"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/kdnssd-5.78.0.tar.xz"; - sha256 = "1rsjbi5x05ii17xl8zvcrfjmjsq0g6vqh90qflnyys6lzhyvs0sf"; - name = "kdnssd-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kdnssd-5.79.1.tar.xz"; + sha256 = "160qyll887wblrw0lhax749lzwhlp92sckj4g259955p8gnsw5lp"; + name = "kdnssd-5.79.1.tar.xz"; }; }; kdoctools = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/kdoctools-5.78.0.tar.xz"; - sha256 = "0qngw9li2am0phkys45cph3qj01fjhjhvp3dsk3ymr60szryw23s"; - name = "kdoctools-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kdoctools-5.79.0.tar.xz"; + sha256 = "03bvj3grjw6a56shdy8c3mdp11pwmc72ccp3ia00bz310ahpphzb"; + name = "kdoctools-5.79.0.tar.xz"; }; }; kemoticons = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/kemoticons-5.78.0.tar.xz"; - sha256 = "14alh2n5igk3cpm1j7ms7y0xph61qy5k3n2bw8y4y5wkb8qmqg3m"; - name = "kemoticons-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kemoticons-5.79.0.tar.xz"; + sha256 = "04x1yfdcyvx3x4aqha69rsaa78j4iw6qam3hp5a4di0yf653mphp"; + name = "kemoticons-5.79.0.tar.xz"; }; }; kfilemetadata = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/kfilemetadata-5.78.0.tar.xz"; - sha256 = "111w47f74kmn81hvjxjhp6n6kc4533a76fzvrv6wbprqiwc6bncx"; - name = "kfilemetadata-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kfilemetadata-5.79.0.tar.xz"; + sha256 = "0yxjapq88pfcma82mc9gz03x1bb81xl6xzrinr6jgz09206ra395"; + name = "kfilemetadata-5.79.0.tar.xz"; }; }; kglobalaccel = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/kglobalaccel-5.78.0.tar.xz"; - sha256 = "08mqjdigb5lzx0kqhmw5m8gnvs01fzg3j0dan70v5203wbfnw69z"; - name = "kglobalaccel-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kglobalaccel-5.79.0.tar.xz"; + sha256 = "0qqxvv3m7b44makgdcsxdhzamm4ahm1pn94rn6cpsrqsyci8axy8"; + name = "kglobalaccel-5.79.0.tar.xz"; }; }; kguiaddons = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/kguiaddons-5.78.0.tar.xz"; - sha256 = "1l3ppihibhcjajmd55dr6mcc1xd4ni2iw2rdpk2l11ran4nys2dd"; - name = "kguiaddons-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kguiaddons-5.79.0.tar.xz"; + sha256 = "118wiy3pbmbazfivmh0w2g5l10qcp10b34r3d02pj7rs2a74h05w"; + name = "kguiaddons-5.79.0.tar.xz"; }; }; kholidays = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/kholidays-5.78.0.tar.xz"; - sha256 = "147ma06mrbydf2gyrh526bjh1f0xlnxiw89xp6n3wq0qmmdvhs17"; - name = "kholidays-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kholidays-5.79.0.tar.xz"; + sha256 = "1lbbq6y1xkffh9qma7hr5hi712kl85kv51gij0mj69ssv1iq2a8n"; + name = "kholidays-5.79.0.tar.xz"; }; }; khtml = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/portingAids/khtml-5.78.0.tar.xz"; - sha256 = "0pai60cbl8p01xb97191nyzmsf7q00vcqvy8cdr8gfvrlx8k7dhn"; - name = "khtml-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/portingAids/khtml-5.79.0.tar.xz"; + sha256 = "1916kpb3kr0d7lbf0b65lrwkxnlgickm7vrmlc3qwlmf3fyqvkhy"; + name = "khtml-5.79.0.tar.xz"; }; }; ki18n = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/ki18n-5.78.0.tar.xz"; - sha256 = "0mafvkrgmdcj869dzqmgphdwhl6a2bf2lw99w7frxh2qw4n2sd8k"; - name = "ki18n-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/ki18n-5.79.0.tar.xz"; + sha256 = "12sa7ycxc7m7nrsm6x7f822c8p586hy0syny5ya8vpmhwk1j3gik"; + name = "ki18n-5.79.0.tar.xz"; }; }; kiconthemes = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/kiconthemes-5.78.0.tar.xz"; - sha256 = "0ssd1298pqm0g46m92b5d4yfrqxgmwf465lcbia41lndjd6px27v"; - name = "kiconthemes-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kiconthemes-5.79.0.tar.xz"; + sha256 = "0bbs8q0dpz4qyxsd1qk5jxazn600m5j2axzccxyrr21r9plbs4nx"; + name = "kiconthemes-5.79.0.tar.xz"; }; }; kidletime = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/kidletime-5.78.0.tar.xz"; - sha256 = "0aw6g6p3bmp32zk22fwp2f1d20vbf7921ixnyf7a0w535r58d5ma"; - name = "kidletime-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kidletime-5.79.0.tar.xz"; + sha256 = "0pp2ii4cvxygz40ai0b3rpqdjgpq4nya2hrms9c3yxb5hizrrrak"; + name = "kidletime-5.79.0.tar.xz"; }; }; kimageformats = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/kimageformats-5.78.0.tar.xz"; - sha256 = "0gv2w49cdzji8h9swaazpmbn0qqzn4ncnxj7f9rqp686q17czm7c"; - name = "kimageformats-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kimageformats-5.79.0.tar.xz"; + sha256 = "09ffc44vzcin2ikyhm0awba7ag7pbnam4cilvfr3lwnj022y7j7c"; + name = "kimageformats-5.79.0.tar.xz"; }; }; kinit = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/kinit-5.78.0.tar.xz"; - sha256 = "16shlmm6q0vaf05gkrgqpmjrs5fgb8jrfgq331x7ic567hhzv4vv"; - name = "kinit-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kinit-5.79.0.tar.xz"; + sha256 = "0ppri3gaiwawydjfw8ji6accrpwc8ms0sb1s5pn59wqiyv52f5rv"; + name = "kinit-5.79.0.tar.xz"; }; }; kio = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/kio-5.78.0.tar.xz"; - sha256 = "086nhyjk5sjvp97fs6kkmc99jh2303sbmpfki1qvcwzdq6idn4g2"; - name = "kio-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kio-5.79.0.tar.xz"; + sha256 = "1ri5dv8lc4ywc7jknlszri812y91mgggjx5z5qfkv971njm6fz3n"; + name = "kio-5.79.0.tar.xz"; }; }; kirigami2 = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/kirigami2-5.78.0.tar.xz"; - sha256 = "0667wcxyhil332g6gk12bjg5y0c1zk15354wx6mg8krxl3i2nkjy"; - name = "kirigami2-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kirigami2-5.79.0.tar.xz"; + sha256 = "01rb678qz1avzi7393wylwnc13ndzx2pgqnz3bd0zki0pjfrrlzp"; + name = "kirigami2-5.79.0.tar.xz"; }; }; kitemmodels = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/kitemmodels-5.78.0.tar.xz"; - sha256 = "1yn8gi7dml7mxyk93fzx5id2pckw6qbbkifwzmhq5i3vzpq1qdja"; - name = "kitemmodels-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kitemmodels-5.79.0.tar.xz"; + sha256 = "1g9xa0h3kq0m5v1yvwgr8f6lrq8n2x1qzqqjbbbbyg8ayavv4abs"; + name = "kitemmodels-5.79.0.tar.xz"; }; }; kitemviews = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/kitemviews-5.78.0.tar.xz"; - sha256 = "10ysirhlgbzyiybb1ap111w89v3czing43ap10n5pldgh1c8ky05"; - name = "kitemviews-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kitemviews-5.79.0.tar.xz"; + sha256 = "0p21hyxhain2mr19lzfml23ilpgqwr2i27p1qg39jnwyb74jw0nl"; + name = "kitemviews-5.79.0.tar.xz"; }; }; kjobwidgets = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/kjobwidgets-5.78.0.tar.xz"; - sha256 = "0cdy7w14wr08xf9na1jzbrwjvmiw5q2ciniafzf9cn55yxrvmhwv"; - name = "kjobwidgets-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kjobwidgets-5.79.0.tar.xz"; + sha256 = "059a58hp0npip07w7idjrl5sjjgl4i3bdqzv1k22hlvzdsyibggr"; + name = "kjobwidgets-5.79.0.tar.xz"; }; }; kjs = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/portingAids/kjs-5.78.0.tar.xz"; - sha256 = "0sjnwj6x7dgvqh333yii5vlh7pbl1kc7zrbdjkqi38cfnbcf2w4h"; - name = "kjs-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/portingAids/kjs-5.79.0.tar.xz"; + sha256 = "1v51xjmwxi1x85b4hlj8m12zxl5w0d160kjjbrrxqfn64i4302ga"; + name = "kjs-5.79.0.tar.xz"; }; }; kjsembed = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/portingAids/kjsembed-5.78.0.tar.xz"; - sha256 = "0r8hxbqn5k0wsk4swym7hi15mnhd9dyvcgz8lycqnvlrz0walvr9"; - name = "kjsembed-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/portingAids/kjsembed-5.79.0.tar.xz"; + sha256 = "18kjq5mim7b1a5mlhkwpwvnszjqxilhi4laqladh97wkmvsr85py"; + name = "kjsembed-5.79.0.tar.xz"; }; }; kmediaplayer = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/portingAids/kmediaplayer-5.78.0.tar.xz"; - sha256 = "0yy0k2cgchj1pnk2q7gq4iihscf6rgiwdpfn6i0i8zcczkm2gyls"; - name = "kmediaplayer-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/portingAids/kmediaplayer-5.79.0.tar.xz"; + sha256 = "1lgrcib9acbzgs1kv44bqfisrayiir2r1iygrrncp117fj9cqx8b"; + name = "kmediaplayer-5.79.0.tar.xz"; }; }; knewstuff = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/knewstuff-5.78.0.tar.xz"; - sha256 = "1fb1ka7ljfw4wyf8sy0r5vy9nmji286p26wjzgsf2rzzskaspc6m"; - name = "knewstuff-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/knewstuff-5.79.0.tar.xz"; + sha256 = "0bsg0r0s12ck2cafkvnmjldr32ykivcpqjs1zfzqqbvy5w05a81y"; + name = "knewstuff-5.79.0.tar.xz"; }; }; knotifications = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/knotifications-5.78.0.tar.xz"; - sha256 = "0f93xql467jbz964lpjrsip77wf0s8qygggkjb85y8xgpcdw4zrr"; - name = "knotifications-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/knotifications-5.79.0.tar.xz"; + sha256 = "11g4xsa0z9680k4blxb1axn874p6s2vd5p9h376ln3blhjmy17hj"; + name = "knotifications-5.79.0.tar.xz"; }; }; knotifyconfig = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/knotifyconfig-5.78.0.tar.xz"; - sha256 = "0nzs76ii447xv3dqcg14a045xc74bnvwghfdmlb0vmh22p3a60fz"; - name = "knotifyconfig-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/knotifyconfig-5.79.0.tar.xz"; + sha256 = "0c6d95bf8876czjd39cla7pd3li8sm684h04f77czf6sh1mil49d"; + name = "knotifyconfig-5.79.0.tar.xz"; }; }; kpackage = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/kpackage-5.78.0.tar.xz"; - sha256 = "0d0vfh3ifaj2xifw370rfapw2yf24h7f8xwbhmx787dr6w86m47c"; - name = "kpackage-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kpackage-5.79.0.tar.xz"; + sha256 = "1xkkw4lk9hx2irni5d2k7873bffgd2w41qvvp25d786dz612fy27"; + name = "kpackage-5.79.0.tar.xz"; }; }; kparts = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/kparts-5.78.0.tar.xz"; - sha256 = "1np1vshzihh2r51gzy54yvm6h898ffw5b20c3r6jaa0837g3mlvp"; - name = "kparts-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kparts-5.79.0.tar.xz"; + sha256 = "0d9dsgf6q44gqril6h9w5jfsavk0m5gclbmjdxjkcvrz3xfbjhd9"; + name = "kparts-5.79.0.tar.xz"; }; }; kpeople = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/kpeople-5.78.0.tar.xz"; - sha256 = "0ccc10qfhw69s12sfgpql988pf7pssx9k8j9xcywil4y7xidk05i"; - name = "kpeople-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kpeople-5.79.0.tar.xz"; + sha256 = "0dj8hcjl0r673j7m2k83mxy2787jfi9pz6cvmfqfczbzpw20ycf4"; + name = "kpeople-5.79.0.tar.xz"; }; }; kplotting = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/kplotting-5.78.0.tar.xz"; - sha256 = "00wd3rgp4c0sngfbdz613792sidsykbnazsq05lf4pk46py4xcvc"; - name = "kplotting-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kplotting-5.79.0.tar.xz"; + sha256 = "0lawpg7i36wppm95jxhhc7ghc88kb1s34px6w8p7n6cm2gxkhwn6"; + name = "kplotting-5.79.0.tar.xz"; }; }; kpty = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/kpty-5.78.0.tar.xz"; - sha256 = "1nhijlp98bnnqj9c0i3g1xfpdhghw7241av4wzwhhxny67addlf3"; - name = "kpty-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kpty-5.79.0.tar.xz"; + sha256 = "1qd09r17nmsnqxggmsdw0j6l0620f11ya6mx7bc9zs2y08mgvjka"; + name = "kpty-5.79.0.tar.xz"; }; }; kquickcharts = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/kquickcharts-5.78.0.tar.xz"; - sha256 = "1zq5bp3w42sqvlvkc7vx6l7h142ihzgzqpa2435j9apvx0kvjqhp"; - name = "kquickcharts-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kquickcharts-5.79.0.tar.xz"; + sha256 = "1p9a3mq7xxyavzmgjmz47vrv0hm1h9g8fsligi3r3n5az7klra6f"; + name = "kquickcharts-5.79.0.tar.xz"; }; }; kross = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/portingAids/kross-5.78.0.tar.xz"; - sha256 = "07ylcvkz5xf6b9n65373a8zpp5nsby5c99l912bdxf05hrjcw8b1"; - name = "kross-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/portingAids/kross-5.79.0.tar.xz"; + sha256 = "00hpyxcn2fwaz32gggqjcmx4blbcdxj3yvhldnmmkmi3k0r68dfc"; + name = "kross-5.79.0.tar.xz"; }; }; krunner = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/krunner-5.78.0.tar.xz"; - sha256 = "00hy62g9i9vdzgv9ljfqjv0m45lrsmxynmp3fyp5c3amj9r64pkm"; - name = "krunner-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/krunner-5.79.0.tar.xz"; + sha256 = "0v7faai6ar06cw7gikhccsa92aii085dk81g4xpyskmxlpvrraci"; + name = "krunner-5.79.0.tar.xz"; }; }; kservice = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/kservice-5.78.0.tar.xz"; - sha256 = "181maly1xij1jp7f0x9ajbv5q6qszqd273sdz1snkg5j4398mric"; - name = "kservice-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kservice-5.79.0.tar.xz"; + sha256 = "1drzj4s1zbh5pffnh3r1wjsk7g1vr0np2h28mlfm4hy3bywxzrnp"; + name = "kservice-5.79.0.tar.xz"; }; }; ktexteditor = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/ktexteditor-5.78.0.tar.xz"; - sha256 = "1r148n3nx3jyw2vn4rfxdl2mkywr5fn78s5ya7vq44pw2bmwar2n"; - name = "ktexteditor-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/ktexteditor-5.79.0.tar.xz"; + sha256 = "1csms6cl8pp9slzwzdgsxhah1b218maakkxmiqk0ngx2sf4lbfc3"; + name = "ktexteditor-5.79.0.tar.xz"; }; }; ktextwidgets = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/ktextwidgets-5.78.0.tar.xz"; - sha256 = "1gpqxvlmqm5nj5kgx2dmvl8ynjqw995wnpl9ja5c82d8bczkn4z8"; - name = "ktextwidgets-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/ktextwidgets-5.79.0.tar.xz"; + sha256 = "1bnhq4jpybckdlw5518n2hbfilbpadafvchnxigg9p7671pkp85l"; + name = "ktextwidgets-5.79.0.tar.xz"; }; }; kunitconversion = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/kunitconversion-5.78.0.tar.xz"; - sha256 = "17a3lpc60qn9qd53mlrjxwg5gyqvq0vnnz9wdrak481nf2c0qycc"; - name = "kunitconversion-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kunitconversion-5.79.0.tar.xz"; + sha256 = "19snm2mvvbs2aqpq7k9b3g1fbg40kpmbjmqn38g6m065mpw3372l"; + name = "kunitconversion-5.79.0.tar.xz"; }; }; kwallet = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/kwallet-5.78.0.tar.xz"; - sha256 = "1a8n5d9y9qwcb4d9zbr1xhk3w390n7f6mmx52nq5akna51zrjc4p"; - name = "kwallet-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kwallet-5.79.0.tar.xz"; + sha256 = "1qickn20ry8qccirdc7rvdf40dxgb13y4n0wi80qz87xzmps3f3p"; + name = "kwallet-5.79.0.tar.xz"; }; }; kwayland = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/kwayland-5.78.0.tar.xz"; - sha256 = "052avcafjnib55s2lp1fzhx7dk9mlyg4v143gfp9j8wvlqaa8sxb"; - name = "kwayland-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kwayland-5.79.0.tar.xz"; + sha256 = "14grhcav772zfdjmwnjms819by2djm8dnv71cj4ps45iq0gba6ck"; + name = "kwayland-5.79.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/kwidgetsaddons-5.78.0.tar.xz"; - sha256 = "0b2y9ilk2zz4zw2m1lcwrmn3hni5jh6kalclx5l9fi98686b1az4"; - name = "kwidgetsaddons-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kwidgetsaddons-5.79.0.tar.xz"; + sha256 = "0jpfwxa397cvqr1q92b2nva7wy2ngv08kz5l94xrz0wzkagxfixc"; + name = "kwidgetsaddons-5.79.0.tar.xz"; }; }; kwindowsystem = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/kwindowsystem-5.78.0.tar.xz"; - sha256 = "003jypnib16qpm7l76zqbhhbqq2g23hm245l9dskbansxpncmfbc"; - name = "kwindowsystem-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kwindowsystem-5.79.0.tar.xz"; + sha256 = "15pi2vnvdchj9f3yp1p7hqxmnwd606a6fwq4h7li4pvb4w3gibmq"; + name = "kwindowsystem-5.79.0.tar.xz"; }; }; kxmlgui = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/kxmlgui-5.78.0.tar.xz"; - sha256 = "05yxgxbvv8anl4m40jwwfx183y69fdljj4g7daip0nk7hs4vc37q"; - name = "kxmlgui-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kxmlgui-5.79.0.tar.xz"; + sha256 = "1j8fb5i1v7pqs5as1h43nc0s2pm3i9cwks2h5388yld325ysx0v9"; + name = "kxmlgui-5.79.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/portingAids/kxmlrpcclient-5.78.0.tar.xz"; - sha256 = "0591c23sjwfhrf7d7z6bgikjal1h70vpjx7xmr1ypwck6pxj8z2x"; - name = "kxmlrpcclient-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/portingAids/kxmlrpcclient-5.79.0.tar.xz"; + sha256 = "1cwvglsfv5m3mb5bjl7rfas1samyw703qjfiz1pf6vxgmpxdcr4a"; + name = "kxmlrpcclient-5.79.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/modemmanager-qt-5.78.0.tar.xz"; - sha256 = "09y3pjav7dzfmplacwn0j281d59rdhlad16myaxh6hbf9zdkmnyr"; - name = "modemmanager-qt-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/modemmanager-qt-5.79.0.tar.xz"; + sha256 = "0xfbchyaaqxjj66zb19k4vxi9azijf0llbql6fzxln687s3z65wd"; + name = "modemmanager-qt-5.79.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/networkmanager-qt-5.78.0.tar.xz"; - sha256 = "0wfyczlki8sb2wydyslpi111y4hfc6xvnar8cxj75bsn83pd9wya"; - name = "networkmanager-qt-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/networkmanager-qt-5.79.0.tar.xz"; + sha256 = "04iaqa2q73zvscx300bah6mnl79dai9yrmq11d1vyil99af36m6s"; + name = "networkmanager-qt-5.79.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/oxygen-icons5-5.78.0.tar.xz"; - sha256 = "1xp3zg59srxfc0z5cf45x7am98rsjq3p3ms2975il03389w55kr9"; - name = "oxygen-icons5-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/oxygen-icons5-5.79.0.tar.xz"; + sha256 = "1j6l9r4l82gp5qcpn3xw4dzfbhsawbpk8mypnfckk73x1bjcaqss"; + name = "oxygen-icons5-5.79.0.tar.xz"; }; }; plasma-framework = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/plasma-framework-5.78.0.tar.xz"; - sha256 = "10c4d7mvnjdpjcjzxy8r5k1h3pxw9d4h9ii8bkngb2kjfblf3bj6"; - name = "plasma-framework-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/plasma-framework-5.79.0.tar.xz"; + sha256 = "15hbfqdyas27kj6rd24n6d80r1dcsiiv0zgjkp12x8dnjyd3vz4x"; + name = "plasma-framework-5.79.0.tar.xz"; }; }; prison = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/prison-5.78.0.tar.xz"; - sha256 = "0ygsdjcxr7l7jgllf6c38rbpc4byikg7zx71dzmas7ikg4axylfk"; - name = "prison-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/prison-5.79.0.tar.xz"; + sha256 = "1rn66n67g914w1klgsirqff62qv4p2l64ahzsxnbixfwy1dwlpa2"; + name = "prison-5.79.0.tar.xz"; }; }; purpose = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/purpose-5.78.0.tar.xz"; - sha256 = "13v2w4kx7ir9wqyahn6rlq7li7kxigxppffjccwpfihzpnyig029"; - name = "purpose-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/purpose-5.79.0.tar.xz"; + sha256 = "1mlph5mzwfqwlkvm3df3in3r3airnx4hxhy0p56ri3k3m9k2rqpz"; + name = "purpose-5.79.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/qqc2-desktop-style-5.78.0.tar.xz"; - sha256 = "0a9kxfrvx0qv079vd9vx4924vs5g8qbicdp1wfv3c80ilbmn1sik"; - name = "qqc2-desktop-style-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/qqc2-desktop-style-5.79.0.tar.xz"; + sha256 = "1cykbdbzxkblwp0dmgc4r3csml9l81zhfsqcjamfai6srl10vbij"; + name = "qqc2-desktop-style-5.79.0.tar.xz"; }; }; solid = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/solid-5.78.0.tar.xz"; - sha256 = "1qgx9fsaxsypjfzyp3dq79skp7vhhv59ssqb1aq4168gdsai15qj"; - name = "solid-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/solid-5.79.0.tar.xz"; + sha256 = "033ss326q450phf918a5py3z6ajnjj6f1nws8ngp05zi028nkhrl"; + name = "solid-5.79.0.tar.xz"; }; }; sonnet = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/sonnet-5.78.0.tar.xz"; - sha256 = "1jw00bkhjf029yr6qh7mkdpizcc96103fsf68ydkbykfqsb0xry2"; - name = "sonnet-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/sonnet-5.79.0.tar.xz"; + sha256 = "09b1rb88ck50g67nmki06ixxsfnz3x3jd0f334qaz147h2jklvyq"; + name = "sonnet-5.79.0.tar.xz"; }; }; syndication = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/syndication-5.78.0.tar.xz"; - sha256 = "0sy2419xrkb5yqj70x2gakb53hqz7j5631pjkvai92gvk01bcbd1"; - name = "syndication-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/syndication-5.79.0.tar.xz"; + sha256 = "1jyz0c67zscgspvisn43wrdgk4pxs4i3r9pyknm8nvxwiff2p1ji"; + name = "syndication-5.79.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.78.0"; + version = "5.79.1"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/syntax-highlighting-5.78.0.tar.xz"; - sha256 = "1m6ngf6nij3p09p7dhngjr9jhmc6dl12vd2x4dkj5fs8wlfbfplb"; - name = "syntax-highlighting-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/syntax-highlighting-5.79.1.tar.xz"; + sha256 = "143ra8j0x1biijclnjhp6b69v04m65avp2nic9jzj9y5wjz5x0mj"; + name = "syntax-highlighting-5.79.1.tar.xz"; }; }; threadweaver = { - version = "5.78.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.78/threadweaver-5.78.0.tar.xz"; - sha256 = "1llqfmpbq0mysa1h7vx16v020zw776sqkrh85kah9478bj7ffwnr"; - name = "threadweaver-5.78.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/threadweaver-5.79.0.tar.xz"; + sha256 = "062r9nhggw3dlvgpb2l6fqyyzqv35a9lgvikh2pjdicx9r2s8z19"; + name = "threadweaver-5.79.0.tar.xz"; }; }; } From cfaf8647df69b30b1ffea94410ef9523c1b6c5ca Mon Sep 17 00:00:00 2001 From: Yaroslav Bolyukin <iam@lach.pw> Date: Tue, 16 Feb 2021 18:28:22 +0300 Subject: [PATCH 081/188] plasma5: 5.20.90 -> 5.21.0 Signed-off-by: Yaroslav Bolyukin <iam@lach.pw> --- pkgs/desktops/plasma-5/fetch.sh | 2 +- pkgs/desktops/plasma-5/srcs.nix | 416 ++++++++++++++++---------------- 2 files changed, 209 insertions(+), 209 deletions(-) diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index e6f0d185fc86..1a29cdadc34e 100644 --- a/pkgs/desktops/plasma-5/fetch.sh +++ b/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/unstable/plasma/5.20.90/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.21.0/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index 6aa0b4a6dfe0..d8caf49def1f 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -4,419 +4,419 @@ { bluedevil = { - version = "5.20.90"; + version = "5.21.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.20.90/bluedevil-5.20.90.tar.xz"; - sha256 = "0fqnwkg666kqai9wb8rprjbpf4fd2rirl9p14249z635y37nxigx"; - name = "bluedevil-5.20.90.tar.xz"; + url = "${mirror}/stable/plasma/5.21.0/bluedevil-5.21.0.tar.xz"; + sha256 = "1ywrkfgkfmqjhmvi0q6lsw1svk36aizr3x25v48r46mbcppcxrwg"; + name = "bluedevil-5.21.0.tar.xz"; }; }; breeze = { - version = "5.20.90"; + version = "5.21.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.20.90/breeze-5.20.90.tar.xz"; - sha256 = "1f14kl70yzpcirgcc9absp15hkkcs1md49hj8zd8cyqfy2va9ppp"; - name = "breeze-5.20.90.tar.xz"; + url = "${mirror}/stable/plasma/5.21.0/breeze-5.21.0.tar.xz"; + sha256 = "1qqqd9y6y707dj3kasl4wr6i73vy55vjvbzi3xs00cp382si0wdw"; + name = "breeze-5.21.0.tar.xz"; }; }; breeze-grub = { - version = "5.20.90"; + version = "5.21.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.20.90/breeze-grub-5.20.90.tar.xz"; - sha256 = "1sy4245bhsr0gvdj75d1v7gahsmiz6p5jviai77m4c2vshh8s1g8"; - name = "breeze-grub-5.20.90.tar.xz"; + url = "${mirror}/stable/plasma/5.21.0/breeze-grub-5.21.0.tar.xz"; + sha256 = "0mvasvvyf6bxr3g1sfc7fii9qdgnrild61h87hw86gy48mvs838s"; + name = "breeze-grub-5.21.0.tar.xz"; }; }; breeze-gtk = { - version = "5.20.90"; + version = "5.21.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.20.90/breeze-gtk-5.20.90.tar.xz"; - sha256 = "14khgqgp7j14y1l1pxpmp6n39jzzyn5ma76m8xn901hqv9638c63"; - name = "breeze-gtk-5.20.90.tar.xz"; + url = "${mirror}/stable/plasma/5.21.0/breeze-gtk-5.21.0.tar.xz"; + sha256 = "15d3yw7zjkrfahmw7rysjvw4vwy7qmicah4pan57hiyj20zryakl"; + name = "breeze-gtk-5.21.0.tar.xz"; }; }; breeze-plymouth = { - version = "5.20.90"; + version = "5.21.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.20.90/breeze-plymouth-5.20.90.tar.xz"; - sha256 = "0r5yvlmwm3dxz140npk93b45rmy4vhhip1sy7xcm89q03v4y1j8r"; - name = "breeze-plymouth-5.20.90.tar.xz"; + url = "${mirror}/stable/plasma/5.21.0/breeze-plymouth-5.21.0.tar.xz"; + sha256 = "116z28rv5qgjadczaw8qsjxl12v2yd4y7cm8zhw9nxbvww9g2k6k"; + name = "breeze-plymouth-5.21.0.tar.xz"; }; }; discover = { - version = "5.20.90"; + version = "5.21.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.20.90/discover-5.20.90.tar.xz"; - sha256 = "01apxnlkk6hzwx23k334jj6qnpdywp7bymrmh55pf61hn7rj7n25"; - name = "discover-5.20.90.tar.xz"; + url = "${mirror}/stable/plasma/5.21.0/discover-5.21.0.tar.xz"; + sha256 = "0316sm9mamk0kz3wqikdfc97hk3qd7g4zhjdgghx5plj52jafghc"; + name = "discover-5.21.0.tar.xz"; }; }; drkonqi = { - version = "5.20.90"; + version = "5.21.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.20.90/drkonqi-5.20.90.tar.xz"; - sha256 = "0ksz1z6p3axq70z252gkwa70kvg200hyw6sn18mha2h6g9hw46gw"; - name = "drkonqi-5.20.90.tar.xz"; + url = "${mirror}/stable/plasma/5.21.0/drkonqi-5.21.0.tar.xz"; + sha256 = "1ryqrc679f3w75f5df5n72aq2hbgw9jf7rbnss1468iwkaj3gmys"; + name = "drkonqi-5.21.0.tar.xz"; }; }; kactivitymanagerd = { - version = "5.20.90"; + version = "5.21.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.20.90/kactivitymanagerd-5.20.90.tar.xz"; - sha256 = "00d7m71z5jgbbmsgyhawsqp8fzsqa062z1dmhvx0jjkdvrgvc04s"; - name = "kactivitymanagerd-5.20.90.tar.xz"; + url = "${mirror}/stable/plasma/5.21.0/kactivitymanagerd-5.21.0.tar.xz"; + sha256 = "0rhdg9kxlpbyzs1lj41f6yixvwh7h87xnwaswyf7z7yfcw9vy2jz"; + name = "kactivitymanagerd-5.21.0.tar.xz"; }; }; kde-cli-tools = { - version = "5.20.90"; + version = "5.21.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.20.90/kde-cli-tools-5.20.90.tar.xz"; - sha256 = "1syq034ikyhc3bhqx946jw71j7bngkppg3i9swlr7w19pb68g4nv"; - name = "kde-cli-tools-5.20.90.tar.xz"; + url = "${mirror}/stable/plasma/5.21.0/kde-cli-tools-5.21.0.tar.xz"; + sha256 = "136pyvm24gh51bvrjrs139vaic037ylzz6w4ddjxary0zi4kl1gn"; + name = "kde-cli-tools-5.21.0.tar.xz"; }; }; kdecoration = { - version = "5.20.90"; + version = "5.21.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.20.90/kdecoration-5.20.90.tar.xz"; - sha256 = "144wby86zbz3npbk7m3zf18aap05spxv79wn2vddb6n1d7722ryb"; - name = "kdecoration-5.20.90.tar.xz"; + url = "${mirror}/stable/plasma/5.21.0/kdecoration-5.21.0.tar.xz"; + sha256 = "03aglly2d4mrizzana8w11vbd3lpmy50z97kwlk8lpqml7yqnap3"; + name = "kdecoration-5.21.0.tar.xz"; }; }; kde-gtk-config = { - version = "5.20.90"; + version = "5.21.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.20.90/kde-gtk-config-5.20.90.tar.xz"; - sha256 = "1qan8d9ird6svp8c8l7x01ssx76ckmyq5wdwvlsp94kbm8590gsj"; - name = "kde-gtk-config-5.20.90.tar.xz"; + url = "${mirror}/stable/plasma/5.21.0/kde-gtk-config-5.21.0.tar.xz"; + sha256 = "0midb0x8aq4pc62w3vkdhg2k7hkdm1hmx2zwyxx14443yh9kq7km"; + name = "kde-gtk-config-5.21.0.tar.xz"; }; }; kdeplasma-addons = { - version = "5.20.90"; + version = "5.21.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.20.90/kdeplasma-addons-5.20.90.tar.xz"; - sha256 = "0vjw0750fkigvzrdbzl4zdjbyvrb0q5lxzywkhz38qwrs60k3hyi"; - name = "kdeplasma-addons-5.20.90.tar.xz"; + url = "${mirror}/stable/plasma/5.21.0/kdeplasma-addons-5.21.0.tar.xz"; + sha256 = "01zvx00m0yda0xw26swb7v99kvb4dcq1cgbrm02rkzvmh52yaqrk"; + name = "kdeplasma-addons-5.21.0.tar.xz"; }; }; kgamma5 = { - version = "5.20.90"; + version = "5.21.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.20.90/kgamma5-5.20.90.tar.xz"; - sha256 = "0060g40lxzycww1kh18qncygbxgf66vva10yqr1ibhkip806jcm8"; - name = "kgamma5-5.20.90.tar.xz"; + url = "${mirror}/stable/plasma/5.21.0/kgamma5-5.21.0.tar.xz"; + sha256 = "0lg23wixrpq57645k3c1h78pj6ykdfmihacmwali9lsysnb0a3h4"; + name = "kgamma5-5.21.0.tar.xz"; }; }; khotkeys = { - version = "5.20.90"; + version = "5.21.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.20.90/khotkeys-5.20.90.tar.xz"; - sha256 = "1clbbzrj0ixz8xzjnd2agmjmxvs6r61kgykfk9ihagnv6varbffq"; - name = "khotkeys-5.20.90.tar.xz"; + url = "${mirror}/stable/plasma/5.21.0/khotkeys-5.21.0.tar.xz"; + sha256 = "06prv641mqmmbjjlpylvnawkcfnz5c96cxsc1k0h8fiazlf04dp9"; + name = "khotkeys-5.21.0.tar.xz"; }; }; kinfocenter = { - version = "5.20.90"; + version = "5.21.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.20.90/kinfocenter-5.20.90.tar.xz"; - sha256 = "1k4r8aia60g5mki2490c9xrlnqgvibdnyk1lpcmin8r474yg2b15"; - name = "kinfocenter-5.20.90.tar.xz"; + url = "${mirror}/stable/plasma/5.21.0/kinfocenter-5.21.0.tar.xz"; + sha256 = "027x8mjwa7p4nj6ksvqrn27vrvj2aymbkpnz7nd8v7fdn7hi6whp"; + name = "kinfocenter-5.21.0.tar.xz"; }; }; kmenuedit = { - version = "5.20.90"; + version = "5.21.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.20.90/kmenuedit-5.20.90.tar.xz"; - sha256 = "0jq9hjjmpg47ca675rnss3sagvxgxwpr525nngp8ivc7aa154wmf"; - name = "kmenuedit-5.20.90.tar.xz"; + url = "${mirror}/stable/plasma/5.21.0/kmenuedit-5.21.0.tar.xz"; + sha256 = "1lfvh7i19yfj6i2i3ccpdcxawzya7rp1rx7dp9lb42y4spx1ddaa"; + name = "kmenuedit-5.21.0.tar.xz"; }; }; kscreen = { - version = "5.20.90"; + version = "5.21.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.20.90/kscreen-5.20.90.tar.xz"; - sha256 = "1rlvgxyly3s2g1iplqqz5irj9987y4gd6jbngrap1mc47kdbvr3a"; - name = "kscreen-5.20.90.tar.xz"; + url = "${mirror}/stable/plasma/5.21.0/kscreen-5.21.0.tar.xz"; + sha256 = "043h5mf85qgxha43399ri74y0zknaq04rja8jzn17xqx9l6s9sna"; + name = "kscreen-5.21.0.tar.xz"; }; }; kscreenlocker = { - version = "5.20.90"; + version = "5.21.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.20.90/kscreenlocker-5.20.90.tar.xz"; - sha256 = "1hxllh1fg87gq6wa8lwawvakwxvbhlj2lmk9mlqg41hwh48g24ah"; - name = "kscreenlocker-5.20.90.tar.xz"; + url = "${mirror}/stable/plasma/5.21.0/kscreenlocker-5.21.0.tar.xz"; + sha256 = "115hds7sa1ssc42pjc22jv8d0vdxxwd9cyhgd5czpy5s51famffk"; + name = "kscreenlocker-5.21.0.tar.xz"; }; }; ksshaskpass = { - version = "5.20.90"; + version = "5.21.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.20.90/ksshaskpass-5.20.90.tar.xz"; - sha256 = "1zia38ji2mcrv79l4wda38d3cvhipnsnj12j2s1c1l3bmz93n2q1"; - name = "ksshaskpass-5.20.90.tar.xz"; + url = "${mirror}/stable/plasma/5.21.0/ksshaskpass-5.21.0.tar.xz"; + sha256 = "0zsbhfhk00rm6g9bi1hs98r67wnb612kxfqi315a1mnm30nascbi"; + name = "ksshaskpass-5.21.0.tar.xz"; }; }; ksysguard = { - version = "5.20.90"; + version = "5.21.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.20.90/ksysguard-5.20.90.tar.xz"; - sha256 = "07xsiqfqa5fbkf6x4bwrj2rmd3n7qfp1zf6gq1is05gi43zdki8q"; - name = "ksysguard-5.20.90.tar.xz"; + url = "${mirror}/stable/plasma/5.21.0/ksysguard-5.21.0.tar.xz"; + sha256 = "1z16b892laj8yf9bqmma8099i5w7a2lnhkjiw5cqlczxcd44m9iw"; + name = "ksysguard-5.21.0.tar.xz"; }; }; kwallet-pam = { - version = "5.20.90"; + version = "5.21.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.20.90/kwallet-pam-5.20.90.tar.xz"; - sha256 = "1zccrj4c8ay78r251v454zd10a7zg0lbxrpl47g4fcvclby29d2k"; - name = "kwallet-pam-5.20.90.tar.xz"; + url = "${mirror}/stable/plasma/5.21.0/kwallet-pam-5.21.0.tar.xz"; + sha256 = "07v9qslv2l92f5rzdv555slwdppdndvhjj6zpc672m572hljqm67"; + name = "kwallet-pam-5.21.0.tar.xz"; }; }; kwayland-integration = { - version = "5.20.90"; + version = "5.21.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.20.90/kwayland-integration-5.20.90.tar.xz"; - sha256 = "0nl50i5wvz1rigfmzhladzjdskvs1snmx1hzhxb83ab8yn35jhsf"; - name = "kwayland-integration-5.20.90.tar.xz"; + url = "${mirror}/stable/plasma/5.21.0/kwayland-integration-5.21.0.tar.xz"; + sha256 = "0g8lkilf5mr72fw10fwcck3nnbh1izazqj2r121zx52aqilr1mxx"; + name = "kwayland-integration-5.21.0.tar.xz"; }; }; kwayland-server = { - version = "5.20.90"; + version = "5.21.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.20.90/kwayland-server-5.20.90.tar.xz"; - sha256 = "0fmrcm35cnqk2hxs03smmp4gk3a7xa1ldizj34897lxdp10rbvrq"; - name = "kwayland-server-5.20.90.tar.xz"; + url = "${mirror}/stable/plasma/5.21.0/kwayland-server-5.21.0.tar.xz"; + sha256 = "0c8q25pqh7zx8kmzsxbs4dsm90nk81pspzchxwh1h4gc3c8h2zz6"; + name = "kwayland-server-5.21.0.tar.xz"; }; }; kwin = { - version = "5.20.90"; + version = "5.21.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.20.90/kwin-5.20.90.tar.xz"; - sha256 = "0py0xz1j8npq8iwcf3lks8xj16lj8kib7r1cij3q7ayx7l58inka"; - name = "kwin-5.20.90.tar.xz"; + url = "${mirror}/stable/plasma/5.21.0/kwin-5.21.0.tar.xz"; + sha256 = "18g5k6c7g94szd5g84i8abvy7xnddap7jlhnw8s92zvhab0y9w6w"; + name = "kwin-5.21.0.tar.xz"; }; }; kwrited = { - version = "5.20.90"; + version = "5.21.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.20.90/kwrited-5.20.90.tar.xz"; - sha256 = "0s952ib7j8pq5rhvwsxqz5yvizvfvihb45xn0rrd2x7nv7zi70qp"; - name = "kwrited-5.20.90.tar.xz"; + url = "${mirror}/stable/plasma/5.21.0/kwrited-5.21.0.tar.xz"; + sha256 = "0i784dvfgfn5vr8pmiffpln3nhk0x97vpxgfp6dyxg0ljwswpq3a"; + name = "kwrited-5.21.0.tar.xz"; }; }; libkscreen = { - version = "5.20.90"; + version = "5.21.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.20.90/libkscreen-5.20.90.tar.xz"; - sha256 = "06pfcaa5lylbsrdr7k14z0cf4idn90xwvqwglyq2m5gvhiqjv346"; - name = "libkscreen-5.20.90.tar.xz"; + url = "${mirror}/stable/plasma/5.21.0/libkscreen-5.21.0.tar.xz"; + sha256 = "0r83b4lanq8w748jczgpn5zi7aijmsw5x50lk1kvxbzyrjq0xis2"; + name = "libkscreen-5.21.0.tar.xz"; }; }; libksysguard = { - version = "5.20.90"; + version = "5.21.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.20.90/libksysguard-5.20.90.tar.xz"; - sha256 = "0dmbr138jjpliasrglcs6kjalaix5q60m9jm23q046cgqb928d6l"; - name = "libksysguard-5.20.90.tar.xz"; + url = "${mirror}/stable/plasma/5.21.0/libksysguard-5.21.0.tar.xz"; + sha256 = "11kf54vxs8pf3llifrlnpmr18cchzs16dl0a60z86qnx672fhvqf"; + name = "libksysguard-5.21.0.tar.xz"; }; }; milou = { - version = "5.20.90"; + version = "5.21.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.20.90/milou-5.20.90.tar.xz"; - sha256 = "1msjy4315503q0vsbfbj2x9raqxsg0sq2iy7zshsnbg6i8bnqvjh"; - name = "milou-5.20.90.tar.xz"; + url = "${mirror}/stable/plasma/5.21.0/milou-5.21.0.tar.xz"; + sha256 = "1msfn1189plhjv70cjsl38rlhk5cz6zfwm08vig8h1b18z6qg6c7"; + name = "milou-5.21.0.tar.xz"; }; }; oxygen = { - version = "5.20.90"; + version = "5.21.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.20.90/oxygen-5.20.90.tar.xz"; - sha256 = "12vnjdv14065p737plzly0921sww53lj5haa2bvd53nnxwf06ikc"; - name = "oxygen-5.20.90.tar.xz"; + url = "${mirror}/stable/plasma/5.21.0/oxygen-5.21.0.tar.xz"; + sha256 = "0qsmi7wix9hd6i99cgw8sz7pd3v1ki56b7i2jmzi1ffwx5919hyw"; + name = "oxygen-5.21.0.tar.xz"; }; }; plasma-browser-integration = { - version = "5.20.90"; + version = "5.21.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.20.90/plasma-browser-integration-5.20.90.tar.xz"; - sha256 = "0l8dh06b83b98hprs0lw6n71649v0lnmgid4kdxmng415g4jizd1"; - name = "plasma-browser-integration-5.20.90.tar.xz"; + url = "${mirror}/stable/plasma/5.21.0/plasma-browser-integration-5.21.0.tar.xz"; + sha256 = "038x40vhbm150n8vwyl3zx5a93bm5xazcijicjlvxbva7dzvha7k"; + name = "plasma-browser-integration-5.21.0.tar.xz"; }; }; plasma-desktop = { - version = "5.20.90"; + version = "5.21.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.20.90/plasma-desktop-5.20.90.tar.xz"; - sha256 = "1a53z21k544zrn68n2m8rfdh32zpnbk1sb51a92i90z6mplmcg31"; - name = "plasma-desktop-5.20.90.tar.xz"; + url = "${mirror}/stable/plasma/5.21.0/plasma-desktop-5.21.0.tar.xz"; + sha256 = "0pnlh693gl9z7s61bx7z6wy7nsnv1grkhqp3rrdinx1n281d9igb"; + name = "plasma-desktop-5.21.0.tar.xz"; }; }; plasma-disks = { - version = "5.20.90"; + version = "5.21.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.20.90/plasma-disks-5.20.90.tar.xz"; - sha256 = "0lklfwqg1iiya3zdn6i5ffqww1gpydygnvvlq3r6nlyfgk7zkv5a"; - name = "plasma-disks-5.20.90.tar.xz"; + url = "${mirror}/stable/plasma/5.21.0/plasma-disks-5.21.0.tar.xz"; + sha256 = "0b6p1j1jbz44wwmvf0w5vqjimsya3n24n296scgiq3nrdjzshjd9"; + name = "plasma-disks-5.21.0.tar.xz"; }; }; plasma-firewall = { - version = "5.20.90"; + version = "5.21.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.20.90/plasma-firewall-5.20.90.tar.xz"; - sha256 = "09z5fapd6azikh3zw361rgy77dlbvzhiq48b8rfx7bg05krgmjmk"; - name = "plasma-firewall-5.20.90.tar.xz"; + url = "${mirror}/stable/plasma/5.21.0/plasma-firewall-5.21.0.tar.xz"; + sha256 = "1j76gs8xrchqjwcr3lhzsg5caf2mbm0afcxypfyix5gxjz0galss"; + name = "plasma-firewall-5.21.0.tar.xz"; }; }; plasma-integration = { - version = "5.20.90"; + version = "5.21.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.20.90/plasma-integration-5.20.90.tar.xz"; - sha256 = "1x58z1kify5m7j6y2xx409qdla7gi5bhj3dw6nphijc0cqi61msx"; - name = "plasma-integration-5.20.90.tar.xz"; + url = "${mirror}/stable/plasma/5.21.0/plasma-integration-5.21.0.tar.xz"; + sha256 = "10vpywq8jbfp62mkfn0bsziipbq0kzkyp4arpq0x5n9ssfxl507v"; + name = "plasma-integration-5.21.0.tar.xz"; }; }; plasma-nano = { - version = "5.20.90"; + version = "5.21.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.20.90/plasma-nano-5.20.90.tar.xz"; - sha256 = "148jrhrf2zw4328i8rdbhpvjiivfcqwgkw6217h7sfpp6jz30y81"; - name = "plasma-nano-5.20.90.tar.xz"; + url = "${mirror}/stable/plasma/5.21.0/plasma-nano-5.21.0.tar.xz"; + sha256 = "0cnj0k4yqxjamrj1fsp2s4d8j067n5bkzr1h51kin1m396mq1msi"; + name = "plasma-nano-5.21.0.tar.xz"; }; }; plasma-nm = { - version = "5.20.90"; + version = "5.21.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.20.90/plasma-nm-5.20.90.tar.xz"; - sha256 = "0mgjahczf7g6xxba2c3h0h6p4121pa0mvb8xyq4d85y39gp8ljz7"; - name = "plasma-nm-5.20.90.tar.xz"; + url = "${mirror}/stable/plasma/5.21.0/plasma-nm-5.21.0.tar.xz"; + sha256 = "0pp3hflfd1v9wmv5h71i1aaw0gwi6xbwcnvsr13hvb4d71vwm6vx"; + name = "plasma-nm-5.21.0.tar.xz"; }; }; plasma-pa = { - version = "5.20.90"; + version = "5.21.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.20.90/plasma-pa-5.20.90.tar.xz"; - sha256 = "04pcssh569yb2j3af9jgnaipwr1bggy407v5x2xc4ax8n61cpzal"; - name = "plasma-pa-5.20.90.tar.xz"; + url = "${mirror}/stable/plasma/5.21.0/plasma-pa-5.21.0.tar.xz"; + sha256 = "19vgk3j7bw8fcvvkgpd90dxyqhxb6wi2rbw89knd2hk3rb7akpj8"; + name = "plasma-pa-5.21.0.tar.xz"; }; }; plasma-phone-components = { - version = "5.20.90"; + version = "5.21.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.20.90/plasma-phone-components-5.20.90.tar.xz"; - sha256 = "0nnbyvsrmnmgsbryap38c3vz5xb93pc9mdbyxjv08h07x433k2as"; - name = "plasma-phone-components-5.20.90.tar.xz"; + url = "${mirror}/stable/plasma/5.21.0/plasma-phone-components-5.21.0.tar.xz"; + sha256 = "1hg3nk4dvbsn4vf3n07xxcm74p5q1gp2cv8rkcxy5g92p13xxva4"; + name = "plasma-phone-components-5.21.0.tar.xz"; }; }; plasma-sdk = { - version = "5.20.90"; + version = "5.21.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.20.90/plasma-sdk-5.20.90.tar.xz"; - sha256 = "1j2i1krk4w392skx29hsm2jccqnfrvjx5mnax42066bbjs4gnz10"; - name = "plasma-sdk-5.20.90.tar.xz"; + url = "${mirror}/stable/plasma/5.21.0/plasma-sdk-5.21.0.tar.xz"; + sha256 = "0qn59yv3sd8yp87sbnnfn2m0wn95clica1fq4zw3bh0zlgw0l2wk"; + name = "plasma-sdk-5.21.0.tar.xz"; }; }; plasma-systemmonitor = { - version = "5.20.90"; + version = "5.21.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.20.90/plasma-systemmonitor-5.20.90.tar.xz"; - sha256 = "10vlmakpbwx1vcgdnb0dfhjladizr047dr9jbryj7nwc21j5ljn3"; - name = "plasma-systemmonitor-5.20.90.tar.xz"; + url = "${mirror}/stable/plasma/5.21.0/plasma-systemmonitor-5.21.0.tar.xz"; + sha256 = "0h6m6i11szj7c2rf67js84x6xycs4lbf5vx8lrgw1rqn3i02yxcp"; + name = "plasma-systemmonitor-5.21.0.tar.xz"; }; }; plasma-tests = { - version = "5.20.90"; + version = "5.21.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.20.90/plasma-tests-5.20.90.tar.xz"; - sha256 = "1p07h5qbb4hrk770kg4n9zpx2yxml5xbk3a0r2zw13awjwrnphzz"; - name = "plasma-tests-5.20.90.tar.xz"; + url = "${mirror}/stable/plasma/5.21.0/plasma-tests-5.21.0.tar.xz"; + sha256 = "1z49dl8bmni9k19d5j9sa3nd02p02m5x4w9cb75w5w1ciaq3sqb5"; + name = "plasma-tests-5.21.0.tar.xz"; }; }; plasma-thunderbolt = { - version = "5.20.90"; + version = "5.21.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.20.90/plasma-thunderbolt-5.20.90.tar.xz"; - sha256 = "0jybgq2k45azni0csg2qijxz4zagv5j66vvwslncy2rwwapcdzs1"; - name = "plasma-thunderbolt-5.20.90.tar.xz"; + url = "${mirror}/stable/plasma/5.21.0/plasma-thunderbolt-5.21.0.tar.xz"; + sha256 = "1kywxh06yfsqih517hly3ra18a3rq278imyvkrj5b4fjsczc404g"; + name = "plasma-thunderbolt-5.21.0.tar.xz"; }; }; plasma-vault = { - version = "5.20.90"; + version = "5.21.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.20.90/plasma-vault-5.20.90.tar.xz"; - sha256 = "0y7czrfpwja5px4lmvrjh1p5xngwbavhpk4g6h2vb4gzshz338kq"; - name = "plasma-vault-5.20.90.tar.xz"; + url = "${mirror}/stable/plasma/5.21.0/plasma-vault-5.21.0.tar.xz"; + sha256 = "13la88yi85hi85r4cs3jxwhhm1m1z7l8pgjfcfm6n75jm0ij7fya"; + name = "plasma-vault-5.21.0.tar.xz"; }; }; plasma-workspace = { - version = "5.20.90"; + version = "5.21.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.20.90/plasma-workspace-5.20.90.tar.xz"; - sha256 = "064qlf1jvrw9svh7sjab06vlip9x6vzv8a4rh40b09d235ci2ihb"; - name = "plasma-workspace-5.20.90.tar.xz"; + url = "${mirror}/stable/plasma/5.21.0/plasma-workspace-5.21.0.tar.xz"; + sha256 = "1m6bl1n2qd88kvx9vccpbw16kg4rg0zs2vbl81gli2wamnxhnzzs"; + name = "plasma-workspace-5.21.0.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.20.90"; + version = "5.21.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.20.90/plasma-workspace-wallpapers-5.20.90.tar.xz"; - sha256 = "171jcdlr1zpnagqghix1m08r9jwq738mcxlzh9c4fxh122x34hk4"; - name = "plasma-workspace-wallpapers-5.20.90.tar.xz"; + url = "${mirror}/stable/plasma/5.21.0/plasma-workspace-wallpapers-5.21.0.tar.xz"; + sha256 = "11w3129xrgyj91jp3pm1iy7fi088g1jybh4a5fagmac4x0hlwsz7"; + name = "plasma-workspace-wallpapers-5.21.0.tar.xz"; }; }; plymouth-kcm = { - version = "5.20.90"; + version = "5.21.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.20.90/plymouth-kcm-5.20.90.tar.xz"; - sha256 = "1aj7w2k1m5901c7m6jsbsr041ydwgl6k630gxhva1s3p7g94mp9n"; - name = "plymouth-kcm-5.20.90.tar.xz"; + url = "${mirror}/stable/plasma/5.21.0/plymouth-kcm-5.21.0.tar.xz"; + sha256 = "07zjb75qcmhz3cinyvmlx44pibi4p540kmghr79n8z5z314dzzir"; + name = "plymouth-kcm-5.21.0.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.20.90"; + version = "1-5.21.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.20.90/polkit-kde-agent-1-5.20.90.tar.xz"; - sha256 = "0q4gy13gan68kv9fw81pv4k3x9cwx1zl8d0szrdcsjf99fc00y9d"; - name = "polkit-kde-agent-1-5.20.90.tar.xz"; + url = "${mirror}/stable/plasma/5.21.0/polkit-kde-agent-1-5.21.0.tar.xz"; + sha256 = "12z8m08w8gwkfv32hggwacvrai7slijs3vbf1rwc0q9bma564ra5"; + name = "polkit-kde-agent-1-5.21.0.tar.xz"; }; }; powerdevil = { - version = "5.20.90"; + version = "5.21.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.20.90/powerdevil-5.20.90.tar.xz"; - sha256 = "0dihcn6qyzclywnm38wj57mbwsr8cp861nj676lzwi7ijdw34y4q"; - name = "powerdevil-5.20.90.tar.xz"; + url = "${mirror}/stable/plasma/5.21.0/powerdevil-5.21.0.tar.xz"; + sha256 = "1fr9d7721i7l3cmyi1q9yyl4xmmbyc0vhxrrn2v7sjs27hgf1sd3"; + name = "powerdevil-5.21.0.tar.xz"; }; }; qqc2-breeze-style = { - version = "5.20.90"; + version = "5.21.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.20.90/qqc2-breeze-style-5.20.90.tar.xz"; - sha256 = "0zm9cmw5hh47f3l0kv77zqcph610irh80ayqpj4was0jmng2v47n"; - name = "qqc2-breeze-style-5.20.90.tar.xz"; + url = "${mirror}/stable/plasma/5.21.0/qqc2-breeze-style-5.21.0.tar.xz"; + sha256 = "0by7js52w14vb7ma29shhb1wzl8wprq9xdy966003yxz1jx1nqkf"; + name = "qqc2-breeze-style-5.21.0.tar.xz"; }; }; sddm-kcm = { - version = "5.20.90"; + version = "5.21.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.20.90/sddm-kcm-5.20.90.tar.xz"; - sha256 = "04cm6kaww8nmbvbj6xgfhbv076kjf8hy0acwhn4dbr20d3j8sixr"; - name = "sddm-kcm-5.20.90.tar.xz"; + url = "${mirror}/stable/plasma/5.21.0/sddm-kcm-5.21.0.tar.xz"; + sha256 = "12hyyh92zvi1bx6r60fynz1zadi8jv25id4zx7qhsb36fk49h9l9"; + name = "sddm-kcm-5.21.0.tar.xz"; }; }; systemsettings = { - version = "5.20.90"; + version = "5.21.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.20.90/systemsettings-5.20.90.tar.xz"; - sha256 = "1hjs4adrh6kpc4d537268fln27ah47gp9ksbaivppnx9qy884hr7"; - name = "systemsettings-5.20.90.tar.xz"; + url = "${mirror}/stable/plasma/5.21.0/systemsettings-5.21.0.tar.xz"; + sha256 = "02p3qbw28q6rjrpqkv2d5znx0rkscqcbx3f4d8yjb7g4ba88c043"; + name = "systemsettings-5.21.0.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.20.90"; + version = "5.21.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.20.90/xdg-desktop-portal-kde-5.20.90.tar.xz"; - sha256 = "1l1vphw5crysr912fp4nf6g1jmzbyvdkv04b4735lr0i4chk1ja0"; - name = "xdg-desktop-portal-kde-5.20.90.tar.xz"; + url = "${mirror}/stable/plasma/5.21.0/xdg-desktop-portal-kde-5.21.0.tar.xz"; + sha256 = "0fakwl100ry210vvslxz94p83y52lvy44acsbb42aln07z7j9kvp"; + name = "xdg-desktop-portal-kde-5.21.0.tar.xz"; }; }; } From b20587ed56960c538d2b033f88d7be26ef61fd95 Mon Sep 17 00:00:00 2001 From: Yaroslav Bolyukin <iam@lach.pw> Date: Wed, 17 Feb 2021 18:59:12 +0300 Subject: [PATCH 082/188] kdesu: upgrade patch Signed-off-by: Yaroslav Bolyukin <iam@lach.pw> --- .../kdesu/kdesu-search-for-wrapped-daemon-first.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/kdesu/kdesu-search-for-wrapped-daemon-first.patch b/pkgs/development/libraries/kde-frameworks/kdesu/kdesu-search-for-wrapped-daemon-first.patch index f82bf828e8e9..07da70092dc6 100644 --- a/pkgs/development/libraries/kde-frameworks/kdesu/kdesu-search-for-wrapped-daemon-first.patch +++ b/pkgs/development/libraries/kde-frameworks/kdesu/kdesu-search-for-wrapped-daemon-first.patch @@ -17,14 +17,14 @@ index 44fbacd..6b5abf5 100644 static QString findDaemon() { -- QString daemon = QFile::decodeName(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/kdesud"); +- QString daemon = QFile::decodeName(KDE_INSTALL_FULL_LIBEXECDIR_KF5 "/kdesud"); - if (!QFile::exists(daemon)) { // if not in libexec, find it in PATH - daemon = QStandardPaths::findExecutable(QStringLiteral("kdesud")); - if (daemon.isEmpty()) { - qCWarning(KSU_LOG) << "kdesud daemon not found."; + QString daemon = QFile::decodeName("/run/wrappers/bin/kdesud"); + if (!QFile::exists(daemon)) { // if not in wrappers -+ daemon = QFile::decodeName(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/kdesud"); ++ daemon = QFile::decodeName(KDE_INSTALL_FULL_LIBEXECDIR_KF5 "/kdesud"); + if (!QFile::exists(daemon)) { // if not in libexec, find it in PATH + daemon = QStandardPaths::findExecutable(QStringLiteral("kdesud")); + if (daemon.isEmpty()) { From 15fd83232c18905be84b477425cd5856ce5b6d35 Mon Sep 17 00:00:00 2001 From: Yaroslav Bolyukin <iam@lach.pw> Date: Wed, 17 Feb 2021 18:59:27 +0300 Subject: [PATCH 083/188] kfilemetadata: upgrade patch Signed-off-by: Yaroslav Bolyukin <iam@lach.pw> --- .../kde-frameworks/kfilemetadata/cmake-install-paths.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/kfilemetadata/cmake-install-paths.patch b/pkgs/development/libraries/kde-frameworks/kfilemetadata/cmake-install-paths.patch index 732f7b69c828..daeaf222b630 100644 --- a/pkgs/development/libraries/kde-frameworks/kfilemetadata/cmake-install-paths.patch +++ b/pkgs/development/libraries/kde-frameworks/kfilemetadata/cmake-install-paths.patch @@ -6,7 +6,7 @@ Index: kfilemetadata-5.18.0/src/CMakeLists.txt install(EXPORT KF5FileMetaDataTargets NAMESPACE KF5:: -- DESTINATION ${LIB_INSTALL_DIR}/cmake/KF5FileMetaData +- DESTINATION ${KDE_INSTALL_LIBDIR}/cmake/KF5FileMetaData + DESTINATION ${KDE_INSTALL_FULL_CMAKEPACKAGEDIR}/KF5FileMetaData FILE KF5FileMetaDataTargets.cmake) From 47d5bebf6764dacd2dc277b80ba4667eaae91d74 Mon Sep 17 00:00:00 2001 From: Yaroslav Bolyukin <iam@lach.pw> Date: Wed, 17 Feb 2021 18:59:43 +0300 Subject: [PATCH 084/188] kinit: upgrade patches Signed-off-by: Yaroslav Bolyukin <iam@lach.pw> --- .../libraries/kde-frameworks/kinit/0001-kinit-libpath.patch | 2 +- .../kde-frameworks/kinit/0002-start_kdeinit-path.patch | 2 +- .../kde-frameworks/kinit/0003-kdeinit-extra-libs.patch | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/kinit/0001-kinit-libpath.patch b/pkgs/development/libraries/kde-frameworks/kinit/0001-kinit-libpath.patch index 21477394c915..a3e4014df509 100644 --- a/pkgs/development/libraries/kde-frameworks/kinit/0001-kinit-libpath.patch +++ b/pkgs/development/libraries/kde-frameworks/kinit/0001-kinit-libpath.patch @@ -20,7 +20,7 @@ index 8fff17a..0801b75 100644 - // https://sourceware.org/bugzilla/show_bug.cgi?id=13945 - // - so we try hacking it in ourselves - QString install_lib_dir = QFile::decodeName( -- CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/"); +- CMAKE_INSTALL_PREFIX "/" KDE_INSTALL_LIBDIR "/"); - QString orig_libpath = libpath; - libpath = install_lib_dir + libpath; - l.setFileName(libpath); diff --git a/pkgs/development/libraries/kde-frameworks/kinit/0002-start_kdeinit-path.patch b/pkgs/development/libraries/kde-frameworks/kinit/0002-start_kdeinit-path.patch index bf25b98d6c56..3728c3c58b83 100644 --- a/pkgs/development/libraries/kde-frameworks/kinit/0002-start_kdeinit-path.patch +++ b/pkgs/development/libraries/kde-frameworks/kinit/0002-start_kdeinit-path.patch @@ -15,7 +15,7 @@ index 891f50c..ef664ad 100644 #include <string.h> #include <unistd.h> --#define EXECUTE CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/start_kdeinit" +-#define EXECUTE KDE_INSTALL_FULL_LIBEXECDIR_KF5 "/start_kdeinit" +#define EXECUTE "/run/wrappers/bin/start_kdeinit" #if KDEINIT_OOM_PROTECT diff --git a/pkgs/development/libraries/kde-frameworks/kinit/0003-kdeinit-extra-libs.patch b/pkgs/development/libraries/kde-frameworks/kinit/0003-kdeinit-extra-libs.patch index 9df8505b2929..499c975a9e2d 100644 --- a/pkgs/development/libraries/kde-frameworks/kinit/0003-kdeinit-extra-libs.patch +++ b/pkgs/development/libraries/kde-frameworks/kinit/0003-kdeinit-extra-libs.patch @@ -33,7 +33,7 @@ index 0801b75..622dd5f 100644 -// Completely unrelated to plugins. -static QString findSharedLib(const QString &lib) -{ -- QString path = QFile::decodeName(CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/") + lib; +- QString path = QFile::decodeName(CMAKE_INSTALL_PREFIX "/" KDE_INSTALL_LIBDIR "/") + lib; - if (QFile::exists(path)) { - return path; - } From 1a4ab2408dccadb9fb74dfff1c5abfb0d22f76d2 Mon Sep 17 00:00:00 2001 From: Yaroslav Bolyukin <iam@lach.pw> Date: Wed, 24 Feb 2021 07:57:38 +0300 Subject: [PATCH 085/188] plasma5: 5.21.0 -> 5.21.1 Signed-off-by: Yaroslav Bolyukin <iam@lach.pw> --- pkgs/desktops/plasma-5/fetch.sh | 2 +- pkgs/desktops/plasma-5/srcs.nix | 416 ++++++++++++++++---------------- 2 files changed, 209 insertions(+), 209 deletions(-) diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index 1a29cdadc34e..1a739585efe0 100644 --- a/pkgs/desktops/plasma-5/fetch.sh +++ b/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma/5.21.0/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.21.1/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index d8caf49def1f..96a60ac5e4b1 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -4,419 +4,419 @@ { bluedevil = { - version = "5.21.0"; + version = "5.21.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.0/bluedevil-5.21.0.tar.xz"; - sha256 = "1ywrkfgkfmqjhmvi0q6lsw1svk36aizr3x25v48r46mbcppcxrwg"; - name = "bluedevil-5.21.0.tar.xz"; + url = "${mirror}/stable/plasma/5.21.1/bluedevil-5.21.1.tar.xz"; + sha256 = "0b69gacp5cbl32m92k2j36cqq38lpxlybx3wnzj1148j6wvfbajn"; + name = "bluedevil-5.21.1.tar.xz"; }; }; breeze = { - version = "5.21.0"; + version = "5.21.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.0/breeze-5.21.0.tar.xz"; - sha256 = "1qqqd9y6y707dj3kasl4wr6i73vy55vjvbzi3xs00cp382si0wdw"; - name = "breeze-5.21.0.tar.xz"; + url = "${mirror}/stable/plasma/5.21.1/breeze-5.21.1.tar.xz"; + sha256 = "1xdpsc4nf0556x9iimszi287jjks8qpqi45n81iccbcz91i5bnb5"; + name = "breeze-5.21.1.tar.xz"; }; }; breeze-grub = { - version = "5.21.0"; + version = "5.21.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.0/breeze-grub-5.21.0.tar.xz"; - sha256 = "0mvasvvyf6bxr3g1sfc7fii9qdgnrild61h87hw86gy48mvs838s"; - name = "breeze-grub-5.21.0.tar.xz"; + url = "${mirror}/stable/plasma/5.21.1/breeze-grub-5.21.1.tar.xz"; + sha256 = "0w0kkdqliliy72f41xps0a2mr0rf4kn08immichcvrm47r9bjr37"; + name = "breeze-grub-5.21.1.tar.xz"; }; }; breeze-gtk = { - version = "5.21.0"; + version = "5.21.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.0/breeze-gtk-5.21.0.tar.xz"; - sha256 = "15d3yw7zjkrfahmw7rysjvw4vwy7qmicah4pan57hiyj20zryakl"; - name = "breeze-gtk-5.21.0.tar.xz"; + url = "${mirror}/stable/plasma/5.21.1/breeze-gtk-5.21.1.tar.xz"; + sha256 = "14xq2796n8927362851kffpvxxscw82sm5j9ghsb24hr860zcdk7"; + name = "breeze-gtk-5.21.1.tar.xz"; }; }; breeze-plymouth = { - version = "5.21.0"; + version = "5.21.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.0/breeze-plymouth-5.21.0.tar.xz"; - sha256 = "116z28rv5qgjadczaw8qsjxl12v2yd4y7cm8zhw9nxbvww9g2k6k"; - name = "breeze-plymouth-5.21.0.tar.xz"; + url = "${mirror}/stable/plasma/5.21.1/breeze-plymouth-5.21.1.tar.xz"; + sha256 = "0xgxmh5gnjz8r5h97arsb1ddvizfpajw6zfwrkrsiw0kxkb0ppn9"; + name = "breeze-plymouth-5.21.1.tar.xz"; }; }; discover = { - version = "5.21.0"; + version = "5.21.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.0/discover-5.21.0.tar.xz"; - sha256 = "0316sm9mamk0kz3wqikdfc97hk3qd7g4zhjdgghx5plj52jafghc"; - name = "discover-5.21.0.tar.xz"; + url = "${mirror}/stable/plasma/5.21.1/discover-5.21.1.tar.xz"; + sha256 = "1a1wmils7ijkvn1x5gqrdg3rv7mcnh0gaaig9ca555qqc2ab0ivl"; + name = "discover-5.21.1.tar.xz"; }; }; drkonqi = { - version = "5.21.0"; + version = "5.21.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.0/drkonqi-5.21.0.tar.xz"; - sha256 = "1ryqrc679f3w75f5df5n72aq2hbgw9jf7rbnss1468iwkaj3gmys"; - name = "drkonqi-5.21.0.tar.xz"; + url = "${mirror}/stable/plasma/5.21.1/drkonqi-5.21.1.tar.xz"; + sha256 = "1iqk9mg5bi5yn9ccalwva8yshamrmsx4kfww8imxv8mhmq9p4mib"; + name = "drkonqi-5.21.1.tar.xz"; }; }; kactivitymanagerd = { - version = "5.21.0"; + version = "5.21.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.0/kactivitymanagerd-5.21.0.tar.xz"; - sha256 = "0rhdg9kxlpbyzs1lj41f6yixvwh7h87xnwaswyf7z7yfcw9vy2jz"; - name = "kactivitymanagerd-5.21.0.tar.xz"; + url = "${mirror}/stable/plasma/5.21.1/kactivitymanagerd-5.21.1.tar.xz"; + sha256 = "1wzwkyylk4qsiab7jzlw62mfv5r3pxdk3vqyydca112836nhbdj3"; + name = "kactivitymanagerd-5.21.1.tar.xz"; }; }; kde-cli-tools = { - version = "5.21.0"; + version = "5.21.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.0/kde-cli-tools-5.21.0.tar.xz"; - sha256 = "136pyvm24gh51bvrjrs139vaic037ylzz6w4ddjxary0zi4kl1gn"; - name = "kde-cli-tools-5.21.0.tar.xz"; + url = "${mirror}/stable/plasma/5.21.1/kde-cli-tools-5.21.1.tar.xz"; + sha256 = "0835323rbb3akhzdnjxb2myfbfz0wh3c5j1jih4l9zqr0ixx9lb3"; + name = "kde-cli-tools-5.21.1.tar.xz"; }; }; kdecoration = { - version = "5.21.0"; + version = "5.21.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.0/kdecoration-5.21.0.tar.xz"; - sha256 = "03aglly2d4mrizzana8w11vbd3lpmy50z97kwlk8lpqml7yqnap3"; - name = "kdecoration-5.21.0.tar.xz"; + url = "${mirror}/stable/plasma/5.21.1/kdecoration-5.21.1.tar.xz"; + sha256 = "1qy848hvqiar3vj7cz0srszybqj9sf5lfip8ws0fwllqgsa5v505"; + name = "kdecoration-5.21.1.tar.xz"; }; }; kde-gtk-config = { - version = "5.21.0"; + version = "5.21.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.0/kde-gtk-config-5.21.0.tar.xz"; - sha256 = "0midb0x8aq4pc62w3vkdhg2k7hkdm1hmx2zwyxx14443yh9kq7km"; - name = "kde-gtk-config-5.21.0.tar.xz"; + url = "${mirror}/stable/plasma/5.21.1/kde-gtk-config-5.21.1.tar.xz"; + sha256 = "0nq741x9flnyzhgj5h4r1774b11211ab0lcclhlji9ch7kqxs8dc"; + name = "kde-gtk-config-5.21.1.tar.xz"; }; }; kdeplasma-addons = { - version = "5.21.0"; + version = "5.21.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.0/kdeplasma-addons-5.21.0.tar.xz"; - sha256 = "01zvx00m0yda0xw26swb7v99kvb4dcq1cgbrm02rkzvmh52yaqrk"; - name = "kdeplasma-addons-5.21.0.tar.xz"; + url = "${mirror}/stable/plasma/5.21.1/kdeplasma-addons-5.21.1.tar.xz"; + sha256 = "0xpki1kabdm4fwifx0xsb0isig9dnzks4zfglrkg9g0nafahsbf8"; + name = "kdeplasma-addons-5.21.1.tar.xz"; }; }; kgamma5 = { - version = "5.21.0"; + version = "5.21.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.0/kgamma5-5.21.0.tar.xz"; - sha256 = "0lg23wixrpq57645k3c1h78pj6ykdfmihacmwali9lsysnb0a3h4"; - name = "kgamma5-5.21.0.tar.xz"; + url = "${mirror}/stable/plasma/5.21.1/kgamma5-5.21.1.tar.xz"; + sha256 = "1316l73jj4b41mrsk1vba3g4mdj0q6hxazqqkvzrcinzwr34p3l2"; + name = "kgamma5-5.21.1.tar.xz"; }; }; khotkeys = { - version = "5.21.0"; + version = "5.21.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.0/khotkeys-5.21.0.tar.xz"; - sha256 = "06prv641mqmmbjjlpylvnawkcfnz5c96cxsc1k0h8fiazlf04dp9"; - name = "khotkeys-5.21.0.tar.xz"; + url = "${mirror}/stable/plasma/5.21.1/khotkeys-5.21.1.tar.xz"; + sha256 = "1kp6s1qgzz6j5z4widy5hqnwyh90vw3adf47jk54msdzlh2ak0q7"; + name = "khotkeys-5.21.1.tar.xz"; }; }; kinfocenter = { - version = "5.21.0"; + version = "5.21.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.0/kinfocenter-5.21.0.tar.xz"; - sha256 = "027x8mjwa7p4nj6ksvqrn27vrvj2aymbkpnz7nd8v7fdn7hi6whp"; - name = "kinfocenter-5.21.0.tar.xz"; + url = "${mirror}/stable/plasma/5.21.1/kinfocenter-5.21.1.tar.xz"; + sha256 = "1fy5985f4zf9v656dfb30c95pkbasx2302qamdxpfhrl465nqn5d"; + name = "kinfocenter-5.21.1.tar.xz"; }; }; kmenuedit = { - version = "5.21.0"; + version = "5.21.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.0/kmenuedit-5.21.0.tar.xz"; - sha256 = "1lfvh7i19yfj6i2i3ccpdcxawzya7rp1rx7dp9lb42y4spx1ddaa"; - name = "kmenuedit-5.21.0.tar.xz"; + url = "${mirror}/stable/plasma/5.21.1/kmenuedit-5.21.1.tar.xz"; + sha256 = "1cksy6fn9mx96jnlglzmg0n9817vmypl1lwxdyxncxzw275k0c05"; + name = "kmenuedit-5.21.1.tar.xz"; }; }; kscreen = { - version = "5.21.0"; + version = "5.21.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.0/kscreen-5.21.0.tar.xz"; - sha256 = "043h5mf85qgxha43399ri74y0zknaq04rja8jzn17xqx9l6s9sna"; - name = "kscreen-5.21.0.tar.xz"; + url = "${mirror}/stable/plasma/5.21.1/kscreen-5.21.1.tar.xz"; + sha256 = "0w199x0ig7vv7ki17v5paipw1jkkiavj6296zmpbnxn88n6i8jw3"; + name = "kscreen-5.21.1.tar.xz"; }; }; kscreenlocker = { - version = "5.21.0"; + version = "5.21.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.0/kscreenlocker-5.21.0.tar.xz"; - sha256 = "115hds7sa1ssc42pjc22jv8d0vdxxwd9cyhgd5czpy5s51famffk"; - name = "kscreenlocker-5.21.0.tar.xz"; + url = "${mirror}/stable/plasma/5.21.1/kscreenlocker-5.21.1.tar.xz"; + sha256 = "1qpmysv7cby0bir4qyr1if3zc1ky43fyzhhxfqc69mcx803iabyv"; + name = "kscreenlocker-5.21.1.tar.xz"; }; }; ksshaskpass = { - version = "5.21.0"; + version = "5.21.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.0/ksshaskpass-5.21.0.tar.xz"; - sha256 = "0zsbhfhk00rm6g9bi1hs98r67wnb612kxfqi315a1mnm30nascbi"; - name = "ksshaskpass-5.21.0.tar.xz"; + url = "${mirror}/stable/plasma/5.21.1/ksshaskpass-5.21.1.tar.xz"; + sha256 = "11avkc3qqskq8pkdsq1jikpdh9izghv3algbf67lwl236s8mmdzk"; + name = "ksshaskpass-5.21.1.tar.xz"; }; }; ksysguard = { - version = "5.21.0"; + version = "5.21.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.0/ksysguard-5.21.0.tar.xz"; - sha256 = "1z16b892laj8yf9bqmma8099i5w7a2lnhkjiw5cqlczxcd44m9iw"; - name = "ksysguard-5.21.0.tar.xz"; + url = "${mirror}/stable/plasma/5.21.1/ksysguard-5.21.1.tar.xz"; + sha256 = "1fnccjs04b3pvdb8wwmw03g8x4h7zw5q4pxh0gfy7w705w3wkxwm"; + name = "ksysguard-5.21.1.tar.xz"; }; }; kwallet-pam = { - version = "5.21.0"; + version = "5.21.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.0/kwallet-pam-5.21.0.tar.xz"; - sha256 = "07v9qslv2l92f5rzdv555slwdppdndvhjj6zpc672m572hljqm67"; - name = "kwallet-pam-5.21.0.tar.xz"; + url = "${mirror}/stable/plasma/5.21.1/kwallet-pam-5.21.1.tar.xz"; + sha256 = "0ybdyalppfypvq26j6lxjfz2zm41kw1nlsyh857z06f0s65257zb"; + name = "kwallet-pam-5.21.1.tar.xz"; }; }; kwayland-integration = { - version = "5.21.0"; + version = "5.21.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.0/kwayland-integration-5.21.0.tar.xz"; - sha256 = "0g8lkilf5mr72fw10fwcck3nnbh1izazqj2r121zx52aqilr1mxx"; - name = "kwayland-integration-5.21.0.tar.xz"; + url = "${mirror}/stable/plasma/5.21.1/kwayland-integration-5.21.1.tar.xz"; + sha256 = "0s0gljcfv3sjh63d8bcjmzqgvxrqzjbxj8dsyi68w187dxzca8b4"; + name = "kwayland-integration-5.21.1.tar.xz"; }; }; kwayland-server = { - version = "5.21.0"; + version = "5.21.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.0/kwayland-server-5.21.0.tar.xz"; - sha256 = "0c8q25pqh7zx8kmzsxbs4dsm90nk81pspzchxwh1h4gc3c8h2zz6"; - name = "kwayland-server-5.21.0.tar.xz"; + url = "${mirror}/stable/plasma/5.21.1/kwayland-server-5.21.1.tar.xz"; + sha256 = "00d14d8q3jw1h2yyn49wpxndwl5v1clxnialrqgkyli6qkwkf29m"; + name = "kwayland-server-5.21.1.tar.xz"; }; }; kwin = { - version = "5.21.0"; + version = "5.21.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.0/kwin-5.21.0.tar.xz"; - sha256 = "18g5k6c7g94szd5g84i8abvy7xnddap7jlhnw8s92zvhab0y9w6w"; - name = "kwin-5.21.0.tar.xz"; + url = "${mirror}/stable/plasma/5.21.1/kwin-5.21.1.tar.xz"; + sha256 = "035w7b9cfg3hv9kw3rab1y9xw4r51psz7csx7nki05nwzx84812s"; + name = "kwin-5.21.1.tar.xz"; }; }; kwrited = { - version = "5.21.0"; + version = "5.21.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.0/kwrited-5.21.0.tar.xz"; - sha256 = "0i784dvfgfn5vr8pmiffpln3nhk0x97vpxgfp6dyxg0ljwswpq3a"; - name = "kwrited-5.21.0.tar.xz"; + url = "${mirror}/stable/plasma/5.21.1/kwrited-5.21.1.tar.xz"; + sha256 = "15xsjkxqx48wpzjawv4qpbgh8a48sfrmldgcwhn1cscq8s0marh3"; + name = "kwrited-5.21.1.tar.xz"; }; }; libkscreen = { - version = "5.21.0"; + version = "5.21.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.0/libkscreen-5.21.0.tar.xz"; - sha256 = "0r83b4lanq8w748jczgpn5zi7aijmsw5x50lk1kvxbzyrjq0xis2"; - name = "libkscreen-5.21.0.tar.xz"; + url = "${mirror}/stable/plasma/5.21.1/libkscreen-5.21.1.tar.xz"; + sha256 = "0hrgmnvyv5v5d15wj1gynyzk83jj8p9cjhz0q2l41n2rh81rw52z"; + name = "libkscreen-5.21.1.tar.xz"; }; }; libksysguard = { - version = "5.21.0"; + version = "5.21.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.0/libksysguard-5.21.0.tar.xz"; - sha256 = "11kf54vxs8pf3llifrlnpmr18cchzs16dl0a60z86qnx672fhvqf"; - name = "libksysguard-5.21.0.tar.xz"; + url = "${mirror}/stable/plasma/5.21.1/libksysguard-5.21.1.tar.xz"; + sha256 = "14zafjp0ikqgkdr8a04idj08xami2xn8cw3scgwfcix3y7mv0ip8"; + name = "libksysguard-5.21.1.tar.xz"; }; }; milou = { - version = "5.21.0"; + version = "5.21.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.0/milou-5.21.0.tar.xz"; - sha256 = "1msfn1189plhjv70cjsl38rlhk5cz6zfwm08vig8h1b18z6qg6c7"; - name = "milou-5.21.0.tar.xz"; + url = "${mirror}/stable/plasma/5.21.1/milou-5.21.1.tar.xz"; + sha256 = "095mk7592r4fwkw5f3p8mgc0p2wg8wi347qx8s1yblwjcml86a5f"; + name = "milou-5.21.1.tar.xz"; }; }; oxygen = { - version = "5.21.0"; + version = "5.21.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.0/oxygen-5.21.0.tar.xz"; - sha256 = "0qsmi7wix9hd6i99cgw8sz7pd3v1ki56b7i2jmzi1ffwx5919hyw"; - name = "oxygen-5.21.0.tar.xz"; + url = "${mirror}/stable/plasma/5.21.1/oxygen-5.21.1.tar.xz"; + sha256 = "1s5bzdj5l515g4biarrzmkc7vpi0hqbk75rjjkr11fsvkghhphwg"; + name = "oxygen-5.21.1.tar.xz"; }; }; plasma-browser-integration = { - version = "5.21.0"; + version = "5.21.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.0/plasma-browser-integration-5.21.0.tar.xz"; - sha256 = "038x40vhbm150n8vwyl3zx5a93bm5xazcijicjlvxbva7dzvha7k"; - name = "plasma-browser-integration-5.21.0.tar.xz"; + url = "${mirror}/stable/plasma/5.21.1/plasma-browser-integration-5.21.1.tar.xz"; + sha256 = "0m99il47932ybsdp5z7apgb9l991wdhbrm3sninflcrg6ag9myp3"; + name = "plasma-browser-integration-5.21.1.tar.xz"; }; }; plasma-desktop = { - version = "5.21.0"; + version = "5.21.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.0/plasma-desktop-5.21.0.tar.xz"; - sha256 = "0pnlh693gl9z7s61bx7z6wy7nsnv1grkhqp3rrdinx1n281d9igb"; - name = "plasma-desktop-5.21.0.tar.xz"; + url = "${mirror}/stable/plasma/5.21.1/plasma-desktop-5.21.1.tar.xz"; + sha256 = "1ligy1ps3ajrsg6lvb9ailirgc52sswbknp0zn53n8gka176c555"; + name = "plasma-desktop-5.21.1.tar.xz"; }; }; plasma-disks = { - version = "5.21.0"; + version = "5.21.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.0/plasma-disks-5.21.0.tar.xz"; - sha256 = "0b6p1j1jbz44wwmvf0w5vqjimsya3n24n296scgiq3nrdjzshjd9"; - name = "plasma-disks-5.21.0.tar.xz"; + url = "${mirror}/stable/plasma/5.21.1/plasma-disks-5.21.1.tar.xz"; + sha256 = "0py662wlqbx5408rjbxnsa5ccnsaqx2wfy84fvjs4vl73wqmi2nl"; + name = "plasma-disks-5.21.1.tar.xz"; }; }; plasma-firewall = { - version = "5.21.0"; + version = "5.21.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.0/plasma-firewall-5.21.0.tar.xz"; - sha256 = "1j76gs8xrchqjwcr3lhzsg5caf2mbm0afcxypfyix5gxjz0galss"; - name = "plasma-firewall-5.21.0.tar.xz"; + url = "${mirror}/stable/plasma/5.21.1/plasma-firewall-5.21.1.tar.xz"; + sha256 = "19q7w9m1vj7gs5d3prraciw00iy0ywjfxlpjhxjiq0s0s0icf1hb"; + name = "plasma-firewall-5.21.1.tar.xz"; }; }; plasma-integration = { - version = "5.21.0"; + version = "5.21.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.0/plasma-integration-5.21.0.tar.xz"; - sha256 = "10vpywq8jbfp62mkfn0bsziipbq0kzkyp4arpq0x5n9ssfxl507v"; - name = "plasma-integration-5.21.0.tar.xz"; + url = "${mirror}/stable/plasma/5.21.1/plasma-integration-5.21.1.tar.xz"; + sha256 = "0i51grmjkf9k6z1aq4j69wqdwdnn4rcryvi7b9lfpqaz1phsqhq7"; + name = "plasma-integration-5.21.1.tar.xz"; }; }; plasma-nano = { - version = "5.21.0"; + version = "5.21.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.0/plasma-nano-5.21.0.tar.xz"; - sha256 = "0cnj0k4yqxjamrj1fsp2s4d8j067n5bkzr1h51kin1m396mq1msi"; - name = "plasma-nano-5.21.0.tar.xz"; + url = "${mirror}/stable/plasma/5.21.1/plasma-nano-5.21.1.tar.xz"; + sha256 = "0qz14rmnlpk8mc1lgk854zlp032znc27j0wg6a7zsljikbx90dzm"; + name = "plasma-nano-5.21.1.tar.xz"; }; }; plasma-nm = { - version = "5.21.0"; + version = "5.21.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.0/plasma-nm-5.21.0.tar.xz"; - sha256 = "0pp3hflfd1v9wmv5h71i1aaw0gwi6xbwcnvsr13hvb4d71vwm6vx"; - name = "plasma-nm-5.21.0.tar.xz"; + url = "${mirror}/stable/plasma/5.21.1/plasma-nm-5.21.1.tar.xz"; + sha256 = "0lg9fkk4lag5pi648jv66b8mzp645xx75y4zylj87yz3i8h9may4"; + name = "plasma-nm-5.21.1.tar.xz"; }; }; plasma-pa = { - version = "5.21.0"; + version = "5.21.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.0/plasma-pa-5.21.0.tar.xz"; - sha256 = "19vgk3j7bw8fcvvkgpd90dxyqhxb6wi2rbw89knd2hk3rb7akpj8"; - name = "plasma-pa-5.21.0.tar.xz"; + url = "${mirror}/stable/plasma/5.21.1/plasma-pa-5.21.1.tar.xz"; + sha256 = "17vxvvrii3q46k22k3v94hicvxw7cdfl4rgaqbb8rvy94f2dhvir"; + name = "plasma-pa-5.21.1.tar.xz"; }; }; plasma-phone-components = { - version = "5.21.0"; + version = "5.21.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.0/plasma-phone-components-5.21.0.tar.xz"; - sha256 = "1hg3nk4dvbsn4vf3n07xxcm74p5q1gp2cv8rkcxy5g92p13xxva4"; - name = "plasma-phone-components-5.21.0.tar.xz"; + url = "${mirror}/stable/plasma/5.21.1/plasma-phone-components-5.21.1.tar.xz"; + sha256 = "1fzjwc1x40n8wxq9fqm83j07yg9zniilmafcsv0rd80k6v99691i"; + name = "plasma-phone-components-5.21.1.tar.xz"; }; }; plasma-sdk = { - version = "5.21.0"; + version = "5.21.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.0/plasma-sdk-5.21.0.tar.xz"; - sha256 = "0qn59yv3sd8yp87sbnnfn2m0wn95clica1fq4zw3bh0zlgw0l2wk"; - name = "plasma-sdk-5.21.0.tar.xz"; + url = "${mirror}/stable/plasma/5.21.1/plasma-sdk-5.21.1.tar.xz"; + sha256 = "0s18lgp8baan9s9qr8wwaq3ah668255whz9xpl2xl1qv9qnr5v28"; + name = "plasma-sdk-5.21.1.tar.xz"; }; }; plasma-systemmonitor = { - version = "5.21.0"; + version = "5.21.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.0/plasma-systemmonitor-5.21.0.tar.xz"; - sha256 = "0h6m6i11szj7c2rf67js84x6xycs4lbf5vx8lrgw1rqn3i02yxcp"; - name = "plasma-systemmonitor-5.21.0.tar.xz"; + url = "${mirror}/stable/plasma/5.21.1/plasma-systemmonitor-5.21.1.tar.xz"; + sha256 = "1mfmlnsa2iy4wrdi2hghrapd7j02k3xkv4cfv44pw29i5iihvx6a"; + name = "plasma-systemmonitor-5.21.1.tar.xz"; }; }; plasma-tests = { - version = "5.21.0"; + version = "5.21.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.0/plasma-tests-5.21.0.tar.xz"; - sha256 = "1z49dl8bmni9k19d5j9sa3nd02p02m5x4w9cb75w5w1ciaq3sqb5"; - name = "plasma-tests-5.21.0.tar.xz"; + url = "${mirror}/stable/plasma/5.21.1/plasma-tests-5.21.1.tar.xz"; + sha256 = "1qxlwvxwkqgxy6kvd9dqp7wg02gc4j37az20gxglm5s4jf9j47kr"; + name = "plasma-tests-5.21.1.tar.xz"; }; }; plasma-thunderbolt = { - version = "5.21.0"; + version = "5.21.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.0/plasma-thunderbolt-5.21.0.tar.xz"; - sha256 = "1kywxh06yfsqih517hly3ra18a3rq278imyvkrj5b4fjsczc404g"; - name = "plasma-thunderbolt-5.21.0.tar.xz"; + url = "${mirror}/stable/plasma/5.21.1/plasma-thunderbolt-5.21.1.tar.xz"; + sha256 = "1v6yjxk30wpr86f1m7zn9sm5vvagcjmqz8b3s9sliv0z69n50fzx"; + name = "plasma-thunderbolt-5.21.1.tar.xz"; }; }; plasma-vault = { - version = "5.21.0"; + version = "5.21.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.0/plasma-vault-5.21.0.tar.xz"; - sha256 = "13la88yi85hi85r4cs3jxwhhm1m1z7l8pgjfcfm6n75jm0ij7fya"; - name = "plasma-vault-5.21.0.tar.xz"; + url = "${mirror}/stable/plasma/5.21.1/plasma-vault-5.21.1.tar.xz"; + sha256 = "0mfjmmn3s2piqg8idmndh1klrr3fllka0lx6ckx7bmj1g7z3kr0d"; + name = "plasma-vault-5.21.1.tar.xz"; }; }; plasma-workspace = { - version = "5.21.0"; + version = "5.21.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.0/plasma-workspace-5.21.0.tar.xz"; - sha256 = "1m6bl1n2qd88kvx9vccpbw16kg4rg0zs2vbl81gli2wamnxhnzzs"; - name = "plasma-workspace-5.21.0.tar.xz"; + url = "${mirror}/stable/plasma/5.21.1/plasma-workspace-5.21.1.tar.xz"; + sha256 = "0aq2158sijlgz3baslj57kzhmdx3m0zir80qz1svw94grfszjc2a"; + name = "plasma-workspace-5.21.1.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.21.0"; + version = "5.21.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.0/plasma-workspace-wallpapers-5.21.0.tar.xz"; - sha256 = "11w3129xrgyj91jp3pm1iy7fi088g1jybh4a5fagmac4x0hlwsz7"; - name = "plasma-workspace-wallpapers-5.21.0.tar.xz"; + url = "${mirror}/stable/plasma/5.21.1/plasma-workspace-wallpapers-5.21.1.tar.xz"; + sha256 = "1pfgzzfhwdgczhrgizwi7rvav1hawwv6zra8nlqnfia8rc4mjs3n"; + name = "plasma-workspace-wallpapers-5.21.1.tar.xz"; }; }; plymouth-kcm = { - version = "5.21.0"; + version = "5.21.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.0/plymouth-kcm-5.21.0.tar.xz"; - sha256 = "07zjb75qcmhz3cinyvmlx44pibi4p540kmghr79n8z5z314dzzir"; - name = "plymouth-kcm-5.21.0.tar.xz"; + url = "${mirror}/stable/plasma/5.21.1/plymouth-kcm-5.21.1.tar.xz"; + sha256 = "1il5a60db4brgs0ifmbxhq1ncqg80pkz5pnddbb3vwiwgwrsjziw"; + name = "plymouth-kcm-5.21.1.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.21.0"; + version = "1-5.21.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.0/polkit-kde-agent-1-5.21.0.tar.xz"; - sha256 = "12z8m08w8gwkfv32hggwacvrai7slijs3vbf1rwc0q9bma564ra5"; - name = "polkit-kde-agent-1-5.21.0.tar.xz"; + url = "${mirror}/stable/plasma/5.21.1/polkit-kde-agent-1-5.21.1.tar.xz"; + sha256 = "1lm6rl3lfimlfw7yaqk81jdrdi31qbz951vzcss4prwa1iqdi7b2"; + name = "polkit-kde-agent-1-5.21.1.tar.xz"; }; }; powerdevil = { - version = "5.21.0"; + version = "5.21.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.0/powerdevil-5.21.0.tar.xz"; - sha256 = "1fr9d7721i7l3cmyi1q9yyl4xmmbyc0vhxrrn2v7sjs27hgf1sd3"; - name = "powerdevil-5.21.0.tar.xz"; + url = "${mirror}/stable/plasma/5.21.1/powerdevil-5.21.1.tar.xz"; + sha256 = "08a9wl97lpcm0qz438ha8avdc6ybsij5vvy3p0ijkdn1psq2974b"; + name = "powerdevil-5.21.1.tar.xz"; }; }; qqc2-breeze-style = { - version = "5.21.0"; + version = "5.21.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.0/qqc2-breeze-style-5.21.0.tar.xz"; - sha256 = "0by7js52w14vb7ma29shhb1wzl8wprq9xdy966003yxz1jx1nqkf"; - name = "qqc2-breeze-style-5.21.0.tar.xz"; + url = "${mirror}/stable/plasma/5.21.1/qqc2-breeze-style-5.21.1.tar.xz"; + sha256 = "1k4zl5hbbyk2v9gila8whkh7yniv3nwcgdc73ysc75ivqyzydsix"; + name = "qqc2-breeze-style-5.21.1.tar.xz"; }; }; sddm-kcm = { - version = "5.21.0"; + version = "5.21.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.0/sddm-kcm-5.21.0.tar.xz"; - sha256 = "12hyyh92zvi1bx6r60fynz1zadi8jv25id4zx7qhsb36fk49h9l9"; - name = "sddm-kcm-5.21.0.tar.xz"; + url = "${mirror}/stable/plasma/5.21.1/sddm-kcm-5.21.1.tar.xz"; + sha256 = "0j76zwmn2r62hjzv1gni44a9admd38x2s8s30qfc1dzc7nkv61sh"; + name = "sddm-kcm-5.21.1.tar.xz"; }; }; systemsettings = { - version = "5.21.0"; + version = "5.21.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.0/systemsettings-5.21.0.tar.xz"; - sha256 = "02p3qbw28q6rjrpqkv2d5znx0rkscqcbx3f4d8yjb7g4ba88c043"; - name = "systemsettings-5.21.0.tar.xz"; + url = "${mirror}/stable/plasma/5.21.1/systemsettings-5.21.1.tar.xz"; + sha256 = "0kzg3raa2f3lwb5qs10g8kzmv6px8fk4z2sq5jnjl3n9zqgzykkr"; + name = "systemsettings-5.21.1.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.21.0"; + version = "5.21.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.0/xdg-desktop-portal-kde-5.21.0.tar.xz"; - sha256 = "0fakwl100ry210vvslxz94p83y52lvy44acsbb42aln07z7j9kvp"; - name = "xdg-desktop-portal-kde-5.21.0.tar.xz"; + url = "${mirror}/stable/plasma/5.21.1/xdg-desktop-portal-kde-5.21.1.tar.xz"; + sha256 = "1xfnwycrq51sz1r57misrz8acq6yd1vrr5gjir4f1ynfclhf9aj6"; + name = "xdg-desktop-portal-kde-5.21.1.tar.xz"; }; }; } From 5dab7824e9a1fbf844b8f1dea618b81c083fec57 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" <ryantm-bot@ryantm.com> Date: Wed, 20 Jan 2021 08:55:35 +0000 Subject: [PATCH 086/188] mpg123: 1.26.3 -> 1.26.4 --- pkgs/applications/audio/mpg123/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix index 0b46cffd19c8..5c7eb6b88cf1 100644 --- a/pkgs/applications/audio/mpg123/default.nix +++ b/pkgs/applications/audio/mpg123/default.nix @@ -7,11 +7,11 @@ }: stdenv.mkDerivation rec { - name = "mpg123-1.26.3"; + name = "mpg123-1.26.4"; src = fetchurl { url = "mirror://sourceforge/mpg123/${name}.tar.bz2"; - sha256 = "0vkcfdx0mqq6lmpczsmpa2jsb0s6dryx3i7gvr32i3w9b9w9ij9h"; + sha256 = "sha256-CBmRVA33pmaykEmthw8pPPoohjs2SIq01Yzqp7WEZFQ="; }; outputs = [ "out" "conplay" ]; From 5f621580dedeba1fe1f4a35c6db1d2b76e95f180 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" <ryantm-bot@ryantm.com> Date: Wed, 20 Jan 2021 04:52:31 +0000 Subject: [PATCH 087/188] lyx: 2.3.6 -> 2.3.6.1 --- pkgs/applications/misc/lyx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix index 800de77f1c57..7cab86df9671 100644 --- a/pkgs/applications/misc/lyx/default.nix +++ b/pkgs/applications/misc/lyx/default.nix @@ -3,12 +3,12 @@ }: mkDerivation rec { - version = "2.3.6"; + version = "2.3.6.1"; pname = "lyx"; src = fetchurl { url = "ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/${pname}-${version}.tar.xz"; - sha256 = "160whjwwrmxizdakjlkf9xc86bhqfnslw47fixgqq4qhbapcxxkg"; + sha256 = "sha256-xr7SYzQZiY4Bp8w1AxDX2TS/WRyrcln8JYGqTADq+ng="; }; # LaTeX is used from $PATH, as people often want to have it with extra pkgs From d6094c4937079da64d95a754aeab5f88438d7077 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" <ryantm-bot@ryantm.com> Date: Wed, 20 Jan 2021 05:10:15 +0000 Subject: [PATCH 088/188] mpop: 1.4.11 -> 1.4.12 --- pkgs/applications/networking/mpop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mpop/default.nix b/pkgs/applications/networking/mpop/default.nix index 01528df856c0..a488817a0cfe 100644 --- a/pkgs/applications/networking/mpop/default.nix +++ b/pkgs/applications/networking/mpop/default.nix @@ -4,11 +4,11 @@ with lib; stdenv.mkDerivation rec { pname = "mpop"; - version = "1.4.11"; + version = "1.4.12"; src = fetchurl { url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz"; - sha256 = "1gcxvhin5y0q47svqbf90r5aip0cgywm8sq6m84ygda7km8xylwv"; + sha256 = "sha256-X2NVtS2cNgYZYjpAxmwaVXHjk7Q/5YN1wN41QprDSAo="; }; nativeBuildInputs = [ pkg-config ]; From 475886c20a4ad53f5507bff534d07f0c85d2b177 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" <ryantm-bot@ryantm.com> Date: Wed, 20 Jan 2021 04:58:52 +0000 Subject: [PATCH 089/188] mblaze: 1.0 -> 1.1 --- pkgs/applications/networking/mailreaders/mblaze/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/mblaze/default.nix b/pkgs/applications/networking/mailreaders/mblaze/default.nix index 2ac32f34304f..b7527d04cb69 100644 --- a/pkgs/applications/networking/mailreaders/mblaze/default.nix +++ b/pkgs/applications/networking/mailreaders/mblaze/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "mblaze"; - version = "1.0"; + version = "1.1"; nativeBuildInputs = [ installShellFiles ]; buildInputs = [ ruby ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "leahneukirchen"; repo = "mblaze"; rev = "v${version}"; - sha256 = "0hxy3mjjv4hg856sl1r15fdmqaw4s9c26b3lidsd5x0kpqy601ai"; + sha256 = "sha256-Ho2Qoxs93ig4yYUOaoqdYnLA8Y4+7CfRM0dju89JOa4="; }; makeFlags = [ "PREFIX=$(out)" ]; From 26c9976e500c25dfcb5b0a48c307d9549a1df729 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de> Date: Fri, 26 Feb 2021 10:55:25 +0100 Subject: [PATCH 090/188] Revert "Apply suggestions from code review" This reverts commit acde9a01a3f5cd12b769385880bab90281ab8361. A better solution is a65208ca8e593e2478b0848e6b5cbda7530a1707. --- pkgs/data/misc/tzdata/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix index a2db4d0d9684..795c5cb681cc 100644 --- a/pkgs/data/misc/tzdata/default.nix +++ b/pkgs/data/misc/tzdata/default.nix @@ -42,10 +42,10 @@ stdenv.mkDerivation rec { installFlags = [ "ZIC=./zic-native" ]; + # NOTE: in cross-compilation scenarios, this is built for the build platform. preInstall = '' mv zic.o zic.o.orig mv zic zic.orig - # NOTE: in cross-compilation scenarios, this is built for the build platform. make $makeFlags cc=cc AR=ar zic mv zic zic-native mv zic.o.orig zic.o From 109cbc400f4dd472d91f1f7768f42d7faac0cddb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de> Date: Fri, 26 Feb 2021 10:56:10 +0100 Subject: [PATCH 091/188] Revert "Fix tzdata cross-compilation" This reverts commit 963513e6540cb5ef85c1d6410bc7cdd937f95bdb. A better solution is a65208ca8e593e2478b0848e6b5cbda7530a1707. --- pkgs/data/misc/tzdata/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix index 795c5cb681cc..82dd336e5e50 100644 --- a/pkgs/data/misc/tzdata/default.nix +++ b/pkgs/data/misc/tzdata/default.nix @@ -42,11 +42,10 @@ stdenv.mkDerivation rec { installFlags = [ "ZIC=./zic-native" ]; - # NOTE: in cross-compilation scenarios, this is built for the build platform. preInstall = '' mv zic.o zic.o.orig mv zic zic.orig - make $makeFlags cc=cc AR=ar zic + make $makeFlags cc=${stdenv.cc.targetPrefix}cc AR=${stdenv.cc.targetPrefix}ar zic mv zic zic-native mv zic.o.orig zic.o mv zic.orig zic From c50a347cb5604fe92173204872d2ebdb694075b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu> Date: Fri, 26 Feb 2021 11:51:31 +0100 Subject: [PATCH 092/188] buildRustPackage: use checkType argument The `checkType` argument of buildRustPackage was not used anymore since the refactoring of `buildRustPackage` into hooks. This was an oversight that is fixed by this change. The check type can also be passed directly to cargoCheckHook using the `cargoCheckType` environment variable. --- doc/languages-frameworks/rust.section.md | 7 ++++--- pkgs/build-support/rust/default.nix | 2 ++ pkgs/build-support/rust/hooks/cargo-check-hook.sh | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index 94f94aaffe32..1a749d2c8476 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -320,9 +320,10 @@ attributes can also be used: variable `buildAndTestSubdir` can be used to build a crate in a Cargo workspace. Additional maturin flags can be passed through `maturinBuildFlags`. -* `cargoCheckHook`: run tests using Cargo. Additional flags can be - passed to Cargo using `checkFlags` and `checkFlagsArray`. By - default, tests are run in parallel. This can be disabled by setting +* `cargoCheckHook`: run tests using Cargo. The build type for checks + can be set using `cargoCheckType`. Additional flags can be passed to + the tests using `checkFlags` and `checkFlagsArray`. By default, + tests are run in parallel. This can be disabled by setting `dontUseCargoParallelTests`. * `cargoInstallHook`: install binaries and static/shared libraries that were built using `cargoBuildHook`. diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index bfa6c0d17cd6..ff9ca642daad 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -103,6 +103,8 @@ stdenv.mkDerivation ((removeAttrs args ["depsExtraArgs"]) // lib.optionalAttrs u cargoBuildType = buildType; + cargoCheckType = checkType; + patchRegistryDeps = ./patch-registry-deps; nativeBuildInputs = nativeBuildInputs ++ [ diff --git a/pkgs/build-support/rust/hooks/cargo-check-hook.sh b/pkgs/build-support/rust/hooks/cargo-check-hook.sh index 8c5b1a13219a..82e669af3a08 100644 --- a/pkgs/build-support/rust/hooks/cargo-check-hook.sh +++ b/pkgs/build-support/rust/hooks/cargo-check-hook.sh @@ -15,7 +15,7 @@ cargoCheckHook() { threads=1 fi - argstr="--${cargoBuildType} --target @rustTargetPlatformSpec@ --frozen"; + argstr="--${cargoCheckType} --target @rustTargetPlatformSpec@ --frozen"; ( set -x From 24601c00d565efde81c51328a0bc045d446fd025 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" <ryantm-bot@ryantm.com> Date: Wed, 20 Jan 2021 04:24:29 +0000 Subject: [PATCH 093/188] minizip2: 2.10.4 -> 2.10.6 --- pkgs/development/libraries/minizip2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/minizip2/default.nix b/pkgs/development/libraries/minizip2/default.nix index 16bb2b8d44e6..591bb8c8dc3a 100644 --- a/pkgs/development/libraries/minizip2/default.nix +++ b/pkgs/development/libraries/minizip2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "minizip"; - version = "2.10.4"; + version = "2.10.6"; src = fetchFromGitHub { owner = "nmoinvaz"; repo = pname; rev = version; - sha256 = "15bbagngvm738prkzv7lfs64pn4pq7jkhwz571j0w0nb5nw9c01x"; + sha256 = "sha256-OAm4OZeQdP2Q/UKYI9bR7OV9RmLmYF/j2NpK5TPoE60="; }; nativeBuildInputs = [ cmake pkg-config ]; From 9f1fae0536514f90d5c110b420c4b0b194042c2c Mon Sep 17 00:00:00 2001 From: Fabian Affolter <mail@fabian-affolter.ch> Date: Fri, 26 Feb 2021 19:22:11 +0100 Subject: [PATCH 094/188] python3Packages.simplejson: 3.17.0 -> 3.17.2 --- .../python-modules/simplejson/default.nix | 32 ++++++++----------- 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/simplejson/default.nix b/pkgs/development/python-modules/simplejson/default.nix index fe08f5bbe2e5..dd27c02dc874 100644 --- a/pkgs/development/python-modules/simplejson/default.nix +++ b/pkgs/development/python-modules/simplejson/default.nix @@ -2,39 +2,35 @@ , buildPythonPackage , fetchFromGitHub , stdenv -, pytest +, pytestCheckHook }: buildPythonPackage rec { pname = "simplejson"; - version = "3.17.0"; + version = "3.17.2"; doCheck = !stdenv.isDarwin; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1b1hhh1dia673vhq3jl2br1iqwb9yjii6iak56w96s9972vjbz3z"; + sha256 = "sha256-2ZC7aKyUUcth43Ce0j6JdjrJ4gb4QfJDlY2M5TLMQ+o="; }; - # Package does not need pytest, but its a bit easier debugging. - checkInputs = [ pytest ]; - # Ignore warnings because test does not expect them in stderr - # See https://github.com/simplejson/simplejson/issues/241 - checkPhase = '' - PYTHONWARNINGS="ignore" pytest simplejson/tests - ''; + checkInputs = [ pytestCheckHook ]; - meta = { - description = "A simple, fast, extensible JSON encoder/decoder for Python"; + pythonImportsCheck = [ "simplejson" ]; + + meta = with lib; { + description = "Extensible JSON encoder/decoder for Python"; longDescription = '' - simplejson is compatible with Python 2.4 and later with no - external dependencies. It covers the full JSON specification - for both encoding and decoding, with unicode support. By - default, encoding is done in an encoding neutral fashion (plain - ASCII with \uXXXX escapes for unicode characters). + simplejson covers the full JSON specification for both encoding + and decoding, with unicode support. By default, encoding is done + in an encoding neutral fashion (plain ASCII with \uXXXX escapes + for unicode characters). ''; homepage = "https://github.com/simplejson/simplejson"; - license = with lib.licenses; [ mit afl21 ]; + license = with licenses; [ mit afl21 ]; + maintainers = with maintainers; [ fab ]; }; } From c72363839afeb73123648e48b098a9442c39cc38 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" <ryantm-bot@ryantm.com> Date: Wed, 20 Jan 2021 11:40:22 +0000 Subject: [PATCH 095/188] libndctl: 70.1 -> 71.1 --- pkgs/development/libraries/libndctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libndctl/default.nix b/pkgs/development/libraries/libndctl/default.nix index b7e082f2b9ba..91a2c378c03c 100644 --- a/pkgs/development/libraries/libndctl/default.nix +++ b/pkgs/development/libraries/libndctl/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "libndctl"; - version = "70.1"; + version = "71.1"; src = fetchFromGitHub { owner = "pmem"; repo = "ndctl"; rev = "v${version}"; - sha256 = "09ymdibcr18vpmyf2n0xrnzgccfvr7iy3p2l5lbh7cgz7djyl5wq"; + sha256 = "sha256-osux3DiKRh8ftHwyfFI+WSFx20+yJsg1nVx5nuoKJu4="; }; outputs = [ "out" "lib" "man" "dev" ]; From 5854bf0834009c12f238f569500c0132f74b2abf Mon Sep 17 00:00:00 2001 From: Masanori Ogino <167209+omasanori@users.noreply.github.com> Date: Fri, 26 Feb 2021 03:55:21 +0900 Subject: [PATCH 096/188] re2c: fix CVE-2018-21232 It backports patches from 2.0 series to fix CVE-2018-21232. References: https://github.com/NixOS/nixpkgs/issues/88391 https://www.openwall.com/lists/oss-security/2020/04/27/2 https://github.com/skvadrik/re2c/issues/219 Signed-off-by: Masanori Ogino <167209+omasanori@users.noreply.github.com> --- .../tools/parsing/re2c/default.nix | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/pkgs/development/tools/parsing/re2c/default.nix b/pkgs/development/tools/parsing/re2c/default.nix index 665609fe90af..ebba9903a47c 100644 --- a/pkgs/development/tools/parsing/re2c/default.nix +++ b/pkgs/development/tools/parsing/re2c/default.nix @@ -12,6 +12,30 @@ stdenv.mkDerivation rec { }; patches = [ + (fetchpatch { + name = "CVE-2018-21232-part1.patch"; + url = "https://github.com/skvadrik/re2c/commit/fd634998f813340768c333cdad638498602856e5.patch"; + sha256 = "1blyg5lyhqd4ymisih65xl0g36ig71ijia4skkkd59rdvj78aiw6"; + }) + + (fetchpatch { + name = "CVE-2018-21232-part2.patch"; + url = "https://github.com/skvadrik/re2c/commit/7b5643476bd99c994c4f51b8143f942982d85521.patch"; + sha256 = "0rhmgqrinpk49r9x75ygrs14lz72aw5ad5kr6qp9bdyl8gs082qp"; + }) + + (fetchpatch { + name = "CVE-2018-21232-part3.patch"; + url = "https://github.com/skvadrik/re2c/commit/4d9c809355b574f2a58eac119f5e076c48e4d1e2.patch"; + sha256 = "0k86wg9icw1gkqpf7rq2w6xsq4caxw3rc0zfxf39liwa35027rai"; + }) + + (fetchpatch { + name = "CVE-2018-21232-part4.patch"; + url = "https://github.com/skvadrik/re2c/commit/89be91f3df00657261870adbc590209fdb2bc405.patch"; + sha256 = "1aygy9va7jwby93chlskwg7z90fn07x5hym0gziwlkx8k900p3a3"; + }) + (fetchpatch { name = "CVE-2020-11958.patch"; url = "https://github.com/skvadrik/re2c/commit/c4603ba5ce229db83a2a4fb93e6d4b4e3ec3776a.patch"; From 59f21b70a9cdf8998126ae316b285384a58f4fd0 Mon Sep 17 00:00:00 2001 From: Ivan Babrou <github@ivan.computer> Date: Fri, 26 Feb 2021 14:50:26 -0800 Subject: [PATCH 097/188] soxr: add patch to fix aarch64-darwin compilation --- .../misc/audio/soxr/arm64-check.patch | 79 +++++++++++++++++++ pkgs/applications/misc/audio/soxr/default.nix | 5 ++ 2 files changed, 84 insertions(+) create mode 100644 pkgs/applications/misc/audio/soxr/arm64-check.patch diff --git a/pkgs/applications/misc/audio/soxr/arm64-check.patch b/pkgs/applications/misc/audio/soxr/arm64-check.patch new file mode 100644 index 000000000000..ac16a214c3aa --- /dev/null +++ b/pkgs/applications/misc/audio/soxr/arm64-check.patch @@ -0,0 +1,79 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Misty De Meo <mistydemeo@gmail.com> +Date: Tue, 15 Sep 2020 16:57:26 -0700 +Subject: [PATCH] Check for __arm64__, not just __arm__ + +On at least one 64-bit ARM processor I've tested (Apple Silicon on macOS), +__arm__ isn't defined but __arm64__ is. As a result, some of the +ARM-specific macros are missing and calls to them fail. +--- + src/cr-core.c | 2 +- + src/dev32s.h | 2 +- + src/pffft-wrap.c | 2 +- + src/pffft.c | 4 ++-- + 4 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/cr-core.c b/src/cr-core.c +index 159a5d9..fe5ea8a 100644 +--- a/src/cr-core.c ++++ b/src/cr-core.c +@@ -80,7 +80,7 @@ static void cubic_stage_fn(stage_t * p, fifo_t * output_fifo) + #define DEFINED_X86 0 + #endif + +-#if defined __arm__ ++#if defined(__arm__) || defined(__arm64__) + #define DEFINED_ARM 1 + #else + #define DEFINED_ARM 0 +diff --git a/src/dev32s.h b/src/dev32s.h +index 7edae86..a14d7ad 100644 +--- a/src/dev32s.h ++++ b/src/dev32s.h +@@ -31,7 +31,7 @@ SIMD_INLINE(void) vStorSum(float * a, v4_t b) { + v4_t t = vAdd(_mm_movehl_ps(b, b), b); + _mm_store_ss(a, vAdd(t, _mm_shuffle_ps(t,t,1)));} + +-#elif defined __arm__ ++#elif defined(__arm__) || defined(__arm64__) + + #include <arm_neon.h> + +diff --git a/src/pffft-wrap.c b/src/pffft-wrap.c +index c920f06..1641fc4 100644 +--- a/src/pffft-wrap.c ++++ b/src/pffft-wrap.c +@@ -40,7 +40,7 @@ static void pffft_zconvolve(PFFFT_Setup *s, const float *a, const float *b, floa + + float ar, ai, br, bi; + +-#ifdef __arm__ ++#if defined(__arm__) || defined(__arm64__) + __builtin_prefetch(va); + __builtin_prefetch(vb); + __builtin_prefetch(va+2); +diff --git a/src/pffft.c b/src/pffft.c +index 46c841e..8c775a9 100644 +--- a/src/pffft.c ++++ b/src/pffft.c +@@ -157,7 +157,7 @@ typedef __m128 v4sf; + /* + ARM NEON support macros + */ +-#elif !defined(PFFFT_SIMD_DISABLE) && defined(__arm__) ++#elif !defined(PFFFT_SIMD_DISABLE) && (defined(__arm__) || defined(__arm64__)) + # include <arm_neon.h> + typedef float32x4_t v4sf; + # define SIMD_SZ 4 +@@ -1732,7 +1732,7 @@ void pffft_zconvolve_accumulate(PFFFT_Setup *s, const float *a, const float *b, + const v4sf * RESTRICT vb = (const v4sf*)b; + v4sf * RESTRICT vab = (v4sf*)ab; + +-#ifdef __arm__ ++#if defined(__arm__) || defined(__arm64__) + __builtin_prefetch(va); + __builtin_prefetch(vb); + __builtin_prefetch(vab); +-- +2.30.1 + diff --git a/pkgs/applications/misc/audio/soxr/default.nix b/pkgs/applications/misc/audio/soxr/default.nix index 3f3ed0a0b156..8460b4856dcc 100644 --- a/pkgs/applications/misc/audio/soxr/default.nix +++ b/pkgs/applications/misc/audio/soxr/default.nix @@ -8,6 +8,11 @@ stdenv.mkDerivation rec { sha256 = "12aql6svkplxq5fjycar18863hcq84c5kx8g6f4rj0lcvigw24di"; }; + patches = [ + # Remove once https://sourceforge.net/p/soxr/code/merge-requests/5/ is merged. + ./arm64-check.patch + ]; + outputs = [ "out" "doc" ]; # headers are just two and very small preConfigure = if stdenv.isDarwin then '' From afbb72faef12e125b9631560cffd12785684383a Mon Sep 17 00:00:00 2001 From: Ivan Babrou <github@ivan.computer> Date: Fri, 26 Feb 2021 20:44:19 -0800 Subject: [PATCH 098/188] perl530: backport aarch64-darwin patch This was originally in #105026, but then 5.30.1 happened with this change included, so there were conflict and the patch got dropped. Let's introduce it separately for only one version that still needs it. --- .../interpreters/perl/aarch64-darwin.patch | 46 +++++++++++++++++++ .../development/interpreters/perl/default.nix | 5 +- 2 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/interpreters/perl/aarch64-darwin.patch diff --git a/pkgs/development/interpreters/perl/aarch64-darwin.patch b/pkgs/development/interpreters/perl/aarch64-darwin.patch new file mode 100644 index 000000000000..b700c8ca6e0d --- /dev/null +++ b/pkgs/development/interpreters/perl/aarch64-darwin.patch @@ -0,0 +1,46 @@ +diff --git a/hints/darwin.sh b/hints/darwin.sh +index 0a91bc083c0..fdfbdd4a3b9 100644 +--- a/hints/darwin.sh ++++ b/hints/darwin.sh +@@ -301,7 +301,7 @@ case "$osvers" in # Note: osvers is the kernel version, not the 10.x + # We now use MACOSX_DEPLOYMENT_TARGET, if set, as an override by + # capturing its value and adding it to the flags. + case "$MACOSX_DEPLOYMENT_TARGET" in +- 10.*) ++ [1-9][0-9].*) + add_macosx_version_min ccflags $MACOSX_DEPLOYMENT_TARGET + add_macosx_version_min ldflags $MACOSX_DEPLOYMENT_TARGET + ;; +@@ -313,7 +313,7 @@ case "$osvers" in # Note: osvers is the kernel version, not the 10.x + + *** Unexpected MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET + *** +-*** Please either set it to 10.something, or to empty. ++*** Please either set it to a valid macOS version number (e.g., 10.15) or to empty. + + EOM + exit 1 +@@ -327,7 +327,7 @@ EOM + # "ProductVersion: 10.11" "10.11" + prodvers=`sw_vers|awk '/^ProductVersion:/{print $2}'|awk -F. '{print $1"."$2}'` + case "$prodvers" in +- 10.*) ++ [1-9][0-9].*) + add_macosx_version_min ccflags $prodvers + add_macosx_version_min ldflags $prodvers + ;; +@@ -342,11 +342,10 @@ EOM + exit 1 + esac + +- # The X in 10.X +- prodvers_minor=$(echo $prodvers|awk -F. '{print $2}') ++ darwin_major=$(echo $osvers|awk -F. '{print $1}') + +- # macOS (10.12) deprecated syscall(). +- if [ "$prodvers_minor" -ge 12 ]; then ++ # macOS 10.12 (darwin 16.0.0) deprecated syscall(). ++ if [ "$darwin_major" -ge 16 ]; then + d_syscall='undef' + # If deploying to pre-10.12, suppress Time::HiRes's detection of the system clock_gettime() + case "$MACOSX_DEPLOYMENT_TARGET" in diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 66e0b284fc0d..e0c72d628a30 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -41,7 +41,10 @@ let ] ++ optional stdenv.isSunOS ./ld-shared.patch ++ optionals stdenv.isDarwin [ ./cpp-precomp.patch ./sw_vers.patch ] - ++ optional crossCompiling ./MakeMaker-cross.patch; + ++ optional crossCompiling ./MakeMaker-cross.patch + # Backporting https://github.com/Perl/perl5/pull/17946, can be + # removed if there's ever a 5.30.x release with it included. + ++ optional (versionOlder version "5.32.1") ./aarch64-darwin.patch; # This is not done for native builds because pwd may need to come from # bootstrap tools when building bootstrap perl. From 103d77e02fcdc262923fe30e46dd4b8799d945ce Mon Sep 17 00:00:00 2001 From: "R. RyanTM" <ryantm-bot@ryantm.com> Date: Wed, 20 Jan 2021 11:33:48 +0000 Subject: [PATCH 099/188] nettools: 1.60_p20180626073013 -> 2.10 --- pkgs/os-specific/linux/net-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/net-tools/default.nix b/pkgs/os-specific/linux/net-tools/default.nix index 461a65c007b2..c9410c27df96 100644 --- a/pkgs/os-specific/linux/net-tools/default.nix +++ b/pkgs/os-specific/linux/net-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "net-tools"; - version = "1.60_p20180626073013"; + version = "2.10"; src = fetchurl { url = "mirror://gentoo/distfiles/${pname}-${version}.tar.xz"; - sha256 = "0mzsjjmz5kn676w2glmxwwd8bj0xy9dhhn21aplb435b767045q4"; + sha256 = "sha256-smJDWlJB6Jv6UcPKvVEzdTlS96e3uT8y4Iy52W9YDWk="; }; preBuild = From 63963400dcdea9f58f835b14acbe6f1a8bd3cdbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io> Date: Sat, 27 Feb 2021 10:13:02 +0100 Subject: [PATCH 100/188] iana-etc: 20200729 -> 20210225 --- pkgs/data/misc/iana-etc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/iana-etc/default.nix b/pkgs/data/misc/iana-etc/default.nix index 421054fa17f0..60735eb4782c 100644 --- a/pkgs/data/misc/iana-etc/default.nix +++ b/pkgs/data/misc/iana-etc/default.nix @@ -1,11 +1,11 @@ { lib, fetchzip }: let - version = "20200729"; + version = "20210225"; in fetchzip { name = "iana-etc-${version}"; url = "https://github.com/Mic92/iana-etc/releases/download/${version}/iana-etc-${version}.tar.gz"; - sha256 = "05cymmisfvpyd7fwzc6axvm5fsi1v6hzs0pjr4xp1i95wvpz7qpm"; + sha256 = "sha256-NVvZG3EJEYOXFDTBXD5m9sg/8msyMiBMkiZr+ZxWZ/g="; postFetch = '' tar -xzvf $downloadedFile --strip-components=1 From 2e1a7b94f3c85c982da8cd659e7a8d563fd3cbc0 Mon Sep 17 00:00:00 2001 From: Ivan Babrou <github@ivan.computer> Date: Fri, 26 Feb 2021 20:20:19 -0800 Subject: [PATCH 101/188] ocamlPackages.ocaml: fix assembler detection for aarch64-darwin --- pkgs/development/compilers/ocaml/generic.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix index d4a6b6250b52..d9853dd642ab 100644 --- a/pkgs/development/compilers/ocaml/generic.nix +++ b/pkgs/development/compilers/ocaml/generic.nix @@ -66,6 +66,10 @@ stdenv.mkDerivation (args // { preConfigure = optionalString (!lib.versionAtLeast version "4.04") '' CAT=$(type -tp cat) sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang + '' + optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + # Do what upstream does by default now: https://github.com/ocaml/ocaml/pull/10176 + # This is required for aarch64-darwin, everything else works as is. + AS="${stdenv.cc}/bin/cc -c" ASPP="${stdenv.cc}/bin/cc -c" ''; postBuild = '' mkdir -p $out/include From 0dcd780908e5fdfb3e879ebfb4a42f030d531c5c Mon Sep 17 00:00:00 2001 From: Daniel Nagy <danielnagy@posteo.de> Date: Wed, 24 Feb 2021 15:51:18 +0100 Subject: [PATCH 102/188] spidermonkey_78: 78.4.0 -> 78.8.0 --- .../interpreters/spidermonkey/78.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/spidermonkey/78.nix b/pkgs/development/interpreters/spidermonkey/78.nix index e04069f6aecc..23f24ca8ba46 100644 --- a/pkgs/development/interpreters/spidermonkey/78.nix +++ b/pkgs/development/interpreters/spidermonkey/78.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchurl -, fetchpatch , autoconf213 , pkg-config , perl @@ -21,11 +20,11 @@ stdenv.mkDerivation rec { pname = "spidermonkey"; - version = "78.4.0"; + version = "78.8.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"; - sha256 = "1z3hj45bnd12z3g6ajv9qrgclca7fymi1sxj9l9nh9q6y6xz0g4f"; + sha256 = "0451hhjrj9hb6limxim7sbhvw4gs6dd2gmnfxjjx07z3wbgdzwhw"; }; outputs = [ "out" "dev" ]; @@ -96,9 +95,19 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + postPatch = '' + # This patch is a manually applied fix of + # https://bugzilla.mozilla.org/show_bug.cgi?id=1644600 + # Once that bug is fixed, this can be removed. + # This is needed in, for example, `zeroad`. + substituteInPlace js/public/StructuredClone.h \ + --replace "class SharedArrayRawBufferRefs {" \ + "class JS_PUBLIC_API SharedArrayRawBufferRefs {" + ''; + meta = with lib; { description = "Mozilla's JavaScript engine written in C/C++"; - homepage = "https://developer.mozilla.org/en/SpiderMonkey"; + homepage = "https://spidermonkey.dev/"; license = licenses.gpl2; # TODO: MPL/GPL/LGPL tri-license. maintainers = with maintainers; [ abbradar lostnet ]; platforms = platforms.linux; From 48ebb82c32b78c700adda413dc921529050a9eed Mon Sep 17 00:00:00 2001 From: Martin Weinelt <hexa@darmstadt.ccc.de> Date: Sat, 27 Feb 2021 13:05:52 +0100 Subject: [PATCH 103/188] python3Packages.aiohttp: 3.7.3 -> 3.7.4 https://github.com/aio-libs/aiohttp/blob/master/CHANGES.rst#374-2021-02-25 Clean up package, reenable tests, allow local networking for darwin for loopback network tests, actually enable xdist, disable coverage. Fixes: CVE-2021-21330 --- .../python-modules/aiohttp/default.nix | 75 +++++++++---------- 1 file changed, 35 insertions(+), 40 deletions(-) diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index 514d1d308e12..c682423eec1d 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -3,82 +3,77 @@ , buildPythonPackage , fetchPypi , pythonOlder +, async-timeout , attrs , chardet -, multidict -, async-timeout -, yarl , idna-ssl +, multidict , typing-extensions -, pytestrunner -, pytestCheckHook -, gunicorn +, yarl , async_generator -, pytest_xdist -, pytestcov -, pytest-mock -, trustme , brotlipy , freezegun -, isPy38 +, gunicorn +, pytest-mock +, pytest-xdist +, pytestCheckHook , re-assert +, trustme }: buildPythonPackage rec { pname = "aiohttp"; - version = "3.7.3"; - # https://github.com/aio-libs/aiohttp/issues/4525 python3.8 failures - disabled = pythonOlder "3.5"; + version = "3.7.4"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "9c1a81af067e72261c9cbe33ea792893e83bc6aa987bfbd6fdc1e5e7b22777c4"; + sha256 = "1pn79h8fng4xi5gl1f6saw31nxgmgyxl41yf3vba1l21673yr12x"; }; - checkInputs = [ - pytestrunner pytestCheckHook gunicorn async_generator pytest_xdist - pytest-mock pytestcov trustme brotlipy freezegun - re-assert - ]; + postPatch = '' + substituteInPlace setup.cfg --replace " --cov=aiohttp" "" + ''; propagatedBuildInputs = [ + async-timeout attrs chardet multidict - async-timeout typing-extensions yarl ] ++ lib.optionals (pythonOlder "3.7") [ idna-ssl ]; + checkInputs = [ + async_generator + brotlipy + freezegun + gunicorn + pytest-mock + pytest-xdist + pytestCheckHook + re-assert + trustme + ]; + + pytestFlagsArray = [ + "-n auto" + ]; + disabledTests = [ - # disable tests which attempt to do loopback connections - "get_valid_log_format_exc" - "test_access_logger_atoms" - "aiohttp_request_coroutine" - "server_close_keepalive_connection" - "connector" - "client_disconnect" - "handle_keepalive_on_closed_connection" - "proxy_https_bad_response" - "partially_applied_handler" - "middleware" + # Disable tests that require network access "test_mark_formdata_as_processed" - # no longer compatible with pytest>=6 - "aiohttp_plugin_async_fixture" ] ++ lib.optionals stdenv.is32bit [ "test_cookiejar" - ] ++ lib.optionals isPy38 [ - # Python 3.8 https://github.com/aio-libs/aiohttp/issues/4525 - "test_read_boundary_with_incomplete_chunk" - "test_read_incomplete_chunk" - "test_request_tracing_exception" ] ++ lib.optionals stdenv.isDarwin [ - "test_addresses" # https://github.com/aio-libs/aiohttp/issues/3572 + "test_addresses" # https://github.com/aio-libs/aiohttp/issues/3572, remove >= v4.0.0 "test_close" ]; + __darwinAllowLocalNetworking = true; + # aiohttp in current folder shadows installed version # Probably because we run `python -m pytest` instead of `pytest` in the hook. preCheck = '' From 7ad8fdca00135c735b607a90c47c24ba2096144a Mon Sep 17 00:00:00 2001 From: Rick van Schijndel <rol3517@gmail.com> Date: Sat, 27 Feb 2021 00:46:35 +0100 Subject: [PATCH 104/188] gsm: support for cross-compilation --- pkgs/development/libraries/gsm/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/gsm/default.nix b/pkgs/development/libraries/gsm/default.nix index 13088dda0c91..f70a748a20e7 100644 --- a/pkgs/development/libraries/gsm/default.nix +++ b/pkgs/development/libraries/gsm/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { }; patchPhase = '' + substituteInPlace Makefile \ + --replace "= gcc " "?= gcc " # Fix include directory sed -e 's,$(GSM_INSTALL_ROOT)/inc,$(GSM_INSTALL_ROOT)/include/gsm,' -i Makefile '' + optionalString (!staticSupport) ( From 772aa5a94c5c0101ae22f21739e37c7aea5db11f Mon Sep 17 00:00:00 2001 From: Arthur Gautier <baloo@superbaloo.net> Date: Sat, 27 Feb 2021 21:18:13 +0000 Subject: [PATCH 105/188] thin-provisioning-tools: extraneous dependency on binutils Signed-off-by: Arthur Gautier <baloo@superbaloo.net> --- pkgs/tools/misc/thin-provisioning-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/thin-provisioning-tools/default.nix b/pkgs/tools/misc/thin-provisioning-tools/default.nix index 794e0d4e2578..bff6c9c96887 100644 --- a/pkgs/tools/misc/thin-provisioning-tools/default.nix +++ b/pkgs/tools/misc/thin-provisioning-tools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, expat, libaio, boost, binutils }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, expat, libaio, boost }: stdenv.mkDerivation rec { pname = "thin-provisioning-tools"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ expat libaio boost binutils ]; + buildInputs = [ expat libaio boost ]; enableParallelBuilding = true; From 5ce1b566dc6252f81773dcda555d79dacc88ed4f Mon Sep 17 00:00:00 2001 From: Ivan Babrou <github@ivan.computer> Date: Sat, 27 Feb 2021 23:26:43 -0800 Subject: [PATCH 106/188] python38Packages.py-cpuinfo: aarch64-darwin support --- pkgs/development/python-modules/py-cpuinfo/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/py-cpuinfo/default.nix b/pkgs/development/python-modules/py-cpuinfo/default.nix index 455b91663e2d..e87bf26dd596 100644 --- a/pkgs/development/python-modules/py-cpuinfo/default.nix +++ b/pkgs/development/python-modules/py-cpuinfo/default.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitHub +, fetchpatch , buildPythonPackage , pytestCheckHook }: @@ -15,6 +16,14 @@ buildPythonPackage rec { sha256 = "10qfaibyb2syiwiyv74l7d97vnmlk079qirgnw3ncklqjs0s3gbi"; }; + patches = [ + # Make it detect Apple Silicon, remove after https://github.com/workhorsy/py-cpuinfo/pull/161 is merged. + (fetchpatch { + url = "https://github.com/workhorsy/py-cpuinfo/commit/54c32da6678f9d75ec5acf4534056cdc85c2a04d.patch"; + sha256 = "sha256-3R46KrpACAQ1V0CQtz48V5mQXxvplUQrXnACtiE8WqY="; + }) + ]; + checkInputs = [ pytestCheckHook ]; From 1303257d8826681b7c0c122b38bb5bd4a1002aa7 Mon Sep 17 00:00:00 2001 From: Andrew Childs <lorne@cons.org.nz> Date: Fri, 11 Dec 2020 20:15:34 +0900 Subject: [PATCH 107/188] lib/systems: add `darwinArch` --- lib/systems/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/systems/default.nix b/lib/systems/default.nix index 1bbe976c4d21..1e38dbf531b1 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -107,6 +107,11 @@ rec { powerpc64le = "ppc64le"; }.${final.parsed.cpu.name} or final.parsed.cpu.name; + darwinArch = { + armv7a = "armv7"; + aarch64 = "arm64"; + }.${final.parsed.cpu.name} or final.parsed.cpu.name; + emulator = pkgs: let qemu-user = pkgs.qemu.override { smartcardSupport = false; From d16a8753d91365d0239eec9549b11e7a61c1c61b Mon Sep 17 00:00:00 2001 From: Andrew Childs <lorne@cons.org.nz> Date: Thu, 19 Nov 2020 16:54:02 +0900 Subject: [PATCH 108/188] stdenv: set CMAKE_OSX_ARCHITECTURES appropriately --- pkgs/development/tools/build-managers/cmake/setup-hook.sh | 3 --- pkgs/stdenv/generic/make-derivation.nix | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh index 0bb695615fce..89e8e0e197a0 100755 --- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh +++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh @@ -50,9 +50,6 @@ cmakeConfigurePhase() { # because we usually do not package the framework cmakeFlags="-DCMAKE_FIND_FRAMEWORK=LAST $cmakeFlags" - # on macOS i686 was only relevant for 10.5 or earlier. - cmakeFlags="-DCMAKE_OSX_ARCHITECTURES=x86_64 $cmakeFlags" - # we never want to use the global macOS SDK cmakeFlags="-DCMAKE_OSX_SYSROOT= $cmakeFlags" diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 13a7a03d6a8b..19c3d8965a74 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -251,6 +251,7 @@ in rec { lib.optional (!stdenv.hostPlatform.isRedox) stdenv.hostPlatform.uname.system)}"] ++ lib.optional (stdenv.hostPlatform.uname.processor != null) "-DCMAKE_SYSTEM_PROCESSOR=${stdenv.hostPlatform.uname.processor}" ++ lib.optional (stdenv.hostPlatform.uname.release != null) "-DCMAKE_SYSTEM_VERSION=${stdenv.hostPlatform.release}" + ++ lib.optional (stdenv.hostPlatform.isDarwin) "-DCMAKE_OSX_ARCHITECTURES=${stdenv.hostPlatform.darwinArch}" ++ lib.optional (stdenv.buildPlatform.uname.system != null) "-DCMAKE_HOST_SYSTEM_NAME=${stdenv.buildPlatform.uname.system}" ++ lib.optional (stdenv.buildPlatform.uname.processor != null) "-DCMAKE_HOST_SYSTEM_PROCESSOR=${stdenv.buildPlatform.uname.processor}" ++ lib.optional (stdenv.buildPlatform.uname.release != null) "-DCMAKE_HOST_SYSTEM_VERSION=${stdenv.buildPlatform.uname.release}"; From fc0456bed1372ccff51fc6fd578e5d2a09d64534 Mon Sep 17 00:00:00 2001 From: Andrew Childs <lorne@cons.org.nz> Date: Thu, 19 Nov 2020 16:57:29 +0900 Subject: [PATCH 109/188] cc-wrapper: set -arch on darwin --- pkgs/build-support/cc-wrapper/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index c8af8789fccf..06e43b6ea5f1 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -481,6 +481,10 @@ stdenv.mkDerivation { substituteAll ${../wrapper-common/utils.bash} $out/nix-support/utils.bash '' + + optionalString stdenv.targetPlatform.isDarwin '' + echo "-arch ${targetPlatform.darwinArch}" >> $out/nix-support/cc-cflags + '' + ## ## Extra custom steps ## From b26e0bac8dab068e54b0c8ee1bf8fd5fe5683b39 Mon Sep 17 00:00:00 2001 From: Andrew Childs <lorne@cons.org.nz> Date: Thu, 19 Nov 2020 16:57:41 +0900 Subject: [PATCH 110/188] bintools-wrapper: set -arch on darwin --- pkgs/build-support/bintools-wrapper/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 8fef2ca6624c..c255f43dfcd8 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -305,6 +305,10 @@ stdenv.mkDerivation { done '' + + optionalString stdenv.targetPlatform.isDarwin '' + echo "-arch ${targetPlatform.darwinArch}" >> $out/nix-support/libc-ldflags + '' + + '' for flags in "$out/nix-support"/*flags*; do substituteInPlace "$flags" --replace $'\n' ' ' From 8feb949ab540130063d1c57db7244024887c4ed9 Mon Sep 17 00:00:00 2001 From: Andrew Childs <lorne@cons.org.nz> Date: Sat, 12 Dec 2020 15:49:48 +0900 Subject: [PATCH 111/188] darwin/xcode: remove -arch flags These are now provided by the standard bintools and cc wrappers. --- pkgs/os-specific/darwin/xcode/sdk-pkgs.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix b/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix index 16ed52ea81e7..cabac19ba867 100644 --- a/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix +++ b/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix @@ -14,12 +14,6 @@ let minSdkVersion = targetPlatform.minSdkVersion or "9.0"; -iosPlatformArch = { parsed, ... }: { - armv7a = "armv7"; - aarch64 = "arm64"; - x86_64 = "x86_64"; -}.${parsed.cpu.name}; - in rec { @@ -35,9 +29,7 @@ rec { binutils = wrapBintoolsWith { libc = targetIosSdkPkgs.libraries; bintools = binutils-unwrapped; - extraBuildCommands = '' - echo "-arch ${iosPlatformArch targetPlatform}" >> $out/nix-support/libc-ldflags - '' + lib.optionalString (sdk.platform == "iPhoneSimulator") '' + extraBuildCommands = lib.optionalString (sdk.platform == "iPhoneSimulator") '' echo "-platform_version ios-sim ${minSdkVersion} ${sdk.version}" >> $out/nix-support/libc-ldflags '' + lib.optionalString (sdk.platform == "iPhoneOS") '' echo "-platform_version ios ${minSdkVersion} ${sdk.version}" >> $out/nix-support/libc-ldflags @@ -52,7 +44,7 @@ rec { extraBuildCommands = '' tr '\n' ' ' < $out/nix-support/cc-cflags > cc-cflags.tmp mv cc-cflags.tmp $out/nix-support/cc-cflags - echo "-target ${targetPlatform.config} -arch ${iosPlatformArch targetPlatform}" >> $out/nix-support/cc-cflags + echo "-target ${targetPlatform.config}" >> $out/nix-support/cc-cflags echo "-isystem ${sdk}/usr/include${lib.optionalString (lib.versionAtLeast "10" sdk.version) " -isystem ${sdk}/usr/include/c++/4.2.1/ -stdlib=libstdc++"}" >> $out/nix-support/cc-cflags '' + lib.optionalString (sdk.platform == "iPhoneSimulator") '' echo "-mios-simulator-version-min=${minSdkVersion}" >> $out/nix-support/cc-cflags From fa62f3716077be3239765b041702ed401bc257e3 Mon Sep 17 00:00:00 2001 From: Max Hausch <cheriimoya@googlemail.com> Date: Wed, 24 Feb 2021 09:25:49 +0100 Subject: [PATCH 112/188] doc: rust: Fix code blocks in markdown And add a word --- doc/languages-frameworks/rust.section.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index 1a749d2c8476..48510b37add3 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -72,8 +72,8 @@ For `cargoHash` you can use: Per the instructions in the [Cargo Book](https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html) best practices guide, Rust applications should always commit the `Cargo.lock` file in git to ensure a reproducible build. However, a few packages do not, and -Nix depends on this file, so if it missing you can use `cargoPatches` to apply -it in the `patchPhase`. Consider sending a PR upstream with a note to the +Nix depends on this file, so if it is missing you can use `cargoPatches` to +apply it in the `patchPhase`. Consider sending a PR upstream with a note to the maintainer describing why it's important to include in the application. The fetcher will verify that the `Cargo.lock` file is in sync with the `src` @@ -146,6 +146,8 @@ where they are known to differ. But there are ways to customize the argument: rustc.platform = { foo = ""; bar = ""; }; }; } + ``` + will result in: ```shell --target /nix/store/asdfasdfsadf-thumb-crazy.json # contains {"foo":"","bar":""} @@ -156,7 +158,7 @@ path) can be passed directly to `buildRustPackage`: ```nix pkgs.rustPlatform.buildRustPackage { - (...) + /* ... */ target = "x86_64-fortanix-unknown-sgx"; } ``` From ebe3ae4d4d4668f3f47a30f10592714df1c9b803 Mon Sep 17 00:00:00 2001 From: Max Hausch <cheriimoya@googlemail.com> Date: Wed, 24 Feb 2021 09:32:22 +0100 Subject: [PATCH 113/188] buildRustPackage: Add cargoTestFlags This makes it possible to pass flags to `cargo test`, which is needed if a crate is compiled with custom feature flags. --- doc/languages-frameworks/rust.section.md | 7 +++++++ pkgs/build-support/rust/hooks/cargo-check-hook.sh | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index 48510b37add3..a3f0238bf3a1 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -193,6 +193,13 @@ rustPlatform.buildRustPackage { Please note that the code will be compiled twice here: once in `release` mode for the `buildPhase`, and again in `debug` mode for the `checkPhase`. +Test flags, e.g., `--features xxx/yyy`, can be passed to `cargo test` via the +`cargoTestFlags` attribute. + +Another attribute, called `checkFlags`, is used to pass arguments to the test +binary itself, as stated +(here)[https://doc.rust-lang.org/cargo/commands/cargo-test.html]. + #### Tests relying on the structure of the `target/` directory Some tests may rely on the structure of the `target/` directory. Those tests diff --git a/pkgs/build-support/rust/hooks/cargo-check-hook.sh b/pkgs/build-support/rust/hooks/cargo-check-hook.sh index 82e669af3a08..bc913c6ab074 100644 --- a/pkgs/build-support/rust/hooks/cargo-check-hook.sh +++ b/pkgs/build-support/rust/hooks/cargo-check-hook.sh @@ -1,4 +1,5 @@ declare -a checkFlags +declare -a cargoTestFlags cargoCheckHook() { echo "Executing cargoCheckHook" @@ -15,7 +16,7 @@ cargoCheckHook() { threads=1 fi - argstr="--${cargoCheckType} --target @rustTargetPlatformSpec@ --frozen"; + argstr="--${cargoCheckType} --target @rustTargetPlatformSpec@ --frozen ${cargoTestFlags}"; ( set -x From f94e21c4e8783c3f5cd1a3edfc0acca79bd4179f Mon Sep 17 00:00:00 2001 From: TredwellGit <tredwell@tutanota.com> Date: Tue, 2 Mar 2021 11:08:19 +0000 Subject: [PATCH 114/188] ffmpeg: 4.3.1 -> 4.3.2 https://nvd.nist.gov/vuln/detail/CVE-2020-35964 https://nvd.nist.gov/vuln/detail/CVE-2020-35965 --- pkgs/development/libraries/ffmpeg-full/default.nix | 5 ----- pkgs/development/libraries/ffmpeg/4.nix | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 916ea2772e19..a09ad0e871ef 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -246,11 +246,6 @@ stdenv.mkDerivation rec { # this should go away in the next release patches = [ - (fetchpatch { - url = "https://git.videolan.org/?p=ffmpeg.git;a=patch;h=7c59e1b0f285cd7c7b35fcd71f49c5fd52cf9315"; - sha256 = "sha256-dqpmpDFETTuWHWolMoLaubU4BeDEuQaBNA0wmzL1f8o="; - name = "fix_libsrt.patch"; - }) # Patch ffmpeg for svt-av1 until version 4.4 (fetchpatch { url = "https://raw.githubusercontent.com/AOMediaCodec/SVT-AV1/v0.8.4/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch"; diff --git a/pkgs/development/libraries/ffmpeg/4.nix b/pkgs/development/libraries/ffmpeg/4.nix index 2cc409fc0370..95207b5386f8 100644 --- a/pkgs/development/libraries/ffmpeg/4.nix +++ b/pkgs/development/libraries/ffmpeg/4.nix @@ -5,8 +5,8 @@ }@args: callPackage ./generic.nix (rec { - version = "4.3.1"; + version = "4.3.2"; branch = "4.3"; - sha256 = "1nghcpm2r9ir2h6xpqfn9381jq6aiwlkwlnyplxywvkbjiisr97l"; + sha256 = "0flik4y7c5kchj65p3p908mk1dsncqgzjdvzysjs12rmf1m6sfmb"; darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ]; } // args) From 4f6ec19dbc322d7ce8df9108b76e0db79682353e Mon Sep 17 00:00:00 2001 From: John Ericson <John.Ericson@Obsidian.Systems> Date: Tue, 2 Mar 2021 22:33:53 +0000 Subject: [PATCH 115/188] buildEnv: Support `nativeBuildInputs` too Since #112276, we should always put `makeWrapper` in `nativeBuildInputs`. But `buildEnv` was saying put it in `buildInputs`. That's wrong! Fix the instructions, and make the right thing possible. --- pkgs/build-support/buildenv/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/buildenv/default.nix b/pkgs/build-support/buildenv/default.nix index 7f2427777f92..5fafc36273a0 100644 --- a/pkgs/build-support/buildenv/default.nix +++ b/pkgs/build-support/buildenv/default.nix @@ -36,8 +36,9 @@ lib.makeOverridable , # Shell commands to run after building the symlink tree. postBuild ? "" -, # Additional inputs. Handy e.g. if using makeWrapper in `postBuild`. - buildInputs ? [] +# Additional inputs +, nativeBuildInputs ? [] # Handy e.g. if using makeWrapper in `postBuild`. +, buildInputs ? [] , passthru ? {} , meta ? {} @@ -53,7 +54,8 @@ in runCommand name rec { inherit manifest ignoreCollisions checkCollisionContents passthru - meta pathsToLink extraPrefix postBuild buildInputs; + meta pathsToLink extraPrefix postBuild + nativeBuildInputs buildInputs; pkgs = builtins.toJSON (map (drv: { paths = # First add the usual output(s): respect if user has chosen explicitly, From 07ecf87693fec1032c19ba1f5b41dc9cf260abb2 Mon Sep 17 00:00:00 2001 From: John Ericson <John.Ericson@Obsidian.Systems> Date: Tue, 2 Mar 2021 22:33:53 +0000 Subject: [PATCH 116/188] treewide: Fix various tools wrappers "with packages" Now that `buildEnv` is ready, always put `makeWrapper` in `nativeBuildInputs`, rather than `buildInputs` or (worse) mucking around with setup hooks by hand. (C.f. #112276, which didn't catch these because the manual setup hook sourcing is such a hack to being with!) Fixes #114687 --- .../haskell-modules/with-packages-wrapper.nix | 3 +-- pkgs/development/interpreters/octave/build-env.nix | 7 ++----- pkgs/development/interpreters/perl/wrapper.nix | 5 ++--- pkgs/development/interpreters/python/wrapper.nix | 13 +++++++++---- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index 32fa46fd04ac..0e566aa2e6e4 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -57,9 +57,8 @@ symlinkJoin { # as a dedicated drv attribute, like `compiler-name` name = ghc.name + "-with-packages"; paths = paths ++ [ghc]; + nativeBuildInputs = [ makeWrapper ]; postBuild = '' - . ${makeWrapper}/nix-support/setup-hook - # wrap compiler executables with correct env variables for prg in ${ghcCommand} ${ghcCommand}i ${ghcCommand}-${ghc.version} ${ghcCommand}i-${ghc.version}; do diff --git a/pkgs/development/interpreters/octave/build-env.nix b/pkgs/development/interpreters/octave/build-env.nix index fee53b716dae..433026f0a7e9 100644 --- a/pkgs/development/interpreters/octave/build-env.nix +++ b/pkgs/development/interpreters/octave/build-env.nix @@ -20,17 +20,14 @@ in buildEnv { inherit ignoreCollisions; extraOutputsToInstall = [ "out" ] ++ extraOutputsToInstall; - buildInputs = [ makeWrapper texinfo wrapOctave ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ texinfo wrapOctave ]; # During "build" we must first unlink the /share symlink to octave's /share # Then, we can re-symlink the all of octave/share, except for /share/octave # in env/share/octave, re-symlink everything from octave/share/octave and then # perform the pkg install. postBuild = '' - . "${makeWrapper}/nix-support/setup-hook" - # The `makeWrapper` used here is the one defined in - # ${makeWrapper}/nix-support/setup-hook - if [ -L "$out/bin" ]; then unlink $out/bin mkdir -p "$out/bin" diff --git a/pkgs/development/interpreters/perl/wrapper.nix b/pkgs/development/interpreters/perl/wrapper.nix index da95b5a89647..e1909a15e059 100644 --- a/pkgs/development/interpreters/perl/wrapper.nix +++ b/pkgs/development/interpreters/perl/wrapper.nix @@ -17,11 +17,10 @@ let inherit ignoreCollisions; extraOutputsToInstall = [ "out" ] ++ extraOutputsToInstall; + nativeBuildInputs = [ makeWrapper ]; + # we create wrapper for the binaries in the different packages postBuild = '' - - . "${makeWrapper}/nix-support/setup-hook" - if [ -L "$out/bin" ]; then unlink "$out/bin" fi diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix index 61ad4a8a6ad9..514930db359b 100644 --- a/pkgs/development/interpreters/python/wrapper.nix +++ b/pkgs/development/interpreters/python/wrapper.nix @@ -1,10 +1,15 @@ -{ lib, stdenv, python, buildEnv, makeWrapper +{ lib, stdenv, buildEnv, makeWrapper + +# manually pased +, python +, requiredPythonModules + +# extra opts , extraLibs ? [] , extraOutputsToInstall ? [] , postBuild ? "" , ignoreCollisions ? false , permitUserSite ? false -, requiredPythonModules # Wrap executables with the given argument. , makeWrapperArgs ? [] , }: @@ -22,9 +27,9 @@ let inherit ignoreCollisions; extraOutputsToInstall = [ "out" ] ++ extraOutputsToInstall; - postBuild = '' - . "${makeWrapper}/nix-support/setup-hook" + nativeBuildInputs = [ makeWrapper ]; + postBuild = '' if [ -L "$out/bin" ]; then unlink "$out/bin" fi From 0843d235b9916d868317181440bb420f9963dd1e Mon Sep 17 00:00:00 2001 From: ajs124 <git@ajs124.de> Date: Sat, 13 Feb 2021 20:23:53 +0100 Subject: [PATCH 117/188] libproxy: 0.4.15 -> 0.4.17 --- .../libraries/libproxy/default.nix | 41 ++----------------- 1 file changed, 4 insertions(+), 37 deletions(-) diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix index afd1a6365b45..afe5b8dde132 100644 --- a/pkgs/development/libraries/libproxy/default.nix +++ b/pkgs/development/libraries/libproxy/default.nix @@ -3,10 +3,9 @@ , pkg-config , cmake , zlib -, fetchpatch , dbus , networkmanager -, spidermonkey_60 +, spidermonkey_68 , pcre , gsettings-desktop-schemas , glib @@ -19,13 +18,13 @@ stdenv.mkDerivation rec { pname = "libproxy"; - version = "0.4.15"; + version = "0.4.17"; src = fetchFromGitHub { owner = "libproxy"; repo = "libproxy"; rev = version; - sha256 = "10swd3x576pinx33iwsbd4h15fbh2snmfxzcmab4c56nb08qlbrs"; + sha256 = "0v8q4ln0pd5231kidpi8wpwh0chcjwcmawcki53czlpdrc09z96r"; }; outputs = [ "out" "dev" "py3" ]; @@ -46,7 +45,7 @@ stdenv.mkDerivation rec { JavaScriptCore ] else [ glib - spidermonkey_60 + spidermonkey_68 dbus networkmanager ]); @@ -57,38 +56,6 @@ stdenv.mkDerivation rec { "-DPYTHON3_SITEPKG_DIR=${placeholder "py3"}/${python3.sitePackages}" ]; - patches = [ - # Make build with spidermonkey_60 - (fetchpatch { - url = "https://github.com/libproxy/libproxy/pull/86.patch"; - sha256 = "17c06ilinrnzr7xnnmw9pc6zrncyaxcdd6r6k1ah5p156skbykfs"; - }) - (fetchpatch { - url = "https://github.com/libproxy/libproxy/pull/87.patch"; - sha256 = "0sagzfwm16f33inbkwsp88w9wmrd034rjmw0y8d122f7k1qfx6zc"; - }) - (fetchpatch { - url = "https://github.com/libproxy/libproxy/pull/95.patch"; - sha256 = "18vyr6wlis9zfwml86606jpgb9mss01l9aj31iiciml8p857aixi"; - }) - (fetchpatch { - name = "CVE-2020-25219.patch"; - url = "https://github.com/libproxy/libproxy/commit/a83dae404feac517695c23ff43ce1e116e2bfbe0.patch"; - sha256 = "0wdh9qjq99aw0jnf2840237i3hagqzy42s09hz9chfgrw8pyr72k"; - }) - (fetchpatch { - name = "CVE-2020-26154.patch"; - url = "https://github.com/libproxy/libproxy/commit/4411b523545b22022b4be7d0cac25aa170ae1d3e.patch"; - sha256 = "0pdy9sw49lxpaiwq073cisk0npir5bkch70nimdmpszxwp3fv1d8"; - }) - - ] ++ lib.optionals stdenv.isDarwin [ - (fetchpatch { - url = "https://github.com/libproxy/libproxy/commit/44158f03f8522116758d335688ed840dfcb50ac8.patch"; - sha256 = "0axfvb6j7gcys6fkwi9dkn006imhvm3kqr83gpwban8419n0q5v1"; - }) - ]; - postFixup = lib.optionalString stdenv.isLinux '' # config_gnome3 uses the helper to find GNOME proxy settings wrapProgram $out/libexec/pxgsettings --prefix XDG_DATA_DIRS : "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}" From e6be0f45ef5fc3295f134e6c48933d16f67e3acc Mon Sep 17 00:00:00 2001 From: Andrew Childs <lorne@cons.org.nz> Date: Thu, 19 Nov 2020 18:12:01 +0900 Subject: [PATCH 118/188] darwin.bootstrap_cmds: use correct arch in "mig" --- .../darwin/apple-source-releases/bootstrap_cmds/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix index 002709ce2df2..5ac971d02f76 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix @@ -1,4 +1,4 @@ -{ lib, appleDerivation, yacc, flex }: +{ lib, stdenv, appleDerivation, yacc, flex }: appleDerivation { nativeBuildInputs = [ yacc flex ]; @@ -26,7 +26,7 @@ appleDerivation { cp migcom.1 $out/share/man/man1 substituteInPlace $out/bin/mig \ - --replace 'arch=`/usr/bin/arch`' 'arch=i386' \ + --replace 'arch=`/usr/bin/arch`' 'arch=${stdenv.targetPlatform.darwinArch}' \ --replace '/usr/bin/' "" \ --replace '/bin/rmdir' "rmdir" \ --replace 'C=''${MIGCC}' "C=cc" From 015ce9d3b6b60077080654d1e1c9ee92f22ae69d Mon Sep 17 00:00:00 2001 From: Ivan Babrou <github@ivan.computer> Date: Tue, 2 Mar 2021 18:13:32 -0800 Subject: [PATCH 119/188] python3Packages.curio: fix another flaky test --- pkgs/development/python-modules/curio/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/curio/default.nix b/pkgs/development/python-modules/curio/default.nix index 31bab8d8fa2e..fb1eceda7f2b 100644 --- a/pkgs/development/python-modules/curio/default.nix +++ b/pkgs/development/python-modules/curio/default.nix @@ -24,6 +24,11 @@ buildPythonPackage rec { url = "https://github.com/dabeaz/curio/commit/132376724bbfaa0a52d3d63d0791aa4ac1eb6f5f.patch"; sha256 = "sha256-AxO0xRcR9l9/NKEJFwyZIoYcyZxpqOhpdNaeaYokVb4="; }) + # Same as above + (fetchpatch { + url = "https://github.com/dabeaz/curio/commit/8ac2f12a2cdacbc750b01fc7459cee8879bc1ee3.patch"; + sha256 = "sha256-2Si3fuDLrI09QuzJd1TrE0QY02G9e9m+1eHFTB/MrWU="; + }) ]; disabled = !isPy3k; From 4aff0e523a409f51f61de96627b04ff294a5aeb5 Mon Sep 17 00:00:00 2001 From: Ivan Babrou <github@ivan.computer> Date: Wed, 24 Feb 2021 23:00:09 -0800 Subject: [PATCH 120/188] pinentry_mac: make it compile on arm64 --- pkgs/tools/security/pinentry/mac.nix | 6 ++++++ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/pinentry/mac.nix b/pkgs/tools/security/pinentry/mac.nix index 9c328d472c4b..27917ffbbf17 100644 --- a/pkgs/tools/security/pinentry/mac.nix +++ b/pkgs/tools/security/pinentry/mac.nix @@ -14,6 +14,12 @@ stdenv.mkDerivation { nativeBuildInputs = [ xcbuildHook ]; buildInputs = [ libiconv ncurses Cocoa ]; + preBuild = '' + # Only build for what we care about (also allows arm64) + substituteInPlace pinentry-mac.xcodeproj/project.pbxproj \ + --replace "i386 x86_64 ppc" "${stdenv.targetPlatform.darwinArch}" + ''; + installPhase = '' mkdir -p $out/Applications mv Products/Release/pinentry-mac.app $out/Applications diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 36e77b1bc5f7..719649455e87 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7142,7 +7142,7 @@ in pinentry_mac = callPackage ../tools/security/pinentry/mac.nix { inherit (darwin.apple_sdk.frameworks) Cocoa; - xcbuildHook = xcbuild6Hook; + xcbuildHook = if stdenv.targetPlatform.isAarch64 then xcbuildHook else xcbuild6Hook; }; pingtcp = callPackage ../tools/networking/pingtcp { }; From 115a91b2db802404ab3822597f9533cf19281199 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" <ryantm-bot@ryantm.com> Date: Wed, 3 Mar 2021 20:44:49 +0000 Subject: [PATCH 121/188] libimagequant: 2.14.0 -> 2.14.1 --- pkgs/development/libraries/libimagequant/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libimagequant/default.nix b/pkgs/development/libraries/libimagequant/default.nix index 1c8502da492f..b52e3854e211 100644 --- a/pkgs/development/libraries/libimagequant/default.nix +++ b/pkgs/development/libraries/libimagequant/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libimagequant"; - version = "2.14.0"; + version = "2.14.1"; src = fetchFromGitHub { owner = "ImageOptim"; repo = pname; rev = version; - sha256 = "sha256-XP/GeZC8TCgBPqtScY9eneZHFter1kdWf/yko0p2VYQ="; + sha256 = "sha256-yWtwBTAs6dlrZz3Bd/4DUb488IJsahPKwjluukTlv/o="; }; preConfigure = '' From b00c7c2d1d905eb63c81a0917f1a94b763a7843b Mon Sep 17 00:00:00 2001 From: Ivan Babrou <github@ivan.computer> Date: Fri, 26 Feb 2021 21:03:53 -0800 Subject: [PATCH 122/188] python37, python2: remove win64 workaround to fix aarch64-darwin The issue manifests itself as the following on `aarch64-darwin`: ``` >>> import ctypes Traceback (most recent call last): File "<stdin>", line 1, in <module> File "/nix/store/i8cq0xrjirz1rcp65wzcyhj6ypzlw9il-python3-3.7.10/lib/python3.7/ctypes/__init__.py", line 551, in <module> _reset_cache() File "/nix/store/i8cq0xrjirz1rcp65wzcyhj6ypzlw9il-python3-3.7.10/lib/python3.7/ctypes/__init__.py", line 273, in _reset_cache CFUNCTYPE(c_int)(lambda: None) MemoryError ``` The commit we backport is included in Python 3.8, and it reverts the change that was introduced all the way back in Python 2.7. --- .../python/cpython/2.7/default.nix | 6 +++ .../cpython/3.7/no-win64-workaround.patch | 37 +++++++++++++++++++ .../interpreters/python/cpython/default.nix | 5 +++ 3 files changed, 48 insertions(+) create mode 100644 pkgs/development/interpreters/python/cpython/3.7/no-win64-workaround.patch diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index 37d43e33d8e5..adeafa80e6cd 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -106,6 +106,12 @@ let ./CVE-2021-3177.patch + # The workaround is for unittests on Win64, which we don't support. + # It does break aarch64-darwin, which we do support. See: + # * https://bugs.python.org/issue35523 + # * https://github.com/python/cpython/commit/e6b247c8e524 + ../3.7/no-win64-workaround.patch + ] ++ optionals (x11Support && stdenv.isDarwin) [ ./use-correct-tcl-tk-on-darwin.patch ] ++ optionals stdenv.isLinux [ diff --git a/pkgs/development/interpreters/python/cpython/3.7/no-win64-workaround.patch b/pkgs/development/interpreters/python/cpython/3.7/no-win64-workaround.patch new file mode 100644 index 000000000000..685b1e83944e --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/3.7/no-win64-workaround.patch @@ -0,0 +1,37 @@ +From e6b247c8e524dbe5fc03b3492f628d0d5348bc49 Mon Sep 17 00:00:00 2001 +From: Victor Stinner <vstinner@redhat.com> +Date: Tue, 18 Dec 2018 14:47:21 +0100 +Subject: [PATCH] bpo-35523: Remove ctypes callback workaround (GH-11211) + +Remove ctypes callback workaround: no longer create a callback at startup. +Avoid SELinux alert on "import ctypes" and "import uuid". +--- + Lib/ctypes/__init__.py | 5 ----- + .../next/Library/2018-12-18-13-52-13.bpo-35523.SkoMno.rst | 2 ++ + 2 files changed, 2 insertions(+), 5 deletions(-) + create mode 100644 Misc/NEWS.d/next/Library/2018-12-18-13-52-13.bpo-35523.SkoMno.rst + +diff --git a/Lib/ctypes/__init__.py b/Lib/ctypes/__init__.py +index 6146773988648..5f78beda5866e 100644 +--- a/Lib/ctypes/__init__.py ++++ b/Lib/ctypes/__init__.py +@@ -266,11 +266,6 @@ def _reset_cache(): + # _SimpleCData.c_char_p_from_param + POINTER(c_char).from_param = c_char_p.from_param + _pointer_type_cache[None] = c_void_p +- # XXX for whatever reasons, creating the first instance of a callback +- # function is needed for the unittests on Win64 to succeed. This MAY +- # be a compiler bug, since the problem occurs only when _ctypes is +- # compiled with the MS SDK compiler. Or an uninitialized variable? +- CFUNCTYPE(c_int)(lambda: None) + + def create_unicode_buffer(init, size=None): + """create_unicode_buffer(aString) -> character array +diff --git a/Misc/NEWS.d/next/Library/2018-12-18-13-52-13.bpo-35523.SkoMno.rst b/Misc/NEWS.d/next/Library/2018-12-18-13-52-13.bpo-35523.SkoMno.rst +new file mode 100644 +index 0000000000000..94a9fd257383e +--- /dev/null ++++ b/Misc/NEWS.d/next/Library/2018-12-18-13-52-13.bpo-35523.SkoMno.rst +@@ -0,0 +1,2 @@ ++Remove :mod:`ctypes` callback workaround: no longer create a callback at ++startup. Avoid SELinux alert on ``import ctypes`` and ``import uuid``. diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 1ae8d19ac58e..fdf022213c5a 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -185,6 +185,11 @@ in with passthru; stdenv.mkDerivation { # Backport a fix for discovering `rpmbuild` command when doing `python setup.py bdist_rpm` to 3.5, 3.6, 3.7. # See: https://bugs.python.org/issue11122 ./3.7/fix-hardcoded-path-checking-for-rpmbuild.patch + # The workaround is for unittests on Win64, which we don't support. + # It does break aarch64-darwin, which we do support. See: + # * https://bugs.python.org/issue35523 + # * https://github.com/python/cpython/commit/e6b247c8e524 + ./3.7/no-win64-workaround.patch ] ++ optionals (isPy37 || isPy38 || isPy39) [ # Fix darwin build https://bugs.python.org/issue34027 ./3.7/darwin-libutil.patch From a84cb88c47995042995d334f497514b20da19312 Mon Sep 17 00:00:00 2001 From: Ana Hobden <operator@hoverbear.org> Date: Wed, 3 Mar 2021 10:09:04 -0800 Subject: [PATCH 123/188] rustPlatform.buildRustPackage: support debug builds Signed-off-by: Ana Hobden <operator@hoverbear.org> --- pkgs/build-support/rust/hooks/cargo-build-hook.sh | 6 +++++- pkgs/build-support/rust/hooks/cargo-check-hook.sh | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/rust/hooks/cargo-build-hook.sh b/pkgs/build-support/rust/hooks/cargo-build-hook.sh index 54f4512d67ca..6760277c2941 100644 --- a/pkgs/build-support/rust/hooks/cargo-build-hook.sh +++ b/pkgs/build-support/rust/hooks/cargo-build-hook.sh @@ -9,6 +9,10 @@ cargoBuildHook() { pushd "${buildAndTestSubdir}" fi + if [ "${cargoBuildType}" != "debug" ]; then + cargoBuildProfileFlag="--${cargoBuildType}" + fi + ( set -x env \ @@ -19,7 +23,7 @@ cargoBuildHook() { cargo build -j $NIX_BUILD_CORES \ --target @rustTargetPlatformSpec@ \ --frozen \ - --${cargoBuildType} \ + ${cargoBuildProfileFlag} \ ${cargoBuildFlags} ) diff --git a/pkgs/build-support/rust/hooks/cargo-check-hook.sh b/pkgs/build-support/rust/hooks/cargo-check-hook.sh index bc913c6ab074..e4c906f873c4 100644 --- a/pkgs/build-support/rust/hooks/cargo-check-hook.sh +++ b/pkgs/build-support/rust/hooks/cargo-check-hook.sh @@ -16,7 +16,11 @@ cargoCheckHook() { threads=1 fi - argstr="--${cargoCheckType} --target @rustTargetPlatformSpec@ --frozen ${cargoTestFlags}"; + if [ "${cargoBuildType}" != "debug" ]; then + cargoBuildProfileFlag="--${cargoBuildType}" + fi + + argstr="${cargoBuildProfileFlag} --target @rustTargetPlatformSpec@ --frozen ${cargoTestFlags}"; ( set -x From 3c96af5e445f4f9736dac1642a2f847625c6dc5f Mon Sep 17 00:00:00 2001 From: Fabian Affolter <mail@fabian-affolter.ch> Date: Thu, 4 Mar 2021 22:04:19 +0100 Subject: [PATCH 124/188] python3Packages.pytile: 5.1.1 -> 5.2.1 --- pkgs/development/python-modules/pytile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytile/default.nix b/pkgs/development/python-modules/pytile/default.nix index 226fdbc715e6..0d4be1442c1a 100644 --- a/pkgs/development/python-modules/pytile/default.nix +++ b/pkgs/development/python-modules/pytile/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pytile"; - version = "5.1.1"; + version = "5.2.1"; disabled = pythonAtLeast "3.9"; src = fetchFromGitHub { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-bVoFTaK/Alemtc5I+Z/M9y/FWczvJ+P86R0DMD89/BM="; + sha256 = "sha256-/QaIMNImeZuAocxU9dfDoudcgJEkjv1doo7KR9TrwzQ="; }; format = "pyproject"; From 7155db92bc67d3ed7a65734aa6b4850fd9f7e984 Mon Sep 17 00:00:00 2001 From: Fabian Affolter <mail@fabian-affolter.ch> Date: Thu, 4 Mar 2021 22:07:19 +0100 Subject: [PATCH 125/188] python3Packages.regenmaschine: 3.1.1 -> 3.1.2 --- pkgs/development/python-modules/regenmaschine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/regenmaschine/default.nix b/pkgs/development/python-modules/regenmaschine/default.nix index 3380ef99f180..02ac2da96726 100644 --- a/pkgs/development/python-modules/regenmaschine/default.nix +++ b/pkgs/development/python-modules/regenmaschine/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "regenmaschine"; - version = "3.1.1"; + version = "3.1.2"; format = "pyproject"; src = fetchFromGitHub { owner = "bachya"; repo = pname; rev = version; - sha256 = "0m6i7vspp8ssdk2k32kznql1j8gkp300kzb7pk67hzvpijdy3mca"; + sha256 = "sha256-lARti3Sb/jh7h8x+lFLqkM/BlL6XmELm46owsL041Cw="; }; nativeBuildInputs = [ poetry-core ]; From 5b31d3b9104fcdb9f23ae64d889f2c61490e3dae Mon Sep 17 00:00:00 2001 From: Fabian Affolter <mail@fabian-affolter.ch> Date: Thu, 4 Mar 2021 22:10:48 +0100 Subject: [PATCH 126/188] python3Packages.aioambient: 1.2.3 -> 1.2.4 --- pkgs/development/python-modules/aioambient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioambient/default.nix b/pkgs/development/python-modules/aioambient/default.nix index cd47d7f08793..5e504ab87a02 100644 --- a/pkgs/development/python-modules/aioambient/default.nix +++ b/pkgs/development/python-modules/aioambient/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "aioambient"; - version = "1.2.3"; + version = "1.2.4"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - sha256 = "1jg93rjn1gxc66qmipw4z1c09l8hgfsydacjgkfjq7vg547lragp"; + sha256 = "sha256-uqvM5F0rpw+xeCXYl4lGMt3r0ugPsUmSvujmTJ9HABk="; }; nativeBuildInputs = [ poetry-core ]; From 0f80e5ddf56a33a189e9ab7e5f78634aa8644349 Mon Sep 17 00:00:00 2001 From: Fabian Affolter <mail@fabian-affolter.ch> Date: Thu, 4 Mar 2021 22:12:00 +0100 Subject: [PATCH 127/188] python3Packages.aioflo: 0.4.2 -> 0.4.3 --- pkgs/development/python-modules/aioflo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioflo/default.nix b/pkgs/development/python-modules/aioflo/default.nix index 60288178def5..8fe61282ab86 100644 --- a/pkgs/development/python-modules/aioflo/default.nix +++ b/pkgs/development/python-modules/aioflo/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "aioflo"; - version = "0.4.2"; + version = "0.4.3"; format = "pyproject"; src = fetchFromGitHub { owner = "bachya"; repo = pname; rev = version; - sha256 = "1ppsinmjph6snj7s4hg28p3qa67kpkadc98ikjjg6w65vcm3dlaz"; + sha256 = "sha256-Dap3yjFIS+k/LLNg+vmYmiFQCOEPNp27p0GCMpn/edA="; }; nativeBuildInputs = [ poetry-core ]; From befae754dcf717c81a599aa593cf5179fdc14c39 Mon Sep 17 00:00:00 2001 From: Fabian Affolter <mail@fabian-affolter.ch> Date: Thu, 4 Mar 2021 22:20:57 +0100 Subject: [PATCH 128/188] python3Packages.aioguardian: 1.0.4 -> 1.0.7 --- pkgs/development/python-modules/aioguardian/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioguardian/default.nix b/pkgs/development/python-modules/aioguardian/default.nix index 8d3de12cd993..47b820161886 100644 --- a/pkgs/development/python-modules/aioguardian/default.nix +++ b/pkgs/development/python-modules/aioguardian/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "aioguardian"; - version = "1.0.4"; + version = "1.0.7"; disabled = pythonAtLeast "3.9"; src = fetchFromGitHub { owner = "bachya"; repo = pname; rev = version; - sha256 = "1cbxcsxh9c8r2zx3lsjdns26sm2qmlwnqgah2sfzbgp1lay23vvq"; + sha256 = "sha256-KMhq86hcqoYloS/6VHsl+3KVEZBbN97ABrZlmEr32Z8="; }; format = "pyproject"; From ac9d7daa39098bfd74442f71cf8a7e6b68d373d8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter <mail@fabian-affolter.ch> Date: Thu, 4 Mar 2021 22:22:43 +0100 Subject: [PATCH 129/188] python3Packages.aiorecollect: 1.0.2 -> 1.0.3 --- pkgs/development/python-modules/aiorecollect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiorecollect/default.nix b/pkgs/development/python-modules/aiorecollect/default.nix index c802633e5723..53daf1f22696 100644 --- a/pkgs/development/python-modules/aiorecollect/default.nix +++ b/pkgs/development/python-modules/aiorecollect/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "aiorecollect"; - version = "1.0.2"; + version = "1.0.3"; format = "pyproject"; src = fetchFromGitHub { owner = "bachya"; repo = pname; rev = version; - sha256 = "0dlz8zmqcn6g6000lfgcy5krpfafzdzrznmk6iwra65wcs7l9392"; + sha256 = "sha256-S4HL8vJS/dTKsR5egKRSHqZYPClcET5Le06euHPyIkU="; }; nativeBuildInputs = [ poetry-core ]; From bed80f15bd5c360b004ac8c44a78520721da548f Mon Sep 17 00:00:00 2001 From: Fabian Affolter <mail@fabian-affolter.ch> Date: Thu, 4 Mar 2021 22:23:42 +0100 Subject: [PATCH 130/188] python3Packages.pyairvisual: 5.0.6 -> 5.0.7 --- pkgs/development/python-modules/pyairvisual/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyairvisual/default.nix b/pkgs/development/python-modules/pyairvisual/default.nix index 882182a3a1ef..bcbb672f5c80 100644 --- a/pkgs/development/python-modules/pyairvisual/default.nix +++ b/pkgs/development/python-modules/pyairvisual/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pyairvisual"; - version = "5.0.6"; + version = "5.0.7"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-7u8AwIr1Ah/7zCfXFwj/C/CaD/B3uLRkZ8Gf6d18Xp0="; + sha256 = "sha256-r/AJl36dv6+C92tc3kpX4/VzG69qdh4ERCyQxDOHdVU="; }; nativeBuildInputs = [ poetry-core ]; From 961af5a4f202fe00b650cf7b8523d6466960dac4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter <mail@fabian-affolter.ch> Date: Thu, 4 Mar 2021 22:24:55 +0100 Subject: [PATCH 131/188] python3Packages.pyflunearyou: 2.0.0 -> 2.0.1 --- pkgs/development/python-modules/pyflunearyou/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyflunearyou/default.nix b/pkgs/development/python-modules/pyflunearyou/default.nix index 9b77cc61de69..c8706760343e 100644 --- a/pkgs/development/python-modules/pyflunearyou/default.nix +++ b/pkgs/development/python-modules/pyflunearyou/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pyflunearyou"; - version = "2.0.0"; + version = "2.0.1"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - sha256 = "18vxwfyvicbx8idpa0h0alp4ygnwfph6g4kq93hfm0fc94gi6h94"; + sha256 = "sha256-2a4OKPmy9tFLJqRg9bEXqrbr3RKVHmKPSYDrtAEqvdo="; }; nativeBuildInputs = [ poetry-core ]; From f7d6cab6db9def9a25ccc423128c9773c571b6f1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter <mail@fabian-affolter.ch> Date: Thu, 4 Mar 2021 22:27:34 +0100 Subject: [PATCH 132/188] python3Packages.pyiqvia: 0.3.2 -> 0.3.3 --- pkgs/development/python-modules/pyiqvia/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyiqvia/default.nix b/pkgs/development/python-modules/pyiqvia/default.nix index f231f98df85d..d2775d6e3b9e 100644 --- a/pkgs/development/python-modules/pyiqvia/default.nix +++ b/pkgs/development/python-modules/pyiqvia/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pyiqvia"; - version = "0.3.2"; + version = "0.3.3"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - sha256 = "089lah23939m523jmjkaw2li0fikp2nswxznfvzwnr6wjpp3m9as"; + sha256 = "sha256-XYWoHKa/yq7MtGVM6eVgLtR2E3VmqsjX3TNcQcd7dEQ="; }; nativeBuildInputs = [ poetry-core ]; From 9273e41e264538eaa13969dab59f0d913f82186d Mon Sep 17 00:00:00 2001 From: Fabian Affolter <mail@fabian-affolter.ch> Date: Thu, 4 Mar 2021 22:28:33 +0100 Subject: [PATCH 133/188] python3Packages.pyopenuv: 2.0.1 -> 2.0.2 --- pkgs/development/python-modules/pyopenuv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyopenuv/default.nix b/pkgs/development/python-modules/pyopenuv/default.nix index a5414021b259..da088254c156 100644 --- a/pkgs/development/python-modules/pyopenuv/default.nix +++ b/pkgs/development/python-modules/pyopenuv/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "pyopenuv"; - version = "2.0.1"; + version = "2.0.2"; format = "pyproject"; src = fetchFromGitHub { owner = "bachya"; repo = pname; rev = version; - sha256 = "1pzdcy65gndrlyhrwyc1rwsh8n4w79wla8n9fr13m00vac3cqkl0"; + sha256 = "sha256-QVgNwu/NXSV9nbRN0POBCdKCv6xdp4uSEzFAiHkhVaQ="; }; nativeBuildInputs = [ poetry-core ]; From 478fa4f487b191057cb88d011e612f2e5dbfe156 Mon Sep 17 00:00:00 2001 From: Mario Rodas <marsam@users.noreply.github.com> Date: Fri, 5 Mar 2021 06:00:00 -0500 Subject: [PATCH 134/188] protobuf: 3.15.2 -> 3.15.5 --- pkgs/development/libraries/protobuf/3.15.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/protobuf/3.15.nix b/pkgs/development/libraries/protobuf/3.15.nix index d23adeb1db93..63e175d98038 100644 --- a/pkgs/development/libraries/protobuf/3.15.nix +++ b/pkgs/development/libraries/protobuf/3.15.nix @@ -1,6 +1,6 @@ { callPackage, ... }: callPackage ./generic-v3.nix { - version = "3.15.2"; - sha256 = "12da2h5ds8yjyssqansvhd2vy72kw6b60j9l6va21ghs8xzyihqi"; + version = "3.15.5"; + sha256 = "1znxzy4illsr4a08642h6s83jawzrq40m6pzkp05q0cpm8hcpvda"; } From 904bb3585ddc5965b910375a5c3fa4738fffbf69 Mon Sep 17 00:00:00 2001 From: Martin Weinelt <hexa@darmstadt.ccc.de> Date: Fri, 12 Feb 2021 15:42:25 +0100 Subject: [PATCH 135/188] python3Packages.astroid: 2.4.2 -> 2.5.0 --- .../python-modules/astroid/default.nix | 33 +++++++++++-------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix index 49f04bcb9116..7ddc91b1a443 100644 --- a/pkgs/development/python-modules/astroid/default.nix +++ b/pkgs/development/python-modules/astroid/default.nix @@ -1,29 +1,34 @@ -{ lib, fetchPypi, buildPythonPackage, pythonOlder, isPyPy, pythonAtLeast -, lazy-object-proxy, six, wrapt, typing, typed-ast -, pytestrunner, pytest +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, isPyPy +, lazy-object-proxy +, wrapt +, typed-ast +, pytestCheckHook }: buildPythonPackage rec { pname = "astroid"; - version = "2.4.2"; + version = "2.5"; - disabled = pythonOlder "3.4" || pythonAtLeast "3.9"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "2f4078c2a41bf377eea06d71c9d2ba4eb8f6b1af2135bec27bbbb7d8f12bb703"; + sha256 = "03dzhjrsc5d2whyjngfrwvxn42058k0cjjr85x2wqzai8psr475k"; }; - postPatch = '' - substituteInPlace astroid/__pkginfo__.py --replace "lazy_object_proxy==1.4.*" "lazy_object_proxy" - ''; - # From astroid/__pkginfo__.py - propagatedBuildInputs = [ lazy-object-proxy six wrapt ] - ++ lib.optional (pythonOlder "3.5") typing - ++ lib.optional (!isPyPy) typed-ast; + propagatedBuildInputs = [ + lazy-object-proxy + wrapt + ] ++ lib.optional (!isPyPy && pythonOlder "3.8") typed-ast; - checkInputs = [ pytestrunner pytest ]; + checkInputs = [ + pytestCheckHook + ]; meta = with lib; { description = "An abstract syntax tree for Python with inference support"; From b79f09557ef025ad81f79283c556780f094cd037 Mon Sep 17 00:00:00 2001 From: Martin Weinelt <hexa@darmstadt.ccc.de> Date: Thu, 18 Feb 2021 17:29:23 +0100 Subject: [PATCH 136/188] python3Packages.astroid: clarify license is lgpl2.1 or newer --- pkgs/development/python-modules/astroid/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix index 7ddc91b1a443..468488ec0cad 100644 --- a/pkgs/development/python-modules/astroid/default.nix +++ b/pkgs/development/python-modules/astroid/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "An abstract syntax tree for Python with inference support"; homepage = "https://github.com/PyCQA/astroid"; - license = licenses.lgpl2; + license = licenses.lgpl21Plus; platforms = platforms.all; maintainers = with maintainers; [ nand0p ]; }; From da92fff6d1c79f3d8e9d3077c24f732447af289d Mon Sep 17 00:00:00 2001 From: Martin Weinelt <hexa@darmstadt.ccc.de> Date: Thu, 25 Feb 2021 02:10:34 +0100 Subject: [PATCH 137/188] python3Packages.pylint: 2.6.2 -> 2.7.1 https://github.com/PyCQA/pylint/blob/pylint-2.7.1/ChangeLog#L5-L197 --- .../python-modules/pylint/default.nix | 73 ++++++++++++------- 1 file changed, 46 insertions(+), 27 deletions(-) diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index 19ffb6419d9a..a7606de3f347 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -1,50 +1,69 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, pythonOlder, astroid, installShellFiles, - isort, mccabe, pytestCheckHook, pytest-benchmark, pytestrunner, toml }: +{ stdenv +, lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, installShellFiles +, astroid +, isort +, mccabe +, toml +, pytest-benchmark +, pytest-xdist +, pytestCheckHook +}: buildPythonPackage rec { pname = "pylint"; - version = "2.6.2"; + version = "2.7.1"; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-cYt0eG6n7QeqDFi/VyFU1Geflg0m6WQcwd4gSjC4f8k="; + sha256 = "10nrvzk1naf5ryawmi59wp99k31053sz37q3x9li2hj2cf7i1kl1"; }; - nativeBuildInputs = [ pytestrunner installShellFiles ]; + nativeBuildInputs = [ + installShellFiles + ]; - checkInputs = [ pytestCheckHook pytest-benchmark ]; + propagatedBuildInputs = [ + astroid + isort + mccabe + toml + ]; - propagatedBuildInputs = [ astroid isort mccabe toml ]; - - postPatch = lib.optionalString stdenv.isDarwin '' - # Remove broken darwin test - rm -vf pylint/test/test_functional.py + postInstall = '' + mkdir -p $out/share/emacs/site-lisp + cp -v "elisp/"*.el $out/share/emacs/site-lisp/ + installManPage man/*.1 ''; - disabledTests = [ - # https://github.com/PyCQA/pylint/issues/3198 - "test_by_module_statement_value" - # has issues with local directories - "test_version" - ] ++ lib.optionals stdenv.isDarwin [ - "test_parallel_execution" - "test_py3k_jobs_option" - ]; + checkInputs = [ + pytest-benchmark + pytest-xdist + pytestCheckHook + ]; + + dontUseSetuptoolsCheck = true; # calls executable in one of the tests preCheck = '' export PATH=$PATH:$out/bin ''; - dontUseSetuptoolsCheck = true; + pytestFlagsArray = [ + "-n auto" + ]; - postInstall = '' - mkdir -p $out/share/emacs/site-lisp - cp "elisp/"*.el $out/share/emacs/site-lisp/ - installManPage man/*.1 - ''; + disabledTests = lib.optionals stdenv.isDarwin [ + "test_parallel_execution" + "test_py3k_jobs_option" + ]; + + disabledTestPaths = lib.optional stdenv.isDarwin "pylint/test/test_functional.py"; meta = with lib; { homepage = "https://pylint.pycqa.org/"; From e69d0a0aa3bf12c5ed2790df1e6bf25eeb53202d Mon Sep 17 00:00:00 2001 From: Mauricio Collares <mauricio@collares.org> Date: Fri, 5 Mar 2021 12:19:49 -0300 Subject: [PATCH 138/188] cython: backport Cython 3.0 trashcan support --- pkgs/development/python-modules/Cython/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix index 64f5bb3ab656..8204984b1511 100644 --- a/pkgs/development/python-modules/Cython/default.nix +++ b/pkgs/development/python-modules/Cython/default.nix @@ -49,6 +49,15 @@ in buildPythonPackage rec { url = "https://github.com/cython/cython/commit/28251032f86c266065e4976080230481b1a1bb29.patch"; sha256 = "19rg7xs8gr90k3ya5c634bs8gww1sxyhdavv07cyd2k71afr83gy"; }) + + # backport Cython 3.0 trashcan support (https://github.com/cython/cython/pull/2842) to 0.X series. + # it does not affect Python code unless the code explicitly uses the feature. + # trashcan support is needed to avoid stack overflows during object deallocation in sage (https://trac.sagemath.org/ticket/27267) + (fetchpatch { + name = "trashcan.patch"; + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/cython/patches/trashcan.patch?id=4569a839f070a1a38d5dbce2a4d19233d25aeed2"; + sha256 = "sha256-+pOF1XNTEtNseLpqPzrc1Jfwt5hGx7doUoccIhNneYY="; + }) ]; checkPhase = '' From 7d1d7848e9f5e47081c71692687ec18e6d9501fc Mon Sep 17 00:00:00 2001 From: Mauricio Collares <mauricio@collares.org> Date: Fri, 5 Mar 2021 13:27:07 -0300 Subject: [PATCH 139/188] cython: 0.29.21 -> 0.29.22 --- pkgs/development/python-modules/Cython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix index 8204984b1511..c09f1586fd6f 100644 --- a/pkgs/development/python-modules/Cython/default.nix +++ b/pkgs/development/python-modules/Cython/default.nix @@ -26,11 +26,11 @@ let in buildPythonPackage rec { pname = "Cython"; - version = "0.29.21"; + version = "0.29.22"; src = fetchPypi { inherit pname version; - sha256 = "1bcwpra7c6k30yvic3sw2v3rq2dr40ypc4zqif6kr52mpn4wnyp5"; + sha256 = "sha256-32uDx6bR2WfqiaKQPkqTE3djSil0WWUuRVFzTEgZVAY="; }; nativeBuildInputs = [ From 84d6dfc4aa22be61455c515975978ad9ae5ed195 Mon Sep 17 00:00:00 2001 From: Fabian Affolter <mail@fabian-affolter.ch> Date: Sat, 20 Feb 2021 17:02:43 +0100 Subject: [PATCH 140/188] python3Packages.pytest: 6.1.2 -> 6.2.2 --- .../python-modules/pytest/default.nix | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 798084d11117..579cfe1271f3 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -1,19 +1,16 @@ { lib, buildPythonPackage, pythonOlder, fetchPypi, isPy3k, isPyPy , atomicwrites , attrs -, funcsigs , hypothesis , iniconfig -, mock , more-itertools , packaging , pathlib2 , pluggy , py , pygments -, python , setuptools -, setuptools_scm +, setuptools-scm , six , toml , wcwidth @@ -21,18 +18,17 @@ }: buildPythonPackage rec { - version = "6.1.2"; pname = "pytest"; - + version = "6.2.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "c0a7e94a8cdbc5422a51ccdad8e6f1024795939cc89159a0ae7f0b316ad3823e"; + sha256 = "sha256-nR7fnn0LhNcuo9vN/SKzX7VDpejypgCS3VeJNr9j1/k="; }; - checkInputs = [ hypothesis pygments ]; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; + propagatedBuildInputs = [ atomicwrites attrs @@ -47,6 +43,11 @@ buildPythonPackage rec { wcwidth ] ++ lib.optionals (pythonOlder "3.6") [ pathlib2 ]; + checkInputs = [ + hypothesis + pygments + ]; + doCheck = !isPyPy; # https://github.com/pytest-dev/pytest/issues/3460 preCheck = '' @@ -80,8 +81,9 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = "https://docs.pytest.org"; description = "Framework for writing tests"; + homepage = "https://docs.pytest.org"; + changelog = "https://github.com/pytest-dev/pytest/releases/tag/${version}"; maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ]; license = licenses.mit; }; From f00fde643ed370b71e68e5a7d9d789d4db23305b Mon Sep 17 00:00:00 2001 From: TredwellGit <tredwell@tutanota.com> Date: Sun, 31 Jan 2021 07:19:37 +0000 Subject: [PATCH 141/188] xorg.utilmacros: 1.19.2 -> 1.19.3 https://lists.x.org/archives/xorg-announce/2021-January/003069.html --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index e8b29f9bbac9..48ba3bffdf65 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1340,11 +1340,11 @@ lib.makeScope newScope (self: with self; { }) {}; utilmacros = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { - name = "util-macros-1.19.2"; + name = "util-macros-1.19.3"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/util/util-macros-1.19.2.tar.bz2"; - sha256 = "04p7ydqxgq37jklnfj18b70zsifiz4h50wvrk94i2112mmv37r6p"; + url = "mirror://xorg/individual/util/util-macros-1.19.3.tar.bz2"; + sha256 = "0w8ryfqylprz37zj9grl4jzdsqq67ibfwq5raj7vm1i7kmp2x08g"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 3ee31e4c2a7a..fa5ed99f2aec 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -216,6 +216,6 @@ mirror://xorg/individual/util/gccmakedep-1.0.3.tar.bz2 mirror://xorg/individual/util/imake-1.0.8.tar.bz2 mirror://xorg/individual/util/lndir-1.0.3.tar.bz2 mirror://xorg/individual/util/makedepend-1.0.6.tar.bz2 -mirror://xorg/individual/util/util-macros-1.19.2.tar.bz2 +mirror://xorg/individual/util/util-macros-1.19.3.tar.bz2 mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2 mirror://xorg/individual/xserver/xorg-server-1.20.10.tar.bz2 From dced68b7180da03c79402211157c0bd3017b99ea Mon Sep 17 00:00:00 2001 From: Fabian Affolter <mail@fabian-affolter.ch> Date: Fri, 5 Mar 2021 23:38:19 +0100 Subject: [PATCH 142/188] python3Packages.urllib3: enable tests (#114282) --- .../python-modules/urllib3/default.nix | 50 ++++++++++++++----- 1 file changed, 37 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix index 7bfb2ba75a35..c255eea04c5c 100644 --- a/pkgs/development/python-modules/urllib3/default.nix +++ b/pkgs/development/python-modules/urllib3/default.nix @@ -1,33 +1,57 @@ -{ lib, buildPythonPackage, fetchPypi -, pytest, mock, tornado, pyopenssl, cryptography -, idna, certifi, ipaddress, pysocks }: +{ lib +, brotli +, buildPythonPackage +, certifi +, cryptography +, dateutil +, fetchPypi +, idna +, mock +, pyopenssl +, pysocks +, pytest-freezegun +, pytest-timeout +, pytestCheckHook +, pythonOlder +, tornado +, trustme +}: buildPythonPackage rec { pname = "urllib3"; version = "1.26.3"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; sha256 = "de3eedaad74a2683334e282005cd8d7f22f4d55fa690a2a1020a416cb0a47e73"; }; - NOSE_EXCLUDE = lib.concatStringsSep "," [ - "test_headers" "test_headerdict" "test_can_validate_ip_san" "test_delayed_body_read_timeout" - "test_timeout_errors_cause_retries" "test_select_multiple_interrupts_with_event" + propagatedBuildInputs = [ + brotli + certifi + cryptography + idna + pyopenssl + pysocks ]; - checkPhase = '' - nosetests -v --cover-min-percentage 1 - ''; + checkInputs = [ + dateutil + mock + pytest-freezegun + pytest-timeout + pytestCheckHook + tornado + trustme + ]; - doCheck = false; - - checkInputs = [ pytest mock tornado ]; - propagatedBuildInputs = [ pyopenssl cryptography idna certifi ipaddress pysocks ]; + pythonImportsCheck = [ "urllib3" ]; meta = with lib; { description = "Powerful, sanity-friendly HTTP client for Python"; homepage = "https://github.com/shazow/urllib3"; license = licenses.mit; + maintainers = with maintainers; [ fab ]; }; } From 223126456c67c68dc13e4c23fbe53eb005eda7d9 Mon Sep 17 00:00:00 2001 From: Ivan Babrou <github@ivan.computer> Date: Fri, 5 Mar 2021 17:47:03 -0800 Subject: [PATCH 143/188] python3Packages.py-cpuinfo: fix another aarch64-darwin test --- pkgs/development/python-modules/py-cpuinfo/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/py-cpuinfo/default.nix b/pkgs/development/python-modules/py-cpuinfo/default.nix index e87bf26dd596..66344cf84f23 100644 --- a/pkgs/development/python-modules/py-cpuinfo/default.nix +++ b/pkgs/development/python-modules/py-cpuinfo/default.nix @@ -22,6 +22,11 @@ buildPythonPackage rec { url = "https://github.com/workhorsy/py-cpuinfo/commit/54c32da6678f9d75ec5acf4534056cdc85c2a04d.patch"; sha256 = "sha256-3R46KrpACAQ1V0CQtz48V5mQXxvplUQrXnACtiE8WqY="; }) + # Continuation of the patch above + (fetchpatch { + url = "https://github.com/workhorsy/py-cpuinfo/commit/0d00f4b99750f292c85ff23e1039ea9489cb7ec8.patch"; + sha256 = "sha256-mHoXoCAEG2v3xpQppRFWzSvhYCp5i9CZkbEgtiLVzMs="; + }) ]; checkInputs = [ From 4f0cdb68d772900ebcdf866f019d085adf64aa26 Mon Sep 17 00:00:00 2001 From: Ben Siraphob <bensiraphob@gmail.com> Date: Sat, 6 Mar 2021 01:11:00 +0700 Subject: [PATCH 144/188] treewide: unzip buldInputs to nativeBuildInputs (2) --- nixos/modules/services/misc/redmine.nix | 2 +- nixos/modules/services/web-apps/dokuwiki.nix | 4 ++-- nixos/modules/services/web-apps/wordpress.nix | 4 ++-- nixos/tests/dokuwiki.nix | 4 ++-- pkgs/applications/misc/megasync/default.nix | 3 +-- pkgs/applications/misc/milu/default.nix | 3 +-- pkgs/applications/networking/browsers/firefox/common.nix | 3 ++- pkgs/applications/networking/mailreaders/thunderbird/68.nix | 2 +- .../networking/mailreaders/thunderbird/default.nix | 2 +- pkgs/applications/video/kodi/default.nix | 2 +- pkgs/applications/video/vlc/default.nix | 4 ++-- pkgs/development/arduino/arduino-core/default.nix | 3 +-- pkgs/development/compilers/openjdk/11.nix | 4 ++-- pkgs/development/compilers/openjdk/12.nix | 4 ++-- pkgs/development/compilers/openjdk/13.nix | 4 ++-- pkgs/development/compilers/openjdk/14.nix | 4 ++-- pkgs/development/compilers/openjdk/8.nix | 4 ++-- pkgs/development/compilers/openjdk/default.nix | 4 ++-- pkgs/development/interpreters/unicon-lang/default.nix | 1 - pkgs/development/pharo/vm/build-vm.nix | 3 +-- .../tools/build-managers/bazel/bazel_4/default.nix | 2 +- pkgs/development/tools/build-managers/msbuild/default.nix | 2 +- pkgs/misc/vscode-extensions/python/extract-nuget.nix | 2 +- pkgs/tools/misc/mc/default.nix | 3 +-- 24 files changed, 34 insertions(+), 39 deletions(-) diff --git a/nixos/modules/services/misc/redmine.nix b/nixos/modules/services/misc/redmine.nix index 8b53eb471db6..e0055576d6f6 100644 --- a/nixos/modules/services/misc/redmine.nix +++ b/nixos/modules/services/misc/redmine.nix @@ -28,7 +28,7 @@ let unpack = id: (name: source: pkgs.stdenv.mkDerivation { name = "redmine-${id}-${name}"; - buildInputs = [ pkgs.unzip ]; + nativeBuildInputs = [ pkgs.unzip ]; buildCommand = '' mkdir -p $out cd $out diff --git a/nixos/modules/services/web-apps/dokuwiki.nix b/nixos/modules/services/web-apps/dokuwiki.nix index 9567223ebc7b..c71c354bb258 100644 --- a/nixos/modules/services/web-apps/dokuwiki.nix +++ b/nixos/modules/services/web-apps/dokuwiki.nix @@ -193,7 +193,7 @@ let }; sourceRoot = "."; # We need unzip to build this package - buildInputs = [ pkgs.unzip ]; + nativeBuildInputs = [ pkgs.unzip ]; # Installing simply means copying all files to the output directory installPhase = "mkdir -p $out; cp -R * $out/"; }; @@ -220,7 +220,7 @@ let sha256 = "4de5ff31d54dd61bbccaf092c9e74c1af3a4c53e07aa59f60457a8f00cfb23a6"; }; # We need unzip to build this package - buildInputs = [ pkgs.unzip ]; + nativeBuildInputs = [ pkgs.unzip ]; # Installing simply means copying all files to the output directory installPhase = "mkdir -p $out; cp -R * $out/"; }; diff --git a/nixos/modules/services/web-apps/wordpress.nix b/nixos/modules/services/web-apps/wordpress.nix index 5fbe53221ae8..f251cfe32db6 100644 --- a/nixos/modules/services/web-apps/wordpress.nix +++ b/nixos/modules/services/web-apps/wordpress.nix @@ -109,7 +109,7 @@ let sha256 = "1rhba5h5fjlhy8p05zf0p14c9iagfh96y91r36ni0rmk6y891lyd"; }; # We need unzip to build this package - buildInputs = [ pkgs.unzip ]; + nativeBuildInputs = [ pkgs.unzip ]; # Installing simply means copying all files to the output directory installPhase = "mkdir -p $out; cp -R * $out/"; }; @@ -136,7 +136,7 @@ let sha256 = "0rjwm811f4aa4q43r77zxlpklyb85q08f9c8ns2akcarrvj5ydx3"; }; # We need unzip to build this package - buildInputs = [ pkgs.unzip ]; + nativeBuildInputs = [ pkgs.unzip ]; # Installing simply means copying all files to the output directory installPhase = "mkdir -p $out; cp -R * $out/"; }; diff --git a/nixos/tests/dokuwiki.nix b/nixos/tests/dokuwiki.nix index 40475d789d47..2664e1500ea4 100644 --- a/nixos/tests/dokuwiki.nix +++ b/nixos/tests/dokuwiki.nix @@ -9,7 +9,7 @@ let sha256 = "4de5ff31d54dd61bbccaf092c9e74c1af3a4c53e07aa59f60457a8f00cfb23a6"; }; # We need unzip to build this package - buildInputs = [ pkgs.unzip ]; + nativeBuildInputs = [ pkgs.unzip ]; # Installing simply means copying all files to the output directory installPhase = "mkdir -p $out; cp -R * $out/"; }; @@ -24,7 +24,7 @@ let sha256 = "e40ed7dd6bbe7fe3363bbbecb4de481d5e42385b5a0f62f6a6ce6bf3a1f9dfa8"; }; # We need unzip to build this package - buildInputs = [ pkgs.unzip ]; + nativeBuildInputs = [ pkgs.unzip ]; sourceRoot = "."; # Installing simply means copying all files to the output directory installPhase = "mkdir -p $out; cp -R * $out/"; diff --git a/pkgs/applications/misc/megasync/default.nix b/pkgs/applications/misc/megasync/default.nix index 1c87747eaca1..9ae6fda9fcec 100644 --- a/pkgs/applications/misc/megasync/default.nix +++ b/pkgs/applications/misc/megasync/default.nix @@ -38,7 +38,7 @@ mkDerivation rec { }; nativeBuildInputs = - [ autoconf automake doxygen lsb-release pkg-config qttools swig ]; + [ autoconf automake doxygen lsb-release pkg-config qttools swig unzip ]; buildInputs = [ c-ares cryptopp @@ -53,7 +53,6 @@ mkDerivation rec { qtbase qtx11extras sqlite - unzip wget ]; diff --git a/pkgs/applications/misc/milu/default.nix b/pkgs/applications/misc/milu/default.nix index 23da8abc6682..a941f6251498 100644 --- a/pkgs/applications/misc/milu/default.nix +++ b/pkgs/applications/misc/milu/default.nix @@ -22,10 +22,9 @@ stdenv.mkDerivation { cp bin/milu $out/bin ''; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config unzip ]; buildInputs = [ glib - unzip llvmPackages.libclang ]; diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 732f9fa08720..2a2cb3a9f743 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -154,7 +154,7 @@ buildStdenv.mkDerivation ({ xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file xorg.pixman yasm libGLU libGL xorg.xorgproto - xorg.libXext unzip makeWrapper + xorg.libXext makeWrapper libevent libstartup_notification /* cairo */ libpng jemalloc glib nasm icu67 libvpx_1_8 @@ -215,6 +215,7 @@ buildStdenv.mkDerivation ({ rust-cbindgen rustc which + unzip ] ++ lib.optional gtk3Support wrapGAppsHook ++ lib.optionals buildStdenv.isDarwin [ xcbuild rsync ] diff --git a/pkgs/applications/networking/mailreaders/thunderbird/68.nix b/pkgs/applications/networking/mailreaders/thunderbird/68.nix index f3594d97801d..4433551d2e10 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/68.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/68.nix @@ -98,6 +98,7 @@ stdenv.mkDerivation rec { rustc which yasm + unzip ] ++ lib.optional gtk3Support wrapGAppsHook; buildInputs = [ @@ -125,7 +126,6 @@ stdenv.mkDerivation rec { pango perl sqlite - unzip xorg.libX11 xorg.libXScrnSaver xorg.libXcursor diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 78a9ef0dbb3e..644910b2ec49 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -99,6 +99,7 @@ stdenv.mkDerivation rec { rustc which yasm + unzip ] ++ lib.optional gtk3Support wrapGAppsHook; buildInputs = [ @@ -126,7 +127,6 @@ stdenv.mkDerivation rec { pango perl sqlite - unzip xorg.libX11 xorg.libXScrnSaver xorg.libXcursor diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index 2de5899aa3e5..8958d00c4b83 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -177,7 +177,7 @@ in stdenv.mkDerivation { libogg libvorbis flac libxslt systemd lzo libcdio libmodplug libass libbluray sqlite libmysqlclient avahi lame - curl bzip2 zip unzip glxinfo + curl bzip2 zip glxinfo libcec libcec_platform dcadec libuuid libgcrypt libgpgerror libunistring libcrossguid libplist diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index f79899259602..adb7ba970e29 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread libbluray dbus fribidi libvorbis libtheora speex lua5 libgcrypt libgpgerror libupnp libcaca libpulseaudio flac schroedinger libxml2 librsvg mpeg2dec - systemd gnutls avahi libcddb SDL SDL_image libmtp unzip taglib libarchive + systemd gnutls avahi libcddb SDL SDL_image libmtp taglib libarchive libkate libtiger libv4l samba libssh2 liboggz libass libdvbpsi libva xorg.xlibsWrapper xorg.libXv xorg.libXvMC xorg.libXpm xorg.xcbutilkeysyms libdc1394 libraw1394 libopus libebml libmatroska libvdpau libsamplerate @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { ++ optional jackSupport libjack2 ++ optionals chromecastSupport [ protobuf libmicrodns ]; - nativeBuildInputs = [ autoreconfHook perl pkg-config removeReferencesTo ] + nativeBuildInputs = [ autoreconfHook perl pkg-config removeReferencesTo unzip ] ++ optionals withQt5 [ wrapQtAppsHook ]; enableParallelBuilding = true; diff --git a/pkgs/development/arduino/arduino-core/default.nix b/pkgs/development/arduino/arduino-core/default.nix index 2eff5e553ea7..529be6e2a56e 100644 --- a/pkgs/development/arduino/arduino-core/default.nix +++ b/pkgs/development/arduino/arduino-core/default.nix @@ -116,13 +116,12 @@ stdenv.mkDerivation rec { # the glib setup hook will populate GSETTINGS_SCHEMAS_PATH, # wrapGAppHooks (among other things) adds it to XDG_DATA_DIRS # so 'save as...' works: - nativeBuildInputs = [ glib wrapGAppsHook ]; + nativeBuildInputs = [ glib wrapGAppsHook unzip ]; buildInputs = [ jdk ant libusb-compat-0_1 libusb1 - unzip zlib ncurses5 readline diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix index a24dca373f1e..f9dd7205659e 100644 --- a/pkgs/development/compilers/openjdk/11.nix +++ b/pkgs/development/compilers/openjdk/11.nix @@ -25,9 +25,9 @@ let sha256 = "06pm3hpz4ggiqwvkgzxr39y9kga7vk4flakfznz5979bvgb926vw"; }; - nativeBuildInputs = [ pkg-config autoconf ]; + nativeBuildInputs = [ pkg-config autoconf unzip ]; buildInputs = [ - cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib + cpio file which zip perl zlib cups freetype alsaLib libjpeg giflib libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst libXi libXinerama libXcursor libXrandr fontconfig openjdk11-bootstrap ] ++ lib.optionals (!headless && enableGnome2) [ diff --git a/pkgs/development/compilers/openjdk/12.nix b/pkgs/development/compilers/openjdk/12.nix index f1c6d8493eb7..8c12b5be7f2e 100644 --- a/pkgs/development/compilers/openjdk/12.nix +++ b/pkgs/development/compilers/openjdk/12.nix @@ -22,9 +22,9 @@ let sha256 = "1ndlxmikyy298z7lqpr1bd0zxq7yx6xidj8y3c8mw9m9fy64h9c7"; }; - nativeBuildInputs = [ pkg-config autoconf ]; + nativeBuildInputs = [ pkg-config autoconf unzip ]; buildInputs = [ - cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib + cpio file which zip perl zlib cups freetype alsaLib libjpeg giflib libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst libXi libXinerama libXcursor libXrandr fontconfig openjdk11 ] ++ lib.optionals (!headless && enableGnome2) [ diff --git a/pkgs/development/compilers/openjdk/13.nix b/pkgs/development/compilers/openjdk/13.nix index 05e367e63146..7e4d9fc7d693 100644 --- a/pkgs/development/compilers/openjdk/13.nix +++ b/pkgs/development/compilers/openjdk/13.nix @@ -22,9 +22,9 @@ let sha256 = "1871ziss7ny19rw8f7bay5vznmhpqbfi4ihn3yygs06wyxhm0zmv"; }; - nativeBuildInputs = [ pkg-config autoconf ]; + nativeBuildInputs = [ pkg-config autoconf unzip ]; buildInputs = [ - cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib + cpio file which zip perl zlib cups freetype alsaLib libjpeg giflib libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst libXi libXinerama libXcursor libXrandr fontconfig openjdk13-bootstrap ] ++ lib.optionals (!headless && enableGnome2) [ diff --git a/pkgs/development/compilers/openjdk/14.nix b/pkgs/development/compilers/openjdk/14.nix index bda6444a8f98..d98d0e9f8ee6 100644 --- a/pkgs/development/compilers/openjdk/14.nix +++ b/pkgs/development/compilers/openjdk/14.nix @@ -22,9 +22,9 @@ let sha256 = "1s1pc6ihzf0awp4hbaqfxmbica0hnrg8nr7s0yd2hfn7nan8xmf3"; }; - nativeBuildInputs = [ pkg-config autoconf ]; + nativeBuildInputs = [ pkg-config autoconf unzip ]; buildInputs = [ - cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib + cpio file which zip perl zlib cups freetype alsaLib libjpeg giflib libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst libXi libXinerama libXcursor libXrandr fontconfig openjdk14-bootstrap ] ++ lib.optionals (!headless && enableGnome2) [ diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index 96a01b0cd925..75dc722b1b22 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -83,9 +83,9 @@ let outputs = [ "out" "jre" ]; - nativeBuildInputs = [ pkg-config lndir ]; + nativeBuildInputs = [ pkg-config lndir unzip ]; buildInputs = [ - cpio file which unzip zip perl openjdk8-bootstrap zlib cups freetype alsaLib + cpio file which zip perl openjdk8-bootstrap zlib cups freetype alsaLib libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst libXi libXinerama libXcursor libXrandr fontconfig ] ++ lib.optionals (!headless && enableGnome2) [ diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index ddd523ad7871..5606059c62d3 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -22,9 +22,9 @@ let sha256 = "1h8n5figc9q0k9p8b0qggyhvqagvxanfih1lj5j492c74cd1mx1l"; }; - nativeBuildInputs = [ pkg-config autoconf ]; + nativeBuildInputs = [ pkg-config autoconf unzip ]; buildInputs = [ - cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib + cpio file which zip perl zlib cups freetype alsaLib libjpeg giflib libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst libXi libXinerama libXcursor libXrandr fontconfig openjdk15-bootstrap ] ++ lib.optionals (!headless && enableGnome2) [ diff --git a/pkgs/development/interpreters/unicon-lang/default.nix b/pkgs/development/interpreters/unicon-lang/default.nix index e64db1b109e9..c399ef223de3 100644 --- a/pkgs/development/interpreters/unicon-lang/default.nix +++ b/pkgs/development/interpreters/unicon-lang/default.nix @@ -42,4 +42,3 @@ stdenv.mkDerivation { homepage = "http://unicon.org"; }; } - diff --git a/pkgs/development/pharo/vm/build-vm.nix b/pkgs/development/pharo/vm/build-vm.nix index 5427e36746ca..c1f703f72515 100644 --- a/pkgs/development/pharo/vm/build-vm.nix +++ b/pkgs/development/pharo/vm/build-vm.nix @@ -53,10 +53,9 @@ stdenv.mkDerivation rec { # http://forum.world.st/OSProcess-fork-issue-with-Debian-built-VM-td4947326.html # # (stack protection is disabled above for gcc 4.8 compatibility.) - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook unzip ]; buildInputs = [ bash - unzip glibc openssl gcc48 diff --git a/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix index 5482db67caee..4f92f8448af1 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix @@ -315,7 +315,7 @@ stdenv.mkDerivation rec { src_for_updater = stdenv.mkDerivation rec { name = "updater-sources"; inherit src; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; inherit sourceRoot; installPhase = '' cp -r . "$out" diff --git a/pkgs/development/tools/build-managers/msbuild/default.nix b/pkgs/development/tools/build-managers/msbuild/default.nix index ce08986b3e17..82c5c88d174e 100644 --- a/pkgs/development/tools/build-managers/msbuild/default.nix +++ b/pkgs/development/tools/build-managers/msbuild/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ dotnet-sdk mono + unzip ]; buildInputs = [ dotnetPackages.Nuget glibcLocales makeWrapper - unzip ]; # https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=msbuild diff --git a/pkgs/misc/vscode-extensions/python/extract-nuget.nix b/pkgs/misc/vscode-extensions/python/extract-nuget.nix index e4d3b6a0ed1b..1e70cabe0358 100644 --- a/pkgs/misc/vscode-extensions/python/extract-nuget.nix +++ b/pkgs/misc/vscode-extensions/python/extract-nuget.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { inherit name version src; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; dontBuild = true; unpackPhase = "unzip $src"; installPhase = '' diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix index d2456a08cbd7..12aa477219b6 100644 --- a/pkgs/tools/misc/mc/default.nix +++ b/pkgs/tools/misc/mc/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-xt6txQWV8tmiLcbCmanyizk+NYNG6/bKREqEadwWbCc="; }; - nativeBuildInputs = [ pkg-config autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook unzip ]; buildInputs = [ file @@ -39,7 +39,6 @@ stdenv.mkDerivation rec { openssl perl slang - unzip zip ] ++ lib.optionals (!stdenv.isDarwin) [ e2fsprogs gpm ]; From 91d653217991163dcc65532c50d0def6bcc7b0b7 Mon Sep 17 00:00:00 2001 From: Orivej Desh <orivej@gmx.fr> Date: Sat, 6 Mar 2021 19:32:55 +0000 Subject: [PATCH 145/188] libtiff: 4.1.0 -> 4.2.0 (#114196) --- pkgs/development/libraries/libtiff/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index 2fad29888982..46c13bbe4a9d 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -4,18 +4,19 @@ , pkg-config , cmake -, zlib +, libdeflate , libjpeg , xz +, zlib }: stdenv.mkDerivation rec { - version = "4.1.0"; pname = "libtiff"; + version = "4.2.0"; src = fetchurl { url = "https://download.osgeo.org/libtiff/tiff-${version}.tar.gz"; - sha256 = "0d46bdvxdiv59lxnb0xz9ywm8arsr6xsapi5s6y6vnys2wjz6aax"; + sha256 = "1jrkjv0xya9radddn8idxvs2gqzp3l2b1s8knlizmn7ad3jq817b"; }; cmakeFlags = if stdenv.isDarwin then [ @@ -35,7 +36,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; - propagatedBuildInputs = [ zlib libjpeg xz ]; #TODO: opengl support (bogus configure detection) + propagatedBuildInputs = [ libjpeg xz zlib ]; #TODO: opengl support (bogus configure detection) + + buildInputs = [ libdeflate ]; # TODO: move all propagatedBuildInputs to buildInputs. enableParallelBuilding = true; From 57047b485c3b0afdc3da3f71a8fa03bd562911d8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" <ryantm-bot@ryantm.com> Date: Wed, 3 Mar 2021 05:11:10 +0000 Subject: [PATCH 146/188] cmake: 3.19.4 -> 3.19.6 --- pkgs/development/tools/build-managers/cmake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index c899647f6aae..399c3c9e38cd 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -20,12 +20,12 @@ stdenv.mkDerivation (rec { + lib.optionalString useNcurses "-cursesUI" + lib.optionalString withQt5 "-qt5UI" + lib.optionalString useQt4 "-qt4UI"; - version = "3.19.4"; + version = "3.19.6"; src = fetchurl { url = "${meta.homepage}files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz"; # compare with https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}-SHA-256.txt - sha256 = "sha256-fQIyufHFfo3oHzgHHvggPmgg/n7siuRqHfEl2I28wuE="; + sha256 = "sha256-7IerZ8RfR8QoXyBCgMXN5I4ckgz8/tFVWyf7OxodILo="; }; patches = [ From 4a14a1a91bfbc632e6d3590f60e3e06d9bb11be1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" <ryantm-bot@ryantm.com> Date: Sun, 21 Feb 2021 08:52:04 +0000 Subject: [PATCH 147/188] autoconf-archive: 2019.01.06 -> 2021.02.19 --- pkgs/development/tools/misc/autoconf-archive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/autoconf-archive/default.nix b/pkgs/development/tools/misc/autoconf-archive/default.nix index e0d558b18800..b53adfd0be06 100644 --- a/pkgs/development/tools/misc/autoconf-archive/default.nix +++ b/pkgs/development/tools/misc/autoconf-archive/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "autoconf-archive"; - version = "2019.01.06"; + version = "2021.02.19"; src = fetchurl { url = "mirror://gnu/autoconf-archive/autoconf-archive-${version}.tar.xz"; - sha256 = "0gqya7nf4j5k98dkky0c3bnr0paciya91vkqazg7knlq621mq68p"; + sha256 = "sha256-6KbrnSjdy6j/7z+iEWUyOem/I5q6agGmt8/Hzq7GnL0="; }; buildInputs = [ xz ]; From 6329ac8111247d6bbe64d050c1bfaa27b1d85080 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" <ryantm-bot@ryantm.com> Date: Sun, 21 Feb 2021 23:45:45 +0000 Subject: [PATCH 148/188] libgcrypt: 1.9.1 -> 1.9.2 --- pkgs/development/libraries/libgcrypt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index 80cd5bc13cc3..a129704897bd 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -6,11 +6,11 @@ assert enableCapabilities -> stdenv.isLinux; stdenv.mkDerivation rec { pname = "libgcrypt"; - version = "1.9.1"; + version = "1.9.2"; src = fetchurl { url = "mirror://gnupg/libgcrypt/${pname}-${version}.tar.bz2"; - sha256 = "1nb50bgzp83q6r5cz4v40y1mcbhpqwqyxlay87xp1lrbkf5pm9n5"; + sha256 = "sha256-ssENCRUTsnHkcXcnRgex/7o9lbGIu/qHl/lIrskFPFo="; }; patches = [ From ac95a1f4cbd91c212a3a7913e125a24884c97a8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io> Date: Sun, 7 Mar 2021 12:19:20 +0000 Subject: [PATCH 149/188] libgcrypt: remove upstreamed patch --- pkgs/development/libraries/libgcrypt/default.nix | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index a129704897bd..6b761d2170c3 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -1,6 +1,4 @@ -{ lib, stdenv, fetchurl, gettext, libgpgerror, enableCapabilities ? false, libcap -, buildPackages, fetchpatch -}: +{ lib, stdenv, fetchurl, gettext, libgpgerror, enableCapabilities ? false, libcap, buildPackages }: assert enableCapabilities -> stdenv.isLinux; @@ -13,15 +11,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-ssENCRUTsnHkcXcnRgex/7o9lbGIu/qHl/lIrskFPFo="; }; - patches = [ - # fix build on 32bit musl - (fetchpatch { - name = "fix_building_with_disable-asm_on_x86.patch"; - url = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=commitdiff_plain;h=af23ab5c5482d625ff52e60606cf044e2b0106c8"; - sha256 = "1m8apm8wra6fk89ggha4d0bba5absihm38zvb2khklqh9q5hj9jw"; - }) - ]; - outputs = [ "out" "dev" "info" ]; outputBin = "dev"; From 0140b2811c049b6c875b763bf171d568f76f6168 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de> Date: Sun, 7 Mar 2021 19:43:23 +0100 Subject: [PATCH 150/188] python3Packages.aiohttp: 3.7.4 -> 3.7.4.post0 --- pkgs/development/python-modules/aiohttp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index c682423eec1d..c0722c8c9781 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -23,12 +23,12 @@ buildPythonPackage rec { pname = "aiohttp"; - version = "3.7.4"; + version = "3.7.4.post0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1pn79h8fng4xi5gl1f6saw31nxgmgyxl41yf3vba1l21673yr12x"; + sha256 = "493d3299ebe5f5a7c66b9819eacdcfbbaaf1a8e84911ddffcdc48888497afecf"; }; postPatch = '' From fe45edd2ef3b5da39abe3ad55b5c5bf26a1bbbf1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk <fridh@fridh.nl> Date: Mon, 8 Mar 2021 17:55:19 +0100 Subject: [PATCH 151/188] python3Packages.pyopenssl: normalize name --- pkgs/development/python-modules/pyopenssl/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix index 86a4c8476839..6bc8c04ec30c 100644 --- a/pkgs/development/python-modules/pyopenssl/default.nix +++ b/pkgs/development/python-modules/pyopenssl/default.nix @@ -64,11 +64,12 @@ let in buildPythonPackage rec { - pname = "pyOpenSSL"; + pname = "pyopenssl"; version = "20.0.1"; src = fetchPypi { - inherit pname version; + pname = "pyOpenSSL"; + inherit version; sha256 = "4c231c759543ba02560fcd2480c48dcec4dae34c9da7d3747c508227e0624b51"; }; From c44ae94eab1bcf4dbef5405800fc597d0b4f78dd Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk <fridh@fridh.nl> Date: Mon, 8 Mar 2021 17:56:24 +0100 Subject: [PATCH 152/188] python3Packages.pytest-forked: don't propagate pytest pytest extensions should not propagate pytest. Doing so makes it impossible to combine the package with another version of pytest, which sometimes is needed. --- pkgs/development/python-modules/pytest-forked/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pytest-forked/default.nix b/pkgs/development/python-modules/pytest-forked/default.nix index 855e1fb470c2..0cfb8cd6afc8 100644 --- a/pkgs/development/python-modules/pytest-forked/default.nix +++ b/pkgs/development/python-modules/pytest-forked/default.nix @@ -18,7 +18,13 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ py pytest ]; + buildInputs = [ + pytest + ]; + + propagatedBuildInputs = [ + py + ]; checkInputs = [ pytestCheckHook ]; From 1ceaf03f8a2ab9bb97bbcad1e1302b315d7e3ffe Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk <fridh@fridh.nl> Date: Mon, 8 Mar 2021 17:57:14 +0100 Subject: [PATCH 153/188] python3Packages.pytest-xdist: don't propagate pytest pytest extensions should not propagate pytest. Doing so makes it impossible to combine the package with another version of pytest, which sometimes is needed. --- pkgs/development/python-modules/pytest-xdist/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix index a6f6ffd7dc0d..bbc08fb59df4 100644 --- a/pkgs/development/python-modules/pytest-xdist/default.nix +++ b/pkgs/development/python-modules/pytest-xdist/default.nix @@ -22,8 +22,11 @@ buildPythonPackage rec { }; nativeBuildInputs = [ setuptools_scm ]; + buildInputs = [ + pytest + ]; checkInputs = [ pytestCheckHook filelock ]; - propagatedBuildInputs = [ execnet pytest pytest-forked psutil ]; + propagatedBuildInputs = [ execnet pytest-forked psutil ]; # access file system disabledTests = [ From bea1b905b703e18e89c06a3fbb67b54d1ae009eb Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk <fridh@fridh.nl> Date: Mon, 8 Mar 2021 18:48:01 +0100 Subject: [PATCH 154/188] python3Packages.pytest_6_1: bring it back for aiohttp --- pkgs/top-level/python-packages.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ada815948ff3..34c946aa0b78 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6193,6 +6193,14 @@ in { hypothesis = self.hypothesis.override { doCheck = false; }; }; + pytest_6_1 = self.pytest_6.overridePythonAttrs (oldAttrs: rec { + version = "6.1.2"; + src = oldAttrs.src.override { + inherit version; + sha256 = "c0a7e94a8cdbc5422a51ccdad8e6f1024795939cc89159a0ae7f0b316ad3823e"; + }; + }); + pytest-aiohttp = callPackage ../development/python-modules/pytest-aiohttp { }; pytest-annotate = callPackage ../development/python-modules/pytest-annotate { }; From b1d8335904dbdee98696a3094e1d918f40a40367 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk <fridh@fridh.nl> Date: Mon, 8 Mar 2021 18:48:15 +0100 Subject: [PATCH 155/188] python3Packages.aiohttp: use pytest_6_1 --- pkgs/top-level/python-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 34c946aa0b78..f446c101d1e9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -250,7 +250,9 @@ in { aiohomekit = callPackage ../development/python-modules/aiohomekit { }; - aiohttp = callPackage ../development/python-modules/aiohttp { }; + aiohttp = callPackage ../development/python-modules/aiohttp { + pytestCheckHook = self.pkgsBuildHost.pytestCheckHook.override { pytest = self.pytest_6_1; }; + }; aiohttp-cors = callPackage ../development/python-modules/aiohttp-cors { }; From 08564e2bd3178b9280e0b41e0857eb2ed55fca45 Mon Sep 17 00:00:00 2001 From: Jan Tojnar <jtojnar@gmail.com> Date: Sat, 6 Mar 2021 23:33:50 +0100 Subject: [PATCH 156/188] libqrtr-glib: init at 1.0.0 libqrtr-glib is a GLib-based library to manage and access the QRTR (Qualcomm IPC Router) bus, required by libqmi. - https://lists.freedesktop.org/archives/libqmi-devel/2021-February/003542.html - https://lists.freedesktop.org/archives/libqmi-devel/2021-February/003550.html --- .../libraries/libqrtr-glib/default.nix | 46 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/development/libraries/libqrtr-glib/default.nix diff --git a/pkgs/development/libraries/libqrtr-glib/default.nix b/pkgs/development/libraries/libqrtr-glib/default.nix new file mode 100644 index 000000000000..29097710a697 --- /dev/null +++ b/pkgs/development/libraries/libqrtr-glib/default.nix @@ -0,0 +1,46 @@ +{ lib +, stdenv +, fetchurl +, pkg-config +, gobject-introspection +, gtk-doc +, docbook-xsl-nons +, docbook_xml_dtd_43 +, glib +}: + +stdenv.mkDerivation rec { + pname = "libqrtr-glib"; + version = "1.0.0"; + + outputs = [ "out" "dev" "devdoc" ]; + + src = fetchurl { + url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz"; + sha256 = "MNh5sq3m+PRh3vOmd3VdtcAji6v2iNXIPAOz5qvjXO4="; + }; + + nativeBuildInputs = [ + pkg-config + gobject-introspection + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_43 + ]; + + buildInputs = [ + glib + ]; + + configureFlags = [ + "--enable-gtk-doc" + ]; + + meta = with lib; { + homepage = "https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib"; + description = "Qualcomm IPC Router protocol helper library"; + maintainers = teams.freedesktop.members; + platforms = platforms.linux; + license = licenses.lgpl2Plus; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6443e41ff622..d20f4a218919 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6058,6 +6058,8 @@ in libqmi = callPackage ../development/libraries/libqmi { }; + libqrtr-glib = callPackage ../development/libraries/libqrtr-glib { }; + libmbim = callPackage ../development/libraries/libmbim { }; libmongo-client = callPackage ../development/libraries/libmongo-client { }; From 53bf5c322d89912ed157ebbd2617ed9190bf8011 Mon Sep 17 00:00:00 2001 From: Jan Tojnar <jtojnar@gmail.com> Date: Sat, 6 Mar 2021 23:36:32 +0100 Subject: [PATCH 157/188] libqmi: 1.26.10 -> 1.28.2 New dependency on QRTR. Also cleaned up the expression a bit. - https://lists.freedesktop.org/archives/libqmi-devel/2021-February/003552.html - https://lists.freedesktop.org/archives/libqmi-devel/2021-March/003554.html --- pkgs/development/libraries/libqmi/default.nix | 48 ++++++++++++++----- 1 file changed, 36 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix index 42d8cbf28596..783469157d87 100644 --- a/pkgs/development/libraries/libqmi/default.nix +++ b/pkgs/development/libraries/libqmi/default.nix @@ -1,31 +1,49 @@ -{ lib, stdenv, fetchurl, pkg-config, gobject-introspection, glib, python3, libgudev, libmbim }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gobject-introspection +, gtk-doc +, docbook-xsl-nons +, docbook_xml_dtd_43 +, glib +, python3 +, libgudev +, libmbim +, libqrtr-glib +}: stdenv.mkDerivation rec { pname = "libqmi"; - version = "1.26.10"; - - src = fetchurl { - url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz"; - sha256 = "sha256-fABD8GyHXlzx3jwMlMzH9bBYYry82eT7DV0UJ30dq1k="; - }; + version = "1.28.2"; outputs = [ "out" "dev" "devdoc" ]; - configureFlags = [ - "--with-udev-base-dir=${placeholder "out"}/lib/udev" - "--enable-introspection" - ]; + src = fetchurl { + url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz"; + sha256 = "jIw+5xmHTSUpvOmzWwKP5DWzbwA5eaNg060JOESdt4M="; + }; nativeBuildInputs = [ pkg-config gobject-introspection python3 + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_43 ]; buildInputs = [ glib libgudev libmbim + libqrtr-glib + ]; + + configureFlags = [ + "--with-udev-base-dir=${placeholder "out"}/lib/udev" + "--enable-gtk-doc" + "--enable-introspection" ]; enableParallelBuilding = true; @@ -35,7 +53,13 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.freedesktop.org/wiki/Software/libqmi/"; description = "Modem protocol helper library"; + maintainers = teams.freedesktop.members; platforms = platforms.linux; - license = licenses.gpl2; + license = with licenses; [ + # Library + lgpl2Plus + # Tools + gpl2Plus + ]; }; } From 041224bd8d557d9505adca03a361f0e65d8637b7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter <mail@fabian-affolter.ch> Date: Wed, 3 Mar 2021 08:08:23 +0100 Subject: [PATCH 158/188] python3Packages.build: 0.1.0 -> 0.3.0 --- pkgs/development/python-modules/check-manifest/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/check-manifest/default.nix b/pkgs/development/python-modules/check-manifest/default.nix index 95bb9660d4cf..42b903db7dee 100644 --- a/pkgs/development/python-modules/check-manifest/default.nix +++ b/pkgs/development/python-modules/check-manifest/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, pep517, toml, mock, breezy, git, build }: +{ lib, buildPythonPackage, fetchPypi, pep517, toml, mock, breezy, git, build, pytestCheckHook }: buildPythonPackage rec { pname = "check-manifest"; @@ -16,7 +16,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ build pep517 toml ]; - checkInputs = [ mock breezy git ]; + checkInputs = [ mock breezy git pytestCheckHook ]; + + pythonImportsCheck = [ "check_manifest" ]; + meta = with lib; { homepage = "https://github.com/mgedmin/check-manifest"; From 8f90fa510ecbc6d9204ea237fa4e298ba6d5e04e Mon Sep 17 00:00:00 2001 From: Fabian Affolter <mail@fabian-affolter.ch> Date: Wed, 3 Mar 2021 11:00:51 +0100 Subject: [PATCH 159/188] python3Packages.build: enable tests --- .../python-modules/build/default.nix | 41 ++++++++++++++----- 1 file changed, 31 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/build/default.nix b/pkgs/development/python-modules/build/default.nix index 46c3bea0b8c5..b5dce09d516f 100644 --- a/pkgs/development/python-modules/build/default.nix +++ b/pkgs/development/python-modules/build/default.nix @@ -1,25 +1,29 @@ { lib , buildPythonPackage , fetchPypi +, filelock , flit-core -, toml -, pep517 -, packaging -, isPy3k -, typing -, pythonOlder , importlib-metadata +, isPy3k +, packaging +, pep517 +, pytest-mock +, pytest-xdist +, pytestCheckHook +, pythonOlder +, toml +, typing }: buildPythonPackage rec { pname = "build"; - version = "0.1.0"; + version = "0.3.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "1d6m21lijwm04g50nwgsgj7x3vhblzw7jv05ah8psqgzk20bbch8"; + sha256 = "sha256-DrlbLI13DXxMm5LGjCJ8NQu/ZfPsg1UazpCXwYzBX90="; }; nativeBuildInputs = [ @@ -36,8 +40,25 @@ buildPythonPackage rec { importlib-metadata ]; - # No tests in archive - doCheck = false; + checkInputs = [ + filelock + pytestCheckHook + pytest-mock + pytest-xdist + ]; + + disabledTests = [ + "test_isolation" + "test_isolated_environment_install" + "test_default_pip_is_never_too_old" + "test_build_isolated - StopIteration" + "test_build_raises_build_exception" + "test_build_raises_build_backend_exception" + "test_projectbuilder.py" + "test_projectbuilder.py" + ]; + + pythonImportsCheck = [ "build" ]; meta = with lib; { description = "Simple, correct PEP517 package builder"; From a7d1e3a27dc457bbb223203e84d102f00f798041 Mon Sep 17 00:00:00 2001 From: Fabian Affolter <mail@fabian-affolter.ch> Date: Wed, 3 Mar 2021 11:01:42 +0100 Subject: [PATCH 160/188] python3Packages.check-manifest: update style and add pythonImportsCheck --- .../python-modules/check-manifest/default.nix | 26 ++++++++++++++++--- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/check-manifest/default.nix b/pkgs/development/python-modules/check-manifest/default.nix index 42b903db7dee..de833e18be8e 100644 --- a/pkgs/development/python-modules/check-manifest/default.nix +++ b/pkgs/development/python-modules/check-manifest/default.nix @@ -1,4 +1,14 @@ -{ lib, buildPythonPackage, fetchPypi, pep517, toml, mock, breezy, git, build, pytestCheckHook }: +{ lib +, breezy +, build +, buildPythonPackage +, fetchPypi +, git +, mock +, pep517 +, pytestCheckHook +, toml +}: buildPythonPackage rec { pname = "check-manifest"; @@ -14,13 +24,21 @@ buildPythonPackage rec { substituteInPlace tests.py --replace "test_build_sdist" "no_test_build_sdist" ''; - propagatedBuildInputs = [ build pep517 toml ]; + propagatedBuildInputs = [ + build + pep517 + toml + ]; - checkInputs = [ mock breezy git pytestCheckHook ]; + checkInputs = [ + breezy + git + mock + pytestCheckHook + ]; pythonImportsCheck = [ "check_manifest" ]; - meta = with lib; { homepage = "https://github.com/mgedmin/check-manifest"; description = "Check MANIFEST.in in a Python source package for completeness"; From 3609a1d536c31be8ba4dadd7440da2a198733cf3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter <mail@fabian-affolter.ch> Date: Wed, 3 Mar 2021 11:04:00 +0100 Subject: [PATCH 161/188] python3Packages.poetry-core: 1.0.0 -> 1.0.2 --- pkgs/development/python-modules/poetry-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/poetry-core/default.nix b/pkgs/development/python-modules/poetry-core/default.nix index d5d4e36d3a37..80c4b5acfe8c 100644 --- a/pkgs/development/python-modules/poetry-core/default.nix +++ b/pkgs/development/python-modules/poetry-core/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "poetry-core"; - version = "1.0.0"; + version = "1.0.2"; format = "pyproject"; src = fetchFromGitHub { owner = "python-poetry"; repo = pname; rev = version; - sha256 = "02pqkwzbg43xz2zsw8q7m0sfkj8wbw07in83gy0bk0znhljhp0vw"; + sha256 = "sha256-OE6oc/3HYrMmgPnINxvSZ27m8YeZk5Gnn9ok8GlSIZ0="; }; nativeBuildInputs = [ From e83d926f216619d344e347a44ebac98d19873395 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" <ryantm-bot@ryantm.com> Date: Mon, 1 Mar 2021 12:10:45 +0000 Subject: [PATCH 162/188] libedit: 20191231-3.1 -> 20210216-3.1 --- pkgs/development/libraries/libedit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libedit/default.nix b/pkgs/development/libraries/libedit/default.nix index 92f3eeb79957..dc5a384569cb 100644 --- a/pkgs/development/libraries/libedit/default.nix +++ b/pkgs/development/libraries/libedit/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libedit"; - version = "20191231-3.1"; + version = "20210216-3.1"; src = fetchurl { url = "https://thrysoee.dk/editline/${pname}-${version}.tar.gz"; - sha256 = "0wch48nml28jj6ild889745dsg2agm7mpvrmbl1gi98nw6vjrf6v"; + sha256 = "sha256-IoP3QdKquTXIxSwEtXv5UtAsLALmURcvisgR93sfx3o="; }; outputs = [ "out" "dev" ]; From 042adf08d1c1886dfbe11603b012f987c60b1148 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer <jonringer117@gmail.com> Date: Sun, 28 Feb 2021 17:18:12 -0800 Subject: [PATCH 163/188] cargo/hooks: allow hooks to be disabled --- pkgs/build-support/rust/hooks/cargo-build-hook.sh | 4 +++- pkgs/build-support/rust/hooks/cargo-check-hook.sh | 2 +- pkgs/build-support/rust/hooks/cargo-install-hook.sh | 2 +- pkgs/build-support/rust/hooks/cargo-setup-hook.sh | 4 +++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/build-support/rust/hooks/cargo-build-hook.sh b/pkgs/build-support/rust/hooks/cargo-build-hook.sh index 6760277c2941..c10120c5aa19 100644 --- a/pkgs/build-support/rust/hooks/cargo-build-hook.sh +++ b/pkgs/build-support/rust/hooks/cargo-build-hook.sh @@ -36,4 +36,6 @@ cargoBuildHook() { echo "Finished cargoBuildHook" } -buildPhase=cargoBuildHook +if [ -z "${dontCargoBuild-}" ] && [ -z "${buildPhase-}" ]; then + buildPhase=cargoBuildHook +fi diff --git a/pkgs/build-support/rust/hooks/cargo-check-hook.sh b/pkgs/build-support/rust/hooks/cargo-check-hook.sh index e4c906f873c4..f0339afb38fa 100644 --- a/pkgs/build-support/rust/hooks/cargo-check-hook.sh +++ b/pkgs/build-support/rust/hooks/cargo-check-hook.sh @@ -41,6 +41,6 @@ cargoCheckHook() { runHook postCheck } -if [ -z "${checkPhase-}" ]; then +if [ -z "${dontCargoCheck-}" ] && [ -z "${checkPhase-}" ]; then checkPhase=cargoCheckHook fi diff --git a/pkgs/build-support/rust/hooks/cargo-install-hook.sh b/pkgs/build-support/rust/hooks/cargo-install-hook.sh index e6ffa3007063..69ce72669366 100644 --- a/pkgs/build-support/rust/hooks/cargo-install-hook.sh +++ b/pkgs/build-support/rust/hooks/cargo-install-hook.sh @@ -43,7 +43,7 @@ cargoInstallHook() { } -if [ -z "${installPhase-}" ]; then +if [ -z "${dontCargoInstall-}" ] && [ -z "${installPhase-}" ]; then installPhase=cargoInstallHook postBuildHooks+=(cargoInstallPostBuildHook) fi diff --git a/pkgs/build-support/rust/hooks/cargo-setup-hook.sh b/pkgs/build-support/rust/hooks/cargo-setup-hook.sh index 0fddd30582a1..842e66b5170e 100644 --- a/pkgs/build-support/rust/hooks/cargo-setup-hook.sh +++ b/pkgs/build-support/rust/hooks/cargo-setup-hook.sh @@ -77,7 +77,9 @@ cargoSetupPostPatchHook() { echo "Finished cargoSetupPostPatchHook" } -postUnpackHooks+=(cargoSetupPostUnpackHook) +if [ -z "${dontCargoSetupPostUnpack-}" ]; then + postUnpackHooks+=(cargoSetupPostUnpackHook) +fi if [ -z ${cargoVendorDir-} ]; then postPatchHooks+=(cargoSetupPostPatchHook) From 3521dc45edbb76e13ec29d2a08b15d3f369413c3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk <fridh@fridh.nl> Date: Mon, 8 Mar 2021 19:36:51 +0100 Subject: [PATCH 164/188] python3Packages.aiohttp: fixup package set In b1d8335904dbdee98696a3094e1d918f40a40367 pytestCheckHook was overridden. Overriding as is done in this commit breaks cross. Therefore, I attempted to use one of the spliced sets but that did not work and got accidentally committed and pushed. --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0632d8260934..2f71dc059bcd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -251,7 +251,7 @@ in { aiohomekit = callPackage ../development/python-modules/aiohomekit { }; aiohttp = callPackage ../development/python-modules/aiohttp { - pytestCheckHook = self.pkgsBuildHost.pytestCheckHook.override { pytest = self.pytest_6_1; }; + pytestCheckHook = self.pytestCheckHook.override { pytest = self.pytest_6_1; }; }; aiohttp-cors = callPackage ../development/python-modules/aiohttp-cors { }; From 86e962a41a7a4a40c7a74d3ea765d9363771fcb7 Mon Sep 17 00:00:00 2001 From: Andrew Childs <lorne@cons.org.nz> Date: Tue, 9 Mar 2021 14:01:34 +0900 Subject: [PATCH 165/188] cc-wrapper: remove quoting of response file Fixes build failures with clang: clang-7: error: unknown argument: '-fPIC -target' clang-7: error: no such file or directory: '@<(printf %qn -O2' clang-7: error: no such file or directory: 'x86_64-apple-darwin' Introduced by 60c5cf9cea56ffd607b48fe07ff1174ea6a13afc in #112449 --- pkgs/build-support/cc-wrapper/cc-wrapper.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh index f033836a962f..d08fd24cd2d6 100644 --- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh @@ -200,10 +200,10 @@ PATH="$path_backup" # Old bash workaround, see above. if (( "${NIX_CC_USE_RESPONSE_FILE:-@use_response_file_by_default@}" >= 1 )); then - exec @prog@ "@<(printf "%q\n" \ + exec @prog@ @<(printf "%q\n" \ ${extraBefore+"${extraBefore[@]}"} \ ${params+"${params[@]}"} \ - ${extraAfter+"${extraAfter[@]}"})" + ${extraAfter+"${extraAfter[@]}"}) else exec @prog@ \ ${extraBefore+"${extraBefore[@]}"} \ From f121c20c924ec4e6b018b5f8dba65c8de7424777 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer <jonringer117@gmail.com> Date: Mon, 8 Mar 2021 21:52:37 -0800 Subject: [PATCH 166/188] pythonPackages.trio: 0.17.0 -> 0.18.0 --- pkgs/development/python-modules/trio/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix index 94da63cd3ec6..baaff068dbc3 100644 --- a/pkgs/development/python-modules/trio/default.nix +++ b/pkgs/development/python-modules/trio/default.nix @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "trio"; - version = "0.17.0"; + version = "0.18.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0zcxirpdvvl54pbfkgw7vz984879xwvdygqfpggnam24is2zjp78"; + sha256 = "0xm0bd1rrlb4l9q0nf2n1wg7xh42ljdnm4i4j0651zi73zk6m9l7"; }; checkInputs = [ astor pytestCheckHook pyopenssl trustme jedi pylint yapf ]; @@ -34,6 +34,8 @@ buildPythonPackage rec { "getprotobyname" "waitpid" "static_tool_sees_all_symbols" + # tests pytest more than python + "fallback_when_no_hook_claims_it" ]; propagatedBuildInputs = [ From 21e3a8abe78870df215c3c5d48124a979bde0a65 Mon Sep 17 00:00:00 2001 From: Andrew Childs <lorne@cons.org.nz> Date: Tue, 9 Mar 2021 18:24:01 +0900 Subject: [PATCH 167/188] stdenv/darwin: allow brotli reference from curl Brotli is recently a default dependency of curl in nixpkgs. See e3d19670a0f6b012aac5e05b50951d8a991ba143 in #112947 --- pkgs/stdenv/darwin/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 3e5c46709ac7..a7b91a82a9d2 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -322,7 +322,7 @@ in rec { libxml2 gettext sharutils gmp libarchive ncurses pkg-config libedit groff openssh sqlite sed serf openldap db cyrus-sasl expat apr-util subversion xz findfreetype libssh curl cmake autoconf automake libtool ed cpio coreutils - libssh2 nghttp2 libkrb5 ninja; + libssh2 nghttp2 libkrb5 ninja brotli; llvmPackages_7 = super.llvmPackages_7 // (let tools = super.llvmPackages_7.tools.extend (_: _: { @@ -359,7 +359,7 @@ in rec { [ bootstrapTools ] ++ (with pkgs; [ xz.bin xz.out libcxx libcxxabi llvmPackages_7.compiler-rt - llvmPackages_7.clang-unwrapped zlib libxml2.out curl.out openssl.out + llvmPackages_7.clang-unwrapped zlib libxml2.out curl.out brotli.lib openssl.out libssh2.out nghttp2.lib libkrb5 coreutils gnugrep pcre.out gmp libiconv ]) ++ (with pkgs.darwin; [ dyld Libsystem CF ICU locale ]); @@ -411,7 +411,7 @@ in rec { [ bootstrapTools ] ++ (with pkgs; [ xz.bin xz.out bash libcxx libcxxabi llvmPackages_7.compiler-rt - llvmPackages_7.clang-unwrapped zlib libxml2.out curl.out openssl.out + llvmPackages_7.clang-unwrapped zlib libxml2.out curl.out brotli.lib openssl.out libssh2.out nghttp2.lib libkrb5 coreutils gnugrep pcre.out gmp libiconv ]) ++ (with pkgs.darwin; [ dyld ICU Libsystem locale ]); @@ -533,7 +533,7 @@ in rec { gzip ncurses.out ncurses.dev ncurses.man gnused bash gawk gnugrep llvmPackages.clang-unwrapped llvmPackages.clang-unwrapped.lib patch pcre.out gettext binutils.bintools darwin.binutils darwin.binutils.bintools - curl.out openssl.out libssh2.out nghttp2.lib libkrb5 + curl.out brotli.lib openssl.out libssh2.out nghttp2.lib libkrb5 cc.expand-response-params libxml2.out ]) ++ (with pkgs.darwin; [ dyld Libsystem CF cctools ICU libiconv locale libtapi From 5ad7e11e5ded7c785e71163cc3d191495b6a9df1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt <hexa@darmstadt.ccc.de> Date: Fri, 12 Mar 2021 04:17:38 +0100 Subject: [PATCH 168/188] firefox: 86.0 -> 86.0.1 --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 1bcaecdfbb89..925374d38e8b 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -7,10 +7,10 @@ in rec { firefox = common rec { pname = "firefox"; - ffversion = "86.0"; + ffversion = "86.0.1"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "f5a7b9aa53e2955e972e30cc62ae64ae955127eab951d7a1102d5ac8a73804982e01b917787c00a6e0a0ed03594567d29a24808271283ef61a9383bc4bb39e3f"; + sha512 = "e613cdcadfd71a01800a72c08c590032605ca8a8a0ba93326ffba93c2819f629fd620c23d00ca1274b203adc20acfe5d7913fee240ff14819fb1377ed08b1214"; }; meta = { From 2e0b261da8c4a08d642bcbf115ffbca5d69ff481 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk <fridh@fridh.nl> Date: Sat, 13 Mar 2021 10:44:31 +0100 Subject: [PATCH 169/188] python3Packages.urllib3: disable two tests that fail on aarch64 Use null workaround to avoid rebuild on other platforms. --- pkgs/development/python-modules/urllib3/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix index c255eea04c5c..ea554efe353d 100644 --- a/pkgs/development/python-modules/urllib3/default.nix +++ b/pkgs/development/python-modules/urllib3/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , brotli , buildPythonPackage , certifi @@ -46,6 +47,14 @@ buildPythonPackage rec { trustme ]; + disabledTests = if stdenv.hostPlatform.isAarch64 then + [ + "test_connection_closed_on_read_timeout_preload_false" + "test_ssl_failed_fingerprint_verification" + ] + else + null; + pythonImportsCheck = [ "urllib3" ]; meta = with lib; { From d0f00f69b4974c25012a07812c4f47a5df88ece0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com> Date: Fri, 12 Mar 2021 23:24:54 +0100 Subject: [PATCH 170/188] pythonPackages: Init pytest_6_1CheckHook with pytest 6.1.X --- pkgs/top-level/python-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ed2591a63d16..32d9f99db0c3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -124,6 +124,8 @@ in { venvShellHook wheelUnpackHook; + pytest_6_1CheckHook = self.pytestCheckHook.override { pytest = self.pytest_6_1; }; + # helpers # We use build packages because we are making a setup hook to be used as a From ed44183ff02f75aebdda305e5ccd0dd3feb34201 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com> Date: Fri, 12 Mar 2021 23:27:52 +0100 Subject: [PATCH 171/188] pythonPackages.async-upnp-client: use pytest_6_1CheckHook --- pkgs/development/python-modules/async-upnp-client/default.nix | 4 ++-- pkgs/top-level/python-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/async-upnp-client/default.nix b/pkgs/development/python-modules/async-upnp-client/default.nix index 6697cb5d13e8..5f6d68b9ca53 100644 --- a/pkgs/development/python-modules/async-upnp-client/default.nix +++ b/pkgs/development/python-modules/async-upnp-client/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchFromGitHub, pythonOlder , voluptuous, aiohttp, async-timeout, python-didl-lite, defusedxml -, pytest_6, pytest-asyncio }: +, pytestCheckHook, pytest-asyncio }: buildPythonPackage rec { pname = "async-upnp-client"; @@ -23,7 +23,7 @@ buildPythonPackage rec { ]; checkInputs = [ - pytest_6 + pytestCheckHook pytest-asyncio ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 32d9f99db0c3..9dc7614b6479 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -538,7 +538,9 @@ in { async-timeout = callPackage ../development/python-modules/async_timeout { }; - async-upnp-client = callPackage ../development/python-modules/async-upnp-client { }; + async-upnp-client = callPackage ../development/python-modules/async-upnp-client { + pytestCheckHook = self.pytest_6_1CheckHook; + }; asyncwhois = callPackage ../development/python-modules/asyncwhois { }; From 1b127bd94e0b22ef7206de003254c0addab43d99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com> Date: Tue, 9 Mar 2021 02:07:00 +0100 Subject: [PATCH 172/188] pythonPackages.trio: fix tests --- pkgs/top-level/python-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9dc7614b6479..3e830547223a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8329,7 +8329,9 @@ in { trimesh = callPackage ../development/python-modules/trimesh { }; - trio = callPackage ../development/python-modules/trio { }; + trio = callPackage ../development/python-modules/trio { + pytestCheckHook = self.pytest_6_1CheckHook; + }; trollius = callPackage ../development/python-modules/trollius { }; From 45ede7d4eadcd0aa6ed818982dbd871187fa85e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com> Date: Tue, 9 Mar 2021 10:23:52 +0100 Subject: [PATCH 173/188] pythonPackages.werkzeug: fix test execution, add empty maintainers field --- pkgs/top-level/python-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3e830547223a..6e3ef19edad6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8723,7 +8723,9 @@ in { webthing = callPackage ../development/python-modules/webthing { }; - werkzeug = callPackage ../development/python-modules/werkzeug { }; + werkzeug = callPackage ../development/python-modules/werkzeug { + pytestCheckHook = self.pytest_6_1CheckHook; + }; west = callPackage ../development/python-modules/west { }; From c20c8df84f7b890c6029c39eaabca1e0e3ffab6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com> Date: Fri, 12 Mar 2021 23:29:56 +0100 Subject: [PATCH 174/188] pythonPackages: aiohttp: use pytest_6_1CheckHook --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6e3ef19edad6..49602dca9b70 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -253,7 +253,7 @@ in { aiohomekit = callPackage ../development/python-modules/aiohomekit { }; aiohttp = callPackage ../development/python-modules/aiohttp { - pytestCheckHook = self.pytestCheckHook.override { pytest = self.pytest_6_1; }; + pytestCheckHook = self.pytest_6_1CheckHook; }; aiohttp-cors = callPackage ../development/python-modules/aiohttp-cors { }; From 9395912baadd025e2cb71c9f4d8545df55554ee9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com> Date: Sat, 13 Mar 2021 00:35:17 +0100 Subject: [PATCH 175/188] pythonPackages.pytest-timeout: don't propagate pytest --- pkgs/development/python-modules/pytest-timeout/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pytest-timeout/default.nix b/pkgs/development/python-modules/pytest-timeout/default.nix index 5833790cf92d..8c59b6ee2c9c 100644 --- a/pkgs/development/python-modules/pytest-timeout/default.nix +++ b/pkgs/development/python-modules/pytest-timeout/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "0xnsigs0kmpq1za0d4i522sp3f71x5bgpdh3ski0rs74yqy13cr0"; }; - propagatedBuildInputs = [ pytest ]; + buildInputs = [ pytest ]; checkInputs = [ pytestCheckHook pexpect pytestcov ]; From 01b24ef00304090c63d7f91abc6e9434921b34a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com> Date: Sat, 13 Mar 2021 01:05:06 +0100 Subject: [PATCH 176/188] pythonPackages.pytest-freezegun: do not propagate pytest --- pkgs/development/python-modules/pytest-freezegun/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pytest-freezegun/default.nix b/pkgs/development/python-modules/pytest-freezegun/default.nix index e5fbb6bb0707..2fbc7a651c18 100644 --- a/pkgs/development/python-modules/pytest-freezegun/default.nix +++ b/pkgs/development/python-modules/pytest-freezegun/default.nix @@ -18,9 +18,10 @@ buildPythonPackage rec { sha256 = "10c4pbh03b4s1q8cjd75lr0fvyf9id0zmdk29566qqsmaz28npas"; }; + buildInputs = [ pytest ]; + propagatedBuildInputs = [ freezegun - pytest ]; checkInputs = [ From cb60634ebf8c691c833a520ddbc1480be4561462 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com> Date: Sat, 13 Mar 2021 01:05:18 +0100 Subject: [PATCH 177/188] pythonPackages.urllib3: use pytest 6.1.2 --- pkgs/top-level/python-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 49602dca9b70..803df5d4d75c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8522,7 +8522,9 @@ in { urlgrabber = callPackage ../development/python-modules/urlgrabber { }; - urllib3 = callPackage ../development/python-modules/urllib3 { }; + urllib3 = callPackage ../development/python-modules/urllib3 { + pytestCheckHook = self.pytest_6_1CheckHook; + }; urwid = callPackage ../development/python-modules/urwid { }; From 89f4b3b5d17c6752e037aac05ebe112a785a622e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk <fridh@fridh.nl> Date: Sat, 13 Mar 2021 16:24:30 +0100 Subject: [PATCH 178/188] pythonPackages: pytest_6_1CheckHook -> pytestCheckHook_6_1 Versions are supposed to be at the end. --- pkgs/top-level/python-packages.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 803df5d4d75c..23a73bb05e29 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -124,7 +124,7 @@ in { venvShellHook wheelUnpackHook; - pytest_6_1CheckHook = self.pytestCheckHook.override { pytest = self.pytest_6_1; }; + pytestCheckHook_6_1 = self.pytestCheckHook.override { pytest = self.pytest_6_1; }; # helpers @@ -253,7 +253,7 @@ in { aiohomekit = callPackage ../development/python-modules/aiohomekit { }; aiohttp = callPackage ../development/python-modules/aiohttp { - pytestCheckHook = self.pytest_6_1CheckHook; + pytestCheckHook = self.pytestCheckHook_6_1; }; aiohttp-cors = callPackage ../development/python-modules/aiohttp-cors { }; @@ -539,7 +539,7 @@ in { async-timeout = callPackage ../development/python-modules/async_timeout { }; async-upnp-client = callPackage ../development/python-modules/async-upnp-client { - pytestCheckHook = self.pytest_6_1CheckHook; + pytestCheckHook = self.pytestCheckHook_6_1; }; asyncwhois = callPackage ../development/python-modules/asyncwhois { }; @@ -8330,7 +8330,7 @@ in { trimesh = callPackage ../development/python-modules/trimesh { }; trio = callPackage ../development/python-modules/trio { - pytestCheckHook = self.pytest_6_1CheckHook; + pytestCheckHook = self.pytestCheckHook_6_1; }; trollius = callPackage ../development/python-modules/trollius { }; @@ -8523,7 +8523,7 @@ in { urlgrabber = callPackage ../development/python-modules/urlgrabber { }; urllib3 = callPackage ../development/python-modules/urllib3 { - pytestCheckHook = self.pytest_6_1CheckHook; + pytestCheckHook = self.pytestCheckHook_6_1; }; urwid = callPackage ../development/python-modules/urwid { }; @@ -8726,7 +8726,7 @@ in { webthing = callPackage ../development/python-modules/webthing { }; werkzeug = callPackage ../development/python-modules/werkzeug { - pytestCheckHook = self.pytest_6_1CheckHook; + pytestCheckHook = self.pytestCheckHook_6_1; }; west = callPackage ../development/python-modules/west { }; From 1df29ee4562a573f0528dcfb8866bd309865ba47 Mon Sep 17 00:00:00 2001 From: Jan Tojnar <jtojnar@gmail.com> Date: Fri, 12 Mar 2021 19:45:39 +0100 Subject: [PATCH 179/188] libqmi: propagate requireds glib and libqrtr-glib are listed in the Requires field of the pkg-config file so we need to propagate them in order for depenents to be able to use this library. --- pkgs/development/libraries/libqmi/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix index 783469157d87..8a3179b03427 100644 --- a/pkgs/development/libraries/libqmi/default.nix +++ b/pkgs/development/libraries/libqmi/default.nix @@ -34,9 +34,12 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - glib libgudev libmbim + ]; + + propagatedBuildInputs = [ + glib libqrtr-glib ]; From 3a7674c896847d18e598fa5da23d7426cb9be3d2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk <fridh@fridh.nl> Date: Sun, 14 Mar 2021 09:10:25 +0100 Subject: [PATCH 180/188] python3Packages.urllib3: disable tests again --- .../python-modules/urllib3/default.nix | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix index ea554efe353d..fa323fb960ba 100644 --- a/pkgs/development/python-modules/urllib3/default.nix +++ b/pkgs/development/python-modules/urllib3/default.nix @@ -47,13 +47,22 @@ buildPythonPackage rec { trustme ]; - disabledTests = if stdenv.hostPlatform.isAarch64 then - [ - "test_connection_closed_on_read_timeout_preload_false" - "test_ssl_failed_fingerprint_verification" - ] - else - null; + # Tests in urllib3 are mostly timeout-based instead of event-based and + # are therefore inherently flaky. On your own machine, the tests will + # typically build fine, but on a loaded cluster such as Hydra random + # timeouts will occur. + # + # The urllib3 test suite has two different timeouts in their test suite + # (see `test/__init__.py`): + # - SHORT_TIMEOUT + # - LONG_TIMEOUT + # When CI is in the env, LONG_TIMEOUT will be significantly increased. + # Still, failures can occur and for that reason tests are disabled. + doCheck = false; + + preCheck = '' + export CI # Increases LONG_TIMEOUT + ''; pythonImportsCheck = [ "urllib3" ]; From 24887716da4aee24d16b06be5cd10c2c2f5619e8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk <fridh@fridh.nl> Date: Sun, 14 Mar 2021 09:30:19 +0100 Subject: [PATCH 181/188] python2Packages.urllib3: keep 1.26.2 for nixops --- pkgs/development/python-modules/urllib3/2.nix | 74 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 9 ++- 2 files changed, 80 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/python-modules/urllib3/2.nix diff --git a/pkgs/development/python-modules/urllib3/2.nix b/pkgs/development/python-modules/urllib3/2.nix new file mode 100644 index 000000000000..b44993c71b26 --- /dev/null +++ b/pkgs/development/python-modules/urllib3/2.nix @@ -0,0 +1,74 @@ +{ lib +, stdenv +, brotli +, buildPythonPackage +, certifi +, cryptography +, dateutil +, fetchPypi +, idna +, mock +, pyopenssl +, pysocks +, pytest-freezegun +, pytest-timeout +, pytestCheckHook +, pythonOlder +, tornado +, trustme +}: + +buildPythonPackage rec { + pname = "urllib3"; + version = "1.26.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "19188f96923873c92ccb987120ec4acaa12f0461fa9ce5d3d0772bc965a39e08"; + }; + + propagatedBuildInputs = [ + brotli + certifi + cryptography + idna + pyopenssl + pysocks + ]; + + checkInputs = [ + dateutil + mock + pytest-freezegun + pytest-timeout + pytestCheckHook + tornado + trustme + ]; + + # Tests in urllib3 are mostly timeout-based instead of event-based and + # are therefore inherently flaky. On your own machine, the tests will + # typically build fine, but on a loaded cluster such as Hydra random + # timeouts will occur. + # + # The urllib3 test suite has two different timeouts in their test suite + # (see `test/__init__.py`): + # - SHORT_TIMEOUT + # - LONG_TIMEOUT + # When CI is in the env, LONG_TIMEOUT will be significantly increased. + # Still, failures can occur and for that reason tests are disabled. + doCheck = false; + + preCheck = '' + export CI # Increases LONG_TIMEOUT + ''; + + pythonImportsCheck = [ "urllib3" ]; + + meta = with lib; { + description = "Powerful, sanity-friendly HTTP client for Python"; + homepage = "https://github.com/shazow/urllib3"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7fa21d27541a..6c4c0738a6d7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8524,9 +8524,12 @@ in { urlgrabber = callPackage ../development/python-modules/urlgrabber { }; - urllib3 = callPackage ../development/python-modules/urllib3 { - pytestCheckHook = self.pytestCheckHook_6_1; - }; + urllib3 = if isPy3k then + callPackage ../development/python-modules/urllib3 { + pytestCheckHook = self.pytestCheckHook_6_1; + } + else + callPackage ../development/python-modules/urllib3/2.nix { }; urwid = callPackage ../development/python-modules/urwid { }; From b3148b97313ffde81e9b4c65fabd2c58a093f25b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk <fridh@fridh.nl> Date: Sun, 14 Mar 2021 09:30:49 +0100 Subject: [PATCH 182/188] pythonPackages.pytestCheckHook_6_1: only override for Python 3 --- pkgs/top-level/python-packages.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6c4c0738a6d7..e3264e836695 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -124,7 +124,15 @@ in { venvShellHook wheelUnpackHook; - pytestCheckHook_6_1 = self.pytestCheckHook.override { pytest = self.pytest_6_1; }; + # Not all packages are compatible with the latest pytest yet. + # We need to override the hook to select an older pytest, however, + # it should not override the version of pytest that is used for say + # Python 2. This is an ugly hack that is needed now because the hook + # propagates the package. + pytestCheckHook_6_1 = if isPy3k then + self.pytestCheckHook.override { pytest = self.pytest_6_1; } + else + self.pytestCheckHook; # helpers From 6ea779b95c379f81c145941e5be872cd8cae0506 Mon Sep 17 00:00:00 2001 From: Andrew Childs <lorne@cons.org.nz> Date: Tue, 16 Mar 2021 22:09:39 +0900 Subject: [PATCH 183/188] libdeflate: fix dylib install name --- pkgs/development/libraries/libdeflate/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libdeflate/default.nix b/pkgs/development/libraries/libdeflate/default.nix index f0bf60cdfb88..d7a4aa91fb54 100644 --- a/pkgs/development/libraries/libdeflate/default.nix +++ b/pkgs/development/libraries/libdeflate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub }: +{ stdenv, lib, fetchFromGitHub, fixDarwinDylibNames }: stdenv.mkDerivation rec { pname = "libdeflate"; @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace /usr/local $out ''; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + configurePhase = '' make programs/config.h ''; From c31077a6020c4d365496a618ba07121b9331bc52 Mon Sep 17 00:00:00 2001 From: Ivan Babrou <github@ivan.computer> Date: Wed, 17 Mar 2021 13:32:48 -0700 Subject: [PATCH 184/188] pythonPackages.lxml: fix build on darwin --- pkgs/development/python-modules/lxml/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lxml/default.nix b/pkgs/development/python-modules/lxml/default.nix index b58376031039..36b1539834d6 100644 --- a/pkgs/development/python-modules/lxml/default.nix +++ b/pkgs/development/python-modules/lxml/default.nix @@ -1,8 +1,9 @@ -{ lib, buildPythonPackage, fetchFromGitHub +{ stdenv, lib, buildPythonPackage, fetchFromGitHub , cython , libxml2 , libxslt , zlib +, xcodebuild }: buildPythonPackage rec { @@ -17,7 +18,7 @@ buildPythonPackage rec { }; # setuptoolsBuildPhase needs dependencies to be passed through nativeBuildInputs - nativeBuildInputs = [ libxml2.dev libxslt.dev cython ]; + nativeBuildInputs = [ libxml2.dev libxslt.dev cython ] ++ lib.optionals stdenv.isDarwin [ xcodebuild ]; buildInputs = [ libxml2 libxslt zlib ]; # tests are meant to be ran "in-place" in the same directory as src From 06c5ea2a148e3f3f9bc5e307a1ea92e056fcdd7f Mon Sep 17 00:00:00 2001 From: Ivan Babrou <github@ivan.computer> Date: Sat, 6 Mar 2021 14:08:29 -0800 Subject: [PATCH 185/188] liblapack: disable failing tests on darwin Tests were enabled in #113021 and staging is broken since then. --- .../science/math/liblapack/default.nix | 25 ++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix index cb29e721de18..35ef509c639e 100644 --- a/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/pkgs/development/libraries/science/math/liblapack/default.nix @@ -10,7 +10,7 @@ let version = "3.9.0"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "liblapack"; inherit version; @@ -23,6 +23,9 @@ stdenv.mkDerivation { nativeBuildInputs = [ gfortran cmake ]; + # Configure stage fails on aarch64-darwin otherwise, due to either clang 11 or gfortran 10. + hardeningDisable = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ "stackprotector" ]; + cmakeFlags = [ "-DCMAKE_Fortran_FLAGS=-fPIC" "-DLAPACKE=ON" @@ -33,6 +36,26 @@ stdenv.mkDerivation { doCheck = true; + # Some CBLAS related tests fail on Darwin: + # 14 - CBLAS-xscblat2 (Failed) + # 15 - CBLAS-xscblat3 (Failed) + # 17 - CBLAS-xdcblat2 (Failed) + # 18 - CBLAS-xdcblat3 (Failed) + # 20 - CBLAS-xccblat2 (Failed) + # 21 - CBLAS-xccblat3 (Failed) + # 23 - CBLAS-xzcblat2 (Failed) + # 24 - CBLAS-xzcblat3 (Failed) + # + # Upstream issue to track: + # * https://github.com/Reference-LAPACK/lapack/issues/440 + ctestArgs = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) "-E '^(CBLAS-(x[sdcz]cblat[23]))$'"; + + checkPhase = '' + runHook preCheck + ctest ${ctestArgs} + runHook postCheck + ''; + meta = with lib; { inherit version; description = "Linear Algebra PACKage"; From bcd7b0dd5d6b48db6640888c6f791a4908568177 Mon Sep 17 00:00:00 2001 From: Ryan Burns <rtburns@protonmail.com> Date: Thu, 18 Mar 2021 12:27:49 -0700 Subject: [PATCH 186/188] darwin/make-bootstrap-tools: avoid brotli dependency Needed as of e3d19670a0f6b012aac5e05b50951d8a991ba143 --- pkgs/stdenv/darwin/make-bootstrap-tools.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix index 1d5abdc8b4a6..7b68c877a6ef 100644 --- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -18,7 +18,7 @@ in rec { bzip2_ = bzip2.override (args: { linkStatic = true; }); # Avoid messing with libkrb5 and libnghttp2. - curl_ = curl.override (args: { gssSupport = false; http2Support = false; }); + curl_ = curlMinimal.override (args: { gssSupport = false; http2Support = false; }); build = stdenv.mkDerivation { name = "stdenv-bootstrap-tools"; From d4d14bd4b6790adca2c2883e0593cdb0525e9668 Mon Sep 17 00:00:00 2001 From: Ivan Babrou <github@ivan.computer> Date: Thu, 18 Mar 2021 13:34:50 -0700 Subject: [PATCH 187/188] liblapack: disable select tests on all darwin platforms (#116779) --- pkgs/development/libraries/science/math/liblapack/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix index 35ef509c639e..50563f2745ab 100644 --- a/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/pkgs/development/libraries/science/math/liblapack/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { # # Upstream issue to track: # * https://github.com/Reference-LAPACK/lapack/issues/440 - ctestArgs = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) "-E '^(CBLAS-(x[sdcz]cblat[23]))$'"; + ctestArgs = lib.optionalString stdenv.isDarwin "-E '^(CBLAS-(x[sdcz]cblat[23]))$'"; checkPhase = '' runHook preCheck From 12238b08ef347c3e6118e97daadc6ac05efc48b0 Mon Sep 17 00:00:00 2001 From: Ivan Babrou <github@ivan.computer> Date: Thu, 18 Mar 2021 19:38:58 -0700 Subject: [PATCH 188/188] pythonPackages.pylint: fix build on darwin The test no longer exists after #112908: ``` Disabled tests path "pylint/test/test_functional.py" does not exist. Aborting ``` --- pkgs/development/python-modules/pylint/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index a7606de3f347..43183482eceb 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -63,8 +63,6 @@ buildPythonPackage rec { "test_py3k_jobs_option" ]; - disabledTestPaths = lib.optional stdenv.isDarwin "pylint/test/test_functional.py"; - meta = with lib; { homepage = "https://pylint.pycqa.org/"; description = "A bug and style checker for Python";