From 930ee4ad5805f04539e0a957c050665400ba9a33 Mon Sep 17 00:00:00 2001 From: Vincent Bernat Date: Mon, 16 Dec 2024 06:06:56 +0100 Subject: [PATCH 01/72] caddy: add support for compiling Caddy with plugins This adds a `withPlugins` function to Caddy package. ```nix services.caddy = { enable = true; package = pkgs.caddy.withPlugins { plugins = [ "github.com/caddy-dns/powerdns@v1.0.1" ]; hash = "sha256-F/jqR4iEsklJFycTjSaW8B/V3iTGqqGOzwYBUXxRKrc="; }; }; ``` --- .../manual/release-notes/rl-2505.section.md | 15 ++++ pkgs/by-name/ca/caddy/package.nix | 88 +++++++++++++++++-- 2 files changed, 97 insertions(+), 6 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 1b33e663a98db..a3ca9fd0300af 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -160,6 +160,21 @@ - `bind.cacheNetworks` now only controls access for recursive queries, where it previously controlled access for all queries. +- Caddy can now be built with plugins by using `caddy.withPlugins`, a `passthru` function that accepts an attribute set as a parameter. The `plugins` argument represents a list of Caddy plugins, with each Caddy plugin being a versioned module. The `hash` argument represents the `vendorHash` of the resulting Caddy source code with the plugins added. + + Example: + ```nix + services.caddy = { + enable = true; + package = pkgs.caddy.withPlugins { + plugins = [ "github.com/caddy-dns/powerdns@v1.0.1" ]; + hash = "sha256-F/jqR4iEsklJFycTjSaW8B/V3iTGqqGOzwYBUXxRKrc="; + }; + }; + ``` + + To get the necessary hash of the vendored dependencies, omit `hash`. The build will fail and tell you the correct value. + - `programs.fzf.keybindings` now supports the fish shell. diff --git a/pkgs/by-name/ca/caddy/package.nix b/pkgs/by-name/ca/caddy/package.nix index d6832d396c773..bf4865a53e089 100644 --- a/pkgs/by-name/ca/caddy/package.nix +++ b/pkgs/by-name/ca/caddy/package.nix @@ -6,6 +6,10 @@ , testers , installShellFiles , stdenv +, go +, xcaddy +, cacert +, git }: let version = "2.8.4"; @@ -32,7 +36,8 @@ buildGoModule { subPackages = [ "cmd/caddy" ]; ldflags = [ - "-s" "-w" + "-s" + "-w" "-X github.com/caddyserver/caddy/v2.CustomVersion=${version}" ]; @@ -61,12 +66,83 @@ buildGoModule { --zsh <($out/bin/caddy completion zsh) ''; - passthru.tests = { - inherit (nixosTests) caddy; - version = testers.testVersion { - command = "${caddy}/bin/caddy version"; - package = caddy; + passthru = { + tests = { + inherit (nixosTests) caddy; + version = testers.testVersion { + command = "${caddy}/bin/caddy version"; + package = caddy; + }; }; + withPlugins = + { plugins + , hash ? lib.fakeHash + }: caddy.overrideAttrs (finalAttrs: prevAttrs: + let + pluginsSorted = builtins.sort builtins.lessThan plugins; + pluginsList = lib.concatMapStrings (plugin: "${plugin}-") pluginsSorted; + pluginsHash = builtins.hashString "md5" pluginsList; + pluginsWithoutVersion = builtins.filter (p: !lib.hasInfix "@" p) pluginsSorted; + in + assert lib.assertMsg (builtins.length pluginsWithoutVersion == 0) + "All plugins should have a version (eg ${builtins.elemAt pluginsWithoutVersion 0}@x.y.z)!"; + { + vendorHash = null; + subPackages = [ "." ]; + + src = stdenv.mkDerivation { + pname = "caddy-src-with-plugins-${pluginsHash}"; + version = finalAttrs.version; + + nativeBuildInputs = [ + go + xcaddy + cacert + git + ]; + dontUnpack = true; + buildPhase = + let + withArgs = lib.concatMapStrings (plugin: "--with ${plugin} ") pluginsSorted; + in + '' + export GOCACHE=$TMPDIR/go-cache + export GOPATH="$TMPDIR/go" + XCADDY_SKIP_BUILD=1 TMPDIR="$PWD" xcaddy build v${finalAttrs.version} ${withArgs} + (cd buildenv* && go mod vendor) + ''; + installPhase = '' + mv buildenv* $out + ''; + + outputHashMode = "recursive"; + outputHash = hash; + outputHashAlgo = "sha256"; + }; + + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + + ${lib.toShellVar "notfound" pluginsSorted} + while read kind module version; do + [[ "$kind" = "dep" ]] || continue + module="''${module}@''${version}" + for i in "''${!notfound[@]}"; do + if [[ ''${notfound[i]} = ''${module} ]]; then + unset 'notfound[i]' + fi + done + done < <($out/bin/caddy build-info) + if (( ''${#notfound[@]} )); then + >&2 echo "Plugins not found: ''${notfound[@]}" + exit 1 + fi + + runHook postInstallCheck + ''; + }); }; meta = with lib; { From f4acd809bb197709f06fab296810566923d7cc09 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 16 Dec 2024 15:00:56 +0000 Subject: [PATCH 02/72] redli: 0.13.0 -> 0.14.0 --- pkgs/by-name/re/redli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/redli/package.nix b/pkgs/by-name/re/redli/package.nix index 84f717b610562..6a915ea5e73cc 100644 --- a/pkgs/by-name/re/redli/package.nix +++ b/pkgs/by-name/re/redli/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "redli"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "IBM-Cloud"; repo = pname; rev = "v${version}"; - hash = "sha256-uXTzDRluBP9pm0SM8sIiGIvvbwATO60JQfQpXWGl5EA="; + hash = "sha256-BbhjelDY8z4ME2zzataMfDGyice0XZSb1r3wCLxspks="; }; - vendorHash = null; + vendorHash = "sha256-6zCkor/fQXKw2JxOKyVjsdsSI6BT7beAs4P0AlSXupE="; meta = with lib; { description = "Humane alternative to the Redis-cli and TLS"; From cc63b30856073a5d86e76b767d9075cbd51b2b8f Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 20 Dec 2024 22:38:21 +0100 Subject: [PATCH 03/72] osmo-msc: 1.12.0 -> 1.12.2 --- pkgs/by-name/os/osmo-msc/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/os/osmo-msc/package.nix b/pkgs/by-name/os/osmo-msc/package.nix index 7e8bb0d8442bb..ab396cfae3044 100644 --- a/pkgs/by-name/os/osmo-msc/package.nix +++ b/pkgs/by-name/os/osmo-msc/package.nix @@ -20,13 +20,13 @@ in stdenv.mkDerivation rec { pname = "osmo-msc"; - version = "1.12.0"; + version = "1.12.2"; src = fetchFromGitHub { owner = "osmocom"; repo = "osmo-msc"; rev = version; - hash = "sha256-3yQKboodOBc55R6CdvqSFSwQpstvCVvtZMn7gFKASmI="; + hash = "sha256-/+pbfJL/kW835AA44jocmk/QLB1tR3Qu5pKj5K5WFRM="; }; postPatch = '' From bd13a0f173b77a252ca83d074c3ce923f51b084e Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 20 Dec 2024 22:39:33 +0100 Subject: [PATCH 04/72] osmo-bsc: 1.12.2 -> 1.12.4 --- pkgs/by-name/os/osmo-bsc/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/os/osmo-bsc/package.nix b/pkgs/by-name/os/osmo-bsc/package.nix index 1ced78422a663..6c6328fe44ebd 100644 --- a/pkgs/by-name/os/osmo-bsc/package.nix +++ b/pkgs/by-name/os/osmo-bsc/package.nix @@ -17,13 +17,13 @@ in stdenv.mkDerivation rec { pname = "osmo-bsc"; - version = "1.12.2"; + version = "1.12.4"; src = fetchFromGitHub { owner = "osmocom"; repo = "osmo-bsc"; rev = version; - hash = "sha256-V1URXatXYaItv1X5VAuWpaeTNJjK6qb9DqmecDm2PQ0="; + hash = "sha256-46riudURcWwm9HuC8t0A2WWnkmSL9yvZFKRgVMxNzrc="; }; postPatch = '' From 613cfb8beefaa7c0f709476159febb4edbc76c78 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 20 Dec 2024 22:30:49 +0100 Subject: [PATCH 05/72] libosmo-sigtran: init at 2.0.1 libosmo-sigtran replaced libosomo-sccp --- .../{libosmo-sccp => libosmo-sigtran}/package.nix | 14 +++++++------- pkgs/by-name/os/osmo-bsc/package.nix | 4 ++-- pkgs/by-name/os/osmo-hnbgw/package.nix | 4 ++-- pkgs/by-name/os/osmo-hnodeb/package.nix | 4 ++-- pkgs/by-name/os/osmo-iuh/package.nix | 4 ++-- pkgs/by-name/os/osmo-msc/package.nix | 4 ++-- pkgs/top-level/aliases.nix | 1 + 7 files changed, 18 insertions(+), 17 deletions(-) rename pkgs/by-name/li/{libosmo-sccp => libosmo-sigtran}/package.nix (76%) diff --git a/pkgs/by-name/li/libosmo-sccp/package.nix b/pkgs/by-name/li/libosmo-sigtran/package.nix similarity index 76% rename from pkgs/by-name/li/libosmo-sccp/package.nix rename to pkgs/by-name/li/libosmo-sigtran/package.nix index 1d11203f66520..491ba6344c1b6 100644 --- a/pkgs/by-name/li/libosmo-sccp/package.nix +++ b/pkgs/by-name/li/libosmo-sigtran/package.nix @@ -2,7 +2,7 @@ lib, stdenv, autoreconfHook, - fetchFromGitHub, + fetchgit, lksctp-tools, pkg-config, libosmocore, @@ -10,14 +10,14 @@ }: stdenv.mkDerivation rec { - pname = "libosmo-sccp"; - version = "1.9.0"; + pname = "libosmo-sigtran"; + version = "2.0.1"; - src = fetchFromGitHub { - owner = "osmocom"; - repo = "libosmo-sccp"; + # fetchFromGitea hangs + src = fetchgit { + url = "https://gitea.osmocom.org/osmocom/libosmo-sigtran.git"; rev = version; - hash = "sha256-XEpkLLOjq28ipAbAyR1uBpo3i77xRZyD9NJ35HlRWXU="; + hash = "sha256-tNSe5FFietdjl80hhQntsdgG90CP7z7RWyTpGhsApt0="; }; configureFlags = [ "--with-systemdsystemunitdir=$out" ]; diff --git a/pkgs/by-name/os/osmo-bsc/package.nix b/pkgs/by-name/os/osmo-bsc/package.nix index 6c6328fe44ebd..108753250f11b 100644 --- a/pkgs/by-name/os/osmo-bsc/package.nix +++ b/pkgs/by-name/os/osmo-bsc/package.nix @@ -7,7 +7,7 @@ libosmocore, libosmoabis, libosmo-netif, - libosmo-sccp, + libosmo-sigtran, osmo-mgw, }: @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { libosmocore libosmoabis libosmo-netif - libosmo-sccp + libosmo-sigtran osmo-mgw ]; diff --git a/pkgs/by-name/os/osmo-hnbgw/package.nix b/pkgs/by-name/os/osmo-hnbgw/package.nix index 63640d549506c..2713c05d0a068 100644 --- a/pkgs/by-name/os/osmo-hnbgw/package.nix +++ b/pkgs/by-name/os/osmo-hnbgw/package.nix @@ -8,7 +8,7 @@ lksctp-tools, libosmo-netif, libasn1c, - libosmo-sccp, + libosmo-sigtran, osmo-iuh, osmo-mgw, }: @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { lksctp-tools libosmo-netif libasn1c - libosmo-sccp + libosmo-sigtran osmo-iuh osmo-mgw ]; diff --git a/pkgs/by-name/os/osmo-hnodeb/package.nix b/pkgs/by-name/os/osmo-hnodeb/package.nix index 035cd37c24829..751077fb85b4d 100644 --- a/pkgs/by-name/os/osmo-hnodeb/package.nix +++ b/pkgs/by-name/os/osmo-hnodeb/package.nix @@ -9,7 +9,7 @@ libasn1c, libosmoabis, libosmo-netif, - libosmo-sccp, + libosmo-sigtran, osmo-iuh, }: @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { libasn1c libosmoabis libosmo-netif - libosmo-sccp + libosmo-sigtran osmo-iuh ]; diff --git a/pkgs/by-name/os/osmo-iuh/package.nix b/pkgs/by-name/os/osmo-iuh/package.nix index 8b23f5c20b215..367d294feb090 100644 --- a/pkgs/by-name/os/osmo-iuh/package.nix +++ b/pkgs/by-name/os/osmo-iuh/package.nix @@ -7,7 +7,7 @@ libosmocore, lksctp-tools, libosmo-netif, - libosmo-sccp, + libosmo-sigtran, libasn1c, python3, }: @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { libosmocore lksctp-tools libosmo-netif - libosmo-sccp + libosmo-sigtran libasn1c ]; diff --git a/pkgs/by-name/os/osmo-msc/package.nix b/pkgs/by-name/os/osmo-msc/package.nix index ab396cfae3044..2444f1e5f462e 100644 --- a/pkgs/by-name/os/osmo-msc/package.nix +++ b/pkgs/by-name/os/osmo-msc/package.nix @@ -8,7 +8,7 @@ sqlite, libosmoabis, libosmo-netif, - libosmo-sccp, + libosmo-sigtran, osmo-mgw, osmo-hlr, lksctp-tools, @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { sqlite libosmoabis libosmo-netif - libosmo-sccp + libosmo-sigtran osmo-mgw osmo-hlr lksctp-tools diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6107678de6754..5a57a02449b2b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -651,6 +651,7 @@ mapAliases { liblastfm = throw "'liblastfm' has been renamed to/replaced by 'libsForQt5.liblastfm'"; # Converted to throw 2024-10-17 libmx = throw "'libmx' has been removed due to lack of maintenance upstream."; # Added 2024-12-04 liboop = throw "liboop has been removed as it is unmaintained upstream."; # Added 2024-08-14 + libosmo-sccp = libosmo-sigtran; # Added 2024-12-20 libpqxx_6 = throw "libpqxx_6 has been removed, please use libpqxx"; # Added 2024-10-02 libpulseaudio-vanilla = libpulseaudio; # Added 2022-04-20 libquotient = libsForQt5.libquotient; # Added 2023-11-11 From 1a7f2a633b1ea07eb024030ed262c91df43f5e33 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 20 Dec 2024 23:10:15 +0100 Subject: [PATCH 06/72] omso-*: remove dead code --- pkgs/by-name/os/osmo-bsc/package.nix | 4 ---- pkgs/by-name/os/osmo-ggsn/package.nix | 4 ---- pkgs/by-name/os/osmo-hlr/package.nix | 4 ---- pkgs/by-name/os/osmo-mgw/package.nix | 4 ---- pkgs/by-name/os/osmo-msc/package.nix | 4 ---- pkgs/by-name/os/osmo-pcu/package.nix | 4 ---- pkgs/by-name/os/osmo-sgsn/package.nix | 4 ---- pkgs/by-name/os/osmo-sip-connector/package.nix | 4 ---- 8 files changed, 32 deletions(-) diff --git a/pkgs/by-name/os/osmo-bsc/package.nix b/pkgs/by-name/os/osmo-bsc/package.nix index 108753250f11b..d4a8f0cfaf73c 100644 --- a/pkgs/by-name/os/osmo-bsc/package.nix +++ b/pkgs/by-name/os/osmo-bsc/package.nix @@ -11,10 +11,6 @@ osmo-mgw, }: -let - inherit (stdenv.hostPlatform) isLinux; -in - stdenv.mkDerivation rec { pname = "osmo-bsc"; version = "1.12.4"; diff --git a/pkgs/by-name/os/osmo-ggsn/package.nix b/pkgs/by-name/os/osmo-ggsn/package.nix index 67322e9751a80..c7eb0c66551a0 100644 --- a/pkgs/by-name/os/osmo-ggsn/package.nix +++ b/pkgs/by-name/os/osmo-ggsn/package.nix @@ -7,10 +7,6 @@ libosmocore, }: -let - inherit (stdenv.hostPlatform) isLinux; -in - stdenv.mkDerivation rec { pname = "osmo-ggsn"; version = "1.12.0"; diff --git a/pkgs/by-name/os/osmo-hlr/package.nix b/pkgs/by-name/os/osmo-hlr/package.nix index 2e58ebb6d2d95..c13c315d8fced 100644 --- a/pkgs/by-name/os/osmo-hlr/package.nix +++ b/pkgs/by-name/os/osmo-hlr/package.nix @@ -9,10 +9,6 @@ sqlite, }: -let - inherit (stdenv.hostPlatform) isLinux; -in - stdenv.mkDerivation rec { pname = "osmo-hlr"; version = "1.8.0"; diff --git a/pkgs/by-name/os/osmo-mgw/package.nix b/pkgs/by-name/os/osmo-mgw/package.nix index e1c6e296b5eb3..acdd2c8e5ff6b 100644 --- a/pkgs/by-name/os/osmo-mgw/package.nix +++ b/pkgs/by-name/os/osmo-mgw/package.nix @@ -9,10 +9,6 @@ libosmoabis, }: -let - inherit (stdenv.hostPlatform) isLinux; -in - stdenv.mkDerivation rec { pname = "osmo-mgw"; version = "1.13.1"; diff --git a/pkgs/by-name/os/osmo-msc/package.nix b/pkgs/by-name/os/osmo-msc/package.nix index 2444f1e5f462e..fe7010c1bf18a 100644 --- a/pkgs/by-name/os/osmo-msc/package.nix +++ b/pkgs/by-name/os/osmo-msc/package.nix @@ -14,10 +14,6 @@ lksctp-tools, }: -let - inherit (stdenv.hostPlatform) isLinux; -in - stdenv.mkDerivation rec { pname = "osmo-msc"; version = "1.12.2"; diff --git a/pkgs/by-name/os/osmo-pcu/package.nix b/pkgs/by-name/os/osmo-pcu/package.nix index 02f0fc4a6f712..c5a3b7cc8cdc3 100644 --- a/pkgs/by-name/os/osmo-pcu/package.nix +++ b/pkgs/by-name/os/osmo-pcu/package.nix @@ -7,10 +7,6 @@ libosmocore, }: -let - inherit (stdenv.hostPlatform) isLinux; -in - stdenv.mkDerivation rec { pname = "osmo-pcu"; version = "1.5.0"; diff --git a/pkgs/by-name/os/osmo-sgsn/package.nix b/pkgs/by-name/os/osmo-sgsn/package.nix index f4c245b49934c..4ab4578e0d1ec 100644 --- a/pkgs/by-name/os/osmo-sgsn/package.nix +++ b/pkgs/by-name/os/osmo-sgsn/package.nix @@ -12,10 +12,6 @@ c-ares, }: -let - inherit (stdenv.hostPlatform) isLinux; -in - stdenv.mkDerivation rec { pname = "osmo-sgsn"; version = "1.12.1"; diff --git a/pkgs/by-name/os/osmo-sip-connector/package.nix b/pkgs/by-name/os/osmo-sip-connector/package.nix index 990967bd564a5..d65fea2630c48 100644 --- a/pkgs/by-name/os/osmo-sip-connector/package.nix +++ b/pkgs/by-name/os/osmo-sip-connector/package.nix @@ -9,10 +9,6 @@ glib, }: -let - inherit (stdenv.hostPlatform) isLinux; -in - stdenv.mkDerivation rec { pname = "osmo-sip-connector"; version = "1.7.0"; From ee290a042118f9af69900b2603e380d64d232bce Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 20 Dec 2024 23:11:23 +0100 Subject: [PATCH 07/72] osmo-*: add markuskowa as maintainer --- pkgs/by-name/os/osmo-bsc/package.nix | 2 +- pkgs/by-name/os/osmo-bts/package.nix | 2 +- pkgs/by-name/os/osmo-ggsn/package.nix | 2 +- pkgs/by-name/os/osmo-hlr/package.nix | 2 +- pkgs/by-name/os/osmo-mgw/package.nix | 2 +- pkgs/by-name/os/osmo-msc/package.nix | 2 +- pkgs/by-name/os/osmo-pcu/package.nix | 2 +- pkgs/by-name/os/osmo-sgsn/package.nix | 2 +- pkgs/by-name/os/osmo-sip-connector/package.nix | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/os/osmo-bsc/package.nix b/pkgs/by-name/os/osmo-bsc/package.nix index d4a8f0cfaf73c..ed6bf1440aae2 100644 --- a/pkgs/by-name/os/osmo-bsc/package.nix +++ b/pkgs/by-name/os/osmo-bsc/package.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { description = "GSM Base Station Controller"; homepage = "https://projects.osmocom.org/projects/osmobsc"; license = lib.licenses.agpl3Plus; - maintainers = [ ]; + maintainers = [ lib.maintainers.markuskowa ]; platforms = lib.platforms.linux; mainProgram = "osmo-bsc"; }; diff --git a/pkgs/by-name/os/osmo-bts/package.nix b/pkgs/by-name/os/osmo-bts/package.nix index 4014643900fe6..1f6f27bb6de51 100644 --- a/pkgs/by-name/os/osmo-bts/package.nix +++ b/pkgs/by-name/os/osmo-bts/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { description = "Osmocom GSM Base Transceiver Station (BTS)"; homepage = "https://osmocom.org/projects/osmobts"; license = lib.licenses.agpl3Plus; - maintainers = [ ]; + maintainers = [ lib.maintainers.markuskowa ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/os/osmo-ggsn/package.nix b/pkgs/by-name/os/osmo-ggsn/package.nix index c7eb0c66551a0..f79640ef8ef2a 100644 --- a/pkgs/by-name/os/osmo-ggsn/package.nix +++ b/pkgs/by-name/os/osmo-ggsn/package.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { description = "Osmocom Gateway GPRS Support Node (GGSN), successor of OpenGGSN"; homepage = "https://osmocom.org/projects/openggsn"; license = lib.licenses.gpl2Only; - maintainers = [ ]; + maintainers = [ lib.maintainers.markuskowa ]; platforms = lib.platforms.linux; mainProgram = "osmo-ggsn"; }; diff --git a/pkgs/by-name/os/osmo-hlr/package.nix b/pkgs/by-name/os/osmo-hlr/package.nix index c13c315d8fced..6e943965b1c93 100644 --- a/pkgs/by-name/os/osmo-hlr/package.nix +++ b/pkgs/by-name/os/osmo-hlr/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { description = "Osmocom implementation of 3GPP Home Location Registr (HLR)"; homepage = "https://osmocom.org/projects/osmo-hlr"; license = lib.licenses.agpl3Plus; - maintainers = [ ]; + maintainers = [ lib.maintainers.markuskowa ]; platforms = lib.platforms.linux; mainProgram = "osmo-hlr"; }; diff --git a/pkgs/by-name/os/osmo-mgw/package.nix b/pkgs/by-name/os/osmo-mgw/package.nix index acdd2c8e5ff6b..e44f207c3d5cc 100644 --- a/pkgs/by-name/os/osmo-mgw/package.nix +++ b/pkgs/by-name/os/osmo-mgw/package.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { mainProgram = "osmo-mgw"; homepage = "https://osmocom.org/projects/osmo-mgw"; license = lib.licenses.agpl3Plus; - maintainers = [ ]; + maintainers = [ lib.maintainers.markuskowa ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/os/osmo-msc/package.nix b/pkgs/by-name/os/osmo-msc/package.nix index fe7010c1bf18a..72d3fa8d03fa9 100644 --- a/pkgs/by-name/os/osmo-msc/package.nix +++ b/pkgs/by-name/os/osmo-msc/package.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { mainProgram = "osmo-msc"; homepage = "https://osmocom.org/projects/osmomsc/wiki"; license = lib.licenses.agpl3Only; - maintainers = [ ]; + maintainers = [ lib.maintainers.markuskowa ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/os/osmo-pcu/package.nix b/pkgs/by-name/os/osmo-pcu/package.nix index c5a3b7cc8cdc3..fa26430c0448b 100644 --- a/pkgs/by-name/os/osmo-pcu/package.nix +++ b/pkgs/by-name/os/osmo-pcu/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { mainProgram = "osmo-pcu"; homepage = "https://osmocom.org/projects/osmopcu"; license = lib.licenses.gpl2Only; - maintainers = [ ]; + maintainers = [ lib.maintainers.markuskowa ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/os/osmo-sgsn/package.nix b/pkgs/by-name/os/osmo-sgsn/package.nix index 4ab4578e0d1ec..c74d297ef83e0 100644 --- a/pkgs/by-name/os/osmo-sgsn/package.nix +++ b/pkgs/by-name/os/osmo-sgsn/package.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { description = "Osmocom implementation of the 3GPP Serving GPRS Support Node (SGSN)"; homepage = "https://osmocom.org/projects/osmosgsn"; license = lib.licenses.agpl3Plus; - maintainers = [ ]; + maintainers = [ lib.maintainers.markuskowa ]; platforms = lib.platforms.linux; mainProgram = "osmo-sgsn"; }; diff --git a/pkgs/by-name/os/osmo-sip-connector/package.nix b/pkgs/by-name/os/osmo-sip-connector/package.nix index d65fea2630c48..8e080ed043f79 100644 --- a/pkgs/by-name/os/osmo-sip-connector/package.nix +++ b/pkgs/by-name/os/osmo-sip-connector/package.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { mainProgram = "osmo-sip-connector"; homepage = "https://osmocom.org/projects/osmo-sip-conector"; license = lib.licenses.agpl3Plus; - maintainers = [ ]; + maintainers = [ lib.maintainers.markuskowa ]; platforms = lib.platforms.linux; }; } From 1e60d267ed5e9e1446d45a245bfc2d144cf8a711 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Dec 2024 06:09:03 +0000 Subject: [PATCH 08/72] plexamp: 4.11.2 -> 4.11.5 --- pkgs/applications/audio/plexamp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/plexamp/default.nix b/pkgs/applications/audio/plexamp/default.nix index bd949f5de67ef..874936c250427 100644 --- a/pkgs/applications/audio/plexamp/default.nix +++ b/pkgs/applications/audio/plexamp/default.nix @@ -7,12 +7,12 @@ let pname = "plexamp"; - version = "4.11.2"; + version = "4.11.5"; src = fetchurl { url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage"; name = "${pname}-${version}.AppImage"; - hash = "sha512-cNBupLFHhq7GDoj/QYGsS0UShTKmDpf/JxBZS92VwTCuuBjScTMGF0cETGEYYnvxqv4vf9MSKNY0/HW9CuguaA=="; + hash = "sha512-j8fPp6JcTB/PwsGgvEGqETZ83mGee1MwR4T9eFcNuoLRtlnudM7c3WDgxhpUdv5Nx3XkcMVnW1fntZYN2sIfzA=="; }; appimageContents = appimageTools.extractType2 { @@ -38,7 +38,7 @@ appimageTools.wrapType2 { meta = with lib; { description = "Beautiful Plex music player for audiophiles, curators, and hipsters"; homepage = "https://plexamp.com/"; - changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/76"; + changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/77"; license = licenses.unfree; maintainers = with maintainers; [ killercup From ceede881941c159e0a49b8aa2c4f488308e5e3fe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Dec 2024 12:39:31 +0000 Subject: [PATCH 09/72] publii: 0.46.2 -> 0.46.3 --- pkgs/by-name/pu/publii/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pu/publii/package.nix b/pkgs/by-name/pu/publii/package.nix index c3dd794635cba..eb08d8de2a12d 100644 --- a/pkgs/by-name/pu/publii/package.nix +++ b/pkgs/by-name/pu/publii/package.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation rec { pname = "publii"; - version = "0.46.2"; + version = "0.46.3"; src = fetchurl { url = "https://getpublii.com/download/Publii-${version}.deb"; - hash = "sha256-evNCXIhqKi23m/J3AoAW7u21neu6+hBFzAZ9MGz4YZ4="; + hash = "sha256-fbK9DVdwjzoxYMvR0EXpZ1Uv3CIMIVAdYcgRdD1p0F4="; }; dontConfigure = true; From 3ce0b979388c89586b4d47de78c9119cde730d6a Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 18 Nov 2024 15:22:33 +0200 Subject: [PATCH 10/72] gnuradio: remove unused swig argument --- pkgs/applications/radio/gnuradio/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix index 8b6d319d65789..826dbeae7d0cf 100644 --- a/pkgs/applications/radio/gnuradio/default.nix +++ b/pkgs/applications/radio/gnuradio/default.nix @@ -10,7 +10,6 @@ , orc , boost , spdlog -, swig , mpir , doxygen , python From 9fb5c8cec93ab4150f59c20b1e672fbbe6f1e6e7 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 18 Nov 2024 16:55:19 +0200 Subject: [PATCH 11/72] gnuradio: use new apple-sdk pattern --- pkgs/applications/radio/gnuradio/default.nix | 2 -- pkgs/development/gnuradio-modules/osmosdr/default.nix | 4 ---- pkgs/top-level/all-packages.nix | 1 - 3 files changed, 7 deletions(-) diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix index 826dbeae7d0cf..1dbf1a3d691f8 100644 --- a/pkgs/applications/radio/gnuradio/default.nix +++ b/pkgs/applications/radio/gnuradio/default.nix @@ -20,7 +20,6 @@ , libjack2 , libiio , libad9361 -, CoreAudio , uhd , SDL , gsl @@ -172,7 +171,6 @@ let gr-audio = { runtime = [] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libjack2 ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreAudio ] ; cmakeEnableFlag = "GR_AUDIO"; }; diff --git a/pkgs/development/gnuradio-modules/osmosdr/default.nix b/pkgs/development/gnuradio-modules/osmosdr/default.nix index aae85f02ab74a..588adb32fe057 100644 --- a/pkgs/development/gnuradio-modules/osmosdr/default.nix +++ b/pkgs/development/gnuradio-modules/osmosdr/default.nix @@ -1,6 +1,5 @@ { lib , stdenv -, darwin , mkDerivation , fetchgit , gnuradio @@ -71,9 +70,6 @@ in mkDerivation { ] ++ lib.optionals (gnuradio.hasFeature "python-support") [ python.pkgs.numpy python.pkgs.pybind11 - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.IOKit - darwin.apple_sdk.frameworks.Security ]; cmakeFlags = [ (if (gnuradio.hasFeature "python-support") then diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b826bf356e79c..0c2d0e0c5d0c1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13637,7 +13637,6 @@ with pkgs; gnuradio = callPackage ../applications/radio/gnuradio/wrapper.nix { unwrapped = callPackage ../applications/radio/gnuradio { - inherit (darwin.apple_sdk.frameworks) CoreAudio; python = python311; }; }; From 6d55129551f7340fbdb349eae41fecb8c6ad0e18 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 18 Nov 2024 17:00:31 +0200 Subject: [PATCH 12/72] gnuradioPackages.osmosdr: don't use with lib; in meta --- pkgs/development/gnuradio-modules/osmosdr/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/gnuradio-modules/osmosdr/default.nix b/pkgs/development/gnuradio-modules/osmosdr/default.nix index 588adb32fe057..82acd2554d388 100644 --- a/pkgs/development/gnuradio-modules/osmosdr/default.nix +++ b/pkgs/development/gnuradio-modules/osmosdr/default.nix @@ -92,11 +92,11 @@ in mkDerivation { ] ; - meta = with lib; { + meta = { description = "Gnuradio block for OsmoSDR and rtl-sdr"; homepage = "https://sdr.osmocom.org/trac/wiki/GrOsmoSDR"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ bjornfor ]; - platforms = platforms.unix; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ bjornfor ]; + platforms = lib.platforms.unix; }; } From 592ebbfbf1b601395294614e826237c41164efcf Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 18 Nov 2024 15:30:04 +0200 Subject: [PATCH 13/72] gnuradioMinimal: move to pkgs/by-name --- pkgs/by-name/gn/gnuradioMinimal/package.nix | 31 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 26 ----------------- 2 files changed, 31 insertions(+), 26 deletions(-) create mode 100644 pkgs/by-name/gn/gnuradioMinimal/package.nix diff --git a/pkgs/by-name/gn/gnuradioMinimal/package.nix b/pkgs/by-name/gn/gnuradioMinimal/package.nix new file mode 100644 index 0000000000000..7d52dd744c967 --- /dev/null +++ b/pkgs/by-name/gn/gnuradioMinimal/package.nix @@ -0,0 +1,31 @@ +{ + gnuradio, + volk, + uhdMinimal, +}: +# A build without gui components and other utilites not needed for end user +# libraries +gnuradio.override { + doWrap = false; + unwrapped = gnuradio.unwrapped.override { + volk = volk.override { + # So it will not reference python + enableModTool = false; + }; + uhd = uhdMinimal; + features = { + gnuradio-companion = false; + python-support = false; + examples = false; + gr-qtgui = false; + gr-utils = false; + gr-modtool = false; + gr-blocktool = false; + sphinx = false; + doxygen = false; + # Doesn't make it reference python eventually, but makes reverse + # depdendencies require python to use cmake files of GR. + gr-ctrlport = false; + }; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0c2d0e0c5d0c1..e55e7941845d2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13641,32 +13641,6 @@ with pkgs; }; }; gnuradioPackages = lib.recurseIntoAttrs gnuradio.pkgs; - # A build without gui components and other utilites not needed for end user - # libraries - gnuradioMinimal = gnuradio.override { - doWrap = false; - unwrapped = gnuradio.unwrapped.override { - volk = volk.override { - # So it will not reference python - enableModTool = false; - }; - uhd = uhdMinimal; - features = { - gnuradio-companion = false; - python-support = false; - examples = false; - gr-qtgui = false; - gr-utils = false; - gr-modtool = false; - gr-blocktool = false; - sphinx = false; - doxygen = false; - # Doesn't make it reference python eventually, but makes reverse - # depdendencies require python to use cmake files of GR. - gr-ctrlport = false; - }; - }; - }; gnuradio3_8 = callPackage ../applications/radio/gnuradio/wrapper.nix { unwrapped = callPackage ../applications/radio/gnuradio/3.8.nix ({ inherit (darwin.apple_sdk.frameworks) CoreAudio; From d8be53aeab8c6a0c9cbb220557bf1860a329fc7f Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 18 Nov 2024 16:17:41 +0200 Subject: [PATCH 14/72] inspectrum: switch to GR 3.10 --- pkgs/by-name/in/inspectrum/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/in/inspectrum/package.nix b/pkgs/by-name/in/inspectrum/package.nix index afdf80ede1a0c..7cc74eb82b9c9 100644 --- a/pkgs/by-name/in/inspectrum/package.nix +++ b/pkgs/by-name/in/inspectrum/package.nix @@ -1,5 +1,5 @@ { lib -, gnuradio3_8Minimal +, gnuradioMinimal , thrift , fetchFromGitHub , pkg-config @@ -9,7 +9,7 @@ , liquid-dsp }: -gnuradio3_8Minimal.pkgs.mkDerivation rec { +gnuradioMinimal.pkgs.mkDerivation rec { pname = "inspectrum"; version = "0.3.1"; @@ -29,9 +29,9 @@ gnuradio3_8Minimal.pkgs.mkDerivation rec { fftwFloat liquid-dsp qt5.qtbase - ] ++ lib.optionals (gnuradio3_8Minimal.hasFeature "gr-ctrlport") [ + ] ++ lib.optionals (gnuradioMinimal.hasFeature "gr-ctrlport") [ thrift - gnuradio3_8Minimal.unwrapped.python.pkgs.thrift + gnuradioMinimal.unwrapped.python.pkgs.thrift ]; meta = with lib; { From d79a8896cb4a73c31a6ba9d3ab25f216ea3f8068 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 18 Nov 2024 16:21:15 +0200 Subject: [PATCH 15/72] gnuradio3_8: remove --- pkgs/applications/radio/gnuradio/3.8.nix | 289 ----------------------- pkgs/top-level/aliases.nix | 3 + pkgs/top-level/all-packages.nix | 34 --- 3 files changed, 3 insertions(+), 323 deletions(-) delete mode 100644 pkgs/applications/radio/gnuradio/3.8.nix diff --git a/pkgs/applications/radio/gnuradio/3.8.nix b/pkgs/applications/radio/gnuradio/3.8.nix deleted file mode 100644 index 3379ba4c1df9b..0000000000000 --- a/pkgs/applications/radio/gnuradio/3.8.nix +++ /dev/null @@ -1,289 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, fetchpatch -, cmake -# Remove gcc and python references -, removeReferencesTo -, pkg-config -, volk -, cppunit -, swig3 -, orc -, boost -, log4cpp -, mpir -, doxygen -, python -, codec2 -, gsm -, thrift -, fftwFloat -, alsa-lib -, libjack2 -, CoreAudio -, uhd -, SDL -, gsl -, cppzmq -# Needed only if qt-gui is disabled, from some reason -, icu -# GUI related -, gtk3 -, pango -, gobject-introspection -, cairo -, qt5 -, libsForQt5 -# Features available to override, the list of them is in featuresInfo. They -# are all turned on by default. -, features ? {} -# If one wishes to use a different src or name for a very custom build -, overrideSrc ? {} -, pname ? "gnuradio" -, version ? "3.8.5.0" -}: - -let - sourceSha256 = "sha256-p4VFjTE0GXmdA7QGhWSUzO/WxJ+8Dq3JEnOABtQtJUU="; - featuresInfo = { - # Needed always - basic = { - native = [ - cmake - pkg-config - orc - ]; - runtime = [ - boost - log4cpp - mpir - ] - # when gr-qtgui is disabled, icu needs to be included, otherwise - # building with boost 1.7x fails - ++ lib.optionals (!(hasFeature "gr-qtgui")) [ icu ]; - pythonNative = with python.pkgs; [ - mako - six - ]; - }; - volk = { - cmakeEnableFlag = "VOLK"; - runtime = [ - volk - ]; - }; - doxygen = { - native = [ doxygen ]; - cmakeEnableFlag = "DOXYGEN"; - }; - sphinx = { - pythonNative = with python.pkgs; [ sphinx ]; - cmakeEnableFlag = "SPHINX"; - }; - python-support = { - pythonRuntime = [ python.pkgs.six ]; - native = [ - swig3 - python - ]; - cmakeEnableFlag = "PYTHON"; - }; - testing-support = { - native = [ cppunit ]; - cmakeEnableFlag = "TESTING"; - }; - gnuradio-runtime = { - cmakeEnableFlag = "GNURADIO_RUNTIME"; - }; - gr-ctrlport = { - cmakeEnableFlag = "GR_CTRLPORT"; - native = [ - swig3 - ]; - runtime = [ - thrift - ]; - pythonRuntime = [ - python.pkgs.thrift - # For gr-perf-monitorx - python.pkgs.matplotlib - python.pkgs.networkx - ]; - }; - gnuradio-companion = { - pythonRuntime = with python.pkgs; [ - pyyaml - mako - numpy - pygobject3 - ]; - runtime = [ - gtk3 - pango - gobject-introspection - cairo - ]; - cmakeEnableFlag = "GRC"; - }; - gr-blocks = { - cmakeEnableFlag = "GR_BLOCKS"; - }; - gr-fec = { - cmakeEnableFlag = "GR_FEC"; - }; - gr-fft = { - runtime = [ fftwFloat ]; - cmakeEnableFlag = "GR_FFT"; - }; - gr-filter = { - runtime = [ fftwFloat ]; - cmakeEnableFlag = "GR_FILTER"; - }; - gr-analog = { - cmakeEnableFlag = "GR_ANALOG"; - }; - gr-digital = { - cmakeEnableFlag = "GR_DIGITAL"; - }; - gr-dtv = { - cmakeEnableFlag = "GR_DTV"; - }; - gr-audio = { - runtime = [] - ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libjack2 ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreAudio ] - ; - cmakeEnableFlag = "GR_AUDIO"; - }; - gr-channels = { - cmakeEnableFlag = "GR_CHANNELS"; - }; - gr-qtgui = { - runtime = [ qt5.qtbase libsForQt5.qwt6_1 ]; - pythonRuntime = [ python.pkgs.pyqt5 ]; - cmakeEnableFlag = "GR_QTGUI"; - }; - gr-trellis = { - cmakeEnableFlag = "GR_TRELLIS"; - }; - gr-uhd = { - runtime = [ uhd ]; - cmakeEnableFlag = "GR_UHD"; - }; - gr-utils = { - cmakeEnableFlag = "GR_UTILS"; - pythonRuntime = with python.pkgs; [ - # For gr_plot - matplotlib - ]; - }; - gr-modtool = { - pythonRuntime = with python.pkgs; [ - setuptools - click - click-plugins - ]; - cmakeEnableFlag = "GR_MODTOOL"; - }; - gr-video-sdl = { - runtime = [ SDL ]; - cmakeEnableFlag = "GR_VIDEO_SDL"; - }; - gr-vocoder = { - runtime = [ codec2 gsm ]; - cmakeEnableFlag = "GR_VOCODER"; - }; - gr-wavelet = { - cmakeEnableFlag = "GR_WAVELET"; - runtime = [ gsl ]; - }; - gr-zeromq = { - runtime = [ cppzmq ]; - cmakeEnableFlag = "GR_ZEROMQ"; - pythonRuntime = [ - # Will compile without this, but it is required by tests, and by some - # gr blocks. - python.pkgs.pyzmq - ]; - }; - }; - shared = (import ./shared.nix { - inherit - stdenv - lib - python - removeReferencesTo - featuresInfo - features - version - sourceSha256 - overrideSrc - fetchFromGitHub - ; - qt = qt5; - gtk = gtk3; - }); - inherit (shared.passthru) hasFeature; # function -in - -stdenv.mkDerivation (finalAttrs: (shared // { - inherit pname version; - # Will still evaluate correctly if not used here. It only helps nix-update - # find the right file in which version is defined. - inherit (shared) src; - # Some of the tests we know why they fail, but others simply hang-out and - # timeout... - doCheck = false; - patches = [ - # Not accepted upstream, see https://github.com/gnuradio/gnuradio/pull/5227 - ./modtool-newmod-permissions.3_8.patch - # Fix compilation with boost 177 - (fetchpatch { - url = "https://github.com/gnuradio/gnuradio/commit/2c767bb260a25b415e8c9c4b3ea37280b2127cec.patch"; - sha256 = "sha256-l4dSzkXb5s3vcCeuKMMwiKfv83hFI9Yg+EMEX+sl+Uo="; - }) - ]; - passthru = shared.passthru // { - # Deps that are potentially overridden and are used inside GR plugins - the same version must - inherit - boost - volk - ; - # Used by many gnuradio modules, the same attribute is present in - # gnuradio3.10 where there it's spdlog. - logLib = log4cpp; - } // lib.optionalAttrs (hasFeature "gr-uhd") { - inherit uhd; - } // lib.optionalAttrs (hasFeature "gr-qtgui") { - qwt = libsForQt5.qwt6_1; - }; - cmakeFlags = shared.cmakeFlags - # From some reason, if these are not set, libcodec2 and gsm are not - # detected properly. The issue is reported upstream: - # https://github.com/gnuradio/gnuradio/issues/4278 - # The above issue was fixed for GR3.9 without a backporting patch. - # - # NOTE: qradiolink needs libcodec2 to be detected in - # order to build, see https://github.com/qradiolink/qradiolink/issues/67 - ++ lib.optionals (hasFeature "gr-vocoder") [ - "-DLIBCODEC2_FOUND=TRUE" - "-DLIBCODEC2_LIBRARIES=${codec2}/lib/libcodec2${stdenv.hostPlatform.extensions.sharedLibrary}" - "-DLIBCODEC2_INCLUDE_DIRS=${codec2}/include" - "-DLIBCODEC2_HAS_FREEDV_API=ON" - "-DLIBGSM_FOUND=TRUE" - "-DLIBGSM_LIBRARIES=${gsm}/lib/libgsm${stdenv.hostPlatform.extensions.sharedLibrary}" - "-DLIBGSM_INCLUDE_DIRS=${gsm}/include/gsm" - ] - ++ lib.optionals (hasFeature "volk" && volk != null) [ - "-DENABLE_INTERNAL_VOLK=OFF" - ] - ; - - postInstall = shared.postInstall - # This is the only python reference worth removing, if needed (3.7 doesn't - # set that reference). - + lib.optionalString (!hasFeature "python-support") '' - remove-references-to -t ${python} $out/lib/cmake/gnuradio/GnuradioConfig.cmake - '' - ; -})) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 2b5d5afbf31f3..9b9124c71c464 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -503,6 +503,9 @@ mapAliases { gnuradio3_9 = throw "gnuradio3_9 has been removed because it is not compatible with the latest volk and it had no dependent packages which justified it's distribution"; # Added 2024-07-28 gnuradio3_9Minimal = throw "gnuradio3_9Minimal has been removed because it is not compatible with the latest volk and it had no dependent packages which justified it's distribution"; # Added 2024-07-28 gnuradio3_9Packages = throw "gnuradio3_9Minimal has been removed because it is not compatible with the latest volk and it had no dependent packages which justified it's distribution"; # Added 2024-07-28 + gnuradio3_8 = throw "gnuradio3_8 has been removed because it was too old and incompatible with a not EOL swig"; # Added 2024-11-18 + gnuradio3_8Minimal = throw "gnuradio3_8Minimal has been removed because it was too old and incompatible with a not EOL swig"; # Added 2024-11-18 + gnuradio3_8Packages = throw "gnuradio3_8Minimal has been removed because it was too old and incompatible with a not EOL swig"; # Added 2024-11-18 gn1924 = throw "gn1924 has been removed because it was broken and no longer used by envoy."; # Added 2024-11-03 gobby5 = throw "'gobby5' has been renamed to/replaced by 'gobby'"; # Converted to throw 2024-10-17 gradle_6 = throw "Gradle 6 has been removed, as it is end-of-life (https://endoflife.date/gradle) and has many vulnerabilities that are not resolved until Gradle 7."; # Added 2024-10-30 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e55e7941845d2..66eee789b1681 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13641,40 +13641,6 @@ with pkgs; }; }; gnuradioPackages = lib.recurseIntoAttrs gnuradio.pkgs; - gnuradio3_8 = callPackage ../applications/radio/gnuradio/wrapper.nix { - unwrapped = callPackage ../applications/radio/gnuradio/3.8.nix ({ - inherit (darwin.apple_sdk.frameworks) CoreAudio; - python = python311; - volk = volk_2; - } // lib.optionalAttrs stdenv.hostPlatform.isLinux { - stdenv = pkgs.stdenvAdapters.useLibsFrom stdenv pkgs.gcc12Stdenv; - }); - }; - gnuradio3_8Packages = lib.recurseIntoAttrs gnuradio3_8.pkgs; - # A build without gui components and other utilites not needed if gnuradio is - # used as a c++ library. - gnuradio3_8Minimal = gnuradio3_8.override { - doWrap = false; - unwrapped = gnuradio3_8.unwrapped.override { - volk = volk_2.override { - enableModTool = false; - }; - uhd = uhdMinimal; - features = { - gnuradio-companion = false; - python-support = false; - examples = false; - gr-qtgui = false; - gr-utils = false; - gr-modtool = false; - sphinx = false; - doxygen = false; - # Doesn't make it reference python eventually, but makes reverse - # depdendencies require python to use cmake files of GR. - gr-ctrlport = false; - }; - }; - }; grandorgue = callPackage ../applications/audio/grandorgue { inherit (darwin.apple_sdk.frameworks) Cocoa; From 7c046c1e241c59473f27db817cc780eda2bc8b7b Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 23 Dec 2024 19:30:16 +0200 Subject: [PATCH 16/72] kodi: add patch for swig 4.3.0 --- pkgs/applications/video/kodi/unwrapped.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/kodi/unwrapped.nix b/pkgs/applications/video/kodi/unwrapped.nix index 495e8f398b37e..4866a2b9f23e8 100644 --- a/pkgs/applications/video/kodi/unwrapped.nix +++ b/pkgs/applications/video/kodi/unwrapped.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchzip +{ stdenv, lib, fetchFromGitHub, fetchpatch, fetchzip , autoconf, automake, libtool, makeWrapper , pkg-config, cmake, yasm, python3Packages , libxcrypt, libgcrypt, libgpg-error, libunistring @@ -99,6 +99,10 @@ in stdenv.mkDerivation (finalAttrs: { patches = [ ./no-python-lib.patch + (fetchpatch { + url = "https://github.com/xbmc/xbmc/commit/32b04718c65a90f87e409674c4ef984b087b8657.patch"; + hash = "sha256-I79thepzDOfw55r9gfaOp/Ri2FA0gouc+RgTc2Zh1Sw="; + }) ]; # make derivations declared in the let binding available here, so @@ -190,7 +194,7 @@ in stdenv.mkDerivation (finalAttrs: { "-DENABLE_OPTICAL=${if opticalSupport then "ON" else "OFF"}" "-DENABLE_VDPAU=${if vdpauSupport then "ON" else "OFF"}" "-DLIRC_DEVICE=/run/lirc/lircd" - "-DSWIG_EXECUTABLE=${buildPackages.swig3}/bin/swig" + "-DSWIG_EXECUTABLE=${buildPackages.swig}/bin/swig" "-DFLATBUFFERS_FLATC_EXECUTABLE=${buildPackages.flatbuffers}/bin/flatc" "-DPYTHON_EXECUTABLE=${buildPackages.python3Packages.python}/bin/python" "-DPYTHON_LIB_PATH=${python3Packages.python.sitePackages}" From 4a9dcde80bb58678ebbfe6967f4b0e144d9635b5 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 18 Nov 2024 16:39:48 +0200 Subject: [PATCH 17/72] swig3: remove --- pkgs/by-name/sw/swig3/package.nix | 56 ------------------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 56 deletions(-) delete mode 100644 pkgs/by-name/sw/swig3/package.nix diff --git a/pkgs/by-name/sw/swig3/package.nix b/pkgs/by-name/sw/swig3/package.nix deleted file mode 100644 index 44848c13582cc..0000000000000 --- a/pkgs/by-name/sw/swig3/package.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - autoconf, - automake, - libtool, - bison, - pcre, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "swig"; - version = "3.0.12"; - - src = fetchFromGitHub { - owner = "swig"; - repo = "swig"; - rev = "rel-${finalAttrs.version}"; - sha256 = "1wyffskbkzj5zyhjnnpip80xzsjcr3p0q5486z3wdwabnysnhn8n"; - }; - - # Not using autoreconfHook because it fails due to missing macros, contrary - # to this script - preConfigure = '' - ./autogen.sh - ''; - - nativeBuildInputs = [ - autoconf - automake - libtool - bison - ]; - buildInputs = [ - pcre - ]; - - configureFlags = [ - "--without-tcl" - ]; - - # Disable ccache documentation as it needs yodl - postPatch = '' - sed -i '/man1/d' CCache/Makefile.in - ''; - - meta = { - description = "Interface compiler that connects C/C++ code to higher-level languages"; - homepage = "https://swig.org/"; - # Different types of licenses available: http://www.swig.org/Release/LICENSE . - license = lib.licenses.gpl3Plus; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ doronbehar ]; - }; -}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9b9124c71c464..89f848224644f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1254,6 +1254,7 @@ mapAliases { swiPrologWithGui = lib.warnOnInstantiate "swiPrologWithGui has been renamed to swi-prolog-gui" swi-prolog-gui; # Added 2024-09-07 swig1 = throw "swig1 has been removed as it is obsolete"; # Added 2024-08-23 swig2 = throw "swig2 has been removed as it is obsolete"; # Added 2024-08-23 + swig3 = throw "swig3 has been removed as it is obsolete"; # Added 2024-11-18 swig4 = swig; # Added 2024-09-12 swigWithJava = throw "swigWithJava has been removed as the main swig package has supported Java since 2009"; # Added 2024-09-12 swtpm-tpm2 = throw "'swtpm-tpm2' has been renamed to/replaced by 'swtpm'"; # Converted to throw 2024-10-17 From c405f45fc0a1136e3044d9791ede7db1246fb517 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 18 Nov 2024 17:01:00 +0200 Subject: [PATCH 18/72] gnuradioPackages.osmosdr: simplify expression for a single GR version Remove unused swig3 dependency - was really needed only for GR 3.8 that is now removed. --- .../gnuradio-modules/osmosdr/default.nix | 30 +++++-------------- 1 file changed, 7 insertions(+), 23 deletions(-) diff --git a/pkgs/development/gnuradio-modules/osmosdr/default.nix b/pkgs/development/gnuradio-modules/osmosdr/default.nix index 82acd2554d388..5fe07a0d5d2f6 100644 --- a/pkgs/development/gnuradio-modules/osmosdr/default.nix +++ b/pkgs/development/gnuradio-modules/osmosdr/default.nix @@ -13,7 +13,6 @@ , thrift , fftwFloat , python -, swig3 , uhd , icu , airspy @@ -24,26 +23,16 @@ , gnuradioAtLeast }: -let - version = { - "3.7" = "0.1.5"; - "3.8" = "0.2.3"; - "3.9" = "0.2.6"; - "3.10" = "0.2.6"; - }.${gnuradio.versionAttr.major}; +mkDerivation rec { + pname = "gr-osmosdr"; + version = "0.2.6"; + src = fetchgit { url = "https://gitea.osmocom.org/sdr/gr-osmosdr"; rev = "v${version}"; - sha256 = { - "3.7" = "0bf9bnc1c3c4yqqqgmg3nhygj6rcfmyk6pybi27f7461d2cw1drv"; - "3.8" = "sha256-ZfI8MshhZOdJ1U5FlnZKXsg2Rsvb6oKg943ZVYd/IWo="; - "3.9" = "sha256-jCUzBY1pYiEtcRQ97t9F6uEMVYw2NU0eoB5Xc2H6pGQ="; - "3.10" = "sha256-jCUzBY1pYiEtcRQ97t9F6uEMVYw2NU0eoB5Xc2H6pGQ="; - }.${gnuradio.versionAttr.major}; + hash = "sha256-jCUzBY1pYiEtcRQ97t9F6uEMVYw2NU0eoB5Xc2H6pGQ="; }; -in mkDerivation { - pname = "gr-osmosdr"; - inherit version src; + disabled = gnuradioAtLeast "3.11"; outputs = [ "out" "dev" ]; @@ -81,13 +70,8 @@ in mkDerivation { nativeBuildInputs = [ cmake pkg-config - swig3 ] ++ lib.optionals (gnuradio.hasFeature "python-support") [ - (if (gnuradio.versionAttr.major == "3.7") then - python.pkgs.cheetah - else - python.pkgs.mako - ) + python.pkgs.mako python ] ; From 90639458999c66bc2d8d85eea67dfcf818baa62f Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 18 Nov 2024 17:10:53 +0200 Subject: [PATCH 19/72] gnuradioPackages.ais: remove Cannot be used anymore by any modern GR version. --- .../gnuradio-modules/ais/default.nix | 66 ------------------- pkgs/top-level/gnuradio-packages.nix | 2 - 2 files changed, 68 deletions(-) delete mode 100644 pkgs/development/gnuradio-modules/ais/default.nix diff --git a/pkgs/development/gnuradio-modules/ais/default.nix b/pkgs/development/gnuradio-modules/ais/default.nix deleted file mode 100644 index a86fce043d97a..0000000000000 --- a/pkgs/development/gnuradio-modules/ais/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ lib -, stdenv -, mkDerivation -, fetchFromGitHub -, cmake -, pkg-config -, python -, boost -, cppunit -, logLib -, osmosdr -, gmp -, mpir -, fftwFloat -, icu -, gnuradio -, thrift -, gnuradioAtLeast -}: - -mkDerivation rec { - pname = "gr-ais"; - version = "2020-08-13"; - src = fetchFromGitHub { - owner = "bistromath"; - repo = "gr-ais"; - rev = "2162103226f3dae43c8c2ab23b79483b84346665"; - sha256 = "1vackka34722d8pcspfwj0j6gc9ic7dqq64sgkrpjm94sh3bmb0b"; - }; - disabled = gnuradioAtLeast "3.9"; - - nativeBuildInputs = [ - cmake - pkg-config - python - ]; - - cmakeFlags = [ - "-DCMAKE_EXE_LINKER_FLAGS=-pthread" - ]; - - buildInputs = [ - cppunit - osmosdr - boost - logLib - gmp - mpir - fftwFloat - icu - thrift - gnuradio.python.pkgs.thrift - ]; - - meta = with lib; { - description = "Gnuradio block for ais"; - mainProgram = "ais_rx"; - homepage = "https://github.com/bistromath/gr-ais"; - license = licenses.gpl3Plus; - platforms = platforms.unix; - # rpcserver_aggregator.h:111:54: error: no template named 'unary_function' - # in namespace 'std'; did you mean '__unary_function'? - broken = stdenv.hostPlatform.isDarwin; - maintainers = with maintainers; [ mog ]; - }; -} diff --git a/pkgs/top-level/gnuradio-packages.nix b/pkgs/top-level/gnuradio-packages.nix index d2bcb572ac0b0..2d772e79a3015 100644 --- a/pkgs/top-level/gnuradio-packages.nix +++ b/pkgs/top-level/gnuradio-packages.nix @@ -37,8 +37,6 @@ in { osmosdr = callPackage ../development/gnuradio-modules/osmosdr/default.nix { }; - ais = callPackage ../development/gnuradio-modules/ais/default.nix { }; - fosphor = callPackage ../development/gnuradio-modules/fosphor/default.nix { }; grnet = callPackage ../development/gnuradio-modules/grnet/default.nix { }; From 19f71524c2f2818b1ed7c873a5901ab39f267b9d Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 18 Nov 2024 17:14:12 +0200 Subject: [PATCH 20/72] gnuradioPackages.limesdr: remove Cannot be used anymore by any modern GR version. --- .../gnuradio-modules/limesdr/default.nix | 63 ------------------- pkgs/top-level/gnuradio-packages.nix | 2 - 2 files changed, 65 deletions(-) delete mode 100644 pkgs/development/gnuradio-modules/limesdr/default.nix diff --git a/pkgs/development/gnuradio-modules/limesdr/default.nix b/pkgs/development/gnuradio-modules/limesdr/default.nix deleted file mode 100644 index 27c846c44af59..0000000000000 --- a/pkgs/development/gnuradio-modules/limesdr/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ lib -, mkDerivation -, fetchFromGitHub -, gnuradio -, thrift -, cmake -, pkg-config -, swig3 -, python -, logLib -, mpir -, boost -, gmp -, icu -, limesuite -, gnuradioAtLeast -}: - -let - version = { - "3.7" = "2.0.0"; - "3.8" = "3.0.1"; - }.${gnuradio.versionAttr.major}; - src = fetchFromGitHub { - owner = "myriadrf"; - repo = "gr-limesdr"; - rev = "v${version}"; - sha256 = { - "3.7" = "0ldqvfwl0gil89l9s31fjf9d7ki0dk572i8vna336igfaz348ypq"; - "3.8" = "ffs+8TU0yr6IW1xZJ/abQ1CQWGZM+zYqPRJxy3ZvM9U="; - }.${gnuradio.versionAttr.major}; - }; -in mkDerivation { - pname = "gr-limesdr"; - inherit version src; - disabled = gnuradioAtLeast "3.9"; - - nativeBuildInputs = [ - cmake - pkg-config - swig3 - python - ]; - buildInputs = [ - logLib - mpir - boost - gmp - icu - limesuite - ] ++ lib.optionals (gnuradio.hasFeature "gr-ctrlport") [ - thrift - python.pkgs.thrift - ]; - - meta = with lib; { - description = "Gnuradio source and sink blocks for LimeSDR"; - homepage = "https://wiki.myriadrf.org/Gr-limesdr_Plugin_for_GNURadio"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = [ maintainers.markuskowa ]; - }; -} diff --git a/pkgs/top-level/gnuradio-packages.nix b/pkgs/top-level/gnuradio-packages.nix index 2d772e79a3015..2cb25194ddb3f 100644 --- a/pkgs/top-level/gnuradio-packages.nix +++ b/pkgs/top-level/gnuradio-packages.nix @@ -47,6 +47,4 @@ in { rds = callPackage ../development/gnuradio-modules/rds/default.nix { }; - limesdr = callPackage ../development/gnuradio-modules/limesdr/default.nix { }; - }) From f3426f874e3d4d3502701c9383bf8c3afe0a16e2 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 18 Nov 2024 17:14:31 +0200 Subject: [PATCH 21/72] gnuradioPackages.rds: remove Cannot be used anymore by any modern GR version. --- .../gnuradio-modules/rds/default.nix | 64 ------------------- pkgs/top-level/gnuradio-packages.nix | 2 - 2 files changed, 66 deletions(-) delete mode 100644 pkgs/development/gnuradio-modules/rds/default.nix diff --git a/pkgs/development/gnuradio-modules/rds/default.nix b/pkgs/development/gnuradio-modules/rds/default.nix deleted file mode 100644 index 5b9a20042cb9f..0000000000000 --- a/pkgs/development/gnuradio-modules/rds/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ lib -, mkDerivation -, fetchFromGitHub -, gnuradio -, cmake -, pkg-config -, swig3 -, python -, logLib -, mpir -, thrift -, boost -, gmp -, icu -, gnuradioAtLeast -}: - -let - version = { - "3.7" = "1.1.0"; - "3.8" = "3.8.0"; - "3.9" = null; - }.${gnuradio.versionAttr.major}; - src = fetchFromGitHub { - owner = "bastibl"; - repo = "gr-rds"; - rev = "v${version}"; - sha256 = { - "3.7" = "0jkzchvw0ivcxsjhi1h0mf7k13araxf5m4wi5v9xdgqxvipjzqfy"; - "3.8" = "+yKLJu2bo7I2jkAiOdjvdhZwxFz9NFgTmzcLthH9Y5o="; - "3.9" = null; - }.${gnuradio.versionAttr.major}; - }; -in mkDerivation { - pname = "gr-rds"; - inherit version src; - disabled = gnuradioAtLeast "3.9"; - - buildInputs = [ - logLib - mpir - boost - gmp - icu - ] ++ lib.optionals (gnuradio.hasFeature "gr-ctrlport") [ - thrift - python.pkgs.thrift - ]; - - nativeBuildInputs = [ - cmake - pkg-config - swig3 - python - ]; - - meta = with lib; { - description = "Gnuradio block for radio data system"; - homepage = "https://github.com/bastibl/gr-rds"; - license = licenses.gpl2Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ mog ]; - }; -} diff --git a/pkgs/top-level/gnuradio-packages.nix b/pkgs/top-level/gnuradio-packages.nix index 2cb25194ddb3f..d067aef6d457f 100644 --- a/pkgs/top-level/gnuradio-packages.nix +++ b/pkgs/top-level/gnuradio-packages.nix @@ -45,6 +45,4 @@ in { nacl = callPackage ../development/gnuradio-modules/nacl/default.nix { }; - rds = callPackage ../development/gnuradio-modules/rds/default.nix { }; - }) From 25e5103b8e0eaa074543c9d821743b7dfe72297a Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 18 Nov 2024 17:14:50 +0200 Subject: [PATCH 22/72] gnuradioPackages.nacl: remove Cannot be used anymore by any modern GR version. --- .../gnuradio-modules/nacl/default.nix | 47 ------------------- pkgs/top-level/gnuradio-packages.nix | 2 - 2 files changed, 49 deletions(-) delete mode 100644 pkgs/development/gnuradio-modules/nacl/default.nix diff --git a/pkgs/development/gnuradio-modules/nacl/default.nix b/pkgs/development/gnuradio-modules/nacl/default.nix deleted file mode 100644 index 34cd04aff4ead..0000000000000 --- a/pkgs/development/gnuradio-modules/nacl/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib -, mkDerivation -, fetchFromGitHub -, cmake -, pkg-config -, cppunit -, swig3 -, boost -, logLib -, python -, libsodium -, gnuradioAtLeast -}: - -mkDerivation { - pname = "gr-nacl"; - version = "2017-04-10"; - src = fetchFromGitHub { - owner = "stwunsch"; - repo = "gr-nacl"; - rev = "15276bb0fcabf5fe4de4e58df3d579b5be0e9765"; - sha256 = "018np0qlk61l7mlv3xxx5cj1rax8f1vqrsrch3higsl25yydbv7v"; - }; - disabled = gnuradioAtLeast "3.8"; - - nativeBuildInputs = [ - cmake - pkg-config - swig3 - python - ]; - - buildInputs = [ - cppunit - logLib - boost - libsodium - ]; - - meta = with lib; { - description = "Gnuradio block for encryption"; - homepage = "https://github.com/stwunsch/gr-nacl"; - license = licenses.gpl3Plus; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ mog ]; - }; -} diff --git a/pkgs/top-level/gnuradio-packages.nix b/pkgs/top-level/gnuradio-packages.nix index d067aef6d457f..e7663ea55645d 100644 --- a/pkgs/top-level/gnuradio-packages.nix +++ b/pkgs/top-level/gnuradio-packages.nix @@ -43,6 +43,4 @@ in { gsm = callPackage ../development/gnuradio-modules/gsm/default.nix { }; - nacl = callPackage ../development/gnuradio-modules/nacl/default.nix { }; - }) From 1d884e1e5acbe86f8e87cdba0c104bd179f1aab0 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 18 Nov 2024 17:16:00 +0200 Subject: [PATCH 23/72] gnuradioPackages.gsm: remove Cannot be used anymore by any modern GR version. --- .../gnuradio-modules/gsm/default.nix | 49 ------------------- pkgs/top-level/gnuradio-packages.nix | 2 - 2 files changed, 51 deletions(-) delete mode 100644 pkgs/development/gnuradio-modules/gsm/default.nix diff --git a/pkgs/development/gnuradio-modules/gsm/default.nix b/pkgs/development/gnuradio-modules/gsm/default.nix deleted file mode 100644 index af7a018f4798d..0000000000000 --- a/pkgs/development/gnuradio-modules/gsm/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib -, mkDerivation -, fetchFromGitHub -, cmake -, pkg-config -, cppunit -, swig3 -, boost -, logLib -, python -, libosmocore -, osmosdr -, gnuradioAtLeast -}: - -mkDerivation { - pname = "gr-gsm"; - version = "2016-08-25"; - src = fetchFromGitHub { - owner = "ptrkrysik"; - repo = "gr-gsm"; - rev = "3ca05e6914ef29eb536da5dbec323701fbc2050d"; - sha256 = "13nnq927kpf91iqccr8db9ripy5czjl5jiyivizn6bia0bam2pvx"; - }; - disabled = gnuradioAtLeast "3.8"; - - nativeBuildInputs = [ - cmake - pkg-config - swig3 - python - ]; - - buildInputs = [ - cppunit - logLib - boost - libosmocore - osmosdr - ]; - - meta = with lib; { - description = "Gnuradio block for gsm"; - homepage = "https://github.com/ptrkrysik/gr-gsm"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ mog ]; - }; -} diff --git a/pkgs/top-level/gnuradio-packages.nix b/pkgs/top-level/gnuradio-packages.nix index e7663ea55645d..101c38c9659b3 100644 --- a/pkgs/top-level/gnuradio-packages.nix +++ b/pkgs/top-level/gnuradio-packages.nix @@ -41,6 +41,4 @@ in { grnet = callPackage ../development/gnuradio-modules/grnet/default.nix { }; - gsm = callPackage ../development/gnuradio-modules/gsm/default.nix { }; - }) From d8fb383b5189fd7df55084c11075f903d088d93c Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 18 Nov 2024 17:11:37 +0200 Subject: [PATCH 24/72] gnuradioPackages.grnet: remove Cannot be used anymore by any modern GR version. --- .../gnuradio-modules/grnet/default.nix | 97 ------------------- pkgs/top-level/gnuradio-packages.nix | 2 - 2 files changed, 99 deletions(-) delete mode 100644 pkgs/development/gnuradio-modules/grnet/default.nix diff --git a/pkgs/development/gnuradio-modules/grnet/default.nix b/pkgs/development/gnuradio-modules/grnet/default.nix deleted file mode 100644 index 7fb8d10997e1c..0000000000000 --- a/pkgs/development/gnuradio-modules/grnet/default.nix +++ /dev/null @@ -1,97 +0,0 @@ -{ lib -, mkDerivation -, fetchFromGitHub -, fetchpatch -, gnuradio -, cmake -, pkg-config -, boost -, logLib -, python -, swig3 -, mpir -, gmp -, doxygen -, libpcap -, icu -, thrift -, gnuradioAtLeast -}: - -let - # Each GR major version requires us to pull a specific git revision of the repository - version = { - "3.7" = { - # Last git revision from the `maint-3.7` branch: - # https://github.com/ghostop14/gr-grnet/tree/maint-3.7 - name = "unstable-2019-08-06"; - gitHash = "beb1cd75d006a982c0a9536e923800c5a0575451"; - }; - "3.8" = { - # Last git revision from the `maint-3.8` branch: - # https://github.com/ghostop14/gr-grnet/tree/maint-3.8 - name = "unstable-2020-11-20"; - gitHash = "b02016043b67a15f27134a4f0b0d43f5d1b9ed6d"; - }; - "3.9" = { - # This revision is taken from the `master` branch. - name = "unstable-2020-12-30"; - gitHash = "e6dfd140cfda715de9bcef4c1116fcacfeb0c606"; - }; - }.${gnuradio.versionAttr.major}; - src = fetchFromGitHub { - owner = "ghostop14"; - repo = "gr-grnet"; - rev = "${version.gitHash}"; - sha256 = { - "3.7" = "LLQ0Jf0Oapecu9gj4IgxOdK7O/OSbHnwNk000GlODxk="; - "3.8" = "vO8l8nV1/yEQf7pKqBbzIg4KkyCyWu+OkKgISyI3PaQ="; - "3.9" = "NsL7HCOQmGyexzpH2qbzv8Bq4bsfiDTNEUi96QDOA/g="; - }.${gnuradio.versionAttr.major}; - }; -in -mkDerivation { - pname = "gr-grnet"; - version = version.name; - inherit src; - disabled = gnuradioAtLeast "3.10"; - - patches = [ - # Use cross platform struct ip instead of iphdr - # https://github.com/ghostop14/gr-grnet/pull/19 - (fetchpatch { - name = "fix-compilation-on-darwin.patch"; - url = "https://github.com/ghostop14/gr-grnet/commit/52c07daa9ba595b76ffa5dd90c0c96694d95d140.patch"; - sha256 = "sha256-1gJaYLIn09blOhALMfBPROt5YBXaosG41Vsd3+5h518="; - }) - ]; - - buildInputs = [ - boost - logLib - doxygen - mpir - gmp - libpcap - icu - ] ++ (if gnuradioAtLeast "3.9" then with python.pkgs; [ - pybind11 - numpy - ] else [ - swig3 - thrift - python.pkgs.thrift - ]); - nativeBuildInputs = [ - cmake - pkg-config - ]; - - meta = with lib; { - description = "GNURadio TCP/UDP source and sink blocks rewritten in C++/Boost"; - homepage = "https://github.com/ghostop14/gr-grnet"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ chuangzhu ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/top-level/gnuradio-packages.nix b/pkgs/top-level/gnuradio-packages.nix index 101c38c9659b3..a2099ea4054b2 100644 --- a/pkgs/top-level/gnuradio-packages.nix +++ b/pkgs/top-level/gnuradio-packages.nix @@ -39,6 +39,4 @@ in { fosphor = callPackage ../development/gnuradio-modules/fosphor/default.nix { }; - grnet = callPackage ../development/gnuradio-modules/grnet/default.nix { }; - }) From d50107f081e8b864aab09117074ade7202d1295d Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 18 Nov 2024 16:17:31 +0200 Subject: [PATCH 25/72] qradiolink: switch to GR 3.10 --- .../applications/radio/qradiolink/default.nix | 37 +++++++++++-------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/radio/qradiolink/default.nix b/pkgs/applications/radio/qradiolink/default.nix index 035f97fd19152..6d60329d717c2 100644 --- a/pkgs/applications/radio/qradiolink/default.nix +++ b/pkgs/applications/radio/qradiolink/default.nix @@ -3,7 +3,8 @@ , libpulseaudio , libconfig # Needs a gnuradio built with qt gui support -, gnuradio3_8 +, gnuradio +, log4cpp , thrift # Not gnuradioPackages' , codec2 @@ -22,15 +23,16 @@ , uhd }: -gnuradio3_8.pkgs.mkDerivation rec { +gnuradio.pkgs.mkDerivation rec { pname = "qradiolink"; - version = "0.9.0-1"; + # https://github.com/qradiolink/qradiolink/tree/gr_3.10 + version = "0.9.0-1-unstable-2024-08-29"; src = fetchFromGitHub { owner = "qradiolink"; repo = "qradiolink"; - rev = version; - sha256 = "sha256-Js6DzmUG8O9c9VvjE6hc7JGuFmgc1Wq41zVJb8Us/yI="; + rev = "f1006a20e0a642d0ac20aab18b19fa97567f2621"; + sha256 = "sha256-9AYFO+mmwLAH8gEpZn6qcENabc/KBMcg/0wCTKsInNY="; }; preBuild = '' @@ -48,35 +50,40 @@ gnuradio3_8.pkgs.mkDerivation rec { ''; buildInputs = [ - gnuradio3_8.unwrapped.boost + gnuradio.unwrapped.boost codec2 - gnuradio3_8.unwrapped.logLib + gnuradio.unwrapped.logLib + # gnuradio uses it's own log library (spdlog), and qradiolink is still + # using the old gnuradio log library log4cpp. Perhaps this won't be needed + # once the gr_3.10 branch will mature enough to be merged into qradiolink's + # master branch. + log4cpp gmp libpulseaudio libconfig gsm - gnuradio3_8.pkgs.osmosdr + gnuradio.pkgs.osmosdr libopus libjpeg limesuite soapysdr-with-plugins speex speexdsp - gnuradio3_8.qt.qtbase - gnuradio3_8.qt.qtmultimedia + gnuradio.qt.qtbase + gnuradio.qt.qtmultimedia libftdi libsndfile cppzmq - gnuradio3_8.qwt + gnuradio.qwt uhd - ] ++ lib.optionals (gnuradio3_8.hasFeature "gr-ctrlport") [ + ] ++ lib.optionals (gnuradio.hasFeature "gr-ctrlport") [ thrift - gnuradio3_8.unwrapped.python.pkgs.thrift + gnuradio.unwrapped.python.pkgs.thrift ]; nativeBuildInputs = [ protobuf - gnuradio3_8.qt.qmake - gnuradio3_8.qt.wrapQtAppsHook + gnuradio.qt.qmake + gnuradio.qt.wrapQtAppsHook ]; meta = with lib; { From e55f1d73344b995738587c6205793ddf04f61c62 Mon Sep 17 00:00:00 2001 From: rewine Date: Tue, 24 Dec 2024 19:37:58 +0800 Subject: [PATCH 26/72] deepin.deepin-calculator: 6.5.2 -> 6.5.4 --- pkgs/desktops/deepin/apps/deepin-calculator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/deepin/apps/deepin-calculator/default.nix b/pkgs/desktops/deepin/apps/deepin-calculator/default.nix index e9be918583848..128fd3b88ee0c 100644 --- a/pkgs/desktops/deepin/apps/deepin-calculator/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-calculator/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "deepin-calculator"; - version = "6.5.2"; + version = "6.5.4"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-5igRoyXx71LepvWlS+CDRq0q9BFCDitM+83j3Mt6DxU="; + hash = "sha256-yLLdQCnEfcKm0su9gIMRDwOxOjLRjrOqf7AkC7PvAwM="; }; nativeBuildInputs = [ From 4642e27d9ac80bc61f81cadb23087b6141de2323 Mon Sep 17 00:00:00 2001 From: Vincent Bernat Date: Tue, 24 Dec 2024 17:53:19 +0100 Subject: [PATCH 27/72] caddy: move withPlugins function into a dedicated file --- pkgs/by-name/ca/caddy/package.nix | 71 +-------------------------- pkgs/by-name/ca/caddy/plugins.nix | 80 +++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+), 69 deletions(-) create mode 100644 pkgs/by-name/ca/caddy/plugins.nix diff --git a/pkgs/by-name/ca/caddy/package.nix b/pkgs/by-name/ca/caddy/package.nix index bf4865a53e089..5a07a76181cff 100644 --- a/pkgs/by-name/ca/caddy/package.nix +++ b/pkgs/by-name/ca/caddy/package.nix @@ -1,5 +1,6 @@ { lib , buildGoModule +, callPackage , fetchFromGitHub , nixosTests , caddy @@ -74,75 +75,7 @@ buildGoModule { package = caddy; }; }; - withPlugins = - { plugins - , hash ? lib.fakeHash - }: caddy.overrideAttrs (finalAttrs: prevAttrs: - let - pluginsSorted = builtins.sort builtins.lessThan plugins; - pluginsList = lib.concatMapStrings (plugin: "${plugin}-") pluginsSorted; - pluginsHash = builtins.hashString "md5" pluginsList; - pluginsWithoutVersion = builtins.filter (p: !lib.hasInfix "@" p) pluginsSorted; - in - assert lib.assertMsg (builtins.length pluginsWithoutVersion == 0) - "All plugins should have a version (eg ${builtins.elemAt pluginsWithoutVersion 0}@x.y.z)!"; - { - vendorHash = null; - subPackages = [ "." ]; - - src = stdenv.mkDerivation { - pname = "caddy-src-with-plugins-${pluginsHash}"; - version = finalAttrs.version; - - nativeBuildInputs = [ - go - xcaddy - cacert - git - ]; - dontUnpack = true; - buildPhase = - let - withArgs = lib.concatMapStrings (plugin: "--with ${plugin} ") pluginsSorted; - in - '' - export GOCACHE=$TMPDIR/go-cache - export GOPATH="$TMPDIR/go" - XCADDY_SKIP_BUILD=1 TMPDIR="$PWD" xcaddy build v${finalAttrs.version} ${withArgs} - (cd buildenv* && go mod vendor) - ''; - installPhase = '' - mv buildenv* $out - ''; - - outputHashMode = "recursive"; - outputHash = hash; - outputHashAlgo = "sha256"; - }; - - - doInstallCheck = true; - installCheckPhase = '' - runHook preInstallCheck - - ${lib.toShellVar "notfound" pluginsSorted} - while read kind module version; do - [[ "$kind" = "dep" ]] || continue - module="''${module}@''${version}" - for i in "''${!notfound[@]}"; do - if [[ ''${notfound[i]} = ''${module} ]]; then - unset 'notfound[i]' - fi - done - done < <($out/bin/caddy build-info) - if (( ''${#notfound[@]} )); then - >&2 echo "Plugins not found: ''${notfound[@]}" - exit 1 - fi - - runHook postInstallCheck - ''; - }); + withPlugins = callPackage ./plugins.nix { inherit caddy; }; }; meta = with lib; { diff --git a/pkgs/by-name/ca/caddy/plugins.nix b/pkgs/by-name/ca/caddy/plugins.nix new file mode 100644 index 0000000000000..be2e2230be85a --- /dev/null +++ b/pkgs/by-name/ca/caddy/plugins.nix @@ -0,0 +1,80 @@ +{ + lib, + stdenv, + go, + xcaddy, + cacert, + git, + caddy, +}: +{ + plugins, + hash ? lib.fakeHash, +}: +let + pluginsSorted = builtins.sort builtins.lessThan plugins; + pluginsList = lib.concatMapStrings (plugin: "${plugin}-") pluginsSorted; + pluginsHash = builtins.hashString "md5" pluginsList; + pluginsWithoutVersion = builtins.filter (p: !lib.hasInfix "@" p) pluginsSorted; +in +assert lib.assertMsg ( + builtins.length pluginsWithoutVersion == 0 +) "All plugins should have a version (eg ${builtins.elemAt pluginsWithoutVersion 0}@x.y.z)!"; +caddy.overrideAttrs ( + finalAttrs: prevAttrs: { + vendorHash = null; + subPackages = [ "." ]; + + src = stdenv.mkDerivation { + pname = "caddy-src-with-plugins-${pluginsHash}"; + version = finalAttrs.version; + + nativeBuildInputs = [ + go + xcaddy + cacert + git + ]; + dontUnpack = true; + buildPhase = + let + withArgs = lib.concatMapStrings (plugin: "--with ${plugin} ") pluginsSorted; + in + '' + export GOCACHE=$TMPDIR/go-cache + export GOPATH="$TMPDIR/go" + XCADDY_SKIP_BUILD=1 TMPDIR="$PWD" xcaddy build v${finalAttrs.version} ${withArgs} + (cd buildenv* && go mod vendor) + ''; + installPhase = '' + mv buildenv* $out + ''; + + outputHashMode = "recursive"; + outputHash = hash; + outputHashAlgo = "sha256"; + }; + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + + ${lib.toShellVar "notfound" pluginsSorted} + while read kind module version; do + [[ "$kind" = "dep" ]] || continue + module="''${module}@''${version}" + for i in "''${!notfound[@]}"; do + if [[ ''${notfound[i]} = ''${module} ]]; then + unset 'notfound[i]' + fi + done + done < <($out/bin/caddy build-info) + if (( ''${#notfound[@]} )); then + >&2 echo "Plugins not found: ''${notfound[@]}" + exit 1 + fi + + runHook postInstallCheck + ''; + } +) From e57d6626fa29e4efed26d0fc0052c45c1fcbaab6 Mon Sep 17 00:00:00 2001 From: Vincent Bernat Date: Tue, 24 Dec 2024 18:02:36 +0100 Subject: [PATCH 28/72] caddy: avoid use of builtins and prefer lib There is no `lib.hashString`, so keep using `builtins` for this one. --- pkgs/by-name/ca/caddy/plugins.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ca/caddy/plugins.nix b/pkgs/by-name/ca/caddy/plugins.nix index be2e2230be85a..790c1180be676 100644 --- a/pkgs/by-name/ca/caddy/plugins.nix +++ b/pkgs/by-name/ca/caddy/plugins.nix @@ -12,14 +12,14 @@ hash ? lib.fakeHash, }: let - pluginsSorted = builtins.sort builtins.lessThan plugins; + pluginsSorted = lib.sort lib.lessThan plugins; pluginsList = lib.concatMapStrings (plugin: "${plugin}-") pluginsSorted; pluginsHash = builtins.hashString "md5" pluginsList; - pluginsWithoutVersion = builtins.filter (p: !lib.hasInfix "@" p) pluginsSorted; + pluginsWithoutVersion = lib.filter (p: !lib.hasInfix "@" p) pluginsSorted; in assert lib.assertMsg ( - builtins.length pluginsWithoutVersion == 0 -) "All plugins should have a version (eg ${builtins.elemAt pluginsWithoutVersion 0}@x.y.z)!"; + lib.length pluginsWithoutVersion == 0 +) "All plugins should have a version (eg ${lib.elemAt pluginsWithoutVersion 0}@x.y.z)!"; caddy.overrideAttrs ( finalAttrs: prevAttrs: { vendorHash = null; From 2f93866f8bc28c659ace406f7fb7a51246e7f625 Mon Sep 17 00:00:00 2001 From: Reno Dakota Date: Wed, 25 Dec 2024 02:38:50 +0000 Subject: [PATCH 29/72] gitstatus: unvendor zlib vendored zlib causes clang build to fail --- pkgs/by-name/gi/gitstatus/package.nix | 16 ++++++++++++---- pkgs/by-name/gi/gitstatus/romkatv_libgit2.nix | 1 - 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/gi/gitstatus/package.nix b/pkgs/by-name/gi/gitstatus/package.nix index cc6037d16c214..04afd67b7c214 100644 --- a/pkgs/by-name/gi/gitstatus/package.nix +++ b/pkgs/by-name/gi/gitstatus/package.nix @@ -5,6 +5,7 @@ fetchFromGitHub, git, zsh, + zlib, runtimeShell, }: stdenv.mkDerivation rec { @@ -18,11 +19,18 @@ stdenv.mkDerivation rec { sha256 = "sha256-b+9bwJ87VV6rbOPobkwMkDXGH34STjYPlt8wCRR5tEc="; }; - env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { - NIX_LDFLAGS = "-liconv"; - }; + env.NIX_LDFLAGS = toString ( + [ + # required by libgit2.a + "-lz" + ] + ++ lib.optional stdenv.hostPlatform.isDarwin "-liconv" + ); - buildInputs = [ (callPackage ./romkatv_libgit2.nix { }) ]; + buildInputs = [ + zlib + (callPackage ./romkatv_libgit2.nix { }) + ]; postPatch = '' sed -i '1i GITSTATUS_AUTO_INSTALL=''${GITSTATUS_AUTO_INSTALL-0}' gitstatus.plugin.sh diff --git a/pkgs/by-name/gi/gitstatus/romkatv_libgit2.nix b/pkgs/by-name/gi/gitstatus/romkatv_libgit2.nix index 9881bd480406f..e1feb240c7b14 100644 --- a/pkgs/by-name/gi/gitstatus/romkatv_libgit2.nix +++ b/pkgs/by-name/gi/gitstatus/romkatv_libgit2.nix @@ -5,7 +5,6 @@ libgit2.overrideAttrs (oldAttrs: { "-DBUILD_CLAR=OFF" "-DBUILD_SHARED_LIBS=OFF" "-DREGEX_BACKEND=builtin" - "-DUSE_BUNDLED_ZLIB=ON" "-DUSE_GSSAPI=OFF" "-DUSE_HTTPS=OFF" "-DUSE_HTTP_PARSER=builtin" # overwritten from libgit2 From bc5ff8d5ec0d50866edf7937a8a1e63d09a72b3f Mon Sep 17 00:00:00 2001 From: FUNABARA Masao Date: Wed, 25 Dec 2024 07:10:13 +0000 Subject: [PATCH 30/72] ruby_3_4: 3.4.0.preview2 -> 3.4.1 --- pkgs/development/interpreters/ruby/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 359c71402e70b..b4f97800205fa 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -441,8 +441,8 @@ in }; ruby_3_4 = generic { - version = rubyVersion "3" "4" "0" "preview2"; - hash = "sha256-RDzX7FSt5HhryXTOn11J8XKmD47chLWXt/4r0qlLg3E="; + version = rubyVersion "3" "4" "1" ""; + hash = "sha256-PTheXSLTaLBkyBehPtjjzD9xp3BdftG654ATwzqnyH8="; cargoHash = "sha256-kdfNY8wVmSRR+cwEDYge/HDPRvdTNKLk/BhgqQeelOg="; }; } From 8b08bf23b7102da44d77adcef5c2463bd90ccde3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 Dec 2024 15:01:18 +0000 Subject: [PATCH 31/72] rime-ls: 0.4.0 -> 0.4.1 --- pkgs/by-name/ri/rime-ls/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ri/rime-ls/package.nix b/pkgs/by-name/ri/rime-ls/package.nix index 1381760ed452b..ec6260e7b101a 100644 --- a/pkgs/by-name/ri/rime-ls/package.nix +++ b/pkgs/by-name/ri/rime-ls/package.nix @@ -7,17 +7,17 @@ }: rustPlatform.buildRustPackage rec { pname = "rime-ls"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "wlh320"; repo = "rime-ls"; rev = "v${version}"; - hash = "sha256-ZqoRFIF3ehfEeTN+ZU+/PAzA4JyS1403+sqZdzwJHA8="; + hash = "sha256-IhrfUPC+7Gsg2n6nsGiK/wRoFGKtLXsRLQBw6XIVu0U="; }; useFetchCargoVendor = true; - cargoHash = "sha256-mbkxOYlOCpNzxVWwG8n4vD8klHGVjvMA8XSsBbifjoM="; + cargoHash = "sha256-beppHZXtNni8tLgZaC6CyL2HMBK7xy5/kP1jFr6JW+M="; nativeBuildInputs = [ rustPlatform.bindgenHook ]; From a33f200bfcdd59f9939a549b11d6b555d50bc819 Mon Sep 17 00:00:00 2001 From: eljamm Date: Wed, 25 Dec 2024 18:30:40 +0100 Subject: [PATCH 32/72] lrcget: 0.5.0 -> 0.9.0 Diff: https://github.com/tranxuanthang/lrcget/compare/refs/tags/0.5.0...0.9.0 Changelog: https://github.com/tranxuanthang/lrcget/releases/tag/0.9.0 --- pkgs/by-name/lr/lrcget/package.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/lr/lrcget/package.nix b/pkgs/by-name/lr/lrcget/package.nix index 8b293a59ddc52..fa71bb3e0de07 100644 --- a/pkgs/by-name/lr/lrcget/package.nix +++ b/pkgs/by-name/lr/lrcget/package.nix @@ -2,7 +2,7 @@ dbus, openssl, gtk3, - webkitgtk_4_0, + webkitgtk_4_1, pkg-config, wrapGAppsHook3, fetchFromGitHub, @@ -17,18 +17,18 @@ }: rustPlatform.buildRustPackage rec { pname = "lrcget"; - version = "0.5.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "tranxuanthang"; repo = "lrcget"; rev = "${version}"; - hash = "sha256-phsiVscbgQwMVWwVizb1n/6OlftQYWvkJ5+As5ITFrQ="; + hash = "sha256-XaQV3YwG15VLcgFJLGsRxCz4n50vAIYxXk09c0GKn5g="; }; sourceRoot = "${src.name}/src-tauri"; - cargoHash = "sha256-mHti3KLjKe25qPLFf0ofzcM2wU4nvhiusIC4bpUdtiY="; + cargoHash = "sha256-l8HMkMMXiYlmaZx+tHE0CXZa2bZakSO/uvJ1lq44Ybk="; frontend = buildNpmPackage { inherit version src; @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec { # To fix `npm ERR! Your cache folder contains root-owned files` makeCacheWritable = true; - npmDepsHash = "sha256-vjDj3b7GVZvM9ioVBp5JpRbWUa33EK6qFTDVgCZkGRA="; + npmDepsHash = "sha256-N48+C3NNPYg/rOpnRNmkZfZU/ZHp8imrG/tiDaMGsCE="; postBuild = '' cp -r dist/ $out @@ -53,7 +53,8 @@ rustPlatform.buildRustPackage rec { postPatch = '' cp -r $frontend ./frontend - substituteInPlace tauri.conf.json --replace-fail '"distDir": "../dist"' '"distDir": "./frontend"' + substituteInPlace tauri.conf.json \ + --replace-fail '"frontendDist": "../dist"' '"frontendDist": "./frontend"' ''; nativeBuildInputs = [ @@ -70,7 +71,7 @@ rustPlatform.buildRustPackage rec { gtk3 ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ - webkitgtk_4_0 + webkitgtk_4_1 alsa-lib ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ From 5ab4b4fadecb51c8b4044d200755cace6368fe21 Mon Sep 17 00:00:00 2001 From: eljamm Date: Wed, 25 Dec 2024 19:34:53 +0100 Subject: [PATCH 33/72] lrcget: add passthru.updateScript --- pkgs/by-name/lr/lrcget/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/lr/lrcget/package.nix b/pkgs/by-name/lr/lrcget/package.nix index fa71bb3e0de07..1cf6cebca767d 100644 --- a/pkgs/by-name/lr/lrcget/package.nix +++ b/pkgs/by-name/lr/lrcget/package.nix @@ -14,6 +14,7 @@ makeDesktopItem, alsa-lib, darwin, + nix-update-script, }: rustPlatform.buildRustPackage rec { pname = "lrcget"; @@ -104,6 +105,8 @@ rustPlatform.buildRustPackage rec { }) ]; + passthru.updateScript = nix-update-script { }; + meta = { description = "Utility for mass-downloading LRC synced lyrics for your offline music library"; homepage = "https://github.com/tranxuanthang/lrcget"; From 76b449a9d1356dd3cdceef126d6a2150cde37a0f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 Dec 2024 19:30:17 +0000 Subject: [PATCH 34/72] postgresqlPackages.pgmq: 1.4.5 -> 1.5.0 --- pkgs/servers/sql/postgresql/ext/pgmq.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pgmq.nix b/pkgs/servers/sql/postgresql/ext/pgmq.nix index c3511e3dfbd5c..375bc7fa28d47 100644 --- a/pkgs/servers/sql/postgresql/ext/pgmq.nix +++ b/pkgs/servers/sql/postgresql/ext/pgmq.nix @@ -8,13 +8,13 @@ buildPostgresqlExtension rec { pname = "pgmq"; - version = "1.4.5"; + version = "1.5.0"; src = fetchFromGitHub { owner = "tembo-io"; repo = "pgmq"; rev = "v${version}"; - hash = "sha256-ynco5t/z7+IPEynuY1wtSaoVloMr6z7UYn4byZecOhg="; + hash = "sha256-iFIHkqL9w7Bw1dxmmL1i0D5Xxq+ljFLf24M9vHArwvE="; }; sourceRoot = "${src.name}/pgmq-extension"; From b02b8abe02a879947afd2fa36dbeae03e0bb1e31 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 25 Dec 2024 21:40:01 +0100 Subject: [PATCH 35/72] libqt5pas,lazarus: 3.2-0 -> 3.6-0 --- pkgs/development/compilers/fpc/lazarus.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix index e11084a345278..bd28073305247 100644 --- a/pkgs/development/compilers/fpc/lazarus.nix +++ b/pkgs/development/compilers/fpc/lazarus.nix @@ -27,7 +27,7 @@ # 1. the build date is embedded in the binary through `$I %DATE%` - we should dump that let - version = "3.2-0"; + version = "3.6-0"; # as of 2.0.10 a suffix is being added. That may or may not disappear and then # come back, so just leave this here. @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20${majorMinorPatch version}/lazarus-${version}.tar.gz"; - sha256 = "69f43f0a10b9e09deea5f35094c73b84464b82d3f40d8a2fcfcb5a5ab03c6edf"; + hash = "sha256-5luQNn9jvxfLe/NfW+acnvcEyklOkdjGfQcuM3P6sIU="; }; postPatch = '' From 62738972ed7f83462d80ab9ca6cd5292a47752a5 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 25 Dec 2024 21:52:01 +0100 Subject: [PATCH 36/72] libqt5pas: Don't rely on mkDerivation from libsForQt5 anymore Qt5 is not the only supported Qt version, and Qt6 dropped the scope-specific mkDerivation. --- pkgs/development/compilers/fpc/libqt5pas.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/fpc/libqt5pas.nix b/pkgs/development/compilers/fpc/libqt5pas.nix index 209a749846dc2..3c7d226bbbd8d 100644 --- a/pkgs/development/compilers/fpc/libqt5pas.nix +++ b/pkgs/development/compilers/fpc/libqt5pas.nix @@ -1,5 +1,5 @@ { - mkDerivation, + stdenv, lib, lazarus, qmake, @@ -7,7 +7,7 @@ qtx11extras, }: -mkDerivation { +stdenv.mkDerivation { pname = "libqt5pas"; inherit (lazarus) version src; @@ -25,6 +25,8 @@ mkDerivation { qtx11extras ]; + dontWrapQtApps = true; + meta = with lib; { description = "Free Pascal Qt5 binding library"; homepage = "https://wiki.freepascal.org/Qt5_Interface#libqt5pas"; From 71b646d14a0d1f358409e1f876b84234104f5116 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Dec 2024 22:08:54 +0100 Subject: [PATCH 37/72] python311Packages.model-checker: 0.5.6 -> 0.6.2 --- pkgs/development/python-modules/model-checker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/model-checker/default.nix b/pkgs/development/python-modules/model-checker/default.nix index 0a27a55ad02c6..56bd8fa933976 100644 --- a/pkgs/development/python-modules/model-checker/default.nix +++ b/pkgs/development/python-modules/model-checker/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "model-checker"; - version = "0.5.6"; + version = "0.6.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "model_checker"; inherit version; - hash = "sha256-dt2/1qY0kyD0K0/d1NJa3q0NrwinmWb8Zd/Shtqj9Ow="; + hash = "sha256-x8lnODvpjfIO8SqHQD90VnNuHZBZl1oNdf4EfM8A4ys="; }; # z3 does not provide a dist-info, so python-runtime-deps-check will fail From df434a17fb97e8fee57bdb51e5098a0a523c4ced Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Dec 2024 22:09:32 +0100 Subject: [PATCH 38/72] python311Packages.parts: 2.0.0 -> 2.1.0 --- pkgs/development/python-modules/parts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/parts/default.nix b/pkgs/development/python-modules/parts/default.nix index 5f942a17c58f6..33a8c7da39481 100644 --- a/pkgs/development/python-modules/parts/default.nix +++ b/pkgs/development/python-modules/parts/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "parts"; - version = "2.0.0"; + version = "2.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-wQgiwr7iOBvy24/w1C311PivWLtXLD/Djs34zo1Zid4="; + hash = "sha256-zauHOv8pM47CVIQIo8aMMPZJgwIowgbVLvfFWzIqHoc="; }; nativeBuildInputs = [ From 98afea5ea7e1f1417f50a7d1be1d876018dd0496 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Dec 2024 22:11:41 +0100 Subject: [PATCH 39/72] python312Packages.pyais: 2.8.2 -> 2.8.3 Diff: https://github.com/M0r13n/pyais/compare/refs/tags/v2.8.2...v2.8.3 Changelog: https://github.com/M0r13n/pyais/blob/v2.8.3/CHANGELOG.txt --- pkgs/development/python-modules/pyais/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyais/default.nix b/pkgs/development/python-modules/pyais/default.nix index b0f2915935ca5..c40e92771a58d 100644 --- a/pkgs/development/python-modules/pyais/default.nix +++ b/pkgs/development/python-modules/pyais/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyais"; - version = "2.8.2"; + version = "2.8.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "M0r13n"; repo = "pyais"; rev = "refs/tags/v${version}"; - hash = "sha256-G3P1ijwOmd1UFIRXC8qPG93gtWJt+EclzO7wjtvj6tk="; + hash = "sha256-LSIytiWqHEczPPGoE3/EX3nCsLOq8zIx4Y2+PGwYgRs="; }; build-system = [ setuptools ]; From e87f44a245478622b6ff52082e931a0dec2669d8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Dec 2024 22:13:42 +0100 Subject: [PATCH 40/72] python312Packages.tencentcloud-sdk-python: 3.0.1287 -> 3.0.1288 Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1287...3.0.1288 Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1288/CHANGELOG.md --- .../python-modules/tencentcloud-sdk-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 99b6a2f35c1a7..e4a9cc0114803 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1287"; + version = "3.0.1288"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-rr56baecL1uROadbtrrSXip2wVKbArZFvDL8DTNUMCI="; + hash = "sha256-cBNWXZP+BilIWlML/voRG+dutqoHJqsJ7iOhAkngC1A="; }; build-system = [ setuptools ]; From 9b0e625dc2069d22ebebed34b99c670daed26551 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 Dec 2024 21:42:48 +0000 Subject: [PATCH 41/72] postgresqlPackages.pg_repack: 1.5.1 -> 1.5.2 --- pkgs/servers/sql/postgresql/ext/pg_repack.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_repack.nix b/pkgs/servers/sql/postgresql/ext/pg_repack.nix index c7d0ab33f69de..f7cb29c40ad5f 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_repack.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_repack.nix @@ -10,7 +10,7 @@ buildPostgresqlExtension (finalAttrs: { pname = "pg_repack"; - version = "1.5.1"; + version = "1.5.2"; buildInputs = postgresql.buildInputs; @@ -18,7 +18,7 @@ buildPostgresqlExtension (finalAttrs: { owner = "reorg"; repo = "pg_repack"; rev = "ver_${finalAttrs.version}"; - sha256 = "sha256-wJwy4qIt6/kgWqT6HbckUVqDayDkixqHpYiC1liLERw="; + sha256 = "sha256-wfjiLkx+S3zVrAynisX1GdazueVJ3EOwQEPcgUQt7eA="; }; passthru.tests = { From d230e69db16434c7423a1b636fc14248f1a7bae0 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 25 Dec 2024 22:45:30 +0100 Subject: [PATCH 42/72] libsForQt5.libqtpas: Rename from libqt5pas In preparation for a qt6Packages.libqtpas. --- pkgs/applications/editors/cudatext/default.nix | 7 +++---- pkgs/by-name/do/doublecmd/package.nix | 4 ++-- pkgs/by-name/la/lazpaint/package.nix | 7 +++---- pkgs/by-name/pe/peazip/package.nix | 3 +-- pkgs/by-name/ya/yandex-browser/package.nix | 4 ++-- pkgs/development/compilers/fpc/lazarus.nix | 6 +++--- .../compilers/fpc/{libqt5pas.nix => libqtpas.nix} | 2 +- pkgs/tools/graphics/goverlay/default.nix | 4 ++-- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 6 ++---- pkgs/top-level/qt5-packages.nix | 2 ++ 11 files changed, 22 insertions(+), 24 deletions(-) rename pkgs/development/compilers/fpc/{libqt5pas.nix => libqtpas.nix} (96%) diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix index 76c4ec5ce9609..45170aa9a5fd6 100644 --- a/pkgs/applications/editors/cudatext/default.nix +++ b/pkgs/applications/editors/cudatext/default.nix @@ -17,8 +17,7 @@ , python3 # Qt5 -, libqt5pas -, qt5 +, libsForQt5 , widgetset ? "qt5" # See https://github.com/Alexey-T/CudaText-lexers @@ -59,13 +58,13 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ lazarus fpc ] - ++ lib.optional (widgetset == "qt5") qt5.wrapQtAppsHook; + ++ lib.optional (widgetset == "qt5") libsForQt5.wrapQtAppsHook; buildInputs = [ libX11 ] ++ lib.optionals (lib.hasPrefix "gtk" widgetset) [ pango cairo glib atk gdk-pixbuf ] ++ lib.optional (widgetset == "gtk2") gtk2 ++ lib.optional (widgetset == "gtk3") gtk3 - ++ lib.optional (widgetset == "qt5") libqt5pas; + ++ lib.optional (widgetset == "qt5") libsForQt5.libqtpas; NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath buildInputs}"; diff --git a/pkgs/by-name/do/doublecmd/package.nix b/pkgs/by-name/do/doublecmd/package.nix index ce5237d5c7ef5..59ed74b6422a6 100644 --- a/pkgs/by-name/do/doublecmd/package.nix +++ b/pkgs/by-name/do/doublecmd/package.nix @@ -8,7 +8,7 @@ glib, lazarus, libX11, - libqt5pas, + libqtpas, wrapQtAppsHook, }: @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { dbus glib libX11 - libqt5pas + libqtpas ]; env.NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath finalAttrs.buildInputs}"; diff --git a/pkgs/by-name/la/lazpaint/package.nix b/pkgs/by-name/la/lazpaint/package.nix index 6c9d1149a1595..60efa31aaba44 100644 --- a/pkgs/by-name/la/lazpaint/package.nix +++ b/pkgs/by-name/la/lazpaint/package.nix @@ -6,7 +6,6 @@ fpc, autoPatchelfHook, libsForQt5, - libqt5pas, xorg, python3, }: @@ -43,9 +42,9 @@ stdenv.mkDerivation rec { autoPatchelfHook ]; - buildInputs = [ - libsForQt5.qtbase - libqt5pas + buildInputs = with libsForQt5; [ + qtbase + libqtpas ]; runtimeDependencies = [ diff --git a/pkgs/by-name/pe/peazip/package.nix b/pkgs/by-name/pe/peazip/package.nix index ed6ecc48e2bb6..b7770087d7bc5 100644 --- a/pkgs/by-name/pe/peazip/package.nix +++ b/pkgs/by-name/pe/peazip/package.nix @@ -6,7 +6,6 @@ fpc, lazarus, xorg, - libqt5pas, runCommand, _7zz, archiver, @@ -41,7 +40,7 @@ stdenv.mkDerivation rec { buildInputs = [ xorg.libX11 - libqt5pas + libsForQt5.libqtpas ]; NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath buildInputs}"; diff --git a/pkgs/by-name/ya/yandex-browser/package.nix b/pkgs/by-name/ya/yandex-browser/package.nix index cf537fefc008d..125a262eb0b63 100644 --- a/pkgs/by-name/ya/yandex-browser/package.nix +++ b/pkgs/by-name/ya/yandex-browser/package.nix @@ -46,7 +46,7 @@ , systemd , at-spi2-atk , at-spi2-core -, libqt5pas +, libsForQt5 , qt6 , vivaldi-ffmpeg-codecs , edition ? "stable" @@ -130,7 +130,7 @@ in stdenv.mkDerivation rec { nss pango (lib.getLib stdenv.cc.cc) - libqt5pas + libsForQt5.libqtpas qt6.qtbase ]; diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix index bd28073305247..9842de6b215ed 100644 --- a/pkgs/development/compilers/fpc/lazarus.nix +++ b/pkgs/development/compilers/fpc/lazarus.nix @@ -19,7 +19,7 @@ binutils, withQt ? false, qtbase ? null, - libqt5pas ? null, + libqtpas ? null, wrapQtAppsHook ? null, }: @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { gdk-pixbuf ] ++ lib.optionals withQt [ - libqt5pas + libqtpas qtbase ]; @@ -113,7 +113,7 @@ stdenv.mkDerivation rec { "-lpango-1.0" ] ++ lib.optionals withQt [ - "-L${lib.getLib libqt5pas}/lib" + "-L${lib.getLib libqtpas}/lib" "-lQt5Pas" ] ); diff --git a/pkgs/development/compilers/fpc/libqt5pas.nix b/pkgs/development/compilers/fpc/libqtpas.nix similarity index 96% rename from pkgs/development/compilers/fpc/libqt5pas.nix rename to pkgs/development/compilers/fpc/libqtpas.nix index 3c7d226bbbd8d..9c85456a1cb08 100644 --- a/pkgs/development/compilers/fpc/libqt5pas.nix +++ b/pkgs/development/compilers/fpc/libqtpas.nix @@ -8,7 +8,7 @@ }: stdenv.mkDerivation { - pname = "libqt5pas"; + pname = "libqtpas"; inherit (lazarus) version src; sourceRoot = "lazarus/lcl/interfaces/qt5/cbindings"; diff --git a/pkgs/tools/graphics/goverlay/default.nix b/pkgs/tools/graphics/goverlay/default.nix index 4b348cc319830..c1d8b8d7dc28a 100644 --- a/pkgs/tools/graphics/goverlay/default.nix +++ b/pkgs/tools/graphics/goverlay/default.nix @@ -10,7 +10,7 @@ breeze-qt5, libGL, libGLU, - libqt5pas, + libqtpas, libX11, coreutils, git, @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { breeze-qt5 libGL libGLU - libqt5pas + libqtpas libX11 ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 05c5d2924793b..33eb474cb4fd5 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -664,6 +664,7 @@ mapAliases { liboop = throw "liboop has been removed as it is unmaintained upstream."; # Added 2024-08-14 libpqxx_6 = throw "libpqxx_6 has been removed, please use libpqxx"; # Added 2024-10-02 libpulseaudio-vanilla = libpulseaudio; # Added 2022-04-20 + libqt5pas = libsForQt5.libqtpas; # Added 2024-12-25 libquotient = libsForQt5.libquotient; # Added 2023-11-11 librarian-puppet-go = throw "'librarian-puppet-go' has been removed, as it's upstream is unmaintained"; # Added 2024-06-10 librdf = throw "'librdf' has been renamed to/replaced by 'lrdf'"; # Converted to throw 2024-10-17 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ce6de34cae815..f43e9f0150137 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1495,7 +1495,7 @@ with pkgs; ### APPLICATIONS/FILE-MANAGERS doublecmd = callPackage ../by-name/do/doublecmd/package.nix { - inherit (qt5) wrapQtAppsHook; + inherit (libsForQt5) libqtpas wrapQtAppsHook; }; krusader = libsForQt5.callPackage ../applications/file-managers/krusader { }; @@ -3582,7 +3582,7 @@ with pkgs; gdown = with python3Packages; toPythonApplication gdown; goverlay = callPackage ../tools/graphics/goverlay { - inherit (qt5) wrapQtAppsHook; + inherit (libsForQt5) libqtpas wrapQtAppsHook; inherit (plasma5Packages) breeze-qt5; }; @@ -9914,8 +9914,6 @@ with pkgs; python = python3; }; - libqt5pas = libsForQt5.callPackage ../development/compilers/fpc/libqt5pas.nix { }; - librsvg = callPackage ../development/libraries/librsvg { inherit (darwin) libobjc; inherit (darwin.apple_sdk.frameworks) ApplicationServices Foundation; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 028b1196fc960..0c80734993fb5 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -170,6 +170,8 @@ in (noExtraAttrs (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdP libqofono = callPackage ../development/libraries/libqofono { }; + libqtpas = callPackage ../development/compilers/fpc/libqtpas.nix { }; + libquotient = callPackage ../development/libraries/libquotient { }; libqaccessibilityclient = callPackage ../development/libraries/libqaccessibilityclient { }; From 542c24caaf45b8d5b1a52e06de48e4ac5975e98c Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 25 Dec 2024 22:00:33 +0100 Subject: [PATCH 43/72] qt6Packages.libqtpas: init at 3.6-0 --- pkgs/development/compilers/fpc/libqtpas.nix | 27 ++++++++++++++------- pkgs/top-level/qt6-packages.nix | 3 +++ 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/pkgs/development/compilers/fpc/libqtpas.nix b/pkgs/development/compilers/fpc/libqtpas.nix index 9c85456a1cb08..5cce2ae6de4fa 100644 --- a/pkgs/development/compilers/fpc/libqtpas.nix +++ b/pkgs/development/compilers/fpc/libqtpas.nix @@ -4,32 +4,41 @@ lazarus, qmake, qtbase, - qtx11extras, + # Not in Qt6 anymore + qtx11extras ? null, }: +let + qtVersion = lib.versions.major qtbase.version; +in stdenv.mkDerivation { pname = "libqtpas"; inherit (lazarus) version src; - sourceRoot = "lazarus/lcl/interfaces/qt5/cbindings"; + sourceRoot = "lazarus/lcl/interfaces/qt${qtVersion}/cbindings"; postPatch = '' - substituteInPlace Qt5Pas.pro \ + substituteInPlace Qt${qtVersion}Pas.pro \ --replace 'target.path = $$[QT_INSTALL_LIBS]' "target.path = $out/lib" ''; nativeBuildInputs = [ qmake ]; - buildInputs = [ - qtbase - qtx11extras - ]; + buildInputs = + [ + qtbase + ] + ++ lib.optionals (qtVersion == "5") [ + qtx11extras + ]; dontWrapQtApps = true; meta = with lib; { - description = "Free Pascal Qt5 binding library"; - homepage = "https://wiki.freepascal.org/Qt5_Interface#libqt5pas"; + description = "Free Pascal Qt${qtVersion} binding library"; + homepage = + "https://wiki.freepascal.org/Qt${qtVersion}_Interface" + + lib.optionalString (qtVersion == "5") "#libqt5pas"; maintainers = with maintainers; [ sikmir ]; inherit (lazarus.meta) license platforms; }; diff --git a/pkgs/top-level/qt6-packages.nix b/pkgs/top-level/qt6-packages.nix index 84b5ea164ffb4..d2d084b60b4b8 100644 --- a/pkgs/top-level/qt6-packages.nix +++ b/pkgs/top-level/qt6-packages.nix @@ -55,6 +55,9 @@ makeScopeWithSplicing' { futuresql = callPackage ../development/libraries/futuresql { }; kquickimageedit = callPackage ../development/libraries/kquickimageedit { }; libqaccessibilityclient = callPackage ../development/libraries/libqaccessibilityclient { }; + + libqtpas = callPackage ../development/compilers/fpc/libqtpas.nix { }; + libquotient = callPackage ../development/libraries/libquotient { }; mlt = pkgs.mlt.override { qt = qt6; From c39894d822964ba5af389fbae9f5649784990dcb Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 25 Dec 2024 22:08:03 +0100 Subject: [PATCH 44/72] lazarus-qt6: init at 3.6-0 --- pkgs/by-name/la/lazpaint/package.nix | 6 +++--- pkgs/development/compilers/fpc/lazarus.nix | 5 +++-- pkgs/tools/graphics/goverlay/default.nix | 6 +++--- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 7 ++++++- 5 files changed, 16 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/la/lazpaint/package.nix b/pkgs/by-name/la/lazpaint/package.nix index 60efa31aaba44..42ef5257a83d1 100644 --- a/pkgs/by-name/la/lazpaint/package.nix +++ b/pkgs/by-name/la/lazpaint/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - lazarus-qt, + lazarus-qt5, fpc, autoPatchelfHook, libsForQt5, @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - lazarus-qt + lazarus-qt5 fpc libsForQt5.wrapQtAppsHook autoPatchelfHook @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { cp -r --no-preserve=mode ${bgrabitmap} bgrabitmap cp -r --no-preserve=mode ${bgracontrols} bgracontrols - lazbuild --lazarusdir=${lazarus-qt}/share/lazarus \ + lazbuild --lazarusdir=${lazarus-qt5}/share/lazarus \ --build-mode=ReleaseQt5 \ bgrabitmap/bgrabitmap/bgrabitmappack.lpk \ bgracontrols/bgracontrols.lpk \ diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix index 9842de6b215ed..56f36a2b59bfe 100644 --- a/pkgs/development/compilers/fpc/lazarus.nix +++ b/pkgs/development/compilers/fpc/lazarus.nix @@ -43,6 +43,7 @@ let ) ); + qtVersion = lib.versions.major qtbase.version; in stdenv.mkDerivation rec { pname = "lazarus-${LCL_PLATFORM}"; @@ -94,7 +95,7 @@ stdenv.mkDerivation rec { "bigide" ]; - LCL_PLATFORM = if withQt then "qt5" else "gtk2"; + LCL_PLATFORM = if withQt then "qt${qtVersion}" else "gtk2"; NIX_LDFLAGS = lib.concatStringsSep " " ( [ @@ -114,7 +115,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals withQt [ "-L${lib.getLib libqtpas}/lib" - "-lQt5Pas" + "-lQt${qtVersion}Pas" ] ); diff --git a/pkgs/tools/graphics/goverlay/default.nix b/pkgs/tools/graphics/goverlay/default.nix index c1d8b8d7dc28a..b7521527c3732 100644 --- a/pkgs/tools/graphics/goverlay/default.nix +++ b/pkgs/tools/graphics/goverlay/default.nix @@ -5,7 +5,7 @@ stdenv, fetchFromGitHub, fpc, - lazarus-qt, + lazarus-qt5, wrapQtAppsHook, breeze-qt5, libGL, @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ fpc - lazarus-qt + lazarus-qt5 wrapQtAppsHook ]; @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { buildPhase = '' runHook preBuild - HOME=$(mktemp -d) lazbuild --lazarusdir=${lazarus-qt}/share/lazarus -B goverlay.lpi + HOME=$(mktemp -d) lazbuild --lazarusdir=${lazarus-qt5}/share/lazarus -B goverlay.lpi runHook postBuild ''; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 33eb474cb4fd5..77f821c49cfda 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -633,6 +633,7 @@ mapAliases { LASzip2 = laszip_2; # Added 2024-06-12 latencytop = throw "'latencytop' has been removed due to lack of maintenance upstream."; # Added 2024-12-04 latinmodern-math = lmmath; + lazarus-qt = lazarus-qt5; # Added 2024-12-25 leafpad = throw "'leafpad' has been removed due to lack of maintenance upstream. Consider using 'xfce.mousepad' instead"; # Added 2024-10-19 ledger_agent = ledger-agent; # Added 2024-01-07 lfs = dysk; # Added 2023-07-03 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f43e9f0150137..43224efc15f4f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6525,7 +6525,12 @@ with pkgs; fpc = fpc; }; - lazarus-qt = libsForQt5.callPackage ../development/compilers/fpc/lazarus.nix { + lazarus-qt5 = libsForQt5.callPackage ../development/compilers/fpc/lazarus.nix { + fpc = fpc; + withQt = true; + }; + + lazarus-qt6 = qt6Packages.callPackage ../development/compilers/fpc/lazarus.nix { fpc = fpc; withQt = true; }; From f3a4952aa90e6697c371f2d24b2f0eb5d3880ef9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Dec 2024 23:03:44 +0100 Subject: [PATCH 45/72] python312Packages.deezer-python: 7.1.0 -> 7.1.1 Diff: https://github.com/browniebroke/deezer-python/compare/refs/tags/v7.1.0...v7.1.1 Changelog: https://github.com/browniebroke/deezer-python/releases/tag/v7.1.1 --- pkgs/development/python-modules/deezer-python/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/deezer-python/default.nix b/pkgs/development/python-modules/deezer-python/default.nix index 78d31ec972241..e022c30623de4 100644 --- a/pkgs/development/python-modules/deezer-python/default.nix +++ b/pkgs/development/python-modules/deezer-python/default.nix @@ -4,7 +4,7 @@ environs, fetchFromGitHub, httpx, - poetry-core, + setuptools, pytest-cov-stub, pytest-mock, pytest-vcr, @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "deezer-python"; - version = "7.1.0"; + version = "7.1.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,10 +24,10 @@ buildPythonPackage rec { owner = "browniebroke"; repo = "deezer-python"; rev = "refs/tags/v${version}"; - hash = "sha256-d+cN6f6jw8D+noxyYl/TpDAkeTb8Krt+r0/Ai65cvdU="; + hash = "sha256-3TYgOa8NWGhkVIT5HkDdpHGyj7FzP8n02a36KHW6IC4="; }; - build-system = [ poetry-core ]; + build-system = [ setuptools ]; dependencies = [ httpx ]; From cc0b31cbce08067180da050f1e9062dba6685c10 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 Dec 2024 22:16:10 +0000 Subject: [PATCH 46/72] postgresqlPackages.plpgsql_check: 2.7.12 -> 2.7.13 --- pkgs/servers/sql/postgresql/ext/plpgsql_check.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix index 86095dd7a6e52..e3b93c16d1bed 100644 --- a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix +++ b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix @@ -9,13 +9,13 @@ buildPostgresqlExtension (finalAttrs: { pname = "plpgsql-check"; - version = "2.7.12"; + version = "2.7.13"; src = fetchFromGitHub { owner = "okbob"; repo = "plpgsql_check"; rev = "v${finalAttrs.version}"; - hash = "sha256-sLakN4595z+Smt7oaK7IPIJZp/JIGwL5UB4OXQek7JU="; + hash = "sha256-9xfL/nhjvVb2hQj0OLOFYdpRfuEXikgTC7rSsEZ8ws8="; }; passthru.tests.extension = postgresqlTestExtension { From 0659cd9cfdad375cc87f9d212ed3577d00bc34e0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Dec 2024 23:29:36 +0100 Subject: [PATCH 47/72] python312Packages.gvm-tools: 24.8.0 -> 24.12.1 Diff: https://github.com/greenbone/gvm-tools/compare/refs/tags/v24.8.0...v24.12.1 Changelog: https://github.com/greenbone/gvm-tools/releases/tag/v24.12.1 --- pkgs/development/python-modules/gvm-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gvm-tools/default.nix b/pkgs/development/python-modules/gvm-tools/default.nix index 73184dcad346e..a9502d39ee53b 100644 --- a/pkgs/development/python-modules/gvm-tools/default.nix +++ b/pkgs/development/python-modules/gvm-tools/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "gvm-tools"; - version = "24.8.0"; + version = "24.12.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = "gvm-tools"; rev = "refs/tags/v${version}"; - hash = "sha256-MwLwJyxKu4O0cEabBjcdhqtqW3uwgbyVlezZysUDYa4="; + hash = "sha256-0YIWfeHd0Z50xschRHrVijhKQdDxvwR+gowEuAIc+OU="; }; __darwinAllowLocalNetworking = true; From 20feba70837d736cb7f87a9892d74dfdcd453434 Mon Sep 17 00:00:00 2001 From: Linus Karl Date: Wed, 20 Nov 2024 17:55:55 +0100 Subject: [PATCH 48/72] wooting-udev-rules: update udev rules --- .../by-name/wo/wooting-udev-rules/package.nix | 6 +- .../wo/wooting-udev-rules/wooting.rules | 99 ++----------------- 2 files changed, 12 insertions(+), 93 deletions(-) diff --git a/pkgs/by-name/wo/wooting-udev-rules/package.nix b/pkgs/by-name/wo/wooting-udev-rules/package.nix index 8231e3e3ea331..5636537607bbe 100644 --- a/pkgs/by-name/wo/wooting-udev-rules/package.nix +++ b/pkgs/by-name/wo/wooting-udev-rules/package.nix @@ -2,9 +2,9 @@ stdenv.mkDerivation rec { pname = "wooting-udev-rules"; - version = "unstable-2023-03-31"; + version = "0-unstable-2024-11-20"; - # Source: https://help.wooting.io/en/article/wootility-configuring-device-access-for-wootility-under-linux-udev-rules-r6lb2o/ + # Source: https://help.wooting.io/article/147-configuring-device-access-for-wootility-under-linux-udev-rules src = [ ./wooting.rules ]; dontUnpack = true; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://help.wooting.io/en/article/wootility-configuring-device-access-for-wootility-under-linux-udev-rules-r6lb2o/"; + homepage = "https://help.wooting.io/article/147-configuring-device-access-for-wootility-under-linux-udev-rules"; description = "udev rules that give NixOS permission to communicate with Wooting keyboards"; platforms = platforms.linux; license = "unknown"; diff --git a/pkgs/by-name/wo/wooting-udev-rules/wooting.rules b/pkgs/by-name/wo/wooting-udev-rules/wooting.rules index 365627fa1aec1..2ea36da2b7305 100644 --- a/pkgs/by-name/wo/wooting-udev-rules/wooting.rules +++ b/pkgs/by-name/wo/wooting-udev-rules/wooting.rules @@ -1,96 +1,15 @@ # Wooting One Legacy -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff01", MODE:="0660", GROUP="input" -SUBSYSTEM=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff01", MODE:="0660", GROUP="input" +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff01", TAG+="uaccess" +SUBSYSTEM=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff01", TAG+="uaccess" # Wooting One update mode -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2402", MODE:="0660", GROUP="input" +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2402", TAG+="uaccess" # Wooting Two Legacy -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff02", MODE:="0660", GROUP="input" -SUBSYSTEM=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff02", MODE:="0660", GROUP="input" +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff02", TAG+="uaccess" +SUBSYSTEM=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff02", TAG+="uaccess" # Wooting Two update mode -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2403", MODE:="0660", GROUP="input" +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2403", TAG+="uaccess" -# Wooting One -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1100", MODE:="0660", GROUP="input" -SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1100", MODE:="0660", GROUP="input" -# Wooting One Alt-gamepad mode -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1101", MODE:="0660", GROUP="input" -SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1101", MODE:="0660", GROUP="input" -# Wooting One 2nd Alt-gamepad mode -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1102", MODE:="0660", GROUP="input" -SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1102", MODE:="0660", GROUP="input" - -# Wooting Two -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1200", MODE:="0660", GROUP="input" -SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1200", MODE:="0660", GROUP="input" -# Wooting Two Alt-gamepad mode -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1201", MODE:="0660", GROUP="input" -SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1201", MODE:="0660", GROUP="input" -# Wooting Two 2nd Alt-gamepad mode -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1202", MODE:="0660", GROUP="input" -SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1202", MODE:="0660", GROUP="input" - -# Wooting Lekker -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1210", MODE:="0660", GROUP="input" -SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1210", MODE:="0660", GROUP="input" -# Wooting Lekker Alt-gamepad mode -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1211", MODE:="0660", GROUP="input" -SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1211", MODE:="0660", GROUP="input" -# Wooting Lekker 2nd Alt-gamepad mode -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1212", MODE:="0660", GROUP="input" -SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1212", MODE:="0660", GROUP="input" - -# Wooting Lekker update mode -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="121f", MODE:="0660", GROUP="input" - -# Wooting Two HE -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1220", MODE:="0660", GROUP="input" -SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1220", MODE:="0660", GROUP="input" -# Wooting Two HE Alt-gamepad mode -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1221", MODE:="0660", GROUP="input" -SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1221", MODE:="0660", GROUP="input" -# Wooting Two HE 2nd Alt-gamepad mode -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1222", MODE:="0660", GROUP="input" -SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1222", MODE:="0660", GROUP="input" - -# Wooting Two HE update mode -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="122f", MODE:="0660", GROUP="input" - -# Wooting Two HE (ARM) -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1230", MODE:="0660", GROUP="input" -SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1230", MODE:="0660", GROUP="input" -# Wooting Two HE Alt-gamepad mode -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1231", MODE:="0660", GROUP="input" -SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1231", MODE:="0660", GROUP="input" -# Wooting Two HE 2nd Alt-gamepad mode -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1232", MODE:="0660", GROUP="input" -SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1232", MODE:="0660", GROUP="input" - -# Wooting Two HE (ARM) update mode -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="123f", MODE:="0660", GROUP="input" - -# Wooting 60HE -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1300", MODE:="0660", GROUP="input" -SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1300", MODE:="0660", GROUP="input" -# Wooting 60HE Alt-gamepad mode -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1301", MODE:="0660", GROUP="input" -SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1301", MODE:="0660", GROUP="input" -# Wooting 60HE 2nd Alt-gamepad mode -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1302", MODE:="0660", GROUP="input" -SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1302", MODE:="0660", GROUP="input" - -# Wooting 60HE update mode -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="130f", MODE:="0660", GROUP="input" - -# Wooting 60HE (ARM) -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1310", MODE:="0660", GROUP="input" -SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1310", MODE:="0660", GROUP="input" -# Wooting 60HE (ARM) Alt-gamepad mode -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1311", MODE:="0660", GROUP="input" -SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1311", MODE:="0660", GROUP="input" -# Wooting 60HE (ARM) 2nd Alt-gamepad mode -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1312", MODE:="0660", GROUP="input" -SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1312", MODE:="0660", GROUP="input" - -# Wooting 60HE (ARM) update mode -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="131f", MODE:="0660", GROUP="input" +# Generic Wootings +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", TAG+="uaccess" +SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", TAG+="uaccess" From b325158bc2a6a442ba03fa7c3cae428d430d23ab Mon Sep 17 00:00:00 2001 From: Linus Karl Date: Wed, 20 Nov 2024 17:59:50 +0100 Subject: [PATCH 49/72] wooting: update module description --- nixos/modules/hardware/wooting.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/modules/hardware/wooting.nix b/nixos/modules/hardware/wooting.nix index 101bd2d32010e..fa39474da1f2c 100644 --- a/nixos/modules/hardware/wooting.nix +++ b/nixos/modules/hardware/wooting.nix @@ -1,7 +1,6 @@ { config, lib, pkgs, ... }: { - options.hardware.wooting.enable = lib.mkEnableOption ''support for Wooting keyboards. - Note that users must be in the "input" group for udev rules to apply''; + options.hardware.wooting.enable = lib.mkEnableOption "support for Wooting keyboards"; config = lib.mkIf config.hardware.wooting.enable { environment.systemPackages = [ pkgs.wootility ]; From 21ccd4badf052dbebf6b04ceb463585425ef28f5 Mon Sep 17 00:00:00 2001 From: Linus Karl Date: Wed, 20 Nov 2024 18:04:19 +0100 Subject: [PATCH 50/72] wooting-udev-rules: add returntoreality to maintainers --- pkgs/by-name/wo/wooting-udev-rules/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/wo/wooting-udev-rules/package.nix b/pkgs/by-name/wo/wooting-udev-rules/package.nix index 5636537607bbe..0bdd12f32028d 100644 --- a/pkgs/by-name/wo/wooting-udev-rules/package.nix +++ b/pkgs/by-name/wo/wooting-udev-rules/package.nix @@ -18,6 +18,9 @@ stdenv.mkDerivation rec { description = "udev rules that give NixOS permission to communicate with Wooting keyboards"; platforms = platforms.linux; license = "unknown"; - maintainers = with maintainers; [ davidtwco ]; + maintainers = with maintainers; [ + davidtwco + returntoreality + ]; }; } From 5c104311486f4a5ee51595f6656d6457abda081b Mon Sep 17 00:00:00 2001 From: Linus Karl Date: Thu, 21 Nov 2024 09:57:59 +0100 Subject: [PATCH 51/72] wootility: 4.6.21 -> 4.7.2 --- pkgs/by-name/wo/wootility/package.nix | 31 ++++++++++++++++----------- 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/wo/wootility/package.nix b/pkgs/by-name/wo/wootility/package.nix index 265f7f9c35ce1..bfcb9e13944e4 100644 --- a/pkgs/by-name/wo/wootility/package.nix +++ b/pkgs/by-name/wo/wootility/package.nix @@ -1,15 +1,16 @@ -{ appimageTools -, fetchurl -, lib -, makeWrapper +{ + appimageTools, + fetchurl, + lib, + makeWrapper, }: let pname = "wootility"; - version = "4.6.21"; + version = "4.7.2"; src = fetchurl { url = "https://s3.eu-west-2.amazonaws.com/wooting-update/wootility-lekker-linux-latest/wootility-lekker-${version}.AppImage"; - sha256 = "sha256-ockTQLZWbYvsLzv+D0exD5W/yMaIdse4/JQshbkVzAU="; + sha256 = "sha256-2xIiSMFyJjmjBQ6GJYtc0VbZkTadV2Ov/mXQcJ8yq2U="; }; in @@ -19,8 +20,10 @@ appimageTools.wrapType2 { nativeBuildInputs = [ makeWrapper ]; extraInstallCommands = - let contents = appimageTools.extract { inherit pname version src; }; - in '' + let + contents = appimageTools.extract { inherit pname version src; }; + in + '' wrapProgram $out/bin/wootility \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" @@ -35,16 +38,20 @@ appimageTools.wrapType2 { export LC_ALL=C.UTF-8 ''; - extraPkgs = pkgs: with pkgs; ([ - xorg.libxkbfile - ]); + extraPkgs = + pkgs: with pkgs; ([ + xorg.libxkbfile + ]); meta = { homepage = "https://wooting.io/wootility"; description = "Customization and management software for Wooting keyboards"; platforms = lib.platforms.linux; license = lib.licenses.unfree; - maintainers = with lib.maintainers; [ davidtwco sodiboo ]; + maintainers = with lib.maintainers; [ + davidtwco + sodiboo + ]; mainProgram = "wootility"; }; } From 65216ff4f3fac48ee4f37ce6f7ff6d10edca7a6d Mon Sep 17 00:00:00 2001 From: Linus Karl Date: Thu, 21 Nov 2024 09:59:05 +0100 Subject: [PATCH 52/72] wootility: add returntoreality to maintainers --- pkgs/by-name/wo/wootility/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/wo/wootility/package.nix b/pkgs/by-name/wo/wootility/package.nix index bfcb9e13944e4..116cba157912f 100644 --- a/pkgs/by-name/wo/wootility/package.nix +++ b/pkgs/by-name/wo/wootility/package.nix @@ -51,6 +51,7 @@ appimageTools.wrapType2 { maintainers = with lib.maintainers; [ davidtwco sodiboo + returntoreality ]; mainProgram = "wootility"; }; From 1cf85a93527703f4f268423ec1bea9ea5f54f825 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 26 Dec 2024 00:33:01 +0000 Subject: [PATCH 53/72] postgresqlPackages.pgrouting: 3.7.0 -> 3.7.1 --- pkgs/servers/sql/postgresql/ext/pgrouting.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pgrouting.nix b/pkgs/servers/sql/postgresql/ext/pgrouting.nix index 9c480c4c91acb..4f3f6bea9354c 100644 --- a/pkgs/servers/sql/postgresql/ext/pgrouting.nix +++ b/pkgs/servers/sql/postgresql/ext/pgrouting.nix @@ -11,7 +11,7 @@ buildPostgresqlExtension rec { pname = "pgrouting"; - version = "3.7.0"; + version = "3.7.1"; nativeBuildInputs = [ cmake @@ -23,7 +23,7 @@ buildPostgresqlExtension rec { owner = "pgRouting"; repo = "pgrouting"; rev = "v${version}"; - hash = "sha256-IwH8bEdyJyPMFYtCfWLRr+jVmS5sOr5QFOhGykGPYh4="; + hash = "sha256-tK1JLWPtFR9nn5SULsPdpC3TXdmWAqq8QGDuD0bkElc="; }; meta = with lib; { From 0bc5b5d1bb374b73e9fd133c6f0adc5cc95430c3 Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 24 Dec 2024 05:55:17 +0000 Subject: [PATCH 54/72] keypunch: 4.0 -> 5.0 Changelog: https://github.com/bragefuglseth/keypunch/releases/tag/v5.0 Diff: https://github.com/bragefuglseth/keypunch/compare/v4.0...v5.0 --- pkgs/by-name/ke/keypunch/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ke/keypunch/package.nix b/pkgs/by-name/ke/keypunch/package.nix index 2efc9afb44ced..a9c91fc3d1c55 100644 --- a/pkgs/by-name/ke/keypunch/package.nix +++ b/pkgs/by-name/ke/keypunch/package.nix @@ -19,18 +19,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "keypunch"; - version = "4.0"; + version = "5.0"; src = fetchFromGitHub { owner = "bragefuglseth"; repo = "keypunch"; - rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-Xd4fzreComOUnoJ6l2ncMWn6DlUeRCM+YwApilhFd/8="; + tag = "v${finalAttrs.version}"; + hash = "sha256-oP/rbtX72Ng4GVsXl5s8eESrUlJiJ/n05KArZHVo00c="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit (finalAttrs) pname version src; - hash = "sha256-agFOxSZBi8f0zEPd+ha5c3IAbSH2jHfUx2iNeHFs9jI="; + hash = "sha256-Uz9YbD4k3o3WOXCoIW41eUdi+HIfZLZJNszr9y3qezI="; }; strictDeps = true; From 5b8caa6cc6366868bb10c61d1a8dc358197b66dd Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Wed, 25 Dec 2024 21:25:31 +0100 Subject: [PATCH 55/72] gitstatus: fix darwin build On darwin with sandbox disabled the system-wide zsvenv will get sourced first and will fail the installCheckPhase with "zsh compinit: insecure directories, run compaudit for list." By using `-d` this will be prevented. Signed-off-by: Florian Brandes --- pkgs/by-name/gi/gitstatus/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/gi/gitstatus/package.nix b/pkgs/by-name/gi/gitstatus/package.nix index 04afd67b7c214..d0eab16e0dec0 100644 --- a/pkgs/by-name/gi/gitstatus/package.nix +++ b/pkgs/by-name/gi/gitstatus/package.nix @@ -111,7 +111,7 @@ stdenv.mkDerivation rec { # run zsh as a full-fledged independent process and then wait for it to # exit. (The "exit" statements in the zshrc ensure that zsh will exit # almost immediately after starting.) - ZDOTDIR=. zsh -i & + ZDOTDIR=. zsh -d -i & wait $! ''; From 1337b7d77741c8bd8694b2e87544cd102f746d08 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 26 Dec 2024 10:00:36 +0300 Subject: [PATCH 56/72] mesa: fix broken vaapi/vdpau symlinks --- pkgs/development/libraries/mesa/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 5e2651b764b30..37b96d30e8678 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -361,6 +361,11 @@ in stdenv.mkDerivation { fi done + # update symlinks pointing to libgallium in $out + for link in $drivers/lib/dri/*_drv_video.so $drivers/lib/vdpau/*.so.1.0.0; do + ln -sf $drivers/lib/libgallium*.so $link + done + # Don't depend on build python patchShebangs --host --update $out/bin/* From a1cfcf8cf18c9094d71653ca128d8d88a0b20cae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 26 Dec 2024 08:16:31 +0000 Subject: [PATCH 57/72] vdrPlugins.softhddevice: 2.4.0 -> 2.4.1 --- pkgs/applications/video/vdr/softhddevice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/vdr/softhddevice/default.nix b/pkgs/applications/video/vdr/softhddevice/default.nix index be330bc9ad03a..7f6637ec3f619 100644 --- a/pkgs/applications/video/vdr/softhddevice/default.nix +++ b/pkgs/applications/video/vdr/softhddevice/default.nix @@ -15,12 +15,12 @@ }: stdenv.mkDerivation rec { pname = "vdr-softhddevice"; - version = "2.4.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "ua0lnj"; repo = "vdr-plugin-softhddevice"; - sha256 = "sha256-ZqZqgrDAEYlDZ3tmZ4WzbxAdLde6kcUbLAplCNLGHEc="; + sha256 = "sha256-bddPyOx8tCG+us9QQxO1t7rZK1HfZy3TFWtd5mPw2o4="; rev = "v${version}"; }; From 754abe634e8fe660887e14a6cecada7a61ce2541 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 26 Dec 2024 08:18:16 +0000 Subject: [PATCH 58/72] vhdl-ls: 0.83.0 -> 0.83.1 --- pkgs/by-name/vh/vhdl-ls/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/vh/vhdl-ls/package.nix b/pkgs/by-name/vh/vhdl-ls/package.nix index a03fd2d3a9050..84c83a51c843f 100644 --- a/pkgs/by-name/vh/vhdl-ls/package.nix +++ b/pkgs/by-name/vh/vhdl-ls/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "vhdl-ls"; - version = "0.83.0"; + version = "0.83.1"; src = fetchFromGitHub { owner = "VHDL-LS"; repo = "rust_hdl"; rev = "v${version}"; - hash = "sha256-WLk8EHzpqUPhrmnRK6mP/4MDfSinytgVDZWi1/OfkyU="; + hash = "sha256-AO95J138d3m8CpJ7hWYeGP+rRd2009qQXwLxbuHDSDs="; }; - cargoHash = "sha256-QkD1dEEphYP0eL4qPe+TAv1ATyVcw5rSPiiIkk21Dms="; + cargoHash = "sha256-L7Y5sJe/6xx0JIEyxPHyKWxHRnkNUek5U3X5BL5a0k8="; postPatch = '' substituteInPlace vhdl_lang/src/config.rs \ From 68b821ffc120c3975f2893b1069f1deeed58ee23 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Thu, 26 Dec 2024 10:06:23 +0100 Subject: [PATCH 59/72] monado: gate tracing support behind argument Signed-off-by: Sefa Eyeoglu --- pkgs/by-name/mo/monado/package.nix | 96 ++++++++++++++++-------------- 1 file changed, 50 insertions(+), 46 deletions(-) diff --git a/pkgs/by-name/mo/monado/package.nix b/pkgs/by-name/mo/monado/package.nix index 5a86d769e943b..9930e8fca5666 100644 --- a/pkgs/by-name/mo/monado/package.nix +++ b/pkgs/by-name/mo/monado/package.nix @@ -61,6 +61,7 @@ # instead of via the monado-service program. For more information see: # https://gitlab.freedesktop.org/monado/monado/-/blob/master/doc/targets.md#xrt_feature_service-disabled serviceSupport ? true, + tracingSupport ? false, }: stdenv.mkDerivation (finalAttrs: { @@ -89,50 +90,53 @@ stdenv.mkDerivation (finalAttrs: { # - DRIVER_ULV2 - Needs proprietary Leapmotion SDK https://api.leapmotion.com/documentation/v2/unity/devguide/Leap_SDK_Overview.html (See https://github.com/NixOS/nixpkgs/issues/292624) # - DRIVER_ULV5 - Needs proprietary Leapmotion SDK https://api.leapmotion.com/documentation/v2/unity/devguide/Leap_SDK_Overview.html (See https://github.com/NixOS/nixpkgs/issues/292624) - buildInputs = [ - bluez - cjson - dbus - eigen - elfutils - gst-plugins-base - gstreamer - hidapi - libbsd - libdrm - libffi - libGL - libjpeg - librealsense - libsurvive - libunwind - libusb1 - libuv - libuvc - libv4l - libXau - libxcb - libXdmcp - libXext - libXrandr - onnxruntime - opencv4 - openhmd - openvr - orc - pcre2 - SDL2 - shaderc - tracy - udev - vulkan-headers - vulkan-loader - wayland - wayland-protocols - wayland-scanner - zlib - zstd - ]; + buildInputs = + [ + bluez + cjson + dbus + eigen + elfutils + gst-plugins-base + gstreamer + hidapi + libbsd + libdrm + libffi + libGL + libjpeg + librealsense + libsurvive + libunwind + libusb1 + libuv + libuvc + libv4l + libXau + libxcb + libXdmcp + libXext + libXrandr + onnxruntime + opencv4 + openhmd + openvr + orc + pcre2 + SDL2 + shaderc + udev + vulkan-headers + vulkan-loader + wayland + wayland-protocols + wayland-scanner + zlib + zstd + ] + ++ lib.optionals tracingSupport [ + tracy + ]; patches = [ # Remove this patch on the next update @@ -146,9 +150,9 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "XRT_FEATURE_SERVICE" serviceSupport) + (lib.cmakeBool "XRT_HAVE_TRACY" tracingSupport) + (lib.cmakeBool "XRT_FEATURE_TRACING" tracingSupport) (lib.cmakeBool "XRT_OPENXR_INSTALL_ABSOLUTE_RUNTIME_PATH" true) - (lib.cmakeBool "XRT_HAVE_TRACY" true) - (lib.cmakeBool "XRT_FEATURE_TRACING" true) (lib.cmakeBool "XRT_HAVE_STEAM" true) (lib.optionals enableCuda "-DCUDA_TOOLKIT_ROOT_DIR=${cudaPackages.cudatoolkit}") ]; From 6c63c2c49a1a01fd8dbcf361f45b7e27950d70d9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 13 Dec 2024 12:15:05 +0000 Subject: [PATCH 60/72] python312Packages.ansible: 10.4.0 -> 11.1.0 --- pkgs/development/python-modules/ansible/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix index 6f8e44822ba15..82da4f30fe8f1 100644 --- a/pkgs/development/python-modules/ansible/default.nix +++ b/pkgs/development/python-modules/ansible/default.nix @@ -22,7 +22,7 @@ let pname = "ansible"; - version = "10.4.0"; + version = "11.1.0"; in buildPythonPackage { inherit pname version; @@ -32,7 +32,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-XBIEiDGmaQ/IZd/gPcirYcO6CLXQGySaFrJHrZmmC8A="; + hash = "sha256-0BtCWZDZYNKjP8N44bc9vKHA4ovCL0BWq2s8jprnT7o="; }; postPatch = '' From d29066d0f3d557b3e21304cd803c3cab27c54c85 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Dec 2024 21:06:01 +0000 Subject: [PATCH 61/72] ansible: 2.17.6 -> 2.18.1 --- pkgs/development/python-modules/ansible/core.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix index 0061a8e4144f2..637e410f36f79 100644 --- a/pkgs/development/python-modules/ansible/core.nix +++ b/pkgs/development/python-modules/ansible/core.nix @@ -31,13 +31,13 @@ buildPythonPackage rec { pname = "ansible-core"; - version = "2.17.6"; + version = "2.18.1"; pyproject = true; src = fetchPypi { pname = "ansible_core"; inherit version; - hash = "sha256-PlOXC3zr/irbObcRweL4u/y+2sgo2lHcA1ehkHBjjpU="; + hash = "sha256-FMrB+Su9rogcsGFu3esXkl6MtQfkhgh5deckUz2d508="; }; # ansible_connection is already wrapped, so don't pass it through From 79795a57979b7bf213e624f6661855fa651cf1a6 Mon Sep 17 00:00:00 2001 From: PerchunPak Date: Thu, 26 Dec 2024 10:45:32 +0100 Subject: [PATCH 62/72] vimPlugins.astrocore: init at 2024-12-23 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ pkgs/applications/editors/vim/plugins/overrides.nix | 6 +++++- .../editors/vim/plugins/vim-plugin-names | 1 + 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 0ef72ff3e9c48..7c57c724ef7d8 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -749,6 +749,18 @@ final: prev: meta.homepage = "https://github.com/otavioschwanck/arrow.nvim/"; }; + astrocore = buildVimPlugin { + pname = "astrocore"; + version = "2024-12-23"; + src = fetchFromGitHub { + owner = "AstroNvim"; + repo = "astrocore"; + rev = "ecaf7c76484d3313b966856c2c29672a6abbc3f4"; + sha256 = "1n9akfpm7lmby20w2dmh99vspff8hack81f6d0as531yjjflbcy0"; + }; + meta.homepage = "https://github.com/AstroNvim/astrocore/"; + }; + astrotheme = buildVimPlugin { pname = "astrotheme"; version = "2024-12-10"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index ef0550d089de6..71f59ea3c5bcd 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -143,6 +143,10 @@ in nvimRequireCheck = "advanced_git_search.utils"; }; + astrocore = super.astrocore.overrideAttrs { + dependencies = [ self.lazy-nvim ]; + }; + astrotheme = super.astrotheme.overrideAttrs { nvimRequireCheck = "astrotheme"; }; @@ -2345,7 +2349,7 @@ in openscad ]; - # FIXME: cant find plugin root dir + # FIXME: can't find plugin root dir nvimSkipModule = [ "openscad" "openscad.snippets.openscad" diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 86c4d7989bdbe..a8b9ce8003f63 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -61,6 +61,7 @@ https://github.com/ckarnell/antonys-macro-repeater/,, https://github.com/solarnz/arcanist.vim/,, https://github.com/vim-scripts/argtextobj.vim/,, https://github.com/otavioschwanck/arrow.nvim/,, +https://github.com/AstroNvim/astrocore/,HEAD, https://github.com/AstroNvim/astrotheme/,, https://github.com/prabirshrestha/async.vim/,, https://github.com/prabirshrestha/asyncomplete-buffer.vim/,HEAD, From d4797eb1104b3043739619fe68df5ea2c8d42483 Mon Sep 17 00:00:00 2001 From: PerchunPak Date: Thu, 26 Dec 2024 10:45:40 +0100 Subject: [PATCH 63/72] vimPlugins.astrolsp: init at 2024-12-23 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 7c57c724ef7d8..78c067c88ce8c 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -761,6 +761,18 @@ final: prev: meta.homepage = "https://github.com/AstroNvim/astrocore/"; }; + astrolsp = buildVimPlugin { + pname = "astrolsp"; + version = "2024-12-23"; + src = fetchFromGitHub { + owner = "AstroNvim"; + repo = "astrolsp"; + rev = "e5e88e2b5ed1c0f8b6fbea682577473aeabdc2b4"; + sha256 = "0arf7lmmcniq1ppsa9544x240simw38m72fm4i0100r05p0h4ygk"; + }; + meta.homepage = "https://github.com/AstroNvim/astrolsp/"; + }; + astrotheme = buildVimPlugin { pname = "astrotheme"; version = "2024-12-10"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index a8b9ce8003f63..a14de70e8ad2a 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -62,6 +62,7 @@ https://github.com/solarnz/arcanist.vim/,, https://github.com/vim-scripts/argtextobj.vim/,, https://github.com/otavioschwanck/arrow.nvim/,, https://github.com/AstroNvim/astrocore/,HEAD, +https://github.com/AstroNvim/astrolsp/,HEAD, https://github.com/AstroNvim/astrotheme/,, https://github.com/prabirshrestha/async.vim/,, https://github.com/prabirshrestha/asyncomplete-buffer.vim/,HEAD, From 173f27f7d9645a4415f686c84b41a7c09e54c6b1 Mon Sep 17 00:00:00 2001 From: PerchunPak Date: Thu, 26 Dec 2024 10:45:47 +0100 Subject: [PATCH 64/72] vimPlugins.astroui: init at 2024-12-23 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ pkgs/applications/editors/vim/plugins/overrides.nix | 11 ++++++++++- .../editors/vim/plugins/vim-plugin-names | 1 + 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 78c067c88ce8c..ec867d55466d1 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -785,6 +785,18 @@ final: prev: meta.homepage = "https://github.com/AstroNvim/astrotheme/"; }; + astroui = buildVimPlugin { + pname = "astroui"; + version = "2024-12-23"; + src = fetchFromGitHub { + owner = "AstroNvim"; + repo = "astroui"; + rev = "81ddd0315ac4b260a4563a00be943992901ae5e5"; + sha256 = "1qv9ny98wxyjdyzsw5gmn4wfsklrl01m27hxaba0mypirjr0kv1r"; + }; + meta.homepage = "https://github.com/AstroNvim/astroui/"; + }; + async-vim = buildVimPlugin { pname = "async.vim"; version = "2022-04-04"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 71f59ea3c5bcd..a24abd823128d 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -148,9 +148,18 @@ in }; astrotheme = super.astrotheme.overrideAttrs { - nvimRequireCheck = "astrotheme"; + nvimSkipModule = [ + # attempt to index local 'c' (a nil value) + "astrotheme.groups.plugins.flash" + "astrotheme.groups.plugins.todo-comments" + ]; }; + astroui = super.astroui.overrideAttrs (oa: { + # Readme states that astrocore is an optional dependency + nativeCheckInputs = oa.nativeCheckInputs ++ [ self.astrocore ]; + }); + asyncrun-vim = super.asyncrun-vim.overrideAttrs { nvimSkipModule = [ # vim plugin with optional toggleterm integration diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index a14de70e8ad2a..9e7bbcf737bc3 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -64,6 +64,7 @@ https://github.com/otavioschwanck/arrow.nvim/,, https://github.com/AstroNvim/astrocore/,HEAD, https://github.com/AstroNvim/astrolsp/,HEAD, https://github.com/AstroNvim/astrotheme/,, +https://github.com/AstroNvim/astroui/,HEAD, https://github.com/prabirshrestha/async.vim/,, https://github.com/prabirshrestha/asyncomplete-buffer.vim/,HEAD, https://github.com/prabirshrestha/asyncomplete-file.vim/,HEAD, From 834fa310e1d1378ceb08eca03afd307c9f844792 Mon Sep 17 00:00:00 2001 From: PerchunPak Date: Thu, 26 Dec 2024 10:45:54 +0100 Subject: [PATCH 65/72] vimPlugins.mason-null-ls-nvim: init at 2024-04-09 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ pkgs/applications/editors/vim/plugins/overrides.nix | 7 +++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 3 files changed, 20 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index ec867d55466d1..6a93b90c1b39e 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -6543,6 +6543,18 @@ final: prev: meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/"; }; + mason-null-ls-nvim = buildVimPlugin { + pname = "mason-null-ls.nvim"; + version = "2024-04-09"; + src = fetchFromGitHub { + owner = "jay-babu"; + repo = "mason-null-ls.nvim"; + rev = "de19726de7260c68d94691afb057fa73d3cc53e7"; + sha256 = "1jxslvqp05hzsz3vrspg5yal94314agh15b2p9cimiwj955igbys"; + }; + meta.homepage = "https://github.com/jay-babu/mason-null-ls.nvim/"; + }; + mason-nvim = buildVimPlugin { pname = "mason.nvim"; version = "2024-07-16"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index a24abd823128d..e19f2b36d7340 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -1569,6 +1569,13 @@ in nvimRequireCheck = "mason-lspconfig"; }; + mason-null-ls-nvim = super.mason-null-ls-nvim.overrideAttrs { + dependencies = with self; [ + mason-nvim + null-ls-nvim + ]; + }; + mason-nvim = super.mason-nvim.overrideAttrs { # lua/mason-vendor/zzlib/inflate-bwo.lua:15: 'end' expected near '&' nvimSkipModule = "mason-vendor.zzlib.inflate-bwo"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 9e7bbcf737bc3..8dd765b737288 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -542,6 +542,7 @@ https://github.com/David-Kunz/markid/,HEAD, https://github.com/chentoast/marks.nvim/,, https://github.com/OXY2DEV/markview.nvim/,HEAD, https://github.com/williamboman/mason-lspconfig.nvim/,HEAD, +https://github.com/jay-babu/mason-null-ls.nvim/,HEAD, https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim/,HEAD, https://github.com/williamboman/mason.nvim/,HEAD, https://github.com/vim-scripts/matchit.zip/,, From 41f9fd5da8b4e6b97c7eb9400acd5aa66a92a63d Mon Sep 17 00:00:00 2001 From: PerchunPak Date: Thu, 26 Dec 2024 10:46:07 +0100 Subject: [PATCH 66/72] vimPlugins.mason-nvim-dap-nvim: init at 2024-08-04 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ pkgs/applications/editors/vim/plugins/overrides.nix | 7 +++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 3 files changed, 20 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 6a93b90c1b39e..cf293c6570022 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -6567,6 +6567,18 @@ final: prev: meta.homepage = "https://github.com/williamboman/mason.nvim/"; }; + mason-nvim-dap-nvim = buildVimPlugin { + pname = "mason-nvim-dap.nvim"; + version = "2024-08-04"; + src = fetchFromGitHub { + owner = "jay-babu"; + repo = "mason-nvim-dap.nvim"; + rev = "8b9363d83b5d779813cdd2819b8308651cec2a09"; + sha256 = "0q2pk217lrnpyvqj0mqikayyiajdvj3apki66mxx27zibgc7qg3l"; + }; + meta.homepage = "https://github.com/jay-babu/mason-nvim-dap.nvim/"; + }; + mason-tool-installer-nvim = buildVimPlugin { pname = "mason-tool-installer.nvim"; version = "2024-06-03"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index e19f2b36d7340..8b658ea75c478 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -1576,6 +1576,13 @@ in ]; }; + mason-nvim-dap-nvim = super.mason-nvim-dap-nvim.overrideAttrs { + dependencies = with self; [ + mason-nvim + nvim-dap + ]; + }; + mason-nvim = super.mason-nvim.overrideAttrs { # lua/mason-vendor/zzlib/inflate-bwo.lua:15: 'end' expected near '&' nvimSkipModule = "mason-vendor.zzlib.inflate-bwo"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 8dd765b737288..06a8a887d4d20 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -543,6 +543,7 @@ https://github.com/chentoast/marks.nvim/,, https://github.com/OXY2DEV/markview.nvim/,HEAD, https://github.com/williamboman/mason-lspconfig.nvim/,HEAD, https://github.com/jay-babu/mason-null-ls.nvim/,HEAD, +https://github.com/jay-babu/mason-nvim-dap.nvim/,HEAD, https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim/,HEAD, https://github.com/williamboman/mason.nvim/,HEAD, https://github.com/vim-scripts/matchit.zip/,, From 34ce9b5ae2200098809de78416883554f39b5e67 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Dec 2024 22:10:28 +0100 Subject: [PATCH 67/72] python311Packages.pontos: 24.12.3 -> 24.12.4 Diff: https://github.com/greenbone/pontos/compare/None...v24.12.4 Changelog: https://github.com/greenbone/pontos/releases/tag/v24.12.4 --- pkgs/development/python-modules/pontos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pontos/default.nix b/pkgs/development/python-modules/pontos/default.nix index e99f07ab0062b..e8b431d34abea 100644 --- a/pkgs/development/python-modules/pontos/default.nix +++ b/pkgs/development/python-modules/pontos/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "pontos"; - version = "24.12.3"; + version = "24.12.4"; pyproject = true; disabled = pythonOlder "3.9"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = "pontos"; tag = "v${version}"; - hash = "sha256-ezU525MPiQkW7nmm/SUdG1dsOfybosdlL1Uf1rHIDFE="; + hash = "sha256-Ri5MtUfIHE0s3Csaf08RZjGvl5HYxZJSn/JwNkkXvRA="; }; build-system = [ poetry-core ]; From 21ed640cbe5be76689f87604aeab26bf5ff487db Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 26 Dec 2024 13:38:35 +0300 Subject: [PATCH 68/72] akkoma: use erlang 26 This is the only user of elixir 1.16 left in tree :( --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 150e5f2632dd9..a872709f99278 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -907,8 +907,8 @@ with pkgs; }; akkoma = callPackage ../servers/akkoma { - elixir = beam_nox.interpreters.elixir_1_16; - beamPackages = beam_nox.packages.erlang.extend (self: super: { elixir = beam_nox.interpreters.elixir_1_16; }); + elixir = beam_nox.packages.erlang_26.elixir_1_16; + beamPackages = beam_nox.packages.erlang_26.extend (self: super: { elixir = self.elixir_1_16; }); }; akkoma-frontends = recurseIntoAttrs { akkoma-fe = callPackage ../servers/akkoma/akkoma-fe { }; From 42c2634653c1ca5dca48ccb51a6c1949212ca6ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Wed, 25 Dec 2024 18:32:06 +0100 Subject: [PATCH 69/72] nixos/opensmtpd: fix opensmtpd test --- nixos/tests/opensmtpd.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/nixos/tests/opensmtpd.nix b/nixos/tests/opensmtpd.nix index 6e848354c103d..d5b5d0fcc3566 100644 --- a/nixos/tests/opensmtpd.nix +++ b/nixos/tests/opensmtpd.nix @@ -22,12 +22,8 @@ import ./make-test-python.nix { extraServerArgs = [ "-v" ]; serverConfiguration = '' listen on 0.0.0.0 - action do_relay relay - # DO NOT DO THIS IN PRODUCTION! - # Setting up authentication requires a certificate which is painful in - # a test environment, but THIS WOULD BE DANGEROUS OUTSIDE OF A - # WELL-CONTROLLED ENVIRONMENT! - match from any for any action do_relay + action relay_smtp2 relay host "smtp://192.168.1.2" + match from any for any action relay_smtp2 ''; }; }; @@ -87,7 +83,7 @@ import ./make-test-python.nix { import smtplib, sys with smtplib.SMTP('192.168.1.1') as smtp: - smtp.sendmail('alice@[192.168.1.1]', 'bob@[192.168.1.2]', """ + smtp.sendmail('alice@smtp1', 'bob@smtp2', """ From: alice@smtp1 To: bob@smtp2 Subject: Test @@ -105,8 +101,8 @@ import ./make-test-python.nix { imap.select() status, refs = imap.search(None, 'ALL') assert status == 'OK' - assert len(refs) == 1 - status, msg = imap.fetch(refs[0], 'BODY[TEXT]') + assert len(refs) == 1 and refs[0] != "" + status, msg = imap.fetch(refs[0], '(BODY[TEXT])') assert status == 'OK' content = msg[0][1] print("===> content:", content) From c340fd898c78d96ff69781af4388318c44537cf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Wed, 25 Dec 2024 19:29:34 +0100 Subject: [PATCH 70/72] nixos/opensmtpd: fix opensmtpd-rspamd test --- nixos/tests/opensmtpd-rspamd.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/nixos/tests/opensmtpd-rspamd.nix b/nixos/tests/opensmtpd-rspamd.nix index 58b0e3b3414dc..20f530f99b94b 100644 --- a/nixos/tests/opensmtpd-rspamd.nix +++ b/nixos/tests/opensmtpd-rspamd.nix @@ -29,12 +29,8 @@ import ./make-test-python.nix { "${pkgs.dovecot}/libexec/dovecot/deliver -d %{user.username}" match from any for local action dovecot_deliver - action do_relay relay - # DO NOT DO THIS IN PRODUCTION! - # Setting up authentication requires a certificate which is painful in - # a test environment, but THIS WOULD BE DANGEROUS OUTSIDE OF A - # WELL-CONTROLLED ENVIRONMENT! - match from any for any action do_relay + action relay_smtp2 relay host "smtp://192.168.1.2" + match from any for any action relay_smtp2 ''; }; services.dovecot2 = { @@ -107,7 +103,7 @@ import ./make-test-python.nix { import smtplib, sys with smtplib.SMTP('192.168.1.1') as smtp: - smtp.sendmail('alice@[192.168.1.1]', 'bob@[192.168.1.2]', """ + smtp.sendmail('alice@smtp1', 'bob@smtp2', """ From: alice@smtp1 To: bob@smtp2 Subject: Test From fb4ff06a4be7a2b39a229bf1d1068804c18becc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Wed, 25 Dec 2024 20:59:10 +0100 Subject: [PATCH 71/72] fix opensmtpd's sendmail, add relevant test --- nixos/modules/services/mail/opensmtpd.nix | 8 ++++--- nixos/tests/opensmtpd.nix | 29 +++++++++++++++++++++-- 2 files changed, 32 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/mail/opensmtpd.nix b/nixos/modules/services/mail/opensmtpd.nix index 1e846e6e55649..d1f944ac88ebd 100644 --- a/nixos/modules/services/mail/opensmtpd.nix +++ b/nixos/modules/services/mail/opensmtpd.nix @@ -113,9 +113,11 @@ in source = "${cfg.package}/bin/smtpctl"; }; - services.mail.sendmailSetuidWrapper = lib.mkIf cfg.setSendmail ( - security.wrappers.smtpctl // { program = "sendmail"; } - ); + services.mail.sendmailSetuidWrapper = lib.mkIf cfg.setSendmail + (security.wrappers.smtpctl // { + source = "${sendmail}/bin/sendmail"; + program = "sendmail"; + }); systemd.tmpfiles.rules = [ "d /var/spool/smtpd 711 root - - -" diff --git a/nixos/tests/opensmtpd.nix b/nixos/tests/opensmtpd.nix index d5b5d0fcc3566..483464362fa74 100644 --- a/nixos/tests/opensmtpd.nix +++ b/nixos/tests/opensmtpd.nix @@ -16,7 +16,24 @@ import ./make-test-python.nix { } ]; }; - environment.systemPackages = [ pkgs.opensmtpd ]; + environment.systemPackages = let + testSendmail = pkgs.writeScriptBin "test-sendmail" '' + #!/bin/sh + set -euxo pipefail + echo "========= SENDING" >&2 + ${pkgs.system-sendmail}/bin/sendmail -v -f alice@smtp1 bob@smtp2 >&2 <&2 + ''; + in [ + pkgs.opensmtpd + testSendmail + ]; services.opensmtpd = { enable = true; extraServerArgs = [ "-v" ]; @@ -108,9 +125,12 @@ import ./make-test-python.nix { print("===> content:", content) split = content.split(b'\r\n') print("===> split:", split) - lastline = split[-3] + split.reverse() + lastline = next(filter(lambda x: x != b"", map(bytes.strip, split))) print("===> lastline:", lastline) assert lastline.strip() == b'Hello World' + imap.store(refs[0], '+FLAGS', '\\Deleted') + imap.expunge() ''; in [ @@ -139,6 +159,11 @@ import ./make-test-python.nix { smtp1.wait_until_fails("smtpctl show queue | egrep .") smtp2.wait_until_fails("smtpctl show queue | egrep .") client.succeed("check-mail-landed >&2") + + smtp1.succeed("test-sendmail") + smtp1.wait_until_fails("smtpctl show queue | egrep .") + smtp2.wait_until_fails("smtpctl show queue | egrep .") + client.succeed("check-mail-landed >&2") ''; meta.timeout = 1800; From 69a8aba1130b9475797f76a1cba01bfc77889568 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Wed, 25 Dec 2024 21:11:05 +0100 Subject: [PATCH 72/72] nixos/opensmtpd: run nixfmt as requested by ci --- nixos/modules/services/mail/opensmtpd.nix | 8 +++-- nixos/tests/opensmtpd.nix | 36 ++++++++++++----------- 2 files changed, 24 insertions(+), 20 deletions(-) diff --git a/nixos/modules/services/mail/opensmtpd.nix b/nixos/modules/services/mail/opensmtpd.nix index d1f944ac88ebd..2fc628a64aebd 100644 --- a/nixos/modules/services/mail/opensmtpd.nix +++ b/nixos/modules/services/mail/opensmtpd.nix @@ -113,11 +113,13 @@ in source = "${cfg.package}/bin/smtpctl"; }; - services.mail.sendmailSetuidWrapper = lib.mkIf cfg.setSendmail - (security.wrappers.smtpctl // { + services.mail.sendmailSetuidWrapper = lib.mkIf cfg.setSendmail ( + security.wrappers.smtpctl + // { source = "${sendmail}/bin/sendmail"; program = "sendmail"; - }); + } + ); systemd.tmpfiles.rules = [ "d /var/spool/smtpd 711 root - - -" diff --git a/nixos/tests/opensmtpd.nix b/nixos/tests/opensmtpd.nix index 483464362fa74..e1c26a7c67759 100644 --- a/nixos/tests/opensmtpd.nix +++ b/nixos/tests/opensmtpd.nix @@ -16,24 +16,26 @@ import ./make-test-python.nix { } ]; }; - environment.systemPackages = let - testSendmail = pkgs.writeScriptBin "test-sendmail" '' - #!/bin/sh - set -euxo pipefail - echo "========= SENDING" >&2 - ${pkgs.system-sendmail}/bin/sendmail -v -f alice@smtp1 bob@smtp2 >&2 <&2 + ${pkgs.system-sendmail}/bin/sendmail -v -f alice@smtp1 bob@smtp2 >&2 <&2 - ''; - in [ - pkgs.opensmtpd - testSendmail - ]; + Hello World + EOF + echo "=========== FINISHED SENDING" >&2 + ''; + in + [ + pkgs.opensmtpd + testSendmail + ]; services.opensmtpd = { enable = true; extraServerArgs = [ "-v" ];