From bcd41f289122c4a182f892ee740b37e436daf89e Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Sat, 27 Aug 2022 17:10:06 -0400 Subject: [PATCH 01/23] linux: Disable DRM_LEGACY, NOUVEAU_LEGACY_CTX_SUPPORT MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This currently gets enabled as generate-config.pl will enable all the drivers below it as modules. Is “not set” in [Arch][1], [Debian][2], [Fedora][3]. See also [summary of setting from various distros in April 2020][4]. Recommended disabled by [CLIP OS][5] and per current [Kernel config description][6]: > bool "Enable legacy drivers (DANGEROUS)" > Enable legacy DRI1 drivers. Those drivers expose unsafe and dangerous > APIs to user-space, which can be used to circumvent access > restrictions and other security measures. For backwards compatibility > those drivers are still available, but their use is highly > inadvisable and might harm your system. > > You are recommended to use the safe modeset-only drivers instead, and > perform 3D emulation in user-space. > > Unless you have strong reasons to go rogue, say "N". Also disable NOUVEAU_LEGACY_CTX_SUPPORT, as this does `select DRM_LEGACY`. Per Kernel config docs: >There was a version of the nouveau DDX that relied on legacy > ctx ioctls not erroring out. But that was back in time a long > ways, so offer a way to disable it now. For uapi compat with > old nouveau ddx this should be on by default, but modern distros > should consider turning it off. and the [commit][7]: > These driver functions contain several bugs and security holes. This > change makes these functions optional can be turned on by a setting, > they are turned off by default for modeset driver with the exception of > the nouvea driver that may require them with an old version of libdrm. Referenced earlier commit elaborates that > libdrm_nouveau before 2.4.33 used contexts Since nixpkgs here has a much newer version (2.4.33 is from March 2012), should not be a concern. NOUVEAU_LEGACY_CTX_SUPPORT is also “not set” in the linked Arch, Debian, & Fedora configs. [1]: https://github.com/archlinux/svntogit-packages/blob/66d72ee54afc604391b618fc3eecc43f29e479e8/trunk/config#L6637 [2]: https://salsa.debian.org/kernel-team/linux/-/blob/07731f5956cf29876a7abc13f4ecbdf4d9459592/debian/config/config#L713 [3]: https://src.fedoraproject.org/rpms/kernel/blob/rawhide/f/kernel-x86_64-fedora.config#_1528 [4]: https://github.com/a13xp0p0v/kconfig-hardened-check/issues/38#issuecomment-608639217 [5]: https://docs.clip-os.org/clipos/kernel.html#configuration [6]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/gpu/drm/Kconfig#n421 [7]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=b30a43ac7132cdda833ac4b13dd1ebd35ace14b7 --- pkgs/os-specific/linux/kernel/common-config.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 8211860b62f5..97bf388d46a6 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -270,6 +270,9 @@ let }; video = { + DRM_LEGACY = no; + NOUVEAU_LEGACY_CTX_SUPPORT = whenAtLeast "5.2" no; + # Allow specifying custom EDID on the kernel command line DRM_LOAD_EDID_FIRMWARE = yes; VGA_SWITCHEROO = yes; # Hybrid graphics support From 4ccddf5d9a531a274af335daab0665364f2ef03d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 30 Aug 2022 03:02:02 +0000 Subject: [PATCH 02/23] xml2rfc: 3.14.1 -> 3.14.2 --- pkgs/development/python-modules/xml2rfc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix index 794cda0d509c..d7d5b52ee42e 100644 --- a/pkgs/development/python-modules/xml2rfc/default.nix +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "xml2rfc"; - version = "3.14.1"; + version = "3.14.2"; disabled = pythonOlder "3.6"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "ietf-tools"; repo = "xml2rfc"; rev = "refs/tags/v${version}"; - sha256 = "sha256-v8wvmAV5t2dEWFWtbM68Npe+QzwXksRUl0H+tP0RgFc="; + sha256 = "sha256-7UKav9IOH3u/3ZPDWVTBSf+A1li65qK2qASJpNVezdI="; }; postPatch = '' From 96398396ebf7caea18a9a25e14421f2a67844b4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 6 Sep 2022 17:16:10 +0200 Subject: [PATCH 03/23] nginxModules.vts: 0.1.18 -> 0.2.0 --- pkgs/servers/http/nginx/modules.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index e2f7119440a1..555615a83f54 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -566,8 +566,8 @@ in name = "vts"; owner = "vozlt"; repo = "nginx-module-vts"; - rev = "v0.1.18"; - sha256 = "1jq2s9k7hah3b317hfn9y3g1q4g4x58k209psrfsqs718a9sw8c7"; + rev = "v0.2.0"; + sha256 = "sha256-uVGHFJt9KNcM4cdCUcSYL5KxbCiZkFf1eTdafCZXRew="; }; }; } From 09800d7f75b2c31820b43ce9287212efba2f523b Mon Sep 17 00:00:00 2001 From: linsui Date: Wed, 7 Sep 2022 21:36:04 +0800 Subject: [PATCH 04/23] firefox wrapper: write extraPrefsFiles before extraPrefs --- .../networking/browsers/firefox/wrapper.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index ba44513ceea2..3e20e6158c97 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -147,7 +147,7 @@ let // extraPolicies; }; - mozillaCfg = writeText "mozilla.cfg" '' + mozillaCfg = '' // First line must be a comment // Disables addon signature checking @@ -155,7 +155,6 @@ let // Security is maintained because only user whitelisted addons // with a checksum can be installed ${ lib.optionalString usesNixExtensions ''lockPref("xpinstall.signatures.required", false)'' }; - ${extraPrefs} ''; ############################# @@ -345,13 +344,19 @@ let echo 'pref("general.config.filename", "mozilla.cfg");' > "$out/lib/${libName}/defaults/pref/autoconfig.js" echo 'pref("general.config.obscure_value", 0);' >> "$out/lib/${libName}/defaults/pref/autoconfig.js" - cat > "$out/lib/${libName}/mozilla.cfg" < ${mozillaCfg} + cat > "$out/lib/${libName}/mozilla.cfg" << EOF + ${mozillaCfg} + EOF extraPrefsFiles=(${builtins.toString extraPrefsFiles}) for extraPrefsFile in "''${extraPrefsFiles[@]}"; do cat "$extraPrefsFile" >> "$out/lib/${libName}/mozilla.cfg" done + cat >> "$out/lib/${libName}/mozilla.cfg" << EOF + ${extraPrefs} + EOF + mkdir -p $out/lib/${libName}/distribution/extensions ############################# From 3a2a763a4265712a972952880933bb2342b0550e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 10 Sep 2022 21:19:14 +0200 Subject: [PATCH 05/23] python310Packages.tensorflow-datasets: fix tests --- .../development/python-modules/tensorflow-datasets/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/tensorflow-datasets/default.nix b/pkgs/development/python-modules/tensorflow-datasets/default.nix index 772e6da92edd..1afd6c55a3fb 100644 --- a/pkgs/development/python-modules/tensorflow-datasets/default.nix +++ b/pkgs/development/python-modules/tensorflow-datasets/default.nix @@ -37,6 +37,7 @@ , termcolor , tifffile , tqdm +, zarr }: buildPythonPackage rec { @@ -99,6 +100,7 @@ buildPythonPackage rec { scipy tensorflow tifffile + zarr ]; disabledTestPaths = [ @@ -123,6 +125,7 @@ buildPythonPackage rec { "tensorflow_datasets/image/lsun_test.py" # Requires `envlogger` which is not packaged in `nixpkgs`. + "tensorflow_datasets/rlds/locomotion/locomotion_test.py" "tensorflow_datasets/rlds/robosuite_panda_pick_place_can/robosuite_panda_pick_place_can_test.py" # Fails with `TypeError: Constant constructor takes either 0 or 2 positional arguments` From 8676f60f1f301981bb9a7cd347ea2e592c6f6494 Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Sat, 10 Sep 2022 22:25:02 +0300 Subject: [PATCH 06/23] nheko: 0.10.0 -> 0.10.1-1 Fixes a build failure https://hydra.nixos.org/build/190031815 --- .../networking/instant-messengers/nheko/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index d3a7abae8205..f3714b4fee97 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -33,13 +33,13 @@ mkDerivation rec { pname = "nheko"; - version = "0.10.0"; + version = "0.10.1-1"; src = fetchFromGitHub { owner = "Nheko-Reborn"; repo = "nheko"; rev = "v${version}"; - sha256 = "sha256-JNAI1+GmRgee7bqeJi8JadV3W7vXMpEvvKqqinb97Ng="; + sha256 = "sha256-Bpf38BAGfvmVyrAptIsQ9HaRUopqvytko6unlWLooUo="; }; nativeBuildInputs = [ From d9038bd6e65fa5d919745917990b0d64590ff025 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 11 Sep 2022 17:14:11 +0200 Subject: [PATCH 07/23] zq: remove noop overwrite --- 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 1090104cccfd..71700e52556c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1426,7 +1426,7 @@ with pkgs; breitbandmessung = callPackage ../applications/networking/breitbandmessung { }; - zq = callPackage ../development/tools/zq { buildGoModule = buildGo118Module; }; + zq = callPackage ../development/tools/zq { }; ### APPLICATIONS/EMULATORS From 649cd671b515366d04fe025a5c930b79811703f0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 11 Sep 2022 16:26:58 +0000 Subject: [PATCH 08/23] eksctl: 0.110.0 -> 0.111.0 --- pkgs/tools/admin/eksctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 144524df6949..f4d45b003186 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "eksctl"; - version = "0.110.0"; + version = "0.111.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-QcSSdMWQNgsxzK9JJxGgIUkx54sLYXaF2HEAJZGWnjI="; + sha256 = "sha256-I/EYq83snTphHlOk6SgZSYpRS3RNpD2JX1fkwqEG9j0="; }; vendorSha256 = "sha256-Dka0UbTxR2UsMkClq8t0//m+Ky7NEw3g9XP6PtTWOe4="; From a27f6b1b0423fbfb37779087b4201f0d7df65ab2 Mon Sep 17 00:00:00 2001 From: amesgen Date: Sun, 11 Sep 2022 19:03:50 +0200 Subject: [PATCH 09/23] gh-dash: 3.2.0 -> 3.3.0 --- pkgs/tools/misc/gh-dash/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/gh-dash/default.nix b/pkgs/tools/misc/gh-dash/default.nix index 2dcf9dfea461..23fde30648da 100644 --- a/pkgs/tools/misc/gh-dash/default.nix +++ b/pkgs/tools/misc/gh-dash/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gh-dash"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "dlvhdr"; repo = "gh-dash"; rev = "v${version}"; - sha256 = "sha256-y7PJ8BDTiip6cjKQ3CVIcf3LwlGsEj3DHn3EOtCGa4A="; + sha256 = "sha256-fgafubFMYkWEqYVC9aHhheJQO8DnHB9onS1NJ63g74Y="; }; - vendorSha256 = "sha256-Hk/sBUI2XYB+ZHfuGUR3muEzUtVsGR28EkRD1jKg0Ss="; + vendorSha256 = "sha256-BbrHvphTQLvUKanmO4GrNpkT0MSlY7+WMJiyXV7dFB8="; ldflags = [ "-s" "-w" ]; From 8926897c2bde06bf76feaacbb9f9e77af581b865 Mon Sep 17 00:00:00 2001 From: joachimschmidt557 Date: Sun, 11 Sep 2022 19:26:51 +0200 Subject: [PATCH 10/23] mopidy-iris: 3.60.0 -> 3.64.0 --- pkgs/applications/audio/mopidy/iris.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix index 5b2cbe031c67..c22508e437ea 100644 --- a/pkgs/applications/audio/mopidy/iris.nix +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "Mopidy-Iris"; - version = "3.60.0"; + version = "3.64.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "18w6qqmxzn8psiacybryxailm826f3j1wgiv0c03fbdsy6kr5f7l"; + sha256 = "062x73glhn1x4wgc7zmb9y3cq15d5grgqf5drdpbp6p3cgk4s2vc"; }; propagatedBuildInputs = [ From eefbc3dad4bcde46b9c6d3804a6c963a03eb29f1 Mon Sep 17 00:00:00 2001 From: joachimschmidt557 Date: Sun, 11 Sep 2022 19:46:45 +0200 Subject: [PATCH 11/23] mopidy-ytmusic: 0.3.5 -> 0.3.7 --- pkgs/applications/audio/mopidy/ytmusic.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/audio/mopidy/ytmusic.nix b/pkgs/applications/audio/mopidy/ytmusic.nix index 9f393a0e7520..dd2692fb9d78 100644 --- a/pkgs/applications/audio/mopidy/ytmusic.nix +++ b/pkgs/applications/audio/mopidy/ytmusic.nix @@ -2,19 +2,14 @@ python3Packages.buildPythonApplication rec { pname = "mopidy-ytmusic"; - version = "0.3.5"; + version = "0.3.7"; src = python3Packages.fetchPypi { inherit version; pname = "Mopidy-YTMusic"; - sha256 = "0pncyxfqxvznb9y4ksndbny1yf5mxh4089ak0yz86dp2qi5j99iv"; + sha256 = "0gqjvi3nfzkqvbdhihzai241p1h5p037bj2475cc93xwzyyqxcrq"; }; - postPatch = '' - substituteInPlace setup.py \ - --replace 'ytmusicapi>=0.20.0,<0.21.0' 'ytmusicapi>=0.20.0' - ''; - propagatedBuildInputs = [ mopidy python3Packages.ytmusicapi From 19cd03d456109f4fffa6e848525e4d4fe61243c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= Date: Sun, 11 Sep 2022 22:07:03 +0200 Subject: [PATCH 12/23] clojure: use latest java LTS --- 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 f1733a14dbb4..79429a702041 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14963,7 +14963,7 @@ with pkgs; clojure = callPackage ../development/interpreters/clojure { # set this to an LTS version of java - jdk = jdk11; + jdk = jdk17; }; clojure-lsp = callPackage ../development/tools/misc/clojure-lsp { }; From cb62326e36148b60a95898b26c07ab221209cf9a Mon Sep 17 00:00:00 2001 From: Ivar Scholten Date: Sun, 11 Sep 2022 19:14:17 +0200 Subject: [PATCH 13/23] hex: init at 0.4.2 Fixes #190768 --- pkgs/tools/misc/hex/default.nix | 34 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/tools/misc/hex/default.nix diff --git a/pkgs/tools/misc/hex/default.nix b/pkgs/tools/misc/hex/default.nix new file mode 100644 index 000000000000..618fbe1dda60 --- /dev/null +++ b/pkgs/tools/misc/hex/default.nix @@ -0,0 +1,34 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, testers +, hex +}: + +rustPlatform.buildRustPackage rec { + pname = "hex"; + version = "0.4.2"; + + src = fetchFromGitHub { + owner = "sitkevij"; + repo = "hex"; + rev = "v${version}"; + hash = "sha256-mxKjiciejnOTbSkCzOWdAtysRAnEv4JgntPS1qM9og8="; + }; + + cargoHash = "sha256-kGe6XN03V+ILnlAcT0E8BvrYMa7ub05STFsFY6X5Gkk="; + + passthru.tests.version = testers.testVersion { + package = hex; + version = "hx ${version}"; + }; + + meta = with lib; { + description = "Futuristic take on hexdump, made in Rust"; + homepage = "https://github.com/sitkevij/hex"; + changelog = "https://github.com/sitkevij/hex/releases/tag/v${version}"; + mainProgram = "hx"; + license = licenses.mit; + maintainers = with maintainers; [ ivar ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 389f5cff4ecc..85891f45135f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7445,6 +7445,8 @@ with pkgs; hevea = callPackage ../tools/typesetting/hevea { }; + hex = callPackage ../tools/misc/hex { }; + hexd = callPackage ../tools/misc/hexd { }; pixd = callPackage ../tools/misc/pixd { }; From 1a20be1a312b69c13b40d246358cf7d315d52b60 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Sep 2022 03:00:22 +0000 Subject: [PATCH 14/23] sish: 2.6.0 -> 2.7.0 --- pkgs/tools/networking/sish/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/sish/default.nix b/pkgs/tools/networking/sish/default.nix index 18d2c0a5cbce..6a7602845d8b 100644 --- a/pkgs/tools/networking/sish/default.nix +++ b/pkgs/tools/networking/sish/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "sish"; - version = "2.6.0"; + version = "2.7.0"; src = fetchFromGitHub { owner = "antoniomika"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Gk6hUv6SKZ71iJdeh9fvA45Oj3J1TjPWpvKQT5qj8NU="; + sha256 = "sha256-TiS28bqwcTbKKAj1trTOEs2a4FGADrkutIU3DkaTcjE="; }; - vendorSha256 = "sha256-FCLhAJxEPskigvlzvm5A+hVQOSWqqZnAxCPe7cawryA="; + vendorSha256 = "sha256-Cky4ggZoNbIZK7w4tL00XqqyDDe0fmYk/+xZvtG/Nmg="; meta = with lib; { description = "HTTP(S)/WS(S)/TCP Tunnels to localhost"; From fce8e2200adcfe848f40758190d8be10cea8603f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Sep 2022 05:59:29 +0000 Subject: [PATCH 15/23] ipinfo: 2.8.1 -> 2.9.0 --- pkgs/tools/networking/ipinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/ipinfo/default.nix b/pkgs/tools/networking/ipinfo/default.nix index 26f4f68c778f..6269c23afe2b 100644 --- a/pkgs/tools/networking/ipinfo/default.nix +++ b/pkgs/tools/networking/ipinfo/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "ipinfo"; - version = "2.8.1"; + version = "2.9.0"; src = fetchFromGitHub { owner = pname; repo = "cli"; rev = "${pname}-${version}"; - hash = "sha256-j+ASyNWfYh4/u7OX3iZx8DZZg1XAwuy6fpC9TJKI+18="; + hash = "sha256-kv8krhmqwE4IfEYPpN+cRAnku/Vm0ctQskCiYAb5YQ0="; }; vendorSha256 = null; From 121aeadda77f42fa272fff45518eacbec08bfc3a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Sep 2022 07:03:22 +0000 Subject: [PATCH 16/23] apache-jena: 4.6.0 -> 4.6.1 --- pkgs/servers/nosql/apache-jena/binary.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/apache-jena/binary.nix b/pkgs/servers/nosql/apache-jena/binary.nix index b43305c728ef..738f110403d3 100644 --- a/pkgs/servers/nosql/apache-jena/binary.nix +++ b/pkgs/servers/nosql/apache-jena/binary.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "apache-jena"; - version = "4.6.0"; + version = "4.6.1"; src = fetchurl { url = "https://dlcdn.apache.org/jena/binaries/apache-jena-${version}.tar.gz"; - sha256 = "sha256-1fNl6O9FVLzBx4U+4E72GY60UGMSRFdKNxIrPdcb/aA="; + sha256 = "sha256-XCExqN0S5aIeLUNkAXjBHPW/fvj+MxQP3GEOP9gSdLE="; }; nativeBuildInputs = [ makeWrapper From a953aca3d73cee231c4f852524d6f336d027ece0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 11 Sep 2022 16:44:53 +0000 Subject: [PATCH 17/23] fclones: 0.27.2 -> 0.27.3 --- pkgs/tools/misc/fclones/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/fclones/default.nix b/pkgs/tools/misc/fclones/default.nix index 5dd351c30bb5..abccd8e00248 100644 --- a/pkgs/tools/misc/fclones/default.nix +++ b/pkgs/tools/misc/fclones/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "fclones"; - version = "0.27.2"; + version = "0.27.3"; src = fetchFromGitHub { owner = "pkolaczk"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cP17WnQsP2S78O9MfmpivibvN1vYMeSNBSrrOENHUiE="; + sha256 = "sha256-IAo7FKHh4oRPEmToEJca6b6E+TZvTeICPRYxol6Ppwo="; }; - cargoSha256 = "sha256-P1T9AAeEmCOiM74RPE/3Lz/XGAj150xTF3egjDv+zvc="; + cargoSha256 = "sha256-S4F/2kf9jbOA3o3kj5Ouo3QvCULbVILh3QbBLXUeOzc="; buildInputs = lib.optionals stdenv.isDarwin [ AppKit From 133d72aa16b4d5f2d2b5c1e841c21a377be93015 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 11 Sep 2022 18:01:00 +0000 Subject: [PATCH 18/23] gopass-jsonapi: 1.14.5 -> 1.14.6 --- pkgs/tools/security/gopass/jsonapi.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/gopass/jsonapi.nix b/pkgs/tools/security/gopass/jsonapi.nix index c4f73630257a..503ce999254d 100644 --- a/pkgs/tools/security/gopass/jsonapi.nix +++ b/pkgs/tools/security/gopass/jsonapi.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "gopass-jsonapi"; - version = "1.14.5"; + version = "1.14.6"; src = fetchFromGitHub { owner = "gopasspw"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zEyzoIl5LiVbNSRebbcE70HxhOGYaZvArdHQqgvi1ns="; + sha256 = "sha256-4jpW1XGT3LWucrDYsz30fKTO7v7AxDKhjx4UYE7NnMQ="; }; - vendorSha256 = "sha256-mcI8ys+Vs46BEaETzsf0f1f2CgjEIV4iwSF4FWgNjUY="; + vendorSha256 = "sha256-bTZ7fjRCKvp7AJcuNDHnsgB8hQUURPBCISgWtBAO1fI="; subPackages = [ "." ]; From f847472df6996c2ec4dd98c459b6734d0729d498 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 11 Sep 2022 22:47:04 +0000 Subject: [PATCH 19/23] neatvnc: 0.5.3 -> 0.5.4 --- pkgs/development/libraries/neatvnc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/neatvnc/default.nix b/pkgs/development/libraries/neatvnc/default.nix index 9936d388d813..aeade2f22c14 100644 --- a/pkgs/development/libraries/neatvnc/default.nix +++ b/pkgs/development/libraries/neatvnc/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "neatvnc"; - version = "0.5.3"; + version = "0.5.4"; src = fetchFromGitHub { owner = "any1"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Y+qFTSvMX/iop+5UOm+4NqMSAZesFIJeTR+CRnlZTYo="; + sha256 = "sha256-IZUCNHhlDhq0KlUjkp3Yh5ysJsThlGw1FLHSaFe4Z0Q="; }; nativeBuildInputs = [ meson pkg-config ninja ]; From 564fb910650c72a9e11aab2e9068aafebcd67564 Mon Sep 17 00:00:00 2001 From: Sandro Date: Mon, 12 Sep 2022 11:47:47 +0200 Subject: [PATCH 20/23] =?UTF-8?q?libusb-compat-0=5F1:=20remove=20patchelf?= =?UTF-8?q?=20from=20nativeBuildInputs=20as=20it=20is=20includ=E2=80=A6=20?= =?UTF-8?q?(#190201)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/libusb-compat/0.1.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libusb-compat/0.1.nix b/pkgs/development/libraries/libusb-compat/0.1.nix index f977d72e7242..b9aa26c67a08 100644 --- a/pkgs/development/libraries/libusb-compat/0.1.nix +++ b/pkgs/development/libraries/libusb-compat/0.1.nix @@ -2,7 +2,6 @@ , lib , fetchFromGitHub , autoreconfHook -, patchelf , pkg-config , libusb1 }: @@ -14,10 +13,6 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; # get rid of propagating systemd closure outputBin = "dev"; - nativeBuildInputs = [ autoreconfHook patchelf pkg-config ]; - - buildInputs = [ libusb1 ]; - src = fetchFromGitHub { owner = "libusb"; repo = "libusb-compat-0.1"; @@ -27,6 +22,10 @@ stdenv.mkDerivation rec { patches = lib.optional stdenv.hostPlatform.isMusl ./fix-headers.patch; + nativeBuildInputs = [ autoreconfHook pkg-config ]; + + buildInputs = [ libusb1 ]; + # without this, libusb-compat is unable to find libusb1 postFixup = '' find $out/lib -name \*.so\* -type f -exec \ From f085846ed2b1cec849bd27f88f5edbc03b5f5da6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 8 Sep 2022 11:35:43 +0200 Subject: [PATCH 21/23] knot-dns: add a test for version-sensitive dependencies --- pkgs/servers/dns/knot-dns/default.nix | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index fc4efcfe56a1..6d46bfb4dce7 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchurl, pkg-config, gnutls, liburcu, lmdb, libcap_ng, libidn2, libunistring , systemd, nettle, libedit, zlib, libiconv, libintl, libmaxminddb, libbpf, nghttp2, libmnl , ngtcp2-gnutls -, autoreconfHook, nixosTests, knot-resolver +, autoreconfHook +, nixosTests, knot-resolver, knot-dns, runCommandLocal , fetchpatch }: @@ -65,6 +66,19 @@ stdenv.mkDerivation rec { inherit knot-resolver; } // lib.optionalAttrs stdenv.isLinux { inherit (nixosTests) knot; + # Some dependencies are very version-sensitive, so the might get dropped + # or embedded after some update, even if the nixPackagers didn't intend to. + # For non-linux I don't know a good replacement for `ldd`. + deps = runCommandLocal "knot-deps-test" + { nativeBuildInputs = [ (lib.getBin stdenv.cc.libc) ]; } + '' + for libname in libngtcp2 libbpf; do + echo "Checking for $libname:" + ldd '${knot-dns.bin}/bin/knotd' | grep -F "$libname" + echo "OK" + done + touch "$out" + ''; }; meta = with lib; { From 997fb2b5709372f893d264e045c7b826e41d7ad4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 8 Sep 2022 11:38:31 +0200 Subject: [PATCH 22/23] knot-dns: 3.2.0 -> 3.2.1 https://gitlab.nic.cz/knot/knot-dns/-/tags/v3.2.1 --- pkgs/servers/dns/knot-dns/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 6d46bfb4dce7..02b8e01437d0 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -3,16 +3,15 @@ , ngtcp2-gnutls , autoreconfHook , nixosTests, knot-resolver, knot-dns, runCommandLocal -, fetchpatch }: stdenv.mkDerivation rec { pname = "knot-dns"; - version = "3.2.0"; + version = "3.2.1"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "426d120994daf93af348aa6c48428e583dd286656415de4daf7a59106fd98631"; + sha256 = "51efa36f92679b25d43dbf8ba543e9f26138559f0fa1ba5fae172f5400659c8f"; }; outputs = [ "bin" "out" "dev" ]; @@ -24,11 +23,6 @@ stdenv.mkDerivation rec { ]; patches = [ - (fetchpatch { - name = "test-32bit-xdp.patch"; - url = "https://gitlab.nic.cz/knot/knot-dns/-/commit/325dfeefdfd8a3dd318cfe0ab52cd7efbf839ccd.diff"; - sha256 = "E5J2Jf4/m5H59Xn6TyATu2gKs3CgShYlMF2Qj1SW1zw="; - }) # Don't try to create directories like /var/lib/knot at build time. # They are later created from NixOS itself. ./dont-create-run-time-dirs.patch From 33956f6fdb079ade70493f23da421cf4471cba64 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Sep 2022 22:11:15 +0000 Subject: [PATCH 23/23] ngtcp2-gnutls: 0.7.0 -> 0.8.1 vcunat: knot-dns now needs >= 0.8.0 instead of == 0.7.0 --- pkgs/development/libraries/ngtcp2/gnutls.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ngtcp2/gnutls.nix b/pkgs/development/libraries/ngtcp2/gnutls.nix index c2b928e851c8..08b0ecea74a6 100644 --- a/pkgs/development/libraries/ngtcp2/gnutls.nix +++ b/pkgs/development/libraries/ngtcp2/gnutls.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "ngtcp2"; - version = "0.7.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "ngtcp2"; repo = "ngtcp2"; rev = "v${version}"; - sha256 = "sha256-REAN5TW0miWXI3HFxtW3znTKTrhsBbNqu1VfjC2w0no="; + sha256 = "sha256-Sn03nY80UmL5oeoK6ScPye1oSUmEKxgoz2VLHcvor3U="; }; outputs = [ "out" "dev" ];