From 28cd68d5a47c96758ec469519fe1101a1723e019 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Oct 2021 00:32:22 +0000 Subject: [PATCH 01/31] yubikey-touch-detector: 1.9.1 -> 1.9.3 --- pkgs/tools/security/yubikey-touch-detector/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/yubikey-touch-detector/default.nix b/pkgs/tools/security/yubikey-touch-detector/default.nix index 93531d3a2b6..8a06c363faf 100644 --- a/pkgs/tools/security/yubikey-touch-detector/default.nix +++ b/pkgs/tools/security/yubikey-touch-detector/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "yubikey-touch-detector"; - version = "1.9.1"; + version = "1.9.3"; src = fetchFromGitHub { owner = "maximbaz"; repo = "yubikey-touch-detector"; rev = version; - sha256 = "sha256-I9dRCQhbXd8K1zp291z9XVwHI9DcxgvrzYaHICZH5v0="; + sha256 = "sha256-f6j+YNYASH0Adg3236QijApALd/yXJjNMYEdP0Pifw0="; }; - vendorSha256 = "sha256-UeDLGwYrXwLOtQt/8fEmficc/1j0x+zr/JLa6lLF5cs="; + vendorSha256 = "sha256-bmFbxMU3PEWpYI0eQw/1RRDP+JGfUY8kOCeTWbdVt9k="; nativeBuildInputs = [ pkg-config ]; From 2e7ab74e76e75090bcd358460e5e6413fb1ada74 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Oct 2021 01:26:17 +0000 Subject: [PATCH 02/31] amdvlk: 2021.Q3.4 -> 2021.Q3.7 --- pkgs/development/libraries/amdvlk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/amdvlk/default.nix b/pkgs/development/libraries/amdvlk/default.nix index 05174c89f7e..9eec2be67b7 100644 --- a/pkgs/development/libraries/amdvlk/default.nix +++ b/pkgs/development/libraries/amdvlk/default.nix @@ -21,13 +21,13 @@ let in stdenv.mkDerivation rec { pname = "amdvlk"; - version = "2021.Q3.4"; + version = "2021.Q3.7"; src = fetchRepoProject { name = "${pname}-src"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; rev = "refs/tags/v-${version}"; - sha256 = "Rmx5vicxKXstI8TdxeFVjEFe71XJOyzp5L6VyDNuXmM="; + sha256 = "sha256-0Q6c10lQSxgqOB6X6F8LyeF2aoyicmp0tZlknuZjQHE="; }; buildInputs = [ From dd72fd59f8aba1fad1e9dc32cf4c66cc5a05053d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 28 Oct 2021 04:20:00 +0000 Subject: [PATCH 03/31] terraform: 1.0.9 -> 1.0.10 https://github.com/hashicorp/terraform/releases/tag/v1.0.10 --- pkgs/applications/networking/cluster/terraform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index ba034056c95..8dfc8c701e3 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -195,8 +195,8 @@ rec { }; terraform_1_0 = mkTerraform { - version = "1.0.9"; - sha256 = "0g97l53xrcafjrzz5inij4q4aaadibn5ilr5j39a6569pkvcvsh3"; + version = "1.0.10"; + sha256 = "1jcgp9q99785m85754ipza7b3dd3g58adpnyh5w2imqj01cas6mb"; vendorSha256 = "00cl42w1mzsi9qd09wydfvp5f2h7lxaay6s2dv0mf47k6h7prf42"; patches = [ ./provider-path-0_15.patch ]; passthru = { inherit plugins; }; From 91e3d8c964261f7e89c545f04d556232496e379e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Oct 2021 04:43:03 +0000 Subject: [PATCH 04/31] xlog: 2.0.23 -> 2.0.24 --- pkgs/applications/radio/xlog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/xlog/default.nix b/pkgs/applications/radio/xlog/default.nix index 06b7c108fa9..59af9a94d96 100644 --- a/pkgs/applications/radio/xlog/default.nix +++ b/pkgs/applications/radio/xlog/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, glib, gtk2, pkg-config, hamlib }: stdenv.mkDerivation rec { pname = "xlog"; - version = "2.0.23"; + version = "2.0.24"; src = fetchurl { url = "https://download.savannah.gnu.org/releases/xlog/${pname}-${version}.tar.gz"; - sha256 = "sha256-JSPyXOJbYOCeWY6h0v8fbmBkf1Dop1gdmnn4gKdBgac="; + sha256 = "sha256-jUU6xt3H9bY9CAQRTFQjprlsC77VwjIB/6sSRNzE+Lw="; }; # glib-2.62 deprecations From 39e8890675923f2a72331353e07b61f85a379b36 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Oct 2021 09:36:06 +0000 Subject: [PATCH 05/31] trackballs: 1.3.2 -> 1.3.3 --- pkgs/games/trackballs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/trackballs/default.nix b/pkgs/games/trackballs/default.nix index 8ebeab4b260..860c5a49ef8 100644 --- a/pkgs/games/trackballs/default.nix +++ b/pkgs/games/trackballs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "trackballs"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "trackballs"; repo = pname; rev = "v${version}"; - sha256 = "G+KfQgqk+iI+Beb/ZRul2ArCBcvwYQ/ftEWzdrtwb18="; + sha256 = "sha256-fCoQqGXwcpcq/gl67XXY5/wEvCM0ZZTV8LhjC+tnRuo="; }; nativeBuildInputs = [ cmake ]; From 3852a95d4103c04336427e9cf8c2be8d6b386790 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Oct 2021 09:41:55 +0000 Subject: [PATCH 06/31] tangram: 1.3.1 -> 1.3.2 --- .../networking/instant-messengers/tangram/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/tangram/default.nix b/pkgs/applications/networking/instant-messengers/tangram/default.nix index e7ca8c320ac..7cb9798517d 100644 --- a/pkgs/applications/networking/instant-messengers/tangram/default.nix +++ b/pkgs/applications/networking/instant-messengers/tangram/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "tangram"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "sonnyp"; repo = "Tangram"; rev = "v${version}"; - sha256 = "0bhs9s6c2k06i3cx01h2102lgl7g6vxm3k63jkkhh2bwdpc9kvn3"; + sha256 = "sha256-WI0H3bforQ6Jc/+TWFT1zUs4KRtWwvXY2/va+Fnd+iU="; fetchSubmodules = true; }; From 2f8c98ace36908388f1cad492d6427e7dd20af17 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Oct 2021 10:16:47 +0000 Subject: [PATCH 07/31] tpm2-pkcs11: 1.5.0 -> 1.7.0 --- pkgs/misc/tpm2-pkcs11/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/tpm2-pkcs11/default.nix b/pkgs/misc/tpm2-pkcs11/default.nix index 232b86b1e7a..f332688de4b 100644 --- a/pkgs/misc/tpm2-pkcs11/default.nix +++ b/pkgs/misc/tpm2-pkcs11/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "tpm2-pkcs11"; - version = "1.5.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "tpm2-software"; repo = pname; rev = version; - sha256 = "0sm73a762c7qd6x3f052m00d7daprifimsfa17dfdf4jvy9fqy56"; + sha256 = "sha256-Z9w6mIFen8Lf1l59XrMtR/Je2BZZycsOLxKS0VS4r4c="; }; patches = lib.singleton ( From d9ebe400f8091efa7fa3be4430429fef5dd002cc Mon Sep 17 00:00:00 2001 From: Sandro Date: Thu, 28 Oct 2021 16:33:51 +0200 Subject: [PATCH 08/31] postgresqlPackages.timescaledb: add comment why refs/tags is used --- pkgs/servers/sql/postgresql/ext/timescaledb.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index dc66534cd8a..19151dec39a 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "timescale"; repo = "timescaledb"; + # some branches are named like tags which confuses git rev = "refs/tags/${version}"; sha256 = "10c5qx8qq7gbs2pq56gn4nadbc8i6r28528hp2nqdg881yaiga3m"; }; From 44452f0ebb3b9f60dcdd86e986aa18419ceac9f1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Oct 2021 15:29:03 +0000 Subject: [PATCH 09/31] tixati: 2.84 -> 2.85 --- pkgs/applications/networking/p2p/tixati/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/p2p/tixati/default.nix b/pkgs/applications/networking/p2p/tixati/default.nix index e5c17581cb5..01e119dafc1 100644 --- a/pkgs/applications/networking/p2p/tixati/default.nix +++ b/pkgs/applications/networking/p2p/tixati/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "tixati"; - version = "2.84"; + version = "2.85"; src = fetchurl { url = "https://download2.tixati.com/download/tixati-${version}-1.x86_64.manualinstall.tar.gz"; - sha256 = "sha256-l3giWCMymUk5z4r4sEBZoeCh3K8jAp8TSf+xvhjeAEU="; + sha256 = "sha256-grmJ52x2NcsgXw5BWrEGF9+7TYS/45HgHUXuZB+hVK4="; }; installPhase = '' From c1c2f0d950743275c81bb11434046d7fafb37d49 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Oct 2021 17:06:42 +0000 Subject: [PATCH 10/31] squid: 4.16 -> 4.17 --- pkgs/servers/squid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/squid/default.nix b/pkgs/servers/squid/default.nix index 206e9fbb005..dae9d21c7f5 100644 --- a/pkgs/servers/squid/default.nix +++ b/pkgs/servers/squid/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "squid"; - version = "4.16"; + version = "4.17"; src = fetchurl { url = "http://www.squid-cache.org/Versions/v4/${pname}-${version}.tar.xz"; - sha256 = "sha256-fgDokXV8HALa5UbJiY9EDGAxtoTYwkPW7atSkHbjumM="; + sha256 = "sha256-y5KKwIx8hrFRscj4J6vhqE2DGBoqhuDVEihhY+HjFBg="; }; nativeBuildInputs = [ pkg-config ]; From 3b1fcb16e62cb0551057c9efd0e641b1e36330a8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Oct 2021 22:35:24 +0000 Subject: [PATCH 11/31] swagger-codegen3: 3.0.25 -> 3.0.29 --- pkgs/tools/networking/swagger-codegen3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/swagger-codegen3/default.nix b/pkgs/tools/networking/swagger-codegen3/default.nix index 8fc908a1f2c..2981196ef7c 100644 --- a/pkgs/tools/networking/swagger-codegen3/default.nix +++ b/pkgs/tools/networking/swagger-codegen3/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { - version = "3.0.25"; + version = "3.0.29"; pname = "swagger-codegen"; jarfilename = "${pname}-cli-${version}.jar"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://repo1.maven.org/maven2/io/swagger/codegen/v3/${pname}-cli/${version}/${jarfilename}"; - sha256 = "1rdz45kmmg60fs7ddnla1xq30nah6s6rd18fqbjbjxng8r92brnd"; + sha256 = "sha256-sEwqUmtWaoBV0QmdP8ibm3neqWHk7+tWLAuO2FaCUtQ="; }; dontUnpack = true; From 78a5bd5be92833170ba2094ad29da3110e6c818b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Oct 2021 23:04:11 +0000 Subject: [PATCH 12/31] songrec: 0.2.0 -> 0.2.1 --- pkgs/applications/audio/songrec/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/songrec/default.nix b/pkgs/applications/audio/songrec/default.nix index 166784a164d..60fbd3a2888 100644 --- a/pkgs/applications/audio/songrec/default.nix +++ b/pkgs/applications/audio/songrec/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "songrec"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "marin-m"; repo = pname; rev = version; - sha256 = "sha256-9fq2P+F7Olm9bUQ1HbH/Lzb5J2mJCma+x/vuH3wf+zY="; + sha256 = "sha256-pKHKM4XOuuZCr4neMe1AVqWMuZghwYNe+ifJCQhXG/c="; }; - cargoSha256 = "sha256-ATlwBMuT8AufkrZNe1+U74hYRN4V88ZDKYvCWV52iyI="; + cargoSha256 = "sha256-J3ezXBOGJwzIPTHXujHpswsgh9PFy110AOQ2pPJNm10="; nativeBuildInputs = [ pkg-config ]; From 39c150745781b3428b9954fd4fa127c8b8f2a988 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Oct 2021 23:33:19 +0000 Subject: [PATCH 13/31] sinit: 1.0 -> 1.1 --- pkgs/os-specific/linux/sinit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/sinit/default.nix b/pkgs/os-specific/linux/sinit/default.nix index 830087013fe..f88eca9b487 100644 --- a/pkgs/os-specific/linux/sinit/default.nix +++ b/pkgs/os-specific/linux/sinit/default.nix @@ -3,10 +3,10 @@ let s = # Generated upstream information rec { baseName="sinit"; - version="1.0"; + version="1.1"; name="${baseName}-${version}"; url="https://git.suckless.org/sinit/"; - sha256="0cf8yylgrrj1wxm5v6jdlbnxpx97m38yxrc9nmv1l8hldjqsj9pc"; + sha256="sha256-VtXkgixgElKKOT26uKN9feXDVjjtSgTWvcgk5o5MLmw="; rev = "refs/tags/v${version}"; }; buildInputs = [ From 399b3fe6a632f886c460e3bff138c7a4493fcd42 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Oct 2021 23:38:22 +0000 Subject: [PATCH 14/31] roswell: 21.06.14.110 -> 21.10.14.111 --- pkgs/development/tools/roswell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/roswell/default.nix b/pkgs/development/tools/roswell/default.nix index 28dcec785ed..89c2745e33e 100644 --- a/pkgs/development/tools/roswell/default.nix +++ b/pkgs/development/tools/roswell/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "roswell"; - version = "21.06.14.110"; + version = "21.10.14.111"; src = fetchFromGitHub { owner = "roswell"; repo = pname; rev = "v${version}"; - sha256 = "18hxhz7skxvzabz5z0yjky4f3fsyfanafh0imkn5macp8aw3wsfm"; + sha256 = "sha256-K4RDNTY8g6MNjjiwXMmYaZm0fChJ1C1eTpc0h7ja1ds="; }; patches = [ From 049264c39b153a59c0bc01ed33e788ad0a3cf393 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Thu, 28 Oct 2021 15:34:46 +0300 Subject: [PATCH 15/31] sdrpp: enable on darwin --- pkgs/applications/radio/sdrpp/default.nix | 17 ++++-- .../radio/sdrpp/runtime-prefix.patch | 60 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +- 3 files changed, 76 insertions(+), 5 deletions(-) create mode 100644 pkgs/applications/radio/sdrpp/runtime-prefix.patch diff --git a/pkgs/applications/radio/sdrpp/default.nix b/pkgs/applications/radio/sdrpp/default.nix index 2324d400323..5a993f4fc10 100644 --- a/pkgs/applications/radio/sdrpp/default.nix +++ b/pkgs/applications/radio/sdrpp/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, cmake, pkg-config -, libX11, glfw, glew, fftwFloat, volk +, libX11, glfw, glew, fftwFloat, volk, AppKit # Sources , airspy_source ? true, airspy , airspyhf_source ? true, airspyhf @@ -13,7 +13,7 @@ , sdrplay_source ? false, sdrplay , soapy_source ? true, soapysdr , spyserver_source ? true -, plutosdr_source ? true, libiio, libad9361 +, plutosdr_source ? stdenv.isLinux, libiio, libad9361 # Sinks , audio_sink ? true, rtaudio , portaudio_sink ? false, portaudio @@ -42,9 +42,12 @@ stdenv.mkDerivation rec { hash = "sha256-g9tpWvVRMXRhPfgvOeJhX6IMouF9+tLUr9wo5r35i/c="; }; + patches = [ ./runtime-prefix.patch ]; + postPatch = '' substituteInPlace CMakeLists.txt \ - --replace "/usr" $out + --replace "/usr/share" "share" \ + --replace "set(CMAKE_INSTALL_PREFIX" "#set(CMAKE_INSTALL_PREFIX" substituteInPlace decoder_modules/m17_decoder/src/m17dsp.h \ --replace "codec2.h" "codec2/codec2.h" ''; @@ -52,6 +55,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ glfw glew fftwFloat volk ] + ++ lib.optional stdenv.isDarwin AppKit ++ lib.optional stdenv.isLinux libX11 ++ lib.optional airspy_source airspy ++ lib.optional airspyhf_source airspyhf @@ -95,13 +99,18 @@ stdenv.mkDerivation rec { OPT_BUILD_RIGCTL_SERVER = rigctl_server; }; + CXXFLAGS = lib.optional stdenv.cc.isClang "-std=c++17"; + LDFLAGS = lib.optional stdenv.cc.isClang "-lc++fs"; + NIX_CFLAGS_COMPILE = "-fpermissive"; + hardeningDisable = lib.optional stdenv.cc.isClang "format"; + meta = with lib; { description = "Cross-Platform SDR Software"; homepage = "https://github.com/AlexandreRouma/SDRPlusPlus"; license = licenses.gpl3Only; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ sikmir ]; }; } diff --git a/pkgs/applications/radio/sdrpp/runtime-prefix.patch b/pkgs/applications/radio/sdrpp/runtime-prefix.patch new file mode 100644 index 00000000000..55ecd8ce3ee --- /dev/null +++ b/pkgs/applications/radio/sdrpp/runtime-prefix.patch @@ -0,0 +1,60 @@ +From a80a739163d2013ec400223a68a387f4f9297b2a Mon Sep 17 00:00:00 2001 +From: Nikolay Korotkiy +Date: Fri, 29 Oct 2021 01:38:21 +0300 +Subject: [PATCH] Fix sdrpp breaking every time the package is rebuilt. + +On NixOS, the INSTALL_PREFIX changes on every rebuild to the package, but sdrpp +fills it in as part of the default config and then installs that config +to the users home folder. Fix this by not substituting @INSTALL_PREFIX@ in the +default config until runtime. +--- + core/src/core.cpp | 8 ++++++-- + core/src/gui/main_window.cpp | 6 ++++++ + 2 files changed, 12 insertions(+), 2 deletions(-) + +diff --git a/core/src/core.cpp b/core/src/core.cpp +index 9546e60..98d6065 100644 +--- a/core/src/core.cpp ++++ b/core/src/core.cpp +@@ -242,8 +242,8 @@ int sdrpp_main(int argc, char *argv[]) { + defConfig["modulesDirectory"] = "./modules"; + defConfig["resourcesDirectory"] = "./res"; + #else +- defConfig["modulesDirectory"] = INSTALL_PREFIX "/lib/sdrpp/plugins"; +- defConfig["resourcesDirectory"] = INSTALL_PREFIX "/share/sdrpp"; ++ defConfig["modulesDirectory"] = "@prefix@/lib/sdrpp/plugins"; ++ defConfig["resourcesDirectory"] = "@prefix@/share/sdrpp"; + #endif + + // Load config +@@ -290,6 +290,10 @@ int sdrpp_main(int argc, char *argv[]) { + int winHeight = core::configManager.conf["windowSize"]["h"]; + maximized = core::configManager.conf["maximized"]; + std::string resDir = core::configManager.conf["resourcesDirectory"]; ++ { ++ std::size_t pos = resDir.find("@prefix@"); ++ if (pos != std::string::npos) resDir.replace(pos, 8, INSTALL_PREFIX); ++ } + json bandColors = core::configManager.conf["bandColors"]; + core::configManager.release(); + +diff --git a/core/src/gui/main_window.cpp b/core/src/gui/main_window.cpp +index 954dbd6..52f0eed 100644 +--- a/core/src/gui/main_window.cpp ++++ b/core/src/gui/main_window.cpp +@@ -44,6 +44,12 @@ void MainWindow::init() { + json menuElements = core::configManager.conf["menuElements"]; + std::string modulesDir = core::configManager.conf["modulesDirectory"]; + std::string resourcesDir = core::configManager.conf["resourcesDirectory"]; ++ { ++ std::size_t pos = modulesDir.find("@prefix@"); ++ if (pos != std::string::npos) modulesDir.replace(pos, 8, INSTALL_PREFIX); ++ pos = resourcesDir.find("@prefix@"); ++ if (pos != std::string::npos) resourcesDir.replace(pos, 8, INSTALL_PREFIX); ++ } + core::configManager.release(); + + // Load menu elements +-- +2.33.0 + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 52c23d8e4c4..f0bd020b2ef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19315,7 +19315,9 @@ with pkgs; sdrplay = callPackage ../applications/radio/sdrplay {}; - sdrpp = callPackage ../applications/radio/sdrpp { }; + sdrpp = callPackage ../applications/radio/sdrpp { + inherit (darwin.apple_sdk.frameworks) AppKit; + }; sblim-sfcc = callPackage ../development/libraries/sblim-sfcc {}; From 858840921739513f9d1ca64fbe4800b46c46689e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Oct 2021 02:01:42 +0000 Subject: [PATCH 16/31] azure-functions-core-tools: 3.0.3734 -> 3.0.3785 --- pkgs/development/tools/azure-functions-core-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/azure-functions-core-tools/default.nix b/pkgs/development/tools/azure-functions-core-tools/default.nix index cec465e7143..f72c875e65e 100644 --- a/pkgs/development/tools/azure-functions-core-tools/default.nix +++ b/pkgs/development/tools/azure-functions-core-tools/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "azure-functions-core-tools"; - version = "3.0.3734"; + version = "3.0.3785"; src = fetchurl { url = "https://github.com/Azure/${pname}/releases/download/${version}/Azure.Functions.Cli.linux-x64.${version}.zip"; - sha256 = "sha256-27kUnXSnDKZ/m8d1KAZG5DrFzB5uqlCLgtN7lXJ+eTY="; + sha256 = "sha256-NdTEFQaG8eFengjzQr51ezehIHFvQZqmrjpjWk4vZKo="; }; buildInputs = [ From 7807e82c0acdc63594acd836248bea151a3772f9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Oct 2021 02:35:56 +0000 Subject: [PATCH 17/31] remind: 03.03.07 -> 03.03.09 --- pkgs/tools/misc/remind/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/remind/default.nix b/pkgs/tools/misc/remind/default.nix index 1ef0ee9dd46..59ddc84465b 100644 --- a/pkgs/tools/misc/remind/default.nix +++ b/pkgs/tools/misc/remind/default.nix @@ -16,11 +16,11 @@ let in tcl.mkTclDerivation rec { pname = "remind"; - version = "03.03.07"; + version = "03.03.09"; src = fetchurl { url = "https://dianne.skoll.ca/projects/remind/download/remind-${version}.tar.gz"; - sha256 = "sha256-h8lOKdHhiVT/XSIkfX7KMHzmIeEdIsFCCPkD9oo7ij0="; + sha256 = "sha256-yQh6jGkRNkQvPoguRmd6025pCEsvO7w8W3YNO2vztvM="; }; propagatedBuildInputs = tclLibraries; From 02facd2d449a58968969323622cb4d12c55df132 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Oct 2021 04:44:23 +0000 Subject: [PATCH 18/31] btop: 1.0.18 -> 1.0.20 --- pkgs/tools/system/btop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/btop/default.nix b/pkgs/tools/system/btop/default.nix index b55af632697..6dfe63215f1 100644 --- a/pkgs/tools/system/btop/default.nix +++ b/pkgs/tools/system/btop/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "btop"; - version = "1.0.18"; + version = "1.0.20"; src = fetchFromGitHub { owner = "aristocratos"; repo = pname; rev = "v${version}"; - sha256 = "sha256-TUrCSpwbUP28COHAAFIdR5Kw18I35nBkiKU62IHCN4o="; + sha256 = "sha256-QMuixP4+wYVcF3s848cw6103PGDON4Inj2Nypt4FGIU="; }; installFlags = [ "PREFIX=$(out)" ]; From 0342aee96979e8109d7647a41b1c05768e4c801d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Oct 2021 04:55:41 +0000 Subject: [PATCH 19/31] sane-airscan: 0.99.26 -> 0.99.27 --- pkgs/applications/graphics/sane/backends/airscan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/sane/backends/airscan/default.nix b/pkgs/applications/graphics/sane/backends/airscan/default.nix index 8d0e32e2b4e..d88c7352d57 100644 --- a/pkgs/applications/graphics/sane/backends/airscan/default.nix +++ b/pkgs/applications/graphics/sane/backends/airscan/default.nix @@ -2,7 +2,7 @@ , libxml2, gnutls, sane-backends }: stdenv.mkDerivation rec { pname = "sane-airscan"; - version = "0.99.26"; + version = "0.99.27"; nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ avahi gnutls libjpeg libpng libxml2 sane-backends ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "alexpevzner"; repo = pname; rev = version; - sha256 = "08snfg5zx9924ryww0kxf1kgl085yw7fg6l4f1kzlhcmqf1958w5"; + sha256 = "sha256-29IPoLF4rmq8sGTi5RmpT1Fq8RJJlaepTt+2GWDU3es="; }; meta = with lib; { From ebaf71bc57e693252a2fedb306d8b96d17b28cc8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Oct 2021 05:02:18 +0000 Subject: [PATCH 20/31] bupstash: 0.10.2 -> 0.10.3 --- pkgs/tools/backup/bupstash/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/backup/bupstash/default.nix b/pkgs/tools/backup/bupstash/default.nix index ccf9115c1e7..91876f68d4a 100644 --- a/pkgs/tools/backup/bupstash/default.nix +++ b/pkgs/tools/backup/bupstash/default.nix @@ -1,16 +1,16 @@ { lib, fetchFromGitHub, installShellFiles, rustPlatform, ronn, pkg-config, libsodium }: rustPlatform.buildRustPackage rec { pname = "bupstash"; - version = "0.10.2"; + version = "0.10.3"; src = fetchFromGitHub { owner = "andrewchambers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0PKQYvKmAGP4/15nKhB+aZh8PF9dtDFjXEuPCA5tDYk="; + sha256 = "sha256-YN5pIXJRTQXqFGuXvyoSlYJEjAZ4wIYEKjEeF8qIJCI="; }; - cargoSha256 = "sha256-6zVWKVtTL6zbB4Uulq+sK4vm3qAC0B5kf0DmDv5aneo="; + cargoSha256 = "sha256-Erpg+Sktx+L2X9k6g1ngOyM8MNoucGcScOSPMB7vld8="; nativeBuildInputs = [ ronn pkg-config installShellFiles ]; buildInputs = [ libsodium ]; From de7f7a80979c0486313e61f902708f3df4463d5a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Oct 2021 05:24:05 +0000 Subject: [PATCH 21/31] cargo-feature: 0.5.3 -> 0.5.5 --- pkgs/development/tools/rust/cargo-feature/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-feature/default.nix b/pkgs/development/tools/rust/cargo-feature/default.nix index 0f21e4326f3..facbf0299a5 100644 --- a/pkgs/development/tools/rust/cargo-feature/default.nix +++ b/pkgs/development/tools/rust/cargo-feature/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-feature"; - version = "0.5.3"; + version = "0.5.5"; src = fetchFromGitHub { owner = "Riey"; repo = pname; rev = "v${version}"; - sha256 = "sha256-aUzmD5Dt0obXWDdZT6/Bzun2R1TLQYYELrN4xEG4hq8="; + sha256 = "sha256-0Ski+LytE636HHduisYJJq3khRsaJJ4YhpmaU5On348="; }; - cargoSha256 = "sha256-R8OaxlBAkK5YQPejOdLuCMeQlCbPcC/VQm9WHm31v54="; + cargoSha256 = "sha256-PA/s/BrqUftdGc5Lvd0glL9Dr8GLX9pYMq6WRRUQwEk="; buildInputs = lib.optional stdenv.isDarwin libiconv; From aa83863ad0c084a9d5a59b47c6230d42075d92dd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Oct 2021 06:14:47 +0000 Subject: [PATCH 22/31] chamber: 2.10.3 -> 2.10.6 --- pkgs/tools/admin/chamber/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/chamber/default.nix b/pkgs/tools/admin/chamber/default.nix index 45c62fd42f9..ef304ff208b 100644 --- a/pkgs/tools/admin/chamber/default.nix +++ b/pkgs/tools/admin/chamber/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "chamber"; - version = "2.10.3"; + version = "2.10.6"; src = fetchFromGitHub { owner = "segmentio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nIIoU+iz2uOglNaqGIhQ2kUjpFOyOx+flXXwu02UG6Y="; + sha256 = "sha256-8VnFpzm5St0AYFzups2ILQ/MrQRZLQ1xY9JjlGVBmZk="; }; CGO_ENABLED = 0; From f9b615c9ffa9141e3659e166c200fe57cfb23bdd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Oct 2021 06:20:44 +0000 Subject: [PATCH 23/31] qbs: 1.20.0 -> 1.20.1 --- pkgs/development/tools/build-managers/qbs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/qbs/default.nix b/pkgs/development/tools/build-managers/qbs/default.nix index 5d59478cdf4..502c5e638ff 100644 --- a/pkgs/development/tools/build-managers/qbs/default.nix +++ b/pkgs/development/tools/build-managers/qbs/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "qbs"; - version = "1.20.0"; + version = "1.20.1"; src = fetchFromGitHub { owner = "qbs"; repo = "qbs"; rev = "v${version}"; - sha256 = "sha256-gKabKjd8GT5eFmobUFK6IUQ+b8Jjn/Kr68i1fXgJS4Q="; + sha256 = "sha256-tqpQ+TpcpD6o/7CtJOMfBQHGK0OX3pVhPHdpVHXplFs="; }; nativeBuildInputs = [ qmake ]; From 00334d352f2948ab5bcb28ba674d9c55e1b5f2ec Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Thu, 28 Oct 2021 23:25:35 -0700 Subject: [PATCH 24/31] Revert "makeRustPlatform: allow to easily override stdenv" This reverts commit f17c3516fb298dc11890a358d25d0b652e7ac300. --- .../compilers/rust/make-rust-platform.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/compilers/rust/make-rust-platform.nix b/pkgs/development/compilers/rust/make-rust-platform.nix index baa29064e20..b7379ac6772 100644 --- a/pkgs/development/compilers/rust/make-rust-platform.nix +++ b/pkgs/development/compilers/rust/make-rust-platform.nix @@ -1,6 +1,6 @@ -{ buildPackages, callPackage, stdenv }@prev: +{ buildPackages, callPackage }: -{ rustc, cargo, stdenv ? prev.stdenv, ... }: +{ rustc, cargo, ... }: rec { rust = { @@ -9,27 +9,27 @@ rec { fetchCargoTarball = buildPackages.callPackage ../../../build-support/rust/fetchCargoTarball.nix { git = buildPackages.gitMinimal; - inherit stdenv cargo; + inherit cargo; }; buildRustPackage = callPackage ../../../build-support/rust { git = buildPackages.gitMinimal; - inherit stdenv cargoBuildHook cargoCheckHook cargoInstallHook cargoSetupHook + inherit cargoBuildHook cargoCheckHook cargoInstallHook cargoSetupHook fetchCargoTarball importCargoLock rustc; }; importCargoLock = buildPackages.callPackage ../../../build-support/rust/import-cargo-lock.nix {}; rustcSrc = callPackage ./rust-src.nix { - inherit stdenv rustc; + inherit rustc; }; rustLibSrc = callPackage ./rust-lib-src.nix { - inherit stdenv rustc; + inherit rustc; }; # Hooks inherit (callPackage ../../../build-support/rust/hooks { - inherit stdenv cargo rustc; + inherit cargo rustc; }) cargoBuildHook cargoCheckHook cargoInstallHook cargoSetupHook maturinBuildHook; } From de4d04d24e713a17841217120bb0103cb216396e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Oct 2021 06:28:34 +0000 Subject: [PATCH 25/31] cheat: 4.2.2 -> 4.2.3 --- pkgs/applications/misc/cheat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/cheat/default.nix b/pkgs/applications/misc/cheat/default.nix index f7a56a48fc7..bda779dd54f 100644 --- a/pkgs/applications/misc/cheat/default.nix +++ b/pkgs/applications/misc/cheat/default.nix @@ -3,13 +3,13 @@ buildGoModule rec { pname = "cheat"; - version = "4.2.2"; + version = "4.2.3"; src = fetchFromGitHub { owner = "cheat"; repo = "cheat"; rev = version; - sha256 = "sha256-YKGCZm0BaFLi+kujl04B4IU1qay15XNfvelxfUkCP8o="; + sha256 = "sha256-F0p309rY0PeeOU1K9Had6qI6DCHgzauuuTjMfWoZYBQ="; }; subPackages = [ "cmd/cheat" ]; From 33e63f7542b2a311c65438b4e5fe81dd7255da7f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Oct 2021 06:45:50 +0000 Subject: [PATCH 26/31] cilium-cli: 0.9.0 -> 0.9.2 --- pkgs/applications/networking/cluster/cilium/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/cilium/default.nix b/pkgs/applications/networking/cluster/cilium/default.nix index 5984710d8c2..2351b41369e 100644 --- a/pkgs/applications/networking/cluster/cilium/default.nix +++ b/pkgs/applications/networking/cluster/cilium/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cilium-cli"; - version = "0.9.0"; + version = "0.9.2"; src = fetchFromGitHub { owner = "cilium"; repo = pname; rev = "v${version}"; - sha256 = "05qc1fcf4ahl1zvxv92mq3awiy5b1rq6r9l896b4hkp0m5lx9m3c"; + sha256 = "sha256-vIm5PkRyh41jtvDrLDxFVzSkhFipYYYEEY0/qxbOXGE="; }; vendorSha256 = null; From bf6e22d4270077f1ef46ef341d21952b68dffd4b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Oct 2021 07:14:43 +0000 Subject: [PATCH 27/31] cliphist: 0.1.0 -> 0.3.0 --- pkgs/tools/wayland/cliphist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/wayland/cliphist/default.nix b/pkgs/tools/wayland/cliphist/default.nix index 44a870db387..9ccad4397dd 100644 --- a/pkgs/tools/wayland/cliphist/default.nix +++ b/pkgs/tools/wayland/cliphist/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cliphist"; - version = "0.1.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "sentriz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CZW7dhOd7E74VNjnvhxvSSUZQtbkGi4uRUM9YQCuJZw="; + sha256 = "sha256-fx33m7DCp5N9VGI/H/IO66ECdFLobRRAAuRGNu4gzSk="; }; vendorSha256 = "sha256-UrKSDvskGwHjwkb/fjvaJZ8xXFD98BFeSJxwJpc8A+M="; From b40d30f92d0f887c62e8baea678b059b6732a50a Mon Sep 17 00:00:00 2001 From: Michael Adler Date: Fri, 29 Oct 2021 10:25:13 +0200 Subject: [PATCH 28/31] bats: 1.4.1 -> 1.5.0 --- pkgs/development/interpreters/bats/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/bats/default.nix b/pkgs/development/interpreters/bats/default.nix index 7a6f62a55c8..1412985a247 100644 --- a/pkgs/development/interpreters/bats/default.nix +++ b/pkgs/development/interpreters/bats/default.nix @@ -1,12 +1,12 @@ -{ stdenv, lib, fetchzip, bash, makeWrapper, coreutils, gnugrep, doCheck ? true }: +{ stdenv, lib, fetchzip, bash, makeWrapper, coreutils, gnugrep, ncurses, doCheck ? true }: stdenv.mkDerivation rec { pname = "bats"; - version = "1.4.1"; + version = "1.5.0"; src = fetchzip { url = "https://github.com/bats-core/bats-core/archive/v${version}.tar.gz"; - hash = "sha256-bGZXjq6zG9MJgDccpVYATsgYhhb1Zf7Deoa/DoSv8QE="; + hash = "sha256-MEkMi2w8G9FZhE3JvzzbqObcErQ9WFXy5mtKwQOoxbk="; }; nativeBuildInputs = [ makeWrapper ]; @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { ''; inherit doCheck; + checkInputs = [ ncurses ]; checkPhase = '' # TODO: cut if https://github.com/bats-core/bats-core/issues/418 allows sed -i '/test works even if PATH is reset/a skip' test/bats.bats From 23308044efafcc44f62d6fbc3251b84b56ac4b6a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Oct 2021 15:16:17 +0000 Subject: [PATCH 29/31] utox: 0.17.0 -> 0.18.1 --- .../networking/instant-messengers/utox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix index e5a2c201d87..4392f587995 100644 --- a/pkgs/applications/networking/instant-messengers/utox/default.nix +++ b/pkgs/applications/networking/instant-messengers/utox/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "utox"; - version = "0.17.0"; + version = "0.18.1"; src = fetchFromGitHub { owner = "uTox"; repo = "uTox"; rev = "v${version}"; - sha256 = "12wbq883il7ikldayh8hm0cjfrkp45vn05xx9s1jbfz6gmkidyar"; + sha256 = "sha256-DxnolxUTn+CL6TbZHKLHOUMTHhtTSWufzzOTRpKjOwc="; fetchSubmodules = true; }; From e0ee3a830ca9a1b1d8419ac92615d4bd530c3779 Mon Sep 17 00:00:00 2001 From: ZJ van de Weg Date: Fri, 29 Oct 2021 11:03:23 +0200 Subject: [PATCH 30/31] duplicity: Update homepage URL The URL was updated by the upstream project and the redirect wasn't working on my browser. This change updates it to fix it. --- pkgs/tools/backup/duplicity/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index cbbd86e0167..232108d8e9f 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -138,7 +138,7 @@ pythonPackages.buildPythonApplication rec { meta = with lib; { description = "Encrypted bandwidth-efficient backup using the rsync algorithm"; - homepage = "https://www.nongnu.org/duplicity"; + homepage = "https://duplicity.gitlab.io/duplicity-web/"; license = licenses.gpl2Plus; platforms = platforms.unix; }; From 604168a4b23ae41e4dd43e73776efcf3d9fce2f3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Oct 2021 09:24:23 +0000 Subject: [PATCH 31/31] python38Packages.scikit-hep-testdata: 0.4.9 -> 0.4.10 --- .../python-modules/scikit-hep-testdata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scikit-hep-testdata/default.nix b/pkgs/development/python-modules/scikit-hep-testdata/default.nix index 8f02f67c1b5..c3cb38fbe6a 100644 --- a/pkgs/development/python-modules/scikit-hep-testdata/default.nix +++ b/pkgs/development/python-modules/scikit-hep-testdata/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "scikit-hep-testdata"; - version = "0.4.9"; + version = "0.4.10"; format = "pyproject"; # fetch from github as we want the data files @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "scikit-hep"; repo = pname; rev = "v${version}"; - sha256 = "0y70nx94y2qf0zmaqjq4ljld31jh277ica0j4c3ck2ph7jrs5pg0"; + sha256 = "0x6ba02f3sba9341nhyg9jdcbl9c1h880d8m75ybdpbn7zlaya1d"; }; nativeBuildInputs = [