From ce5a25ef1abf1bdc4cb14835f6bc2e0a2bf574f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anselm=20Sch=C3=BCler?= Date: Fri, 13 May 2022 13:37:44 +0200 Subject: [PATCH 01/21] flutter.dart: 2.16.1 -> 2.16.2 --- pkgs/development/compilers/flutter/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix index 9eba67734485..acff9dd030eb 100644 --- a/pkgs/development/compilers/flutter/default.nix +++ b/pkgs/development/compilers/flutter/default.nix @@ -10,19 +10,19 @@ let # Decouples flutter derivation from dart derivation, # use specific dart version to not need to bump dart derivation when bumping flutter. - dartVersion = "2.16.1"; + dartVersion = "2.16.2"; dartSourceBase = "https://storage.googleapis.com/dart-archive/channels"; dartForFlutter = dart.override { version = dartVersion; sources = { "${dartVersion}-x86_64-linux" = fetchurl { url = "${dartSourceBase}/stable/release/${dartVersion}/sdk/dartsdk-linux-x64-release.zip"; - sha256 = "sha256-PMY6DCFQC8XrlnFzOEPcwgBAs5/cAvNd78969Z+I1Fk="; + sha256 = "sha256-egrYd7B4XhkBiHPIFE2zopxKtQ58GqlogAKA/UeiXnI="; }; }; }; in { - mkFlutter = mkFlutter; + inherit mkFlutter; stable = mkFlutter rec { inherit version; dart = dartForFlutter; From 4a029b247717729d0bdced11e3d4ce0ff096ace3 Mon Sep 17 00:00:00 2001 From: Zane van Iperen Date: Mon, 23 May 2022 11:52:31 +1000 Subject: [PATCH 02/21] golangci-lint: 1.45.2 -> 1.46.2 --- pkgs/development/tools/golangci-lint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix index 28b15172e405..b47bdcbc1543 100644 --- a/pkgs/development/tools/golangci-lint/default.nix +++ b/pkgs/development/tools/golangci-lint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "golangci-lint"; - version = "1.45.2"; + version = "1.46.2"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - sha256 = "sha256-Mr45nJbpyzxo0ZPwx22JW2WrjyjI9FPpl+gZ7NIc6WQ="; + sha256 = "sha256-7sDAwWz+qoB/ngeH35tsJ5FZUfAQvQsU6kU9rUHIHMk="; }; - vendorSha256 = "sha256-pcbKg1ePN8pObS9EzP3QYjtaty27L9sroKUs/qEPtJo="; + vendorSha256 = "sha256-w38OKN6HPoz37utG/2QSPMai55IRDXCIIymeMe6ogIU="; doCheck = false; From 96ba323a968d5f37b651a0f7442d971358653c82 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Tue, 24 May 2022 09:57:34 +0100 Subject: [PATCH 03/21] kubescape: 2.0.152 -> 2.0.155 --- pkgs/tools/security/kubescape/default.nix | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/kubescape/default.nix b/pkgs/tools/security/kubescape/default.nix index 23f52e3b52ed..9b4500019982 100644 --- a/pkgs/tools/security/kubescape/default.nix +++ b/pkgs/tools/security/kubescape/default.nix @@ -6,15 +6,15 @@ buildGoModule rec { pname = "kubescape"; - version = "2.0.152"; + version = "2.0.155"; src = fetchFromGitHub { owner = "armosec"; repo = pname; rev = "v${version}"; - hash = "sha256-hibXmA2JerfnkGiSnBUCMHGPm4Tefnsl/x2VAS5z0Fo="; + hash = "sha256-ZBjwgrF0Pkour1yXMcY4cZt3W2biCzmPd+EYcY4Ppz0="; }; - vendorSha256 = "sha256-HfsQfoz1n3FEd2eVBBz3Za2jYCSrozXpL34Z8CgQsTA="; + vendorSha256 = "sha256-zj2gDx5333AguLs1Gzu3bYXslDwvPFSbMmOTOFxmq6A="; nativeBuildInputs = [ installShellFiles @@ -37,7 +37,17 @@ buildGoModule rec { go list ./... | grep -v httphandler } - rm core/pkg/resourcehandler/{repositoryscanner,urlloader}_test.go + # remove tests that use networking + rm core/pkg/resourcehandler/urlloader_test.go + + # remove tests that use networking + substituteInPlace core/pkg/resourcehandler/repositoryscanner_test.go \ + --replace "TestScanRepository" "SkipScanRepository" \ + --replace "TestGit" "SkipGit" + + # without networking the branch context can't be fetched and is empty + substituteInPlace core/cautils/scaninfo_test.go \ + --replace 'assert.Equal(t, "master", ctx.RepoContextMetadata.Branch)' 'assert.Equal(t, "", ctx.RepoContextMetadata.Branch)' ''; postInstall = '' From c0085404bd9dd6721eed9b6a5a36a310ca31b286 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sun, 10 Apr 2022 01:59:20 -0700 Subject: [PATCH 04/21] lib/systems/inspect.nix: remove isPowerPC Very confusingly, the `isPowerPC` predicate in `lib/systems/inspect.nix` does *not* match `powerpc64le`! This is because `isPowerPC` is defined as isPowerPC = { cpu = cpuTypes.powerpc; }; Where `cpuTypes.powerpc` is: { bits = 32; significantByte = bigEndian; family = "power"; }; This means that the `isPowerPC` predicate actually only matches the subset of machines marketed under this name which happen to be 32-bit and running in big-endian mode which is equivalent to: with stdenv.hostPlatform; isPower && isBigEndian && is32bit This seems like a sharp edge that people could easily cut themselves on. In fact, that has already happened: in `linux/kernel/common-config.nix` there is a test which will always fail: (stdenv.hostPlatform.isPowerPC && stdenv.hostPlatform.is64bit) A more subtle case of the strict isPowerPC being used instead of the moreg general isPower accidentally are the GHC expressions: Update pkgs/development/compilers/ghc/8.10.7.nix Update pkgs/development/compilers/ghc/8.8.4.nix Update pkgs/development/compilers/ghc/9.2.2.nix Update pkgs/development/compilers/ghc/9.0.2.nix Update pkgs/development/compilers/ghc/head.nix Since the remaining legitimate use sites of isPowerPC are so few, remove the isPowerPC predicate completely. The alternative expression above is noted in the release notes as an alternative. Co-authored-by: sternenseemann --- lib/systems/inspect.nix | 1 - .../from_md/release-notes/rl-2211.section.xml | 17 ++++++++++++++++- .../doc/manual/release-notes/rl-2211.section.md | 3 +++ nixos/modules/installer/cd-dvd/iso-image.nix | 2 +- pkgs/development/compilers/ghc/8.10.7.nix | 2 +- pkgs/development/compilers/ghc/8.8.4.nix | 2 +- pkgs/development/compilers/ghc/9.0.2.nix | 2 +- pkgs/development/compilers/ghc/9.2.2.nix | 2 +- pkgs/development/compilers/ghc/head.nix | 2 +- .../linux/kernel-headers/default.nix | 2 +- pkgs/os-specific/linux/kernel/common-config.nix | 2 +- 11 files changed, 27 insertions(+), 10 deletions(-) diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix index 00cbe4f012cb..e5bd879e2c42 100644 --- a/lib/systems/inspect.nix +++ b/lib/systems/inspect.nix @@ -11,7 +11,6 @@ rec { isi686 = { cpu = cpuTypes.i686; }; isx86_32 = { cpu = { family = "x86"; bits = 32; }; }; isx86_64 = { cpu = { family = "x86"; bits = 64; }; }; - isPowerPC = { cpu = cpuTypes.powerpc; }; isPower = { cpu = { family = "power"; }; }; isPower64 = { cpu = { family = "power"; bits = 64; }; }; isx86 = { cpu = { family = "x86"; }; }; diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 79268b398e60..908d1ab46e8f 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -51,7 +51,7 @@
Backward Incompatibilities - + The isCompatible predicate checking CPU @@ -69,6 +69,21 @@ compatible. + + + The isPowerPC predicate, found on + platform attrsets + (hostPlatform, + buildPlatform, + targetPlatform, etc) has been removed in + order to reduce confusion. The predicate was was defined such + that it matches only the 32-bit big-endian members of the + POWER/PowerPC family, despite having a name which would imply + a broader set of systems. If you were using this predicate, + you can replace foo.isPowerPC with + (with foo; isPower && is32bit && isBigEndian). + +
diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 7d2eacce57fe..87fdf4e77f25 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -37,6 +37,9 @@ In addition to numerous new and upgraded packages, this release has the followin `lib.systems.parse.isCompatible` still exists, but has changed semantically: Architectures with differing endianness modes are *no longer considered compatible*. +- The `isPowerPC` predicate, found on `platform` attrsets (`hostPlatform`, `buildPlatform`, `targetPlatform`, etc) has been removed in order to reduce confusion. The predicate was was defined such that it matches only the 32-bit big-endian members of the POWER/PowerPC family, despite having a name which would imply a broader set of systems. If you were using this predicate, you can replace `foo.isPowerPC` with `(with foo; isPower && is32bit && isBigEndian)`. + + ## Other Notable Changes {#sec-release-22.11-notable-changes} diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index 1eaa940afb1f..d1ccc6c2072f 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -479,7 +479,7 @@ in + lib.optionalString (isx86_32 || isx86_64) "-Xbcj x86" # Untested but should also reduce size for these platforms + lib.optionalString (isAarch32 || isAarch64) "-Xbcj arm" - + lib.optionalString (isPowerPC) "-Xbcj powerpc" + + lib.optionalString (isPower && is32bit && isBigEndian) "-Xbcj powerpc" + lib.optionalString (isSparc) "-Xbcj sparc"; description = '' Compression settings to use for the squashfs nix store. diff --git a/pkgs/development/compilers/ghc/8.10.7.nix b/pkgs/development/compilers/ghc/8.10.7.nix index cdf4faf3ffc7..7a56d7c0e5c8 100644 --- a/pkgs/development/compilers/ghc/8.10.7.nix +++ b/pkgs/development/compilers/ghc/8.10.7.nix @@ -12,7 +12,7 @@ libffi ? null , useLLVM ? !(stdenv.targetPlatform.isx86 - || stdenv.targetPlatform.isPowerPC + || stdenv.targetPlatform.isPower || stdenv.targetPlatform.isSparc) , # LLVM is conceptually a run-time-only depedendency, but for # non-x86, we need LLVM to bootstrap later stages, so it becomes a diff --git a/pkgs/development/compilers/ghc/8.8.4.nix b/pkgs/development/compilers/ghc/8.8.4.nix index af01582b1081..907d995a250a 100644 --- a/pkgs/development/compilers/ghc/8.8.4.nix +++ b/pkgs/development/compilers/ghc/8.8.4.nix @@ -11,7 +11,7 @@ libffi ? null , useLLVM ? !(stdenv.targetPlatform.isx86 - || stdenv.targetPlatform.isPowerPC + || stdenv.targetPlatform.isPower || stdenv.targetPlatform.isSparc) , # LLVM is conceptually a run-time-only depedendency, but for # non-x86, we need LLVM to bootstrap later stages, so it becomes a diff --git a/pkgs/development/compilers/ghc/9.0.2.nix b/pkgs/development/compilers/ghc/9.0.2.nix index a4cefe7294d8..6de0f201599f 100644 --- a/pkgs/development/compilers/ghc/9.0.2.nix +++ b/pkgs/development/compilers/ghc/9.0.2.nix @@ -14,7 +14,7 @@ libffi ? null , useLLVM ? !(stdenv.targetPlatform.isx86 - || stdenv.targetPlatform.isPowerPC + || stdenv.targetPlatform.isPower || stdenv.targetPlatform.isSparc) , # LLVM is conceptually a run-time-only depedendency, but for # non-x86, we need LLVM to bootstrap later stages, so it becomes a diff --git a/pkgs/development/compilers/ghc/9.2.2.nix b/pkgs/development/compilers/ghc/9.2.2.nix index 0a572bff7ef2..880db4337893 100644 --- a/pkgs/development/compilers/ghc/9.2.2.nix +++ b/pkgs/development/compilers/ghc/9.2.2.nix @@ -13,7 +13,7 @@ libffi ? null , useLLVM ? !(stdenv.targetPlatform.isx86 - || stdenv.targetPlatform.isPowerPC + || stdenv.targetPlatform.isPower || stdenv.targetPlatform.isSparc || (stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin)) , # LLVM is conceptually a run-time-only depedendency, but for diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index a2afb7400c20..4f52ba0a6182 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -19,7 +19,7 @@ , elfutils # for DWARF support , useLLVM ? !(stdenv.targetPlatform.isx86 - || stdenv.targetPlatform.isPowerPC + || stdenv.targetPlatform.isPower || stdenv.targetPlatform.isSparc || (stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin)) , # LLVM is conceptually a run-time-only depedendency, but for diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix index 0c1514d01c25..aa9f4e3763b8 100644 --- a/pkgs/os-specific/linux/kernel-headers/default.nix +++ b/pkgs/os-specific/linux/kernel-headers/default.nix @@ -24,7 +24,7 @@ let flex bison python rsync ]; - extraIncludeDirs = lib.optional stdenvNoCC.hostPlatform.isPowerPC ["ppc"]; + extraIncludeDirs = lib.optional (with stdenvNoCC.hostPlatform; isPower && is32bit && isBigEndian) ["ppc"]; inherit patches; diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index d25e20bac8b2..4b6cceba238e 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -29,7 +29,7 @@ let mkIf (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isx86_64 || - (stdenv.hostPlatform.isPowerPC && stdenv.hostPlatform.is64bit) || + (stdenv.hostPlatform.isPower && stdenv.hostPlatform.is64bit) || (stdenv.hostPlatform.isMips && stdenv.hostPlatform.is64bit)); options = { From 7d39042ac24f22960271b9e6b8eb85e441b819f5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 May 2022 14:40:49 +0000 Subject: [PATCH 05/21] python310Packages.pygit2: 1.9.1 -> 1.9.2 --- pkgs/development/python-modules/pygit2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix index 2d4deb16276b..b93016ab6353 100644 --- a/pkgs/development/python-modules/pygit2/default.nix +++ b/pkgs/development/python-modules/pygit2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pygit2"; - version = "1.9.1"; + version = "1.9.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-72R5w7YZKCUxawVjNtt36/9ueEmusfu4i3YAGsM3uck="; + sha256 = "sha256-IIlEM98RRkgarK434rDzu7/eoCbbL1UGEXC9mCPkCxk="; }; preConfigure = lib.optionalString stdenv.isDarwin '' From 7275bd17fd7dee53b37dc28ce3de0b1e35b018e9 Mon Sep 17 00:00:00 2001 From: alyaeanyx Date: Wed, 25 May 2022 21:05:36 +0200 Subject: [PATCH 06/21] libqalculate, qalculate-gtk: 4.1.1 -> 4.2.0 --- pkgs/applications/science/math/qalculate-gtk/default.nix | 4 ++-- pkgs/development/libraries/libqalculate/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index 9571588040b3..fc4e822e208a 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qalculate-gtk"; - version = "4.1.1"; + version = "4.2.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-gtk"; rev = "v${version}"; - sha256 = "sha256-itYNKcdWYMoqlvZ7CYJ6WMv7rS/y1SVdt3O7ahkjPOk="; + sha256 = "sha256-SphruQ/b8z5S/wKb9yhbEy9/pwiY+frZltdIYj0CJBM="; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index afc2313df7a3..d83a4e0a707a 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libqalculate"; - version = "4.1.1"; + version = "4.2.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "libqalculate"; rev = "v${version}"; - sha256 = "sha256-y9GNf2xR3bZ8Pj99Y8qSBbK+hQEkg/+xOzUdyFI5HLw="; + sha256 = "sha256-mIzHizoDsdSVcepWACeVkCTgt4gxd99WKXrrGi+qASo="; }; outputs = [ "out" "dev" "doc" ]; From 863ecea7083c117cc23ca9836169a8f509151525 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 26 May 2022 08:20:18 +1000 Subject: [PATCH 07/21] gdu: 5.13.2 -> 5.14.0 https://github.com/dundee/gdu/releases/tag/v5.14.0 --- pkgs/tools/system/gdu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/gdu/default.nix b/pkgs/tools/system/gdu/default.nix index 4204bf8994b2..f6f0e1fe7f37 100644 --- a/pkgs/tools/system/gdu/default.nix +++ b/pkgs/tools/system/gdu/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gdu"; - version = "5.13.2"; + version = "5.14.0"; src = fetchFromGitHub { owner = "dundee"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2HADEp1nDkIl56e5oxY6bC+lRWanQwjlCChm0aI0N9Q="; + sha256 = "sha256-a0H/OqIHgutuW1egqlhMy5mX2FMYxmAwCbhecCrXuOU="; }; vendorSha256 = "sha256-9+Zez33oET0nx/Xm3fXh1WFoQduMBodvml1oGO6jUYc="; From 9b103fac08e1cd89e5699bf9a2b4b137369ade9c Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Wed, 25 May 2022 23:22:12 +0100 Subject: [PATCH 08/21] elinks: disable perl support on darwin currently causes a header mixup with LIST_HEAD macros --- pkgs/applications/networking/browsers/elinks/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix index 84f46f1b60d8..1daa5d351a8c 100644 --- a/pkgs/applications/networking/browsers/elinks/default.nix +++ b/pkgs/applications/networking/browsers/elinks/default.nix @@ -4,7 +4,7 @@ , # Incompatible licenses, LGPLv3 - GPLv2 enableGuile ? false, guile ? null , enablePython ? false, python ? null -, enablePerl ? (stdenv.hostPlatform == stdenv.buildPlatform), perl ? null +, enablePerl ? (!stdenv.isDarwin) && (stdenv.hostPlatform == stdenv.buildPlatform), perl ? null # re-add javascript support when upstream supports modern spidermonkey }: From 6226fc5cf05b14c81517a1ea7119564efcdfb9b9 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 26 May 2022 00:21:24 +0200 Subject: [PATCH 09/21] ungoogled-chromium: 101.0.4951.64 -> 102.0.5005.61 --- .../networking/browsers/chromium/common.nix | 5 ++--- .../browsers/chromium/upstream-info.json | 16 ++++++++-------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 993f95a6bfff..cfd6b122d6cc 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -166,7 +166,7 @@ let ./patches/m102-fix-dawn_version_generator-failure.patch ]; - postPatch = optionalString (chromiumVersionAtLeast "102") '' + postPatch = '' # Workaround/fix for https://bugs.chromium.org/p/chromium/issues/detail?id=1313361: substituteInPlace BUILD.gn \ --replace '"//infra/orchestrator:orchestrator_all",' "" @@ -174,7 +174,6 @@ let substituteInPlace build/config/compiler/BUILD.gn \ --replace '"-Xclang",' "" \ --replace '"-no-opaque-pointers",' "" - '' + '' # remove unused third-party for lib in ${toString gnSystemLibraries}; do if [ -d "third_party/$lib" ]; then @@ -194,7 +193,7 @@ let --replace "/usr/bin/env -S make -f" "/usr/bin/make -f" fi chmod -x third_party/webgpu-cts/src/tools/run_deno - ${lib.optionalString (chromiumVersionAtLeast "102") "chmod -x third_party/dawn/third_party/webgpu-cts/tools/run_deno"} + chmod -x third_party/dawn/third_party/webgpu-cts/tools/run_deno # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX substituteInPlace sandbox/linux/suid/client/setuid_sandbox_host.cc \ diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index ba54f13ef133..dcca5395defe 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -45,19 +45,19 @@ } }, "ungoogled-chromium": { - "version": "101.0.4951.64", - "sha256": "1xyqm32y9v1hn8ji6qfw6maynqgg3266j58dq4x4aqsm2gj9cn4w", - "sha256bin64": "14ijrj7h2y72ppyysz6jv40c01lbnan7z69cl24asch2zjlgwv8v", + "version": "102.0.5005.61", + "sha256": "07vbi3gn9g4n04b2qi2hm34r122snrqaifa46yk3pyh1d79rfdqs", + "sha256bin64": "100n8k3d9k5bq58irc36ig6m5m0lxggffyk4crqqqcib2anqd0zv", "deps": { "gn": { - "version": "2022-03-14", + "version": "2022-04-14", "url": "https://gn.googlesource.com/gn", - "rev": "bd99dbf98cbdefe18a4128189665c5761263bcfb", - "sha256": "0nql15ckjqkm001xajq3qyn4h4q80i7x6dm9zinxxr1a8q5lppx3" + "rev": "fd9f2036f26d83f9fcfe93042fb952e5a7fe2167", + "sha256": "0b5xs0chcv3hfhy71rycsmgxnqbm375a333hwav8929k9cbi5p9h" }, "ungoogled-patches": { - "rev": "101.0.4951.64-1", - "sha256": "0k7w6xvjf1yzyak9ywvcdw762d8zbx6d8haz35q87jz0mxfn2mr3" + "rev": "102.0.5005.61-1", + "sha256": "1hlyi6k894blkkqmqsizx72bag2vj6wlpza0fvi8db5wp6i5b58g" } } } From a6d35e3b7c99ad1baf84c4cb1d9f0e9b18a5b8b6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 26 May 2022 00:53:10 +0200 Subject: [PATCH 10/21] python310Packages.pygit2: disable on older Python releases - add pythonImportsCheck - fix license entry --- .../python-modules/pygit2/default.nix | 40 +++++++++++++++---- 1 file changed, 32 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix index b93016ab6353..c2f96066c079 100644 --- a/pkgs/development/python-modules/pygit2/default.nix +++ b/pkgs/development/python-modules/pygit2/default.nix @@ -1,12 +1,26 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, isPyPy, isPy3k, libgit2, cached-property, pytestCheckHook, cffi, cacert }: +{ lib +, stdenv +, buildPythonPackage +, cacert +, cached-property +, cffi +, fetchPypi +, isPyPy +, libgit2 +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { pname = "pygit2"; version = "1.9.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-IIlEM98RRkgarK434rDzu7/eoCbbL1UGEXC9mCPkCxk="; + hash = "sha256-IIlEM98RRkgarK434rDzu7/eoCbbL1UGEXC9mCPkCxk="; }; preConfigure = lib.optionalString stdenv.isDarwin '' @@ -19,14 +33,20 @@ buildPythonPackage rec { propagatedBuildInputs = [ cached-property - ] ++ lib.optional (!isPyPy) cffi; + ] ++ lib.optional (!isPyPy) [ + cffi + ]; - propagatedNativeBuildInputs = lib.optional (!isPyPy) cffi; + propagatedNativeBuildInputs = lib.optional (!isPyPy) [ + cffi + ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; disabledTestPaths = [ - # disable tests that require networking + # Disable tests that require networking "test/test_repository.py" "test/test_credentials.py" "test/test_submodule.py" @@ -44,10 +64,14 @@ buildPythonPackage rec { # https://github.com/NixOS/nixpkgs/pull/72544#issuecomment-582681068 doCheck = false; + pythonImportsCheck = [ + "pygit2" + ]; + meta = with lib; { description = "A set of Python bindings to the libgit2 shared library"; - homepage = "https://pypi.python.org/pypi/pygit2"; - license = licenses.gpl2; + homepage = "https://github.com/libgit2/pygit2"; + license = licenses.gpl2Only; maintainers = with maintainers; [ ]; }; } From 357ed68213b459856795e8852821abc6ede6aee5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 26 May 2022 01:09:32 +0200 Subject: [PATCH 11/21] python310Packages.pygit2: add missing input --- pkgs/development/python-modules/pygit2/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix index c2f96066c079..71589deae6f6 100644 --- a/pkgs/development/python-modules/pygit2/default.nix +++ b/pkgs/development/python-modules/pygit2/default.nix @@ -7,6 +7,7 @@ , fetchPypi , isPyPy , libgit2 +, pycparser , pytestCheckHook , pythonOlder }: @@ -33,6 +34,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ cached-property + pycparser ] ++ lib.optional (!isPyPy) [ cffi ]; From d86133f2e096ce27710388ef7b1808f514b72dc1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 26 May 2022 00:27:01 +0000 Subject: [PATCH 12/21] ffuf: 1.4.1 -> 1.5.0 --- pkgs/tools/security/ffuf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/ffuf/default.nix b/pkgs/tools/security/ffuf/default.nix index a3600b89694c..18862b7940df 100644 --- a/pkgs/tools/security/ffuf/default.nix +++ b/pkgs/tools/security/ffuf/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "ffuf"; - version = "1.4.1"; + version = "1.5.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-m+L78fVsqntD7JfgWS9foUJUhIVr+CtJ6K8etsLuNzw="; + sha256 = "sha256-dqABifXA104NCPdrWhB79cZQloJrqwJ45rlh+M/lRrs="; }; vendorSha256 = "sha256-szT08rIozAuliOmge5RFX4NeVrJ2pCVyfotrHuvc0UU="; From 027ad63b0cf1250683cab1caeaa044c305d20d3e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 26 May 2022 01:49:27 +0000 Subject: [PATCH 13/21] python310Packages.hahomematic: 1.5.3 -> 1.5.4 --- pkgs/development/python-modules/hahomematic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 74cf302990dd..a815625bf6ee 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "1.5.3"; + version = "1.5.4"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-4fB0IIKZNNU7MfHRhdjNhP7RQMWcvfqawj2P01LIPa0="; + sha256 = "sha256-V9wQXXPeoplxVcFDIhQcJFnKkewwDEaoQfTsQ7IyjOU="; }; propagatedBuildInputs = [ From c46512f20c6274dd7e156f6632c41daf13fa33ed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 26 May 2022 02:28:32 +0000 Subject: [PATCH 14/21] python310Packages.trimesh: 3.12.3 -> 3.12.4 --- pkgs/development/python-modules/trimesh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index 2d021e0a502d..08325e2106c0 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.12.3"; + version = "3.12.4"; src = fetchPypi { inherit pname version; - sha256 = "sha256-MrvfSC6Uz/EJXQ3F5jAbWR0YJYRjqjwO7SIe0AUSOfA="; + sha256 = "sha256-lAbeCTjEUsNnjhJZNHs4ir8V0bJZUnBIGYYEXV80wyg="; }; propagatedBuildInputs = [ numpy ]; From 59d8283b1c5aa9435255abf10cb8fd782061389d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 26 May 2022 02:53:52 +0000 Subject: [PATCH 15/21] ferm: 2.6 -> 2.7 --- pkgs/tools/networking/ferm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/ferm/default.nix b/pkgs/tools/networking/ferm/default.nix index 580ca848c62b..518bb5c26daa 100644 --- a/pkgs/tools/networking/ferm/default.nix +++ b/pkgs/tools/networking/ferm/default.nix @@ -3,12 +3,12 @@ let inherit (lib.versions) majorMinor; in stdenv.mkDerivation rec { - version = "2.6"; + version = "2.7"; pname = "ferm"; src = fetchurl { url = "http://ferm.foo-projects.org/download/${majorMinor version}/ferm-${version}.tar.xz"; - sha256 = "sha256-aJVBRl58Bzy9YEyc0Y8RPDHAtBuxJhRyalmxfkQFiIU="; + sha256 = "sha256-wA2RDVOU5pZ1YI617g9QTVz9pB6ZCi2akbqsbfk+P5I="; }; # perl is used at build time to gather the ferm version. From dae03289beda7beba9f698c48b25dc945a65fb8f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 26 May 2022 05:18:38 +0000 Subject: [PATCH 16/21] go-task: 3.12.0 -> 3.12.1 --- pkgs/development/tools/go-task/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/go-task/default.nix b/pkgs/development/tools/go-task/default.nix index ff8a8174fd75..a416b5b50424 100644 --- a/pkgs/development/tools/go-task/default.nix +++ b/pkgs/development/tools/go-task/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-task"; - version = "3.12.0"; + version = "3.12.1"; src = fetchFromGitHub { owner = pname; repo = "task"; rev = "v${version}"; - sha256 = "sha256-FArt9w4nZJW/Kql3Y2rr/IVz+SnWCS2lzNMWF6TN0Bg="; + sha256 = "sha256-N/xx5gATuLrHcWnMXgFMmz3wbFtaHsiPfDaNhdTbk5c="; }; vendorSha256 = "sha256-73DtLYyq3sltzv4VtZMlZaSbP9zA9RZw2wgXVkzwrso="; From dc50a81c79e85281b5e72d541e99aa7f1844f408 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 25 May 2022 04:20:00 +0000 Subject: [PATCH 17/21] python39Packages.pdfminer: 20220506 -> 20220524 https://github.com/pdfminer/pdfminer.six/releases/tag/20220524 --- pkgs/development/python-modules/pdfminer_six/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pdfminer_six/default.nix b/pkgs/development/python-modules/pdfminer_six/default.nix index b52106af285b..a2470bf12d69 100644 --- a/pkgs/development/python-modules/pdfminer_six/default.nix +++ b/pkgs/development/python-modules/pdfminer_six/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pdfminer_six"; - version = "20220506"; + version = "20220524"; disabled = !isPy3k; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pdfminer"; repo = "pdfminer.six"; rev = version; - sha256 = "sha256-Lq+ou7+Lmr1H69L8X/vuky+/tXDD3bBBaCysymeRuXA="; + sha256 = "sha256-XO9sdHeS/8MgVW0mxbTe2AY5BDfnBSDNzZwLsSKmQh0="; }; propagatedBuildInputs = [ charset-normalizer cryptography ]; From 4307907d725fce04207f7f092d43c7481e3f7ec0 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 25 May 2022 04:20:00 +0000 Subject: [PATCH 18/21] python39Packages.pdfminer-six: add alias to pdfminer --- pkgs/applications/editors/setzer/default.nix | 2 +- pkgs/applications/misc/visidata/default.nix | 4 ++-- pkgs/applications/office/paperless-ngx/default.nix | 2 +- pkgs/development/python-modules/ocrmypdf/default.nix | 4 ++-- .../python-modules/{pdfminer_six => pdfminer-six}/default.nix | 2 +- pkgs/development/python-modules/pdfx/default.nix | 4 ++-- pkgs/development/python-modules/typecode/default.nix | 4 ++-- pkgs/development/python-modules/weboob/default.nix | 4 ++-- pkgs/development/python-modules/woob/default.nix | 4 ++-- pkgs/tools/misc/diffoscope/default.nix | 2 +- pkgs/tools/text/invoice2data/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 14 files changed, 20 insertions(+), 19 deletions(-) rename pkgs/development/python-modules/{pdfminer_six => pdfminer-six}/default.nix (97%) diff --git a/pkgs/applications/editors/setzer/default.nix b/pkgs/applications/editors/setzer/default.nix index cc1d08cc3f9b..10fb4e0a97e6 100644 --- a/pkgs/applications/editors/setzer/default.nix +++ b/pkgs/applications/editors/setzer/default.nix @@ -51,7 +51,7 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ pygobject3 pyxdg - pdfminer + pdfminer-six pycairo pexpect ]; diff --git a/pkgs/applications/misc/visidata/default.nix b/pkgs/applications/misc/visidata/default.nix index 99657d60bd70..e73c6e7b5dc3 100644 --- a/pkgs/applications/misc/visidata/default.nix +++ b/pkgs/applications/misc/visidata/default.nix @@ -14,7 +14,7 @@ , pyshp , fonttools , pyyaml -, pdfminer +, pdfminer-six , vobject , tabulate , wcwidth @@ -55,7 +55,7 @@ buildPythonApplication rec { pyyaml #namestand #datapackage - pdfminer + pdfminer-six #tabula vobject tabulate diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index 358b66fb589a..2b07b9bd47b3 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -92,7 +92,7 @@ py.pkgs.pythonPackages.buildPythonApplication rec { numpy ocrmypdf pathvalidate - pdfminer + pdfminer-six pikepdf pillow pluggy diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix index 168777594aef..1a427dc379fd 100644 --- a/pkgs/development/python-modules/ocrmypdf/default.nix +++ b/pkgs/development/python-modules/ocrmypdf/default.nix @@ -7,7 +7,7 @@ , importlib-metadata , importlib-resources , jbig2enc -, pdfminer +, pdfminer-six , pikepdf , pillow , pluggy @@ -63,7 +63,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ coloredlogs img2pdf - pdfminer + pdfminer-six pikepdf pillow pluggy diff --git a/pkgs/development/python-modules/pdfminer_six/default.nix b/pkgs/development/python-modules/pdfminer-six/default.nix similarity index 97% rename from pkgs/development/python-modules/pdfminer_six/default.nix rename to pkgs/development/python-modules/pdfminer-six/default.nix index a2470bf12d69..3911794b89cb 100644 --- a/pkgs/development/python-modules/pdfminer_six/default.nix +++ b/pkgs/development/python-modules/pdfminer-six/default.nix @@ -9,7 +9,7 @@ }: buildPythonPackage rec { - pname = "pdfminer_six"; + pname = "pdfminer-six"; version = "20220524"; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/pdfx/default.nix b/pkgs/development/python-modules/pdfx/default.nix index 25efc4418bf9..aaffa0f93818 100644 --- a/pkgs/development/python-modules/pdfx/default.nix +++ b/pkgs/development/python-modules/pdfx/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pdfminer, chardet, pytestCheckHook }: +{ lib, buildPythonPackage, fetchFromGitHub, pdfminer-six, chardet, pytestCheckHook }: buildPythonPackage rec { pname = "pdfx"; @@ -17,7 +17,7 @@ buildPythonPackage rec { --replace "pdfminer.six==20201018" "pdfminer.six" ''; - propagatedBuildInputs = [ pdfminer chardet ]; + propagatedBuildInputs = [ pdfminer-six chardet ]; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/typecode/default.nix b/pkgs/development/python-modules/typecode/default.nix index 7b3a01a53a8a..a177b845b4b3 100644 --- a/pkgs/development/python-modules/typecode/default.nix +++ b/pkgs/development/python-modules/typecode/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , setuptools-scm , attrs -, pdfminer +, pdfminer-six , commoncode , plugincode , binaryornot @@ -33,7 +33,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ attrs - pdfminer + pdfminer-six commoncode plugincode binaryornot diff --git a/pkgs/development/python-modules/weboob/default.nix b/pkgs/development/python-modules/weboob/default.nix index 094dcb3bfbdf..6ceefbaa20ce 100644 --- a/pkgs/development/python-modules/weboob/default.nix +++ b/pkgs/development/python-modules/weboob/default.nix @@ -12,7 +12,7 @@ , lxml , mechanize , nose -, pdfminer +, pdfminer-six , pillow , prettytable , pyqt5 @@ -54,7 +54,7 @@ buildPythonPackage rec { libyaml lxml mechanize - pdfminer + pdfminer-six pillow prettytable pyqt5 diff --git a/pkgs/development/python-modules/woob/default.nix b/pkgs/development/python-modules/woob/default.nix index a681b523a32e..e9f5ec19d1d1 100644 --- a/pkgs/development/python-modules/woob/default.nix +++ b/pkgs/development/python-modules/woob/default.nix @@ -13,7 +13,7 @@ , lxml , mechanize , nose -, pdfminer +, pdfminer-six , pillow , prettytable , pyqt5 @@ -57,7 +57,7 @@ buildPythonPackage rec { libyaml lxml mechanize - pdfminer + pdfminer-six pillow prettytable pyqt5 diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 6bac37c98e75..d2ab1a9ba44f 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -57,7 +57,7 @@ python3Packages.buildPythonApplication rec { ++ lib.optionals enableBloat ([ abootimg apksigner apktool cbfstool colord enjarify ffmpeg fpc ghc ghostscriptX giflib gnupg gnumeric hdf5 imagemagick libcaca llvm jdk mono ocaml odt2txt oggvideotools openssh pdftk poppler_utils procyon qemu R tcpdump ubootTools wabt radare2 xmlbeans - ] ++ (with python3Packages; [ androguard binwalk guestfs h5py pdfminer ])); + ] ++ (with python3Packages; [ androguard binwalk guestfs h5py pdfminer-six ])); checkInputs = with python3Packages; [ pytestCheckHook ] ++ pythonPath; diff --git a/pkgs/tools/text/invoice2data/default.nix b/pkgs/tools/text/invoice2data/default.nix index 941f2d6f4938..d23486159013 100644 --- a/pkgs/tools/text/invoice2data/default.nix +++ b/pkgs/tools/text/invoice2data/default.nix @@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ chardet dateparser - pdfminer + pdfminer-six pillow pyyaml unidecode diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index acfc1e60707a..bb090dad3979 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9283,7 +9283,7 @@ with pkgs; pdftoipe = callPackage ../tools/graphics/pdftoipe { }; - pdfminer = with python3Packages; toPythonApplication pdfminer; + pdfminer = with python3Packages; toPythonApplication pdfminer-six; pdf-quench = callPackage ../applications/misc/pdf-quench { }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 325b5e69b0c7..003f9a516f36 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -97,6 +97,7 @@ mapAliases ({ pam = python-pam; # added 2020-09-07. PasteDeploy = pastedeploy; # added 2021-10-07 pathpy = path; # added 2022-04-12 + pdfminer = pdfminer-six; # added 2022-05-25 pep257 = pydocstyle; # added 2022-04-12 postorius = throw "Please use pkgs.mailmanPackages.postorius"; # added 2022-04-29 powerlineMemSegment = powerline-mem-segment; # added 2021-10-08 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0f10b43dfd67..1c2c95a02eed 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6256,7 +6256,7 @@ in { pdfkit = callPackage ../development/python-modules/pdfkit { }; - pdfminer = callPackage ../development/python-modules/pdfminer_six { }; + pdfminer-six = callPackage ../development/python-modules/pdfminer-six { }; pdfposter = callPackage ../development/python-modules/pdfposter { }; From 76405e3077eaf84e33fb61e11292d859fa1d0d9c Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 26 May 2022 07:06:13 +0000 Subject: [PATCH 19/21] compressFirmwareXz: fix with empty lib/firmware Fixes: 8aa8e0ce7f1 ("nixos/udev: compress all firmware if supported") --- pkgs/build-support/kernel/compress-firmware-xz.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/kernel/compress-firmware-xz.nix b/pkgs/build-support/kernel/compress-firmware-xz.nix index 56595131c891..6a797226aa67 100644 --- a/pkgs/build-support/kernel/compress-firmware-xz.nix +++ b/pkgs/build-support/kernel/compress-firmware-xz.nix @@ -7,7 +7,7 @@ runCommand "${firmware.name}-xz" {} '' (cd ${firmware} && find lib/firmware -type d -print0) | (cd $out && xargs -0 mkdir -v --) (cd ${firmware} && find lib/firmware -type f -print0) | - (cd $out && xargs -0tP "$NIX_BUILD_CORES" -n1 \ + (cd $out && xargs -0rtP "$NIX_BUILD_CORES" -n1 \ sh -c 'xz -9c -T1 -C crc32 --lzma2=dict=2MiB "${firmware}/$1" > "$1.xz"' --) (cd ${firmware} && find lib/firmware -type l) | while read link; do target="$(readlink "${firmware}/$link")" From b3fe9c32f8f92e63889e52f188c07b7b14004ed9 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Fri, 20 May 2022 15:36:30 -0700 Subject: [PATCH 20/21] ber_metaocaml: n107 -> n111 The configure script has changed and no longer seems to provide a way to specify the location of the x11 libraries or headers. Therefore these configure options have been dropped. --- .../compilers/ocaml/ber-metaocaml.nix | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/pkgs/development/compilers/ocaml/ber-metaocaml.nix b/pkgs/development/compilers/ocaml/ber-metaocaml.nix index 0825c2db6603..36ea949d1ece 100644 --- a/pkgs/development/compilers/ocaml/ber-metaocaml.nix +++ b/pkgs/development/compilers/ocaml/ber-metaocaml.nix @@ -9,9 +9,9 @@ let x11deps = [ libX11 xorgproto ]; inherit (lib) optionals; - baseOcamlBranch = "4.07"; + baseOcamlBranch = "4.11"; baseOcamlVersion = "${baseOcamlBranch}.1"; - metaocamlPatch = "107"; + metaocamlPatch = "111"; in stdenv.mkDerivation rec { @@ -20,12 +20,12 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://caml.inria.fr/pub/distrib/ocaml-${baseOcamlBranch}/ocaml-${baseOcamlVersion}.tar.gz"; - sha256 = "1x4sln131mcspisr22qc304590rvg720rbl7g2i4xiymgvhkpm1a"; + sha256 = "sha256-3Yi2OFvZLgrZInMuKMxoyHd4QXcOoAPCC9FS9dtEFc4="; }; metaocaml = fetchurl { - url = "http://okmij.org/ftp/ML/ber-metaocaml-107.tar.gz"; - sha256 = "0xy6n0yj1f53pk612zfmn49pn04bd75qa40xgmr0w0lzx6dqsfmm"; + url = "http://okmij.org/ftp/ML/ber-metaocaml-${metaocamlPatch}.tar.gz"; + sha256 = "sha256-hDb0w0ZCm0hCz8jktZKmr/7gPSfBoKPT/cc7sPjt0yE="; }; x11env = buildEnv { name = "x11env"; paths = x11deps; }; @@ -33,11 +33,7 @@ stdenv.mkDerivation rec { x11inc = "${x11env}/include"; prefixKey = "-prefix "; - configureFlags = optionals useX11 - [ "-x11lib" x11lib - "-x11include" x11inc - "-flambda" - ]; + configureFlags = optionals useX11 [ "--enable-flambda" ]; dontStrip = true; buildInputs = [ ncurses ] ++ optionals useX11 x11deps; @@ -48,8 +44,8 @@ stdenv.mkDerivation rec { # used SIGSTKSZ as the size of a statically-allocated array. This # patch is also applied by the ocaml/4.07.nix expression. (fetchpatch { - url = "https://github.com/ocaml/ocaml/commit/00b8c4d503732343d5d01761ad09650fe50ff3a0.patch"; - sha256 = "sha256:02cfya5ff5szx0fsl5x8ax76jyrla9zmf3qxavf3adhwq5ssrfcv"; + url = "https://github.com/ocaml/ocaml/commit/dd28ac0cf4365bd0ea1bcc374cbc5e95a6f39bea.patch"; + sha256 = "sha256-OmyovAu+8sgg3n5YD29Cytx3u/9PO2ofMsmrwiKUxks="; }) ]; From 21de888352eb79b819c701c051a20ceecf9adacb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Thu, 26 May 2022 12:27:44 +0200 Subject: [PATCH 21/21] mariadb/texlive: Lowercase nixos.org Capitalized URLs look weird and this makes the two URLs in line with the last remaining NixOS.org at https://github.com/NixOS/nixpkgs/pull/169046 --- pkgs/servers/sql/mariadb/default.nix | 2 +- pkgs/tools/typesetting/tex/texlive/bin.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 50989a42e3e3..71b638b9ab8c 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -60,7 +60,7 @@ commonOptions = packageSettings: rec { # attributes common to both builds cmakeFlags = [ "-DBUILD_CONFIG=mysql_release" - "-DMANUFACTURER=NixOS.org" + "-DMANUFACTURER=nixos.org" "-DDEFAULT_CHARSET=utf8mb4" "-DDEFAULT_COLLATION=utf8mb4_unicode_ci" "-DSECURITY_HARDENED=ON" diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index 2827f808678d..4b278c12a3f8 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -33,7 +33,7 @@ let ''; configureFlags = [ - "--with-banner-add=/NixOS.org" + "--with-banner-add=/nixos.org" "--disable-missing" "--disable-native-texlive-build" "--enable-shared" # "--enable-cxx-runtime-hack" # static runtime "--enable-tex-synctex"