From a19640fb81269efe44491c7ac7f0db015630aa35 Mon Sep 17 00:00:00 2001 From: tu-maurice Date: Mon, 15 Nov 2021 21:50:30 +0100 Subject: [PATCH 01/14] gnomeExtensions: make buildShellExtension visible Simply inheriting does not work because all-packages.nix explicitly inherits only gnomeExtensions and gnome*Extensions. --- pkgs/desktops/gnome/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/extensions/default.nix b/pkgs/desktops/gnome/extensions/default.nix index f4f6fba89c2f..2ba640a514ff 100644 --- a/pkgs/desktops/gnome/extensions/default.nix +++ b/pkgs/desktops/gnome/extensions/default.nix @@ -55,8 +55,6 @@ let ]; in rec { - inherit buildShellExtension; - gnome38Extensions = mapUuidNames (produceExtensionsList "38"); gnome40Extensions = mapUuidNames (produceExtensionsList "40"); gnome41Extensions = mapUuidNames (produceExtensionsList "41"); @@ -78,6 +76,8 @@ in rec { mediaplayer = throw "gnomeExtensions.mediaplayer deprecated since 2019-09-23: retired upstream https://github.com/JasonLG1979/gnome-shell-extensions-mediaplayer/blob/master/README.md"; remove-dropdown-arrows = throw "gnomeExtensions.remove-dropdown-arrows removed since 2021-05-25: The extensions has not seen an update sine GNOME 3.34. Furthermore, the functionality it provides is obsolete as of GNOME 40."; }) + # Export buildShellExtension function + (extensions: extensions // { inherit buildShellExtension; }) # Make the set "public" lib.recurseIntoAttrs ]; From 924870839f8c5667246f4eb81a368ef033eb081e Mon Sep 17 00:00:00 2001 From: Winter Date: Sat, 20 Nov 2021 23:14:45 -0500 Subject: [PATCH 02/14] vscode-extensions.tamasfe.even-better-toml: 0.9.3 -> 0.14.2 --- pkgs/misc/vscode-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index f8f892613bac..25a8495c5a9f 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -1516,8 +1516,8 @@ let mktplcRef = { name = "even-better-toml"; publisher = "tamasfe"; - version = "0.9.3"; - sha256 = "16x2y58hkankazpwm93j8lqdn3mala7iayck548kki9zx4qrhhck"; + version = "0.14.2"; + sha256 = "17djwa2bnjfga21nvyz8wwmgnjllr4a7nvrsqvzm02hzlpwaskcl"; }; meta = { license = lib.licenses.mit; From fe15c4fd239b0c355119aaa6e99c7af93986170f Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Sun, 21 Nov 2021 03:01:07 -0500 Subject: [PATCH 03/14] kopia: 0.9.5 -> 0.9.6 --- pkgs/tools/backup/kopia/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/backup/kopia/default.nix b/pkgs/tools/backup/kopia/default.nix index 0774d6e5483a..9ae4ad37a143 100644 --- a/pkgs/tools/backup/kopia/default.nix +++ b/pkgs/tools/backup/kopia/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kopia"; - version = "0.9.5"; + version = "0.9.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-1HCpUfK8y4BaBluThpRVeXTPgMUym6R+WXCO+2pRNjc="; + sha256 = "sha256-lfzlYpkAGGY7fs9PYPSg2XYgW92WV1/zh2oRz4Qw7vs="; }; - vendorSha256 = "sha256-tYu1T4oHkvj4QOS/e/6N9IjMlxrGKosQ78DVgAyh6/Q="; + vendorSha256 = "sha256-xa6B3gGgJc7E8VCfpRXlE8Jw3ylNnfynK+QEiqy2yF4="; doCheck = false; From 4459b35304dfb86626778a1118a485a2be2d73ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Gr=C3=A4fenstein?= Date: Sun, 21 Nov 2021 16:46:39 +0100 Subject: [PATCH 04/14] mpv: set meta.mainProgram --- pkgs/applications/video/mpv/wrapper.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/video/mpv/wrapper.nix b/pkgs/applications/video/mpv/wrapper.nix index 6166ae10d4eb..c097489a33c4 100644 --- a/pkgs/applications/video/mpv/wrapper.nix +++ b/pkgs/applications/video/mpv/wrapper.nix @@ -79,6 +79,8 @@ let rm "$out/Applications/mpv.app/Contents/MacOS/mpv" makeWrapper "${mpv}/Applications/mpv.app/Contents/MacOS/mpv" "$out/Applications/mpv.app/Contents/MacOS/mpv" ${mostMakeWrapperArgs} ''; + + meta.mainProgram = "mpv"; }; in lib.makeOverridable wrapper From 625150b22d9cb55a3d0ad9b0e0a9d953093f5745 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sun, 21 Nov 2021 18:39:56 +0300 Subject: [PATCH 05/14] =?UTF-8?q?reproxy:=200.9.0=20=E2=86=92=200.11.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/servers/reproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/reproxy/default.nix b/pkgs/servers/reproxy/default.nix index 37d76779b2c8..4de4859c67c5 100644 --- a/pkgs/servers/reproxy/default.nix +++ b/pkgs/servers/reproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "reproxy"; - version = "0.9.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "umputun"; repo = pname; rev = "v${version}"; - hash = "sha256-z10KfDwIwitiR6ei1xV9//zhH7DLTow1giEYyjh8FIg="; + hash = "sha256-3kpGeG60WSpcIqVLw437gkDT8XLsDyhGL8/sEnhTgBw="; }; postPatch = '' From 87d20e352ff27c4a0fed11d30f437495baa13c1a Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 21 Nov 2021 15:18:57 -0500 Subject: [PATCH 06/14] cernlib: fix for gfortran10 --- .../libraries/physics/cernlib/default.nix | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/physics/cernlib/default.nix b/pkgs/development/libraries/physics/cernlib/default.nix index f953b663143d..b2656f1cc999 100644 --- a/pkgs/development/libraries/physics/cernlib/default.nix +++ b/pkgs/development/libraries/physics/cernlib/default.nix @@ -35,18 +35,30 @@ stdenv.mkDerivation rec { export PATH=$PATH:$CERN_ROOT/bin ''; + FFLAGS = lib.optionals (lib.versionAtLeast gfortran.version "10.0.0") [ + # Fix https://github.com/vmc-project/geant3/issues/17 + "-fallow-invalid-boz" + + # Fix for gfortran 10 + "-fallow-argument-mismatch" + ]; + + makeFlags = [ + "FORTRANOPTIONS=$(FFLAGS)" + ]; + buildPhase = '' cd $CERN_ROOT mkdir -p build bin lib cd $CERN_ROOT/build $CVSCOSRC/config/imake_boot - make -j $NIX_BUILD_CORES bin/kuipc - make -j $NIX_BUILD_CORES scripts/Makefile + make -j $NIX_BUILD_CORES $makeFlags bin/kuipc + make -j $NIX_BUILD_CORES $makeFlags scripts/Makefile pushd scripts - make -j $NIX_BUILD_CORES install.bin + make -j $NIX_BUILD_CORES $makeFlags install.bin popd - make -j $NIX_BUILD_CORES + make -j $NIX_BUILD_CORES $makeFlags ''; installPhase = '' From 652d17ec7823e81baaebf07abf2939f10919740d Mon Sep 17 00:00:00 2001 From: wackbyte Date: Sun, 21 Nov 2021 18:29:40 -0500 Subject: [PATCH 07/14] discord: remove double systemd dependency --- .../applications/networking/instant-messengers/discord/base.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/base.nix b/pkgs/applications/networking/instant-messengers/discord/base.nix index 2d67236c90eb..5943917dc659 100644 --- a/pkgs/applications/networking/instant-messengers/discord/base.nix +++ b/pkgs/applications/networking/instant-messengers/discord/base.nix @@ -37,7 +37,7 @@ in stdenv.mkDerivation rec { stdenv.cc.cc alsa-lib atk at-spi2-atk at-spi2-core cairo cups dbus expat fontconfig freetype gdk-pixbuf glib gtk3 libnotify libX11 libXcomposite libuuid libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender - libXtst nspr nss libxcb pango systemd libXScrnSaver + libXtst nspr nss libxcb pango libXScrnSaver libappindicator-gtk3 libdbusmenu ]; From 82a8f891ed2a63f95ef5c86be298ac95ae3beedd Mon Sep 17 00:00:00 2001 From: Mrinal Purohit Date: Sun, 21 Nov 2021 02:08:11 +0530 Subject: [PATCH 08/14] dendrite: 0.5.0 -> 0.5.1 --- pkgs/servers/dendrite/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/dendrite/default.nix b/pkgs/servers/dendrite/default.nix index 60855ba8f36a..3d92b2cd4bac 100644 --- a/pkgs/servers/dendrite/default.nix +++ b/pkgs/servers/dendrite/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "matrix-dendrite"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "matrix-org"; repo = "dendrite"; rev = "v${version}"; - sha256 = "iCxfsIOZqPQjY0u2Zw3PCe0IJDczqDjcTUA3U5zXbgM="; + sha256 = "1HCVWSxXOR2syN+dLDSvrNzYHTj/vXZRHkXhU0f3m1k="; }; - vendorSha256 = "sha256-XS1B6Nl5zGevxE1SohpoTwT/bXn5udYV5ANVFn7eTyA="; + vendorSha256 = "sha256-RqEt0RAsKWKy6NvMzulqY56nZ7fIxgJkgN/WpEZ3F2I="; passthru.tests = { inherit (nixosTests) dendrite; From 09454d0f4a23f79d884de9d6ff0d3dfe5ea1e97b Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Sun, 21 Nov 2021 20:56:43 -0500 Subject: [PATCH 09/14] parquet-tools: init at 0.2.9 (#142562) --- pkgs/tools/misc/parquet-tools/default.nix | 69 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 71 insertions(+) create mode 100644 pkgs/tools/misc/parquet-tools/default.nix diff --git a/pkgs/tools/misc/parquet-tools/default.nix b/pkgs/tools/misc/parquet-tools/default.nix new file mode 100644 index 000000000000..0ba909e1f602 --- /dev/null +++ b/pkgs/tools/misc/parquet-tools/default.nix @@ -0,0 +1,69 @@ +{ lib +, fetchFromGitHub +, fetchpatch +, python3Packages +}: + +with python3Packages; + +buildPythonApplication rec { + pname = "parquet-tools"; + version = "0.2.9"; + disabled = pythonOlder "3.8"; + + format = "pyproject"; + + src = fetchFromGitHub { + owner = "ktrueda"; + repo = "parquet-tools"; + rev = version; + sha256 = "0aw0x7lhagp4dwis09fsizr7zbhdpliav0ns5ll5qny7x4m6rkfy"; + }; + + patches = [ + (fetchpatch { + url = "https://github.com/ktrueda/parquet-tools/commit/1c70a07e1c9f17c8890d23aad3ded5dd6c706cb3.patch"; + sha256 = "08j1prdqj8ksw8gwiyj7ivshk82ahmywbzmywclw52nlnniig0sa"; + }) + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'thrift = "^0.13.0"' 'thrift = "*"' \ + --replace 'halo = "^0.0.29"' 'halo = "*"' + substituteInPlace tests/test_inspect.py \ + --replace "parquet-cpp-arrow version 5.0.0" "parquet-cpp-arrow version 6.0.0" \ + --replace "serialized_size: 2222" "serialized_size: 2221" + ''; + + nativeBuildInputs = [ poetry-core ]; + + propagatedBuildInputs = [ + boto3 + colorama + halo + pandas + pyarrow + tabulate + thrift + ]; + + checkInputs = [ + pytestCheckHook + moto + pytest-mock + ]; + + disabledTests = [ + # these tests try to read python code as parquet and fail + "test_local_wildcard" + "test_local_and_s3_wildcard_files" + ]; + + meta = with lib; { + description = "A CLI tool for parquet files"; + homepage = "https://github.com/ktrueda/parquet-tools"; + license = licenses.mit; + maintainers = with maintainers; [ cpcloud ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4ec0d104b9bc..eaf92ebfeffa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1841,6 +1841,8 @@ with pkgs; pacparser = callPackage ../tools/networking/pacparser { }; + parquet-tools = callPackage ../tools/misc/parquet-tools { }; + pass = callPackage ../tools/security/pass { }; passphrase2pgp = callPackage ../tools/security/passphrase2pgp { }; From 712db36fa2c30e0fda89d997753708df69ddbdbe Mon Sep 17 00:00:00 2001 From: Atemu Date: Sun, 7 Nov 2021 12:12:20 +0100 Subject: [PATCH 10/14] kernel/generic: remove redundant kernelOlder/kernelAtLeast --- pkgs/os-specific/linux/kernel/generic.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 2d153d31800e..bca6554ca2ae 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -203,8 +203,6 @@ let features = kernelFeatures; inherit commonStructuredConfig structuredExtraConfig extraMakeFlags isZen isHardened isLibre modDirVersion; isXen = lib.warn "The isXen attribute is deprecated. All Nixpkgs kernels that support it now have Xen enabled." true; - kernelOlder = lib.versionOlder version; - kernelAtLeast = lib.versionAtLeast version; passthru = kernel.passthru // (removeAttrs passthru [ "passthru" ]); tests = let overridableKernel = finalKernel // { From 8d0f1c1725a1b2ab34f401cf1b7fda1fc5bf60e6 Mon Sep 17 00:00:00 2001 From: Atemu Date: Sun, 7 Nov 2021 12:07:14 +0100 Subject: [PATCH 11/14] kernel: compare version against the base version This makes it so that 5.10.1 > 5.10-rc5 --- pkgs/os-specific/linux/kernel/manual-config.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 51ab51fb83c6..4f12337c893f 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -97,13 +97,14 @@ let (isModular || (config.isDisabled "FIRMWARE_IN_KERNEL")) && (lib.versionOlder version "4.14"); in (optionalAttrs isModular { outputs = [ "out" "dev" ]; }) // { - passthru = { + passthru = rec { inherit version modDirVersion config kernelPatches configfile moduleBuildDependencies stdenv; inherit isZen isHardened isLibre; isXen = lib.warn "The isXen attribute is deprecated. All Nixpkgs kernels that support it now have Xen enabled." true; - kernelOlder = lib.versionOlder version; - kernelAtLeast = lib.versionAtLeast version; + baseVersion = lib.head (lib.splitString "-rc" version); + kernelOlder = lib.versionOlder baseVersion; + kernelAtLeast = lib.versionAtLeast baseVersion; }; inherit src; From 92029c12ee0709d869a6c6bbc82af42d4b698c8c Mon Sep 17 00:00:00 2001 From: Atemu Date: Sun, 7 Nov 2021 12:18:12 +0100 Subject: [PATCH 12/14] kernels: set testing to latest if it's newer Closes https://github.com/NixOS/nixpkgs/pull/130872 --- pkgs/top-level/linux-kernels.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index e109cca82077..2aa9f8482f18 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -173,12 +173,17 @@ in { ]; }; - linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - ]; - }; + linux_testing = let + testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + ]; + }; + latest = packageAliases.linux_latest.kernel; + in if latest.kernelAtLeast testing.baseVersion + then latest + else testing; linux_testing_bcachefs = callPackage ../os-specific/linux/kernel/linux-testing-bcachefs.nix rec { kernel = linux_5_15; From 69e914bdb3289851d96cefa763723ab2001f217f Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 20 Nov 2021 14:30:30 -0500 Subject: [PATCH 13/14] libtensorflow: increase meta.timeout to 24h --- pkgs/development/python-modules/tensorflow/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index 6db4090e34ab..e088dec77994 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -344,6 +344,7 @@ let license = licenses.asl20; maintainers = with maintainers; [ jyp abbradar ]; platforms = with platforms; linux ++ darwin; + timeout = 86400; # 24 hours, needed for darwin broken = !(xlaSupport -> cudaSupport); }; }; From 7ea3e0f3f24780c8344492a494c905947e038d7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Vask=C3=B3?= <1771332+vlaci@users.noreply.github.com> Date: Thu, 11 Nov 2021 14:15:24 +0100 Subject: [PATCH 14/14] qemu: fix managedsave (snapshot creation) with QXL video device Backport patch from 6.2.0-rc0 --- pkgs/applications/virtualization/qemu/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index c230fac1e61c..7442f883b5f6 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -112,6 +112,12 @@ stdenv.mkDerivation rec { url = "https://gitlab.com/qemu-project/qemu/-/commit/13a028336f2c05e7ff47dfdaf30dfac7f4883e80.patch"; sha256 = "sha256-23xVixVl+JDBNdhe5j5WY8CB4MsnUo+sjrkAkG+JS6M="; }) + # Fixes managedsave (snapshot creation) with QXL video device. Remove with next release. + (fetchpatch { + name = "qxl-fix-pre-save-logic.patch"; + url = "https://gitlab.com/qemu-project/qemu/-/commit/eb94846280df3f1e2a91b6179fc05f9890b7e384.patch"; + sha256 = "sha256-p31fd47RTSw928DOMrubQQybnzDAGm23z4Yhe+hGJQ8="; + }) ] ++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch ++ lib.optionals stdenv.hostPlatform.isMusl [ ./sigrtminmax.patch