From 7db47b0fffc12d14369d026be49d2a555be90ebd Mon Sep 17 00:00:00 2001 From: Johan Herland Date: Wed, 25 Jun 2025 10:03:07 +0000 Subject: [PATCH 01/27] hdrhistogram_c: init at 0.11.8 --- pkgs/by-name/hd/hdrhistogram_c/package.nix | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 pkgs/by-name/hd/hdrhistogram_c/package.nix diff --git a/pkgs/by-name/hd/hdrhistogram_c/package.nix b/pkgs/by-name/hd/hdrhistogram_c/package.nix new file mode 100644 index 000000000000..f1d128e6a1f6 --- /dev/null +++ b/pkgs/by-name/hd/hdrhistogram_c/package.nix @@ -0,0 +1,32 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + zlib, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "hdrhistogram_c"; + version = "0.11.8"; + + src = fetchFromGitHub { + owner = "HdrHistogram"; + repo = "HdrHistogram_c"; + tag = finalAttrs.version; + hash = "sha256-TFlrC4bgK8o5KRZcLMlYU5EO9Oqaqe08PjJgmsUl51M="; + }; + + buildInputs = [ zlib ]; + nativeBuildInputs = [ cmake ]; + + doCheck = true; + + meta = { + description = "C port or High Dynamic Range (HDR) Histogram"; + homepage = "https://github.com/HdrHistogram/HdrHistogram_c"; + changelog = "https://github.com/HdrHistogram/HdrHistogram_c/releases/tag/${finalAttrs.version}"; + license = lib.licenses.publicDomain; + maintainers = with lib.maintainers; [ jherland ]; + }; +}) From a326bc6ce690700598226553e52ec7a09a41a797 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 2 Aug 2025 10:47:43 +0000 Subject: [PATCH 02/27] python3Packages.smp: 3.3.1 -> 3.3.2 --- pkgs/development/python-modules/smp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/smp/default.nix b/pkgs/development/python-modules/smp/default.nix index 8f4ec2f8fe41..37eb2452d93f 100644 --- a/pkgs/development/python-modules/smp/default.nix +++ b/pkgs/development/python-modules/smp/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "smp"; - version = "3.3.1"; + version = "3.3.2"; pyproject = true; src = fetchFromGitHub { owner = "JPHutchins"; repo = "smp"; tag = version; - hash = "sha256-TjucQm07nbfuFrVOHGOVA/f1rQRQfU8ws8VVC+U/kp8="; + hash = "sha256-klMFJOKGSy6s16M+9wQhSvLSWdNPO/IMNdY5RW+wyFc="; }; build-system = [ @@ -44,7 +44,7 @@ buildPythonPackage rec { meta = { description = "Simple Management Protocol (SMP) for remotely managing MCU firmware"; homepage = "https://github.com/JPHutchins/smp"; - changelog = "https://github.com/JPHutchins/smp/releases/tag/${version}"; + changelog = "https://github.com/JPHutchins/smp/releases/tag/${src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ otavio ]; }; From 174d72c9529be1655464d1472b5d7ec46881a7bc Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sun, 3 Aug 2025 13:45:12 +0200 Subject: [PATCH 03/27] palemoon-bin: 33.8.0 -> 33.8.1.1 --- pkgs/applications/networking/browsers/palemoon/bin.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/palemoon/bin.nix b/pkgs/applications/networking/browsers/palemoon/bin.nix index 20658e875909..c974e96d7119 100644 --- a/pkgs/applications/networking/browsers/palemoon/bin.nix +++ b/pkgs/applications/networking/browsers/palemoon/bin.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "palemoon-bin"; - version = "33.8.0"; + version = "33.8.1.1"; src = finalAttrs.passthru.sources."gtk${if withGTK3 then "3" else "2"}"; @@ -173,11 +173,11 @@ stdenv.mkDerivation (finalAttrs: { { gtk3 = fetchzip { urls = urlRegionVariants "gtk3"; - hash = "sha256-cdPFMYlVEr6D+0mH7Mg5nGpf0KvePGLm3Y/ZytdFHHA="; + hash = "sha256-zUStYcCOwiP/LHDUVzu1E8Req0Erk96/Pp1zu+FvK5s="; }; gtk2 = fetchzip { urls = urlRegionVariants "gtk2"; - hash = "sha256-dgWKmkHl5B1ri3uev63MNz/+E767ip9wJ/YzSog8vdQ="; + hash = "sha256-OfShUQiFtX+3cb035EbE4FgpohDcNXqOa5i75IxGo0o="; }; }; From 0258f52c9e23c15bd95a6c7fa32f6cf1babc9254 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sun, 3 Aug 2025 13:48:08 +0200 Subject: [PATCH 04/27] palemoon-gtk2-bin: init at 33.8.1.1 To make testing the variant override more convenient. --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 19ea2ce1706d..891390e70348 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13242,6 +13242,7 @@ with pkgs; }; palemoon-bin = callPackage ../applications/networking/browsers/palemoon/bin.nix { }; + palemoon-gtk2-bin = palemoon-bin.override { withGTK3 = false; }; pantalaimon = callPackage ../applications/networking/instant-messengers/pantalaimon { }; From 0162d1179e0205a17fd7bd70772c76500b537e7b Mon Sep 17 00:00:00 2001 From: x123 Date: Sun, 3 Aug 2025 12:44:24 +0200 Subject: [PATCH 05/27] ip2asn: init at 0.1.2 --- pkgs/by-name/ip/ip2asn/package.nix | 61 ++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 pkgs/by-name/ip/ip2asn/package.nix diff --git a/pkgs/by-name/ip/ip2asn/package.nix b/pkgs/by-name/ip/ip2asn/package.nix new file mode 100644 index 000000000000..cac2fd031c1e --- /dev/null +++ b/pkgs/by-name/ip/ip2asn/package.nix @@ -0,0 +1,61 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + openssl, + nix-update-script, + versionCheckHook, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "ip2asn"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "x123"; + repo = "ip2asn"; + tag = finalAttrs.version; + hash = "sha256-2wuxBwllrkPdmmBCt7DPQ38E2k3igAjbICun51bhopY="; + }; + + cargoHash = "sha256-fYg0aIU8usueMg6cMWUcwMIFCinHdm6H7k9ywZGYfg8="; + + passthru.updateScript = nix-update-script { }; + + cargoBuildFlags = [ + "-p" + "ip2asn-cli" + ]; + + # disable network based tests that download data + cargoTestFlags = [ + "-p" + "ip2asn-cli" + "--" + "--skip" + "auto_update_tests::test_auto_update_triggers_download" + "--skip" + "auto_update_tests::test_auto_update_skips_check_for_recent_cache" + ]; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + ]; + + meta = { + description = "CLI tool for mapping IP addresses to Autonomous System information"; + homepage = "https://github.com/x123/ip2asn/tree/master/ip2asn-cli"; + changelog = "https://github.com/x123/ip2asn/blob/${finalAttrs.version}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ x123 ]; + mainProgram = "ip2asn"; + }; +}) From 0383e316408c41c45874c37111bf18e26a379a0b Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sun, 3 Aug 2025 17:12:58 +0200 Subject: [PATCH 06/27] libre: 3.10.0 -> 3.24.0 --- pkgs/by-name/li/libre/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libre/package.nix b/pkgs/by-name/li/libre/package.nix index 1058fe8b16d1..5ace0617d47d 100644 --- a/pkgs/by-name/li/libre/package.nix +++ b/pkgs/by-name/li/libre/package.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation rec { - version = "3.10.0"; + version = "3.24.0"; pname = "libre"; src = fetchFromGitHub { owner = "baresip"; repo = "re"; rev = "v${version}"; - sha256 = "sha256-OWVDuKlF7YLipDURC46s14WOLWWagUqWg20sH0kSIA4="; + sha256 = "sha256-wcntgFKpVxDlRMF8a7s9UxeXihguiGxTL/PGv9ImB80="; }; buildInputs = [ From 1c764027890354dad03732d9a11ed3b1fe78128f Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sun, 3 Aug 2025 17:14:20 +0200 Subject: [PATCH 07/27] baresip: 3.10.1 -> 3.24.0 --- pkgs/by-name/ba/baresip/package.nix | 135 ++++++++++++++-------------- 1 file changed, 69 insertions(+), 66 deletions(-) diff --git a/pkgs/by-name/ba/baresip/package.nix b/pkgs/by-name/ba/baresip/package.nix index 904042be942e..f841e562f5fd 100644 --- a/pkgs/by-name/ba/baresip/package.nix +++ b/pkgs/by-name/ba/baresip/package.nix @@ -30,13 +30,13 @@ dbusSupport ? true, }: stdenv.mkDerivation rec { - version = "3.10.1"; + version = "3.24.0"; pname = "baresip"; src = fetchFromGitHub { owner = "baresip"; repo = "baresip"; rev = "v${version}"; - hash = "sha256-0huZP1hopHaN5R1Hki6YutpvoASfIHzHMl/Y4czHHMo="; + hash = "sha256-32XyMblHF+ST+TpIbdyPFdRtWnIugYMr4lYZnfeFm/c="; }; prePatch = '' substituteInPlace cmake/FindGTK3.cmake --replace-fail GTK3_CFLAGS_OTHER "" @@ -102,72 +102,75 @@ stdenv.mkDerivation rec { -D__need_timeval -D__need_timespec -D__need_time_t ''; - doInstallCheck = true; # CMake feature detection is prone to breakage between upgrades: # spot-check that the optional modules we care about were compiled - postInstallCheck = lib.concatMapStringsSep "\n" (m: "test -x $out/lib/baresip/modules/${m}.so") [ - "account" - "alsa" - "aubridge" - "auconv" - "aufile" - "auresamp" - "ausine" - "avcodec" - "avfilter" - "avformat" - "cons" - "contact" - "ctrl_dbus" - "ctrl_tcp" - "debug_cmd" - "dtls_srtp" - "ebuacip" - "echo" - "evdev" - "fakevideo" - "g711" - "g722" - "g726" - "gst" - "gtk" - "httpd" - "httpreq" - "ice" - "l16" - "menu" - "mixausrc" - "mixminus" - "multicast" - "mwi" - "natpmp" - "netroam" - "pcp" - "pipewire" - "plc" - "portaudio" - "presence" - "rtcpsummary" - "sdl" - "selfview" - "serreg" - "snapshot" - "sndfile" - "srtp" - "stdio" - "stun" - "swscale" - "syslog" - "turn" - "uuid" - "v4l2" - "vidbridge" - "vidinfo" - "vp8" - "vp9" - "vumeter" - "x11" - ]; + installCheckPhase = '' + runHook preInstallCheck + ${lib.concatMapStringsSep "\n" (m: "test -x $out/lib/baresip/modules/${m}.so") [ + "account" + "alsa" + "aubridge" + "auconv" + "aufile" + "auresamp" + "ausine" + "avcodec" + "avfilter" + "avformat" + "cons" + "contact" + "ctrl_dbus" + "ctrl_tcp" + "debug_cmd" + "dtls_srtp" + "ebuacip" + "echo" + "evdev" + "fakevideo" + "g711" + "g722" + "g726" + "gst" + "gtk" + "httpd" + "httpreq" + "ice" + "l16" + "menu" + "mixausrc" + "mixminus" + "multicast" + "mwi" + "natpmp" + "netroam" + "pcp" + "pipewire" + "plc" + "portaudio" + "presence" + "rtcpsummary" + "sdl" + "selfview" + "serreg" + "snapshot" + "sndfile" + "srtp" + "stdio" + "stun" + "swscale" + "syslog" + "turn" + "uuid" + "v4l2" + "vidbridge" + "vidinfo" + "vp8" + "vp9" + "vumeter" + "x11" + ]} + runHook postInstallCheck + ''; meta = { description = "Modular SIP User-Agent with audio and video support"; From ea8db5549c76a4636c4f10ec83a46d45e997c010 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sun, 3 Aug 2025 17:15:06 +0200 Subject: [PATCH 08/27] baresip: fix module path depending on store path --- .../by-name/ba/baresip/fix-modules-path.patch | 29 +++++++++++++++++++ pkgs/by-name/ba/baresip/package.nix | 8 +++++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/by-name/ba/baresip/fix-modules-path.patch diff --git a/pkgs/by-name/ba/baresip/fix-modules-path.patch b/pkgs/by-name/ba/baresip/fix-modules-path.patch new file mode 100644 index 000000000000..b02c830057c2 --- /dev/null +++ b/pkgs/by-name/ba/baresip/fix-modules-path.patch @@ -0,0 +1,29 @@ +commit 46479c52695cc5f8c01370fd2594468666c45c8e +Author: rnhmjoj +Date: Sun Aug 3 00:18:47 2025 +0200 + + Fix the modules path at build time + + The location of the modules is determined by reading the `module_path` + setting, which is set to "$out/lib/baresip/modules" when the + configuration file is generated during the first run. If the package is + updated and the store path changes, baresip breaks completely, forcing + the user to manually fix the configuration. + + This patch fixes the location of the modules at build time, ignoring the + `module_path` setting, to avoid this issue. + +diff --git a/src/module.c b/src/module.c +index 9f2135c6..b62d0bdd 100644 +--- a/src/module.c ++++ b/src/module.c +@@ -141,8 +141,7 @@ int module_init(const struct conf *conf) + if (!conf) + return EINVAL; + +- if (conf_get(conf, "module_path", &path)) +- pl_set_str(&path, "."); ++ pl_set_str(&path, MOD_PATH); + + err = conf_apply(conf, "module", module_handler, &path); + if (err) diff --git a/pkgs/by-name/ba/baresip/package.nix b/pkgs/by-name/ba/baresip/package.nix index f841e562f5fd..4c4a0210156e 100644 --- a/pkgs/by-name/ba/baresip/package.nix +++ b/pkgs/by-name/ba/baresip/package.nix @@ -29,21 +29,29 @@ zlib, dbusSupport ? true, }: + stdenv.mkDerivation rec { version = "3.24.0"; pname = "baresip"; + src = fetchFromGitHub { owner = "baresip"; repo = "baresip"; rev = "v${version}"; hash = "sha256-32XyMblHF+ST+TpIbdyPFdRtWnIugYMr4lYZnfeFm/c="; }; + + patches = [ + ./fix-modules-path.patch + ]; + prePatch = '' substituteInPlace cmake/FindGTK3.cmake --replace-fail GTK3_CFLAGS_OTHER "" '' + lib.optionalString (!dbusSupport) '' substituteInPlace cmake/modules.cmake --replace-fail 'list(APPEND MODULES ctrl_dbus)' "" ''; + nativeBuildInputs = [ cmake pkg-config From fad3a03c4ba7967b0ef602bd0416aaf009cd837f Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sun, 3 Aug 2025 17:15:38 +0200 Subject: [PATCH 09/27] baresip: add rnhmjoj as maintainer --- pkgs/by-name/ba/baresip/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ba/baresip/package.nix b/pkgs/by-name/ba/baresip/package.nix index 4c4a0210156e..1bf303ffbc9e 100644 --- a/pkgs/by-name/ba/baresip/package.nix +++ b/pkgs/by-name/ba/baresip/package.nix @@ -186,6 +186,7 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ raskin ehmry + rnhmjoj ]; mainProgram = "baresip"; license = lib.licenses.bsd3; From ea43ddefeba770e230720ff4cf44bf6fc4681ad7 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Mon, 4 Aug 2025 16:55:55 +0200 Subject: [PATCH 10/27] {palemoon-bin,palemoon-gtk2-bin}: 33.8.1.1 -> 33.8.1.2 --- pkgs/applications/networking/browsers/palemoon/bin.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/palemoon/bin.nix b/pkgs/applications/networking/browsers/palemoon/bin.nix index c974e96d7119..f126b71e64f3 100644 --- a/pkgs/applications/networking/browsers/palemoon/bin.nix +++ b/pkgs/applications/networking/browsers/palemoon/bin.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "palemoon-bin"; - version = "33.8.1.1"; + version = "33.8.1.2"; src = finalAttrs.passthru.sources."gtk${if withGTK3 then "3" else "2"}"; @@ -173,11 +173,11 @@ stdenv.mkDerivation (finalAttrs: { { gtk3 = fetchzip { urls = urlRegionVariants "gtk3"; - hash = "sha256-zUStYcCOwiP/LHDUVzu1E8Req0Erk96/Pp1zu+FvK5s="; + hash = "sha256-qgabtZ/8nBaOGP0pIXd/byd9XCxulT8w+7uczJE4SAg="; }; gtk2 = fetchzip { urls = urlRegionVariants "gtk2"; - hash = "sha256-OfShUQiFtX+3cb035EbE4FgpohDcNXqOa5i75IxGo0o="; + hash = "sha256-qeA8EYRY9STsezWrvlVt73fgxPB0mynkxtTV71HFMgU="; }; }; From f7bde756ac981d1f325e64126de89929591e1372 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Mon, 4 Aug 2025 18:33:41 +0000 Subject: [PATCH 11/27] heimdall: move override to improve eval --- pkgs/by-name/he/heimdall-gui/package.nix | 7 +++++++ pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 pkgs/by-name/he/heimdall-gui/package.nix diff --git a/pkgs/by-name/he/heimdall-gui/package.nix b/pkgs/by-name/he/heimdall-gui/package.nix new file mode 100644 index 000000000000..6a54d496fe50 --- /dev/null +++ b/pkgs/by-name/he/heimdall-gui/package.nix @@ -0,0 +1,7 @@ +{ + heimdall, +}: + +heimdall.override { + enableGUI = true; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 436c58acff81..d4f3f30c650e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3233,8 +3233,6 @@ with pkgs; heaptrack = libsForQt5.callPackage ../development/tools/profiling/heaptrack { }; - heimdall-gui = heimdall.override { enableGUI = true; }; - headscale = callPackage ../servers/headscale { }; highlight = callPackage ../tools/text/highlight { From fbe4cf6ae3e4436a061319d5b8b407c7660eba05 Mon Sep 17 00:00:00 2001 From: awwpotato Date: Mon, 4 Aug 2025 21:08:01 -0700 Subject: [PATCH 12/27] cryptop: use callPackage --- pkgs/applications/blockchains/cryptop/default.nix | 10 +++------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/blockchains/cryptop/default.nix b/pkgs/applications/blockchains/cryptop/default.nix index c4689d82f4ca..3537243de857 100644 --- a/pkgs/applications/blockchains/cryptop/default.nix +++ b/pkgs/applications/blockchains/cryptop/default.nix @@ -1,13 +1,9 @@ { lib, - buildPythonApplication, + python3Packages, fetchPypi, - requests, - requests-cache, - setuptools, }: - -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "cryptop"; version = "0.2.0"; format = "setuptools"; @@ -17,7 +13,7 @@ buildPythonApplication rec { sha256 = "0akrrz735vjfrm78plwyg84vabj0x3qficq9xxmy9kr40fhdkzpb"; }; - propagatedBuildInputs = [ + propagatedBuildInputs = with python3Packages; [ setuptools requests requests-cache diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7a2b319170a0..6611e9b75612 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14237,7 +14237,7 @@ with pkgs; inherit (darwin) autoSignDarwinBinariesHook; }; - cryptop = python3.pkgs.callPackage ../applications/blockchains/cryptop { }; + cryptop = callPackage ../applications/blockchains/cryptop { }; elements = libsForQt5.callPackage ../applications/blockchains/elements { withGui = true; From ed81ad23a306bde0e385b3d92e7f0fa821f6faa9 Mon Sep 17 00:00:00 2001 From: awwpotato Date: Mon, 4 Aug 2025 21:09:20 -0700 Subject: [PATCH 13/27] cryptop: do not use list for single license --- pkgs/applications/blockchains/cryptop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/blockchains/cryptop/default.nix b/pkgs/applications/blockchains/cryptop/default.nix index 3537243de857..07430c794792 100644 --- a/pkgs/applications/blockchains/cryptop/default.nix +++ b/pkgs/applications/blockchains/cryptop/default.nix @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec { meta = { homepage = "https://github.com/huwwp/cryptop"; description = "Command line Cryptocurrency Portfolio"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ bhipple ]; mainProgram = "cryptop"; }; From 047f027ad7e1a658f0cf2bff1e1373a6422d4c22 Mon Sep 17 00:00:00 2001 From: awwpotato Date: Mon, 4 Aug 2025 21:10:39 -0700 Subject: [PATCH 14/27] cryptop: move to by-name --- .../cryptop/default.nix => by-name/cr/cryptop/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/blockchains/cryptop/default.nix => by-name/cr/cryptop/package.nix} (100%) diff --git a/pkgs/applications/blockchains/cryptop/default.nix b/pkgs/by-name/cr/cryptop/package.nix similarity index 100% rename from pkgs/applications/blockchains/cryptop/default.nix rename to pkgs/by-name/cr/cryptop/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6611e9b75612..244767fc50e4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14237,8 +14237,6 @@ with pkgs; inherit (darwin) autoSignDarwinBinariesHook; }; - cryptop = callPackage ../applications/blockchains/cryptop { }; - elements = libsForQt5.callPackage ../applications/blockchains/elements { withGui = true; inherit (darwin) autoSignDarwinBinariesHook; From 5eda3a402fd3111d37752675a08919e6e5a89176 Mon Sep 17 00:00:00 2001 From: Sergey Volkov Date: Tue, 5 Aug 2025 13:00:56 +0200 Subject: [PATCH 15/27] python3Packages.presto-python-client: fix building --- .../development/python-modules/presto-python-client/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/presto-python-client/default.nix b/pkgs/development/python-modules/presto-python-client/default.nix index 1a02b277f178..d9541c08954b 100644 --- a/pkgs/development/python-modules/presto-python-client/default.nix +++ b/pkgs/development/python-modules/presto-python-client/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, click, - future, httpretty, pytestCheckHook, requests, @@ -28,7 +27,6 @@ buildPythonPackage rec { dependencies = [ click - future requests requests-kerberos six From ea9bf8f355f5e163ca176bbe406651e3f82b7ed0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Aug 2025 21:04:15 +0000 Subject: [PATCH 16/27] python3Packages.cloup: 3.0.7 -> 3.0.8 --- pkgs/development/python-modules/cloup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cloup/default.nix b/pkgs/development/python-modules/cloup/default.nix index a11b1a75ae14..06d946e3fc80 100644 --- a/pkgs/development/python-modules/cloup/default.nix +++ b/pkgs/development/python-modules/cloup/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "cloup"; - version = "3.0.7"; + version = "3.0.8"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-yFLgoFQapDPGqzGpuLUD9j2Ygekd2vA4TWknll8rQhw="; + hash = "sha256-+RwICnJRlt33T+q9YlAmb0Zul/wW3+Iadiz2vGvrPss="; }; nativeBuildInputs = [ setuptools-scm ]; From d5f7f2b9423e2ba97b0ff11d1baf7a30c4abfc97 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Aug 2025 01:09:29 +0000 Subject: [PATCH 17/27] gh-gei: 1.17.0 -> 1.18.0 --- pkgs/by-name/gh/gh-gei/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gh/gh-gei/package.nix b/pkgs/by-name/gh/gh-gei/package.nix index ec168edcb5df..bc51f396b661 100644 --- a/pkgs/by-name/gh/gh-gei/package.nix +++ b/pkgs/by-name/gh/gh-gei/package.nix @@ -7,13 +7,13 @@ buildDotnetModule rec { pname = "gh-gei"; - version = "1.17.0"; + version = "1.18.0"; src = fetchFromGitHub { owner = "github"; repo = "gh-gei"; rev = "v${version}"; - hash = "sha256-mV7lqwC8S5ms79IIcmgDIsUlPKaLSWElXZ00Tm8qs4Y="; + hash = "sha256-AMmeuobgJ+DSRG4zS7RP5l3/BraqQxXB+ygLDc3XnOs="; }; dotnet-sdk = dotnetCorePackages.sdk_8_0_4xx; From d05fb33aa3f4d74016ef83bbbfd092c887ab364d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Aug 2025 02:14:36 +0000 Subject: [PATCH 18/27] codebuff: 1.0.441 -> 1.0.451 --- pkgs/by-name/co/codebuff/package-lock.json | 8 ++++---- pkgs/by-name/co/codebuff/package.nix | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/co/codebuff/package-lock.json b/pkgs/by-name/co/codebuff/package-lock.json index 497642fbb38d..6e2a8c5789ea 100644 --- a/pkgs/by-name/co/codebuff/package-lock.json +++ b/pkgs/by-name/co/codebuff/package-lock.json @@ -5,7 +5,7 @@ "packages": { "": { "dependencies": { - "codebuff": "^1.0.441" + "codebuff": "^1.0.451" } }, "node_modules/chownr": { @@ -18,9 +18,9 @@ } }, "node_modules/codebuff": { - "version": "1.0.441", - "resolved": "https://registry.npmjs.org/codebuff/-/codebuff-1.0.441.tgz", - "integrity": "sha512-2/u30sGXiEd1caB+doYWy34lbv8DJhQ2SomHXpCmmeEKITUgd9ckdVMLaaEgrR/FIUHyFBcu7aCVzmwsBEfnuQ==", + "version": "1.0.451", + "resolved": "https://registry.npmjs.org/codebuff/-/codebuff-1.0.451.tgz", + "integrity": "sha512-LYzX+cu1zMnU/qntnRMQzQ+iPT436OYphFyIrEvx5DarfEEns5UIMDyWp0E9PWxbU4WsJfHJnL6srYxC/T8hUg==", "cpu": [ "x64", "arm64" diff --git a/pkgs/by-name/co/codebuff/package.nix b/pkgs/by-name/co/codebuff/package.nix index affe6a4129e8..1c134a5a052a 100644 --- a/pkgs/by-name/co/codebuff/package.nix +++ b/pkgs/by-name/co/codebuff/package.nix @@ -6,14 +6,14 @@ buildNpmPackage rec { pname = "codebuff"; - version = "1.0.441"; + version = "1.0.451"; src = fetchzip { url = "https://registry.npmjs.org/codebuff/-/codebuff-${version}.tgz"; - hash = "sha256-l57ZQTvvIR8mpFJGJeF6AqE6sbjIUkQdjlvdQ4UAQ9g="; + hash = "sha256-98NiHDb0PrK71I28y7DwDJf2i+mKTQBp22PY4WJh5ig="; }; - npmDepsHash = "sha256-/LiXKA0HdFg3K7xyioL0SKjWicktCpih1oJkEPLDzIA="; + npmDepsHash = "sha256-qtBi5OT7UBsCIriO6Fk33gLOFNp5Ae0bT9qN+37b2sg="; postPatch = '' cp ${./package-lock.json} package-lock.json From d0a8b6f3b419ffc723b55c66144a9df1f3c4a523 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Aug 2025 06:48:35 +0000 Subject: [PATCH 19/27] r2modman: 3.2.1 -> 3.2.3 --- pkgs/by-name/r2/r2modman/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/r2/r2modman/package.nix b/pkgs/by-name/r2/r2modman/package.nix index d9504d7c99de..1a858483234b 100644 --- a/pkgs/by-name/r2/r2modman/package.nix +++ b/pkgs/by-name/r2/r2modman/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "r2modman"; - version = "3.2.1"; + version = "3.2.3"; src = fetchFromGitHub { owner = "ebkr"; repo = "r2modmanPlus"; rev = "v${finalAttrs.version}"; - hash = "sha256-l1xrp+Gl26kiWqh5pIKp4QiETrzr5mTrUP10T0DhUCw="; + hash = "sha256-0LlZsyUSVuDakbNUzJ1ZUBe9KxWNd0ONKkPafwbCINY="; }; offlineCache = fetchYarnDeps { From 46ea598c74c40a811d4e9c74178610b139c19aa8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Aug 2025 07:25:16 +0000 Subject: [PATCH 20/27] kodiPackages.controller-topology-project: 1.0.4 -> 1.0.5 --- .../video/kodi/addons/controller-topology-project/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix b/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix index d38c85da3760..c601366e683e 100644 --- a/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix +++ b/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix @@ -8,13 +8,13 @@ let drv = stdenv.mkDerivation rec { pname = "controller-topology-project"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "kodi-game"; repo = "controller-topology-project"; rev = "v${version}"; - sha256 = "sha256-0h2Qbnym8XxUVao7aEN25uIKSIreutH272OiqtG4Obc="; + sha256 = "sha256-9NqupL/LAshME7GlzKAT6i3kx2MPEBU7Jw2nPele1W8="; }; postPatch = '' From db5969bfbbb1462379cb21eded89bdd482aa32f1 Mon Sep 17 00:00:00 2001 From: Jon Hermansen Date: Wed, 6 Aug 2025 11:29:18 -0400 Subject: [PATCH 21/27] code-cursor: 1.3.8 -> 1.3.9 --- pkgs/by-name/co/code-cursor/package.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/co/code-cursor/package.nix b/pkgs/by-name/co/code-cursor/package.nix index 11111b5322ea..c80f1fa3d25e 100644 --- a/pkgs/by-name/co/code-cursor/package.nix +++ b/pkgs/by-name/co/code-cursor/package.nix @@ -16,20 +16,20 @@ let sources = { x86_64-linux = fetchurl { - url = "https://downloads.cursor.com/production/a1fa6fc7d2c2f520293aad84aaa38d091dee6fef/linux/x64/Cursor-1.3.8-x86_64.AppImage"; - hash = "sha256-qR1Wu3H0JUCKIoUP/QFC1YyYiRaQ9PVN7ZT9TjHwn1k="; + url = "https://downloads.cursor.com/production/54c27320fab08c9f5dd5873f07fca101f7a3e076/linux/x64/Cursor-1.3.9-x86_64.AppImage"; + hash = "sha256-0kkTL6ZCnLxGBQSVoZ7UEOBNtTZVQolVAk/2McCV0Rw="; }; aarch64-linux = fetchurl { - url = "https://downloads.cursor.com/production/a1fa6fc7d2c2f520293aad84aaa38d091dee6fef/linux/arm64/Cursor-1.3.8-aarch64.AppImage"; - hash = "sha256-UrUstEFP8W8Y9WUCR5kt3434bKCBBK/NaSu2UK8+gII="; + url = "https://downloads.cursor.com/production/54c27320fab08c9f5dd5873f07fca101f7a3e076/linux/arm64/Cursor-1.3.9-aarch64.AppImage"; + hash = "sha256-5g26fm+tpm8xQTutygI20TcUHL08gKlG0uZSHixK2Ao="; }; x86_64-darwin = fetchurl { - url = "https://downloads.cursor.com/production/a1fa6fc7d2c2f520293aad84aaa38d091dee6fef/darwin/x64/Cursor-darwin-x64.dmg"; - hash = "sha256-FGjqbOdr1HSjVlDYP/+vp4bVQoqdJww3U4t59QLg1kk="; + url = "https://downloads.cursor.com/production/54c27320fab08c9f5dd5873f07fca101f7a3e076/darwin/x64/Cursor-darwin-x64.dmg"; + hash = "sha256-IJV35JNpoUybArz2NhvX8IzDUmvzN+GVq/MyDtXgVeI="; }; aarch64-darwin = fetchurl { - url = "https://downloads.cursor.com/production/a1fa6fc7d2c2f520293aad84aaa38d091dee6fef/darwin/arm64/Cursor-darwin-arm64.dmg"; - hash = "sha256-tsVPS48APst7kbEh7cjhJ2zYKcKBDdjH+NXMpAe4Ixs="; + url = "https://downloads.cursor.com/production/54c27320fab08c9f5dd5873f07fca101f7a3e076/darwin/arm64/Cursor-darwin-arm64.dmg"; + hash = "sha256-TYdv8UKoBtv0WUHWBqJtpG9vHDkEBBPLS/7BZhdxR1M="; }; }; @@ -39,7 +39,7 @@ in inherit useVSCodeRipgrep; commandLineArgs = finalCommandLineArgs; - version = "1.3.8"; + version = "1.3.9"; pname = "cursor"; # You can find the current VSCode version in the About dialog: From 667278c6e4d6fb220612a8dd986225c492efac75 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Aug 2025 17:34:03 +0000 Subject: [PATCH 22/27] libretro.genesis-plus-gx: 0-unstable-2025-07-18 -> 0-unstable-2025-08-03 --- .../emulators/libretro/cores/genesis-plus-gx.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix b/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix index d09b19cdfedf..9756b8159385 100644 --- a/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix +++ b/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "genesis-plus-gx"; - version = "0-unstable-2025-07-18"; + version = "0-unstable-2025-08-03"; src = fetchFromGitHub { owner = "libretro"; repo = "Genesis-Plus-GX"; - rev = "0cfb7a22b129f42feb3b48095871c122acf45158"; - hash = "sha256-Fonxi2RQJ/iqSLAfun2anHCzVnM7TkJFkc8PtWkNsQY="; + rev = "a69c81e44a3a25e5a9254a18652eae2dad875003"; + hash = "sha256-vjh8NxoQgGU/u8XZLLQslYSlJdlMqU5quOjyWnUm3Ig="; }; meta = { From c11587a49c653041d1a0e45cb240af940e3ea9ed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Aug 2025 18:26:34 +0000 Subject: [PATCH 23/27] stevenblack-blocklist: 3.16.6 -> 3.16.9 --- pkgs/by-name/st/stevenblack-blocklist/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/st/stevenblack-blocklist/package.nix b/pkgs/by-name/st/stevenblack-blocklist/package.nix index 3e1eab82a26a..c1adec89769b 100644 --- a/pkgs/by-name/st/stevenblack-blocklist/package.nix +++ b/pkgs/by-name/st/stevenblack-blocklist/package.nix @@ -6,13 +6,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "stevenblack-blocklist"; - version = "3.16.6"; + version = "3.16.9"; src = fetchFromGitHub { owner = "StevenBlack"; repo = "hosts"; tag = finalAttrs.version; - hash = "sha256-QrJGRXmyOz7sAxDeefZ/vdeX07RwNqX00WPuw6KOnsI="; + hash = "sha256-GLQLaiWBVdRatbq6OaydAddDREHPlHs/kr1QvQp/n1g="; }; outputs = [ From 46f007ef05cfe2e3e8f767dce933dd25a1a524db Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Aug 2025 18:46:59 +0000 Subject: [PATCH 24/27] gosmee: 0.27.0 -> 0.28.0 --- pkgs/by-name/go/gosmee/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/go/gosmee/package.nix b/pkgs/by-name/go/gosmee/package.nix index 91ae45ec3f46..f84542002a00 100644 --- a/pkgs/by-name/go/gosmee/package.nix +++ b/pkgs/by-name/go/gosmee/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gosmee"; - version = "0.27.0"; + version = "0.28.0"; src = fetchFromGitHub { owner = "chmouel"; repo = "gosmee"; rev = "v${version}"; - hash = "sha256-MoSfEnciYn+Lv695aZUl27o8VtmmKf0KbELLJb06hqY="; + hash = "sha256-RJYa6bpd3OUhHhj1vECy8LKSyfIdl2SHedhGgsJclSo="; }; vendorHash = null; From 27db9027d4fb85a81389cab92f3bd3097113d4ff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Aug 2025 01:52:09 +0000 Subject: [PATCH 25/27] n98-magerun2: 9.0.1 -> 9.0.2 --- pkgs/by-name/n9/n98-magerun2/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/n9/n98-magerun2/package.nix b/pkgs/by-name/n9/n98-magerun2/package.nix index cbba74364510..baa1f07955ec 100644 --- a/pkgs/by-name/n9/n98-magerun2/package.nix +++ b/pkgs/by-name/n9/n98-magerun2/package.nix @@ -7,16 +7,16 @@ php83.buildComposerProject2 (finalAttrs: { pname = "n98-magerun2"; - version = "9.0.1"; + version = "9.0.2"; src = fetchFromGitHub { owner = "netz98"; repo = "n98-magerun2"; tag = finalAttrs.version; - hash = "sha256-Lq9TEwhcsoO4Cau2S7i/idEZYIzBeI0iXX1Ol7LnbAo="; + hash = "sha256-v6Be9yODeac4ZLYfHXZTLMcfzjKGDXD7jz7kmI/z8wo="; }; - vendorHash = "sha256-JxUVqQjSBh8FYW1JbwooHHkzDRtMRaCuVO6o45UMzOk="; + vendorHash = "sha256-vaRRxtHu/ZFc+Z38KJjm0iUncFYUfRLkk7A3+T1p4+I="; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = "--version"; From 5db8ee9dbd4d2b394a408c74527968e7a09b0747 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Aug 2025 22:48:23 +0000 Subject: [PATCH 26/27] ananicy-rules-cachyos: 0-unstable-2025-07-06 -> 0-unstable-2025-08-06 --- pkgs/by-name/an/ananicy-rules-cachyos/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix index 44632ea8ab7b..7108d39dfef7 100644 --- a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix +++ b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "ananicy-rules-cachyos"; - version = "0-unstable-2025-07-06"; + version = "0-unstable-2025-08-06"; src = fetchFromGitHub { owner = "CachyOS"; repo = "ananicy-rules"; - rev = "339bee6f2de3de8e866c23b210baf6cabf153549"; - hash = "sha256-D/+/7NdfV8kHwYm5mJ6b7Vl3QCUdK2+NbZSefWTZt5k="; + rev = "80576999c92af3eb88ea2008d4a18d29393ed579"; + hash = "sha256-SdxOgm7purRxIU16RFuSgUzKIgi+7gJ2hJuCDVCjd54="; }; dontConfigure = true; From a9cd681b8df39ca567cada7ff50d44f7b3fb225a Mon Sep 17 00:00:00 2001 From: liberodark Date: Tue, 29 Jul 2025 16:54:53 +0200 Subject: [PATCH 27/27] nixos/ntpd-rs: hardening --- .../services/networking/ntp/ntpd-rs.nix | 81 +++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/nixos/modules/services/networking/ntp/ntpd-rs.nix b/nixos/modules/services/networking/ntp/ntpd-rs.nix index f80ffa2d82cb..89735696616c 100644 --- a/nixos/modules/services/networking/ntp/ntpd-rs.nix +++ b/nixos/modules/services/networking/ntp/ntpd-rs.nix @@ -90,6 +90,49 @@ in "" "${lib.makeBinPath [ cfg.package ]}/ntp-daemon --config=${validateConfig configFile}" ]; + + CapabilityBoundingSet = [ + "CAP_SYS_TIME" + "CAP_NET_BIND_SERVICE" + ]; + AmbientCapabilities = [ + "CAP_SYS_TIME" + "CAP_NET_BIND_SERVICE" + ]; + LimitCORE = 0; + LimitNOFILE = 65535; + LockPersonality = true; + MemorySwapMax = 0; + MemoryZSwapMax = 0; + PrivateTmp = true; + ProcSubset = "pid"; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "strict"; + Restart = "on-failure"; + RestartSec = "10s"; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_UNIX" + "AF_NETLINK" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ + "@system-service" + "@resources" + "@network-io" + "@clock" + ]; + NoNewPrivileges = true; + UMask = "0077"; }; }; @@ -103,6 +146,44 @@ in "" "${lib.makeBinPath [ cfg.package ]}/ntp-metrics-exporter --config=${validateConfig configFile}" ]; + + CapabilityBoundingSet = [ ]; + LimitCORE = 0; + LimitNOFILE = 65535; + LockPersonality = true; + MemorySwapMax = 0; + MemoryZSwapMax = 0; + PrivateTmp = true; + ProcSubset = "pid"; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "strict"; + PrivateDevices = true; + RestrictSUIDSGID = true; + RemoveIPC = true; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_UNIX" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ + "@system-service" + "@network-io" + "~@privileged" + "~@resources" + "~@mount" + ]; + NoNewPrivileges = true; + UMask = "0077"; }; }; };