From 444951aafa6a70f32bb655a83d5aa9e4b6ce7e0f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 27 Dec 2023 23:30:02 +0000 Subject: [PATCH 01/30] python310Packages.formulaic: 0.6.6 -> 1.0.1 --- pkgs/development/python-modules/formulaic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/formulaic/default.nix b/pkgs/development/python-modules/formulaic/default.nix index e119eb9f3b4f..a90c6b9f8d98 100644 --- a/pkgs/development/python-modules/formulaic/default.nix +++ b/pkgs/development/python-modules/formulaic/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "formulaic"; - version = "0.6.6"; + version = "1.0.1"; format = "pyproject"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "matthewwardrop"; repo = "formulaic"; rev = "refs/tags/v${version}"; - hash = "sha256-82+j3JAkjltXuzRhdvO4hoesSTWlNCY6w2mn6TsZqGM="; + hash = "sha256-qivWv1LtFkW55tVKD/Zjd8Q5gVbxhDpZ0inkV6NR7bA="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 90468d17581dfb2b6efb6289161209057e7e4ba6 Mon Sep 17 00:00:00 2001 From: rewine Date: Sat, 23 Dec 2023 22:56:37 +0800 Subject: [PATCH 02/30] wlroots: 0.17.0 -> 0.17.1 --- pkgs/development/libraries/wlroots/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index 8b4abf7d5d12..f2a469b5ce0e 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -128,20 +128,13 @@ rec { }; wlroots_0_17 = generic { - version = "0.17.0"; - hash = "sha256-VUrnSG4UAAH0cBy15lG0w8RernwegD6lkOdLvWU3a4c="; + version = "0.17.1"; + hash = "sha256-Z0gWM7AQqJOSr2maUtjdgk/MF6pyeyFMMTaivgt+RMI="; extraBuildInputs = [ hwdata libliftoff libdisplay-info ]; - patches = [ - (fetchpatch { - name = "tinywl-fix-wlroots-dependency-constraint-in-Makefile.patch"; - url = "https://gitlab.freedesktop.org/wlroots/wlroots/-/commit/fe53ec693789afb44c899cad8c2df70c8f9f9023.patch"; - hash = "sha256-wU62hXgmsAyT5j/bWeCFBkvM9cYjUntdCycQt5HAhb8="; - }) - ]; }; wlroots = wlroots_0_17; From 54dcd76205745730f2c911a179bc3d1befd8f389 Mon Sep 17 00:00:00 2001 From: rewine Date: Tue, 2 Jan 2024 16:56:19 +0800 Subject: [PATCH 03/30] wlroots_0_17: don't pin on ffmpeg_4 --- pkgs/development/libraries/wlroots/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index f2a469b5ce0e..e9265de54c61 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -17,6 +17,7 @@ , xorg , libpng , ffmpeg_4 +, ffmpeg , hwdata , seatd , vulkan-loader @@ -57,7 +58,6 @@ let ++ extraNativeBuildInputs; buildInputs = [ - ffmpeg_4 libGL libcap libinput @@ -116,6 +116,9 @@ rec { wlroots_0_15 = generic { version = "0.15.1"; hash = "sha256-MFR38UuB/wW7J9ODDUOfgTzKLse0SSMIRYTpEaEdRwM="; + extraBuildInputs = [ + ffmpeg_4 + ]; }; wlroots_0_16 = generic { @@ -125,12 +128,16 @@ rec { substituteInPlace backend/drm/meson.build \ --replace /usr/share/hwdata/ ${hwdata}/share/hwdata/ ''; + extraBuildInputs = [ + ffmpeg_4 + ]; }; wlroots_0_17 = generic { version = "0.17.1"; hash = "sha256-Z0gWM7AQqJOSr2maUtjdgk/MF6pyeyFMMTaivgt+RMI="; extraBuildInputs = [ + ffmpeg hwdata libliftoff libdisplay-info From 5cbd74e49a94692ce5582506966789e60a27363e Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Sun, 17 Oct 2021 20:48:47 -0700 Subject: [PATCH 04/30] lib/systems: add exec format inspection attrs Most of the time when we do a patchelf conditional on hostPlatform.isLinux, what we really mean is hostPlatform.isElf. Now that we are starting to support BSDs, this is becoming more important. --- lib/systems/inspect.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix index 073df78797c7..5e5e92699e44 100644 --- a/lib/systems/inspect.nix +++ b/lib/systems/inspect.nix @@ -98,6 +98,9 @@ rec { { cpu = { family = "riscv"; }; } { cpu = { family = "x86"; }; } ]; + + isElf = { kernel.execFormat = execFormats.elf; }; + isMacho = { kernel.execFormat = execFormats.macho; }; }; # given two patterns, return a pattern which is their logical AND. From 6079d13bc96d06408036db7bb05ad9b35584355a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 3 Jan 2024 03:12:42 +0000 Subject: [PATCH 05/30] python310Packages.ezyrb: 1.3.0.post2312 -> 1.3.0.post2401 --- pkgs/development/python-modules/ezyrb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ezyrb/default.nix b/pkgs/development/python-modules/ezyrb/default.nix index c1bee4d060df..faa7efa650f8 100644 --- a/pkgs/development/python-modules/ezyrb/default.nix +++ b/pkgs/development/python-modules/ezyrb/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "ezyrb"; - version = "1.3.0.post2312"; + version = "1.3.0.post2401"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "mathLab"; repo = "EZyRB"; rev = "refs/tags/v${version}"; - hash = "sha256-uS0/Y4luCzJ2zJ0dQ84n4AsQXGWxUv/m5/xiJGPTGDI="; + hash = "sha256-mNpW9RSli7af0fHLh+cmBrOQaO0wlGOrcLigefMR2ww="; }; propagatedBuildInputs = [ From 46d52582b2f76426595906bca7990ea29d7b1d09 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 3 Jan 2024 16:45:28 +0000 Subject: [PATCH 06/30] python310Packages.pot: 0.9.1 -> 0.9.2 --- pkgs/development/python-modules/pot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pot/default.nix b/pkgs/development/python-modules/pot/default.nix index 90aac0fef677..663c0427a5ab 100644 --- a/pkgs/development/python-modules/pot/default.nix +++ b/pkgs/development/python-modules/pot/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "pot"; - version = "0.9.1"; + version = "0.9.2"; pyproject = true; disabled = pythonOlder "3.6"; @@ -28,8 +28,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "PythonOT"; repo = "POT"; - rev = version; - hash = "sha256-D61/dqO16VvcQx4FG1beKR4y1OQHndwCizaugNaUe4g="; + rev = "refs/tags/${version}"; + hash = "sha256-sq8jIWC2DD0T6675W4THbNethm7a//U8HuccKuK0Hjo="; }; nativeBuildInputs = [ From 3d41d9f0d33ee670c0b99090b1b1475ae321d3e9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 Jan 2024 05:37:50 +0000 Subject: [PATCH 07/30] kgeotag: 1.4.0 -> 1.5.0 --- pkgs/by-name/kg/kgeotag/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/kg/kgeotag/package.nix b/pkgs/by-name/kg/kgeotag/package.nix index caaf88f1953b..b59345c79135 100644 --- a/pkgs/by-name/kg/kgeotag/package.nix +++ b/pkgs/by-name/kg/kgeotag/package.nix @@ -2,14 +2,14 @@ libsForQt5.mkDerivation rec { pname = "kgeotag"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitLab { domain = "invent.kde.org"; repo = "kgeotag"; owner = "graphics"; rev = "v${version}"; - hash = "sha256-az/kXEhD/RGfxOMiLEcb651WVPcyBSa8B2sWOF7bz8E="; + hash = "sha256-G9SyGvoSOL6nsWnMuSIUSFHFUwZUzExBJBkKN46o8GI="; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; From dda85b3fb538751a5adbeb9a9a765ff0b0a76f2e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 Jan 2024 07:22:37 +0000 Subject: [PATCH 08/30] gtk-layer-shell: 0.8.1 -> 0.8.2 --- pkgs/development/libraries/gtk-layer-shell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtk-layer-shell/default.nix b/pkgs/development/libraries/gtk-layer-shell/default.nix index 4fbf6f3a6e39..5ecfc299edd4 100644 --- a/pkgs/development/libraries/gtk-layer-shell/default.nix +++ b/pkgs/development/libraries/gtk-layer-shell/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gtk-layer-shell"; - version = "0.8.1"; + version = "0.8.2"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # for demo @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "wmww"; repo = "gtk-layer-shell"; rev = "v${finalAttrs.version}"; - hash = "sha256-WW5sdOAJUKbSLWUpI9BK7O63/Uli+Tu9Tj9ccCOREPM="; + hash = "sha256-8wpfoZcgusJdEbKGZ02UtOOcSogMTNP9Lm+ujo/eKdA="; }; strictDeps = true; From 3c7a9a1656e28765171ef6f752913b05b5cc8105 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 6 Jan 2024 08:59:52 +0000 Subject: [PATCH 09/30] tuptime: 5.2.2 -> 5.2.3 --- pkgs/tools/system/tuptime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/tuptime/default.nix b/pkgs/tools/system/tuptime/default.nix index d93f1a346ca6..d92f65f78ae2 100644 --- a/pkgs/tools/system/tuptime/default.nix +++ b/pkgs/tools/system/tuptime/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "tuptime"; - version = "5.2.2"; + version = "5.2.3"; src = fetchFromGitHub { owner = "rfmoz"; repo = "tuptime"; rev = version; - sha256 = "sha256-YrZP2sovAwwfDBoKoobgkf0+7RmYFUtrV9jfBmDsNL8="; + sha256 = "sha256-kR+Pi7/nsRzmmvibp95wjj8/B/Q6FCDSn2A7vJ3sM94="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; From 945a2d6dc7d54d1eb2333314556016746e9d9c59 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 6 Jan 2024 09:12:48 +0000 Subject: [PATCH 10/30] weaviate: 1.23.0 -> 1.23.1 --- pkgs/servers/search/weaviate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/search/weaviate/default.nix b/pkgs/servers/search/weaviate/default.nix index 307cccf0c211..75f3efe17515 100644 --- a/pkgs/servers/search/weaviate/default.nix +++ b/pkgs/servers/search/weaviate/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "weaviate"; - version = "1.23.0"; + version = "1.23.1"; src = fetchFromGitHub { owner = "weaviate"; repo = "weaviate"; rev = "v${version}"; - hash = "sha256-gm8PNNRnfnpLR5dS7nFfbvbZSSvTxbC4lUma2HI/+ZM="; + hash = "sha256-sQp0RarW+SRxhDmXm1fSI1xEPKPMQ8coJiyJK5d2NlA="; }; vendorHash = "sha256-UEdGoXKq7ewNszahgcomjjuO2uzRZpiwkvvnXyFc9Og="; From 4e0dfe90ebe73a02dbb52553e6680997f2a92710 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 6 Jan 2024 12:31:34 +0000 Subject: [PATCH 11/30] cdxgen: 9.10.1 -> 9.10.2 --- pkgs/tools/security/cdxgen/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/cdxgen/default.nix b/pkgs/tools/security/cdxgen/default.nix index 4c4a7292ac56..162ef7abb642 100644 --- a/pkgs/tools/security/cdxgen/default.nix +++ b/pkgs/tools/security/cdxgen/default.nix @@ -5,16 +5,16 @@ buildNpmPackage rec { pname = "cdxgen"; - version = "9.10.1"; + version = "9.10.2"; src = fetchFromGitHub { owner = "AppThreat"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FkOWkjf/TXjmSOMSTHvf/MhRtuIPFwGwMt1IUJdvKM0="; + sha256 = "sha256-d4abSPP0dLi5xzq1CYxi1MSKogrQ+YcZjmlUEr5+oBQ="; }; - npmDepsHash = "sha256-2DDLogGXT9G8tKJYxVtS7oa5szlaaQTs1kJcgq9GA7k="; + npmDepsHash = "sha256-KLI6wJrP2s2UWkSC5zmFuC2sa2owRgAhnR4UVrI0ThY="; dontNpmBuild = true; From 07fd92be44117a74813cb25261ae6cb9ce0befa6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 7 Jan 2024 04:45:48 +0000 Subject: [PATCH 12/30] gridtracker: 1.23.1207 -> 1.24.0104 --- pkgs/applications/radio/gridtracker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/gridtracker/default.nix b/pkgs/applications/radio/gridtracker/default.nix index c961e1bd2d49..31eb90fb2240 100644 --- a/pkgs/applications/radio/gridtracker/default.nix +++ b/pkgs/applications/radio/gridtracker/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gridtracker"; - version = "1.23.1207"; + version = "1.24.0104"; src = fetchFromGitLab { owner = "gridtracker.org"; repo = "gridtracker"; rev = "v${version}"; - sha256 = "sha256-r7H+fds8FbSLDxPQqn0XUPC6loLgsaNX+DBqJJ96/d4="; + sha256 = "sha256-p3PdYOk0yvG3QkM17grzZmf9upK1n0zo4aOrlhGTvTU="; }; nativeBuildInputs = [ wrapGAppsHook ]; From fac4ee51af07a8b0ca7326b61e22b179d220032b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 7 Jan 2024 05:41:30 +0000 Subject: [PATCH 13/30] renode-unstable: 1.14.0+20231229gita76dac0ae -> 1.14.0+20240106git1b3952c2c --- pkgs/by-name/re/renode-unstable/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/re/renode-unstable/package.nix b/pkgs/by-name/re/renode-unstable/package.nix index b94692a119ac..b733a10bd7ba 100644 --- a/pkgs/by-name/re/renode-unstable/package.nix +++ b/pkgs/by-name/re/renode-unstable/package.nix @@ -7,10 +7,10 @@ inherit buildUnstable; }).overrideAttrs (finalAttrs: _: { pname = "renode-unstable"; - version = "1.14.0+20231229gita76dac0ae"; + version = "1.14.0+20240106git1b3952c2c"; src = fetchurl { url = "https://builds.renode.io/renode-${finalAttrs.version}.linux-portable.tar.gz"; - hash = "sha256-fvwNN3sT8VZ7XJPrfpAbjSiuAB274QhuPeekwz0AU3c="; + hash = "sha256-tDo/01jYoq1Qg8h0BS4BQSPh3rsINpe72eMk9UBWgR0="; }; }) From 546ac6ab8859be32885d527f1f7d2464ea6c4046 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 7 Jan 2024 06:58:57 +0000 Subject: [PATCH 14/30] klipper: unstable-2023-12-13 -> unstable-2024-01-06 --- pkgs/servers/klipper/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix index 4726c63e1448..341fc484451f 100644 --- a/pkgs/servers/klipper/default.nix +++ b/pkgs/servers/klipper/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "klipper"; - version = "unstable-2023-12-13"; + version = "unstable-2024-01-06"; src = fetchFromGitHub { owner = "KevinOConnor"; repo = "klipper"; - rev = "f0753bd3381a86826082d5bf7a349c1f0b9f7e48"; - sha256 = "sha256-4xaee/7tXmR4/249lxHocana0KoesdH22/7HXWq1xwk="; + rev = "b50d6669a8b491edf07602c0528d26abe8985536"; + sha256 = "sha256-qI+0bia5ROzXcuz0JVLdGyRa45NWTU/MH8dBUXGaHgA="; }; sourceRoot = "${src.name}/klippy"; From ac946585dc40cccc6bffa6510b19f6e071abe794 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 7 Jan 2024 07:23:10 +0000 Subject: [PATCH 15/30] kubectl-gadget: 0.23.1 -> 0.24.0 --- .../networking/cluster/kubectl-gadget/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubectl-gadget/default.nix b/pkgs/applications/networking/cluster/kubectl-gadget/default.nix index 8e4fe78c1bd3..479a6efab2a1 100644 --- a/pkgs/applications/networking/cluster/kubectl-gadget/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-gadget/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubectl-gadget"; - version = "0.23.1"; + version = "0.24.0"; src = fetchFromGitHub { owner = "inspektor-gadget"; repo = "inspektor-gadget"; rev = "v${version}"; - hash = "sha256-rlsjkjJg0IRGRBpTGhKTpMVQgxhizN7P+py2R+sczrk="; + hash = "sha256-JC6+6PADTfxpVRowh09fXC8EO/qIsUTTba2uYxxxJ/A="; }; - vendorHash = "sha256-+DXQ4Rgd7egKsDyU0/WQgninlsjPHFAoHy/sSQYE1p8="; + vendorHash = "sha256-7pwEQ1O3i4SmVSTTmOX9KPR0ePdDpf2dQgD4e6fDyzQ="; CGO_ENABLED = 0; From 7cb3f2ddba2499b10062151dfd87331e907415e2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 7 Jan 2024 13:00:48 +0000 Subject: [PATCH 16/30] minio-client: 2023-10-30T18-43-32Z -> 2024-01-05T05-04-32Z --- pkgs/tools/networking/minio-client/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index b40ba824be1b..b3cfc792bc39 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio-client"; - version = "2023-10-30T18-43-32Z"; + version = "2024-01-05T05-04-32Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "sha256-4WYJaFVB/+ERMNKvfDZvJGEiImwISM8fXLbi+Y986AM="; + sha256 = "sha256-1A5Nzlf9xBcOcPdKXZut+4ViUvsDa2uFtfN/nIRoUf8="; }; - vendorHash = "sha256-YDXkJVFK09I/Ic3ZBlO2AtybH6+RfwLmBCldX4i41Po="; + vendorHash = "sha256-rqlPUU9phbsw9cjGvU86DjA3cWhcoxX3kxQ1buLM+hg="; subPackages = [ "." ]; From 4f809c6c676f994e0af5a034484fc2470c100750 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 7 Jan 2024 13:13:59 +0000 Subject: [PATCH 17/30] moar: 1.18.6 -> 1.21.0 --- pkgs/tools/misc/moar/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/moar/default.nix b/pkgs/tools/misc/moar/default.nix index 232972d35ac0..8a11fa6c4617 100644 --- a/pkgs/tools/misc/moar/default.nix +++ b/pkgs/tools/misc/moar/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "moar"; - version = "1.18.6"; + version = "1.21.0"; src = fetchFromGitHub { owner = "walles"; repo = pname; rev = "v${version}"; - hash = "sha256-QQapWDTJkP0YuyNR8J1N2IEETG1BfkdWv40SPD/JKYg="; + hash = "sha256-7Wgt1LE+YmUlV4d79/sXoBmeH4KUhSNUVW5wjYUjg9Y="; }; - vendorHash = "sha256-x6BeU6JDayCOi8T8+NvXZe59QmTaO9RAYwSiFlDPL/c="; + vendorHash = "sha256-RJdjaq2meZ9E3g5E2B1PdRvVCVLwK0WMwM5uYOn3B34="; nativeBuildInputs = [ installShellFiles ]; From c74d8906b5251e0aa9e872ba06d0d16f60c0a54c Mon Sep 17 00:00:00 2001 From: Olmo Kramer Date: Sun, 7 Jan 2024 15:14:56 +0100 Subject: [PATCH 18/30] signaturepdf: Fix postInstall hook --- pkgs/by-name/si/signaturepdf/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/si/signaturepdf/package.nix b/pkgs/by-name/si/signaturepdf/package.nix index d7d18509ac51..34eaab9213ed 100644 --- a/pkgs/by-name/si/signaturepdf/package.nix +++ b/pkgs/by-name/si/signaturepdf/package.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { --run 'echo "You may now open a web browser on http://localhost:$port"' \ --add-flags '-S "localhost:$port" -t public' - runHook preInstall + runHook postInstall ''; meta = with lib; { From 07c3a4234d9466bda52c80bff760b7134687c7a2 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 7 Jan 2024 15:49:31 +0100 Subject: [PATCH 19/30] python311Packages.radicale-infcloud: rename from radicale_infcloud --- .../{radicale_infcloud => radicale-infcloud}/default.nix | 2 +- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) rename pkgs/development/python-modules/{radicale_infcloud => radicale-infcloud}/default.nix (95%) diff --git a/pkgs/development/python-modules/radicale_infcloud/default.nix b/pkgs/development/python-modules/radicale-infcloud/default.nix similarity index 95% rename from pkgs/development/python-modules/radicale_infcloud/default.nix rename to pkgs/development/python-modules/radicale-infcloud/default.nix index cbc4be6e7aa1..214c1dcffe87 100644 --- a/pkgs/development/python-modules/radicale_infcloud/default.nix +++ b/pkgs/development/python-modules/radicale-infcloud/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, buildPythonPackage, radicale }: buildPythonPackage { - pname = "radicale_infcloud"; + pname = "radicale-infcloud"; version = "unstable-2022-04-18"; format = "setuptools"; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 86f10c04908e..976990eb9ec4 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -403,6 +403,7 @@ mapAliases ({ qcodes-loop = throw "qcodes-loop has been removed due to deprecation"; # added 2023-11-30 qiskit-aqua = throw "qiskit-aqua has been removed due to deprecation, with its functionality moved to different qiskit packages"; rabbitpy = throw "rabbitpy has been removed, since it is unmaintained and broken"; # added 2023-07-01 + radicale_infcloud = radicale-infcloud; # added 2024-01-07 radio_beam = radio-beam; # added 2023-11-04 ratelimiter = throw "ratelimiter has been removed, since it is unmaintained and broken"; # added 2023-10-21 rdflib-jsonld = throw "rdflib-jsonld is not compatible with rdflib 6"; # added 2021-11-05 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 73ace0d799d5..8c4601b9bd8d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12269,7 +12269,7 @@ self: super: with self; { rachiopy = callPackage ../development/python-modules/rachiopy { }; - radicale_infcloud = callPackage ../development/python-modules/radicale_infcloud { + radicale-infcloud = callPackage ../development/python-modules/radicale-infcloud { radicale = pkgs.radicale.override { python3 = python; }; }; From 7af53089c65513a7f8cc5bfb4c2c16dfbe7b04bf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 7 Jan 2024 15:48:49 +0000 Subject: [PATCH 20/30] helm-ls: 0.0.8 -> 0.0.9 --- pkgs/development/tools/language-servers/helm-ls/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/language-servers/helm-ls/default.nix b/pkgs/development/tools/language-servers/helm-ls/default.nix index 388bb0e92d4b..5b39548aa65e 100644 --- a/pkgs/development/tools/language-servers/helm-ls/default.nix +++ b/pkgs/development/tools/language-servers/helm-ls/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "helm-ls"; - version = "0.0.8"; + version = "0.0.9"; src = fetchFromGitHub { owner = "mrjosh"; repo = "helm-ls"; rev = "v${version}"; - hash = "sha256-q9RK7wTEbwptzNrXzifq6vUpOKD3idsG5FZKpQZ1uCc="; + hash = "sha256-DfFXKkYrJbO4stBM/5qewhy1etvJS6ey12jmd/NIs8Q="; }; - vendorHash = "sha256-KyeXVS07+WUV+Q5Z9Q+SFp/q9KLLQBpuBH9kRSAh8qg="; + vendorHash = "sha256-8mSX7fwgxwZ8aIXfv3WxLiVH5PjSFzcxM0oekod84tA="; nativeBuildInputs = [ installShellFiles ]; From f078fb0786b033213cf23b0c0b72f6f1c4e796f1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 7 Jan 2024 17:25:05 +0000 Subject: [PATCH 21/30] moon: 1.18.5 -> 1.19.0 --- pkgs/development/tools/build-managers/moon/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/moon/default.nix b/pkgs/development/tools/build-managers/moon/default.nix index 14f4fa806f0c..30f3c14c9d40 100644 --- a/pkgs/development/tools/build-managers/moon/default.nix +++ b/pkgs/development/tools/build-managers/moon/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "moon"; - version = "1.18.5"; + version = "1.19.0"; src = fetchFromGitHub { owner = "moonrepo"; repo = pname; rev = "v${version}"; - hash = "sha256-NZiFxcEdNdqR38VDJe4lC5maLTguk3+t78yG1zqXuA0="; + hash = "sha256-BjSe5N9rFsVL5EueCbBTcnIJM4TYd5q/1wrsANCyniU="; }; - cargoHash = "sha256-BecaYeQYYoP7SubTktYqOejFyCTRolmUTV7rpGwXOGI="; + cargoHash = "sha256-tMqk0aI+ObxlgAOa1inL8mba9ti9Gxhg9mckmyNsuv8="; env = { RUSTFLAGS = "-C strip=symbols"; From e1d9ca4f0799172a84db709ed2ab2401aa60632c Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 4 Jan 2024 21:17:10 +0100 Subject: [PATCH 22/30] abcde: Fix evaluation Was broken in 9fddd791c6a5aab0386eb789521495d0732dc4b4 but not caught due to https://github.com/NixOS/nixpkgs/pull/271123#discussion_r1442134594 --- 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 75130bb4d03c..d2a0095f6243 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30292,7 +30292,7 @@ with pkgs; aaxtomp3 = callPackage ../applications/audio/aaxtomp3 { }; abcde = callPackage ../applications/audio/abcde { - inherit (python3Packages) eyeD3; + inherit (python3Packages) eyed3; }; abiword = callPackage ../applications/office/abiword { }; From 1797094f8b929f12ada2e57772d32151ee7cf843 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 4 Jan 2024 21:23:21 +0100 Subject: [PATCH 23/30] pythonPackages.dnf-plugins-core: Fix eval with allowAliases false This was not caught when the package was introduced because of https://github.com/NixOS/nixpkgs/pull/271123#discussion_r1442134594 --- pkgs/development/python-modules/dnf-plugins-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dnf-plugins-core/default.nix b/pkgs/development/python-modules/dnf-plugins-core/default.nix index 2c27dfe5fa01..54b170f37812 100644 --- a/pkgs/development/python-modules/dnf-plugins-core/default.nix +++ b/pkgs/development/python-modules/dnf-plugins-core/default.nix @@ -4,7 +4,7 @@ # dependencies , cmake -, dateutil +, python-dateutil , dbus-python , dnf4 , gettext @@ -54,7 +54,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - dateutil + python-dateutil dbus-python dnf4.py libcomps From 199a63aa10609022f44491af56c6e95643425636 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 4 Jan 2024 21:33:59 +0100 Subject: [PATCH 24/30] mate.mate-user-share: Fix evaluation with allowAliases false Was broken by feb114f7f0f01295a99c108ed2d97cd0d152f41a And not caught due to https://github.com/NixOS/nixpkgs/pull/271123#discussion_r1442134594 --- pkgs/desktops/mate/mate-user-share/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mate-user-share/default.nix b/pkgs/desktops/mate/mate-user-share/default.nix index 8dc35d704669..84204e3e34be 100644 --- a/pkgs/desktops/mate/mate-user-share/default.nix +++ b/pkgs/desktops/mate/mate-user-share/default.nix @@ -9,14 +9,16 @@ , libnotify , libxml2 , libcanberra-gtk3 -, mod_dnssd -, apacheHttpd +, apacheHttpdPackages , hicolor-icon-theme , mate , wrapGAppsHook , mateUpdateScript }: +let + inherit (apacheHttpdPackages) apacheHttpd mod_dnssd; +in stdenv.mkDerivation rec { pname = "mate-user-share"; version = "1.26.0"; From 046d653f7e5ccb746a3133f1d3aca58156827533 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 4 Jan 2024 21:35:12 +0100 Subject: [PATCH 25/30] pythonPackages.sqlalchemy_1_4: Fix evaluation with allowAliases false Was broken since 7dd34690ec816fe50624466e1c59ce32c2a43b8a but not caught due to https://github.com/NixOS/nixpkgs/pull/271123#discussion_r1442134594 --- pkgs/development/python-modules/sqlalchemy/1_4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sqlalchemy/1_4.nix b/pkgs/development/python-modules/sqlalchemy/1_4.nix index 4efdee5927cc..4deeb396bd0c 100644 --- a/pkgs/development/python-modules/sqlalchemy/1_4.nix +++ b/pkgs/development/python-modules/sqlalchemy/1_4.nix @@ -13,7 +13,7 @@ , aiosqlite , asyncmy , asyncpg -, cx_oracle +, cx-oracle , mariadb , mypy , mysql-connector @@ -79,7 +79,7 @@ buildPythonPackage rec { mariadb ]; oracle = [ - cx_oracle + cx-oracle ]; postgresql = [ psycopg2 From 69460711750d4bb4718516fdb155145e922ff610 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 4 Jan 2024 21:39:07 +0100 Subject: [PATCH 26/30] tests.checkpoint-build: Fix evaluation with allowAliases false Was broken since introduced, but not caught due to https://github.com/NixOS/nixpkgs/pull/271123#discussion_r1442134594 --- pkgs/test/checkpointBuild/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/test/checkpointBuild/default.nix b/pkgs/test/checkpointBuild/default.nix index 4a59760230a6..cdcb022086ba 100644 --- a/pkgs/test/checkpointBuild/default.nix +++ b/pkgs/test/checkpointBuild/default.nix @@ -1,9 +1,9 @@ -{ hello, checkpointBuildTools, runCommandNoCC, texinfo, stdenv, rsync }: +{ hello, checkpointBuildTools, runCommand, texinfo, stdenv, rsync }: let baseHelloArtifacts = checkpointBuildTools.prepareCheckpointBuild hello; patchedHello = hello.overrideAttrs (old: { buildInputs = [ texinfo ]; - src = runCommandNoCC "patch-hello-src" { } '' + src = runCommand "patch-hello-src" { } '' mkdir -p $out cd $out tar xf ${hello.src} --strip-components=1 @@ -24,7 +24,7 @@ let patches = [ ./hello-additionalFile.patch ]; })); - preparedHelloRemoveFileSrc = runCommandNoCC "patch-hello-src" { } '' + preparedHelloRemoveFileSrc = runCommand "patch-hello-src" { } '' mkdir -p $out cd $out tar xf ${hello.src} --strip-components=1 @@ -33,7 +33,7 @@ let patchedHelloRemoveFile = hello.overrideAttrs (old: { buildInputs = [ texinfo ]; - src = runCommandNoCC "patch-hello-src" { } '' + src = runCommand "patch-hello-src" { } '' mkdir -p $out cd $out ${rsync}/bin/rsync -cutU --chown=$USER:$USER --chmod=+w -r ${preparedHelloRemoveFileSrc}/* . From 9be716fb75bc10db65584a18635243d8d5ad784e Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Fri, 5 Jan 2024 02:53:01 +0100 Subject: [PATCH 27/30] cudaPackages.autoAddCudaCompatRunpathHook: Fix eval w/o cuda_compat --- pkgs/development/cuda-modules/setup-hooks/extension.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/cuda-modules/setup-hooks/extension.nix b/pkgs/development/cuda-modules/setup-hooks/extension.nix index 930730ce6c06..10f126bc12fb 100644 --- a/pkgs/development/cuda-modules/setup-hooks/extension.nix +++ b/pkgs/development/cuda-modules/setup-hooks/extension.nix @@ -53,7 +53,7 @@ final: _: { autoAddCudaCompatRunpathHook = final.callPackage ( - {makeSetupHook, cuda_compat}: + {makeSetupHook, cuda_compat ? throw "autoAddCudaCompatRunpathHook: No cuda_compat for CUDA ${final.cudaMajorMinorVersion}" }: makeSetupHook { name = "auto-add-cuda-compat-runpath-hook"; From 3e929146cf01b532ec68a2f73af22271effdc75d Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Sun, 7 Jan 2024 23:18:05 +0100 Subject: [PATCH 28/30] pythonPackages.snakemake-interface-common: Fix eval with allowAliases false Was broken since initialised in 9b2d4d2faa875d91f76d77a9193ff7a840f263e7 but not noticed due to https://github.com/NixOS/nixpkgs/pull/271123#discussion_r1442134594 --- .../python-modules/snakemake-interface-common/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/snakemake-interface-common/default.nix b/pkgs/development/python-modules/snakemake-interface-common/default.nix index d8a326112c33..bccad271d4a1 100644 --- a/pkgs/development/python-modules/snakemake-interface-common/default.nix +++ b/pkgs/development/python-modules/snakemake-interface-common/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , poetry-core , argparse-dataclass -, ConfigArgParse +, configargparse }: buildPythonPackage rec { @@ -24,7 +24,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ argparse-dataclass - ConfigArgParse + configargparse ]; pythonImportsCheck = [ "snakemake_interface_common" ]; From 56df668386ac83c5bcddf9849c645cf0d25706d7 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 4 Jan 2024 21:44:50 +0100 Subject: [PATCH 29/30] lib.callPackageWith: Use abort, not throw This reverts f8ea911f7c4e44b167d4b1b51f6d00ebd93e1ed1, see also https://github.com/NixOS/nixpkgs/pull/271123#discussion_r1442134594 --- lib/customisation.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/customisation.nix b/lib/customisation.nix index c233744e07ca..0b5cad71fddf 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -203,7 +203,11 @@ rec { in if missingArgs == {} then makeOverridable f allArgs - else throw "lib.customisation.callPackageWith: ${error}"; + # This needs to be an abort so it can't be caught with `builtins.tryEval`, + # which is used by nix-env and ofborg to filter out packages that don't evaluate. + # This way we're forced to fix such errors in Nixpkgs, + # which is especially relevant with allowAliases = false + else abort "lib.customisation.callPackageWith: ${error}"; /* Like callPackage, but for a function that returns an attribute From ad51bcc62abee5437b981380a065809ca9ec13ab Mon Sep 17 00:00:00 2001 From: Tom Fitzhenry Date: Tue, 3 Oct 2023 01:04:26 +1100 Subject: [PATCH 30/30] phoc: add passthru.updateScript updateScript is documented at https://nixos.org/manual/nixpkgs/unstable/#var-passthru-updateScript --- pkgs/applications/misc/phoc/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/phoc/default.nix b/pkgs/applications/misc/phoc/default.nix index db53bf937a51..9853cf5f8844 100644 --- a/pkgs/applications/misc/phoc/default.nix +++ b/pkgs/applications/misc/phoc/default.nix @@ -17,6 +17,7 @@ , libxkbcommon , wlroots , xorg +, gitUpdater , nixosTests }: @@ -71,7 +72,13 @@ in stdenv.mkDerivation rec { patchShebangs build-aux/post_install.py ''; - passthru.tests.phosh = nixosTests.phosh; + passthru = { + tests.phosh = nixosTests.phosh; + updateScript = gitUpdater { + url = "https://gitlab.gnome.org/World/Phosh/phoc"; + rev-prefix = "v"; + }; + }; meta = with lib; { description = "Wayland compositor for mobile phones like the Librem 5";