commit 97b60b1800c22850bc7e52596777c8c60dbbd9e6 · pyrox.dev/nixpkgs

+3 -3

pkgs/applications/audio/songrec/default.nix

···

       10
        
       

     

       11
        
       rustPlatform.buildRustPackage rec {

     

       12
        
         pname = "songrec";

     

       13
       -
         version = "0.2.0";

     

       14
        
       

     

       15
        
         src = fetchFromGitHub {

     

       16
        
           owner = "marin-m";

     

       17
        
           repo = pname;

     

       18
        
           rev = version;

     

       19
       -
           sha256 = "sha256-9fq2P+F7Olm9bUQ1HbH/Lzb5J2mJCma+x/vuH3wf+zY=";

     

       20
        
         };

     

       21
        
       

     

       22
       -
         cargoSha256 = "sha256-ATlwBMuT8AufkrZNe1+U74hYRN4V88ZDKYvCWV52iyI=";

     

       23
        
       

     

       24
        
         nativeBuildInputs = [ pkg-config ];

     

       25

···

       10
        
       

     

       11
        
       rustPlatform.buildRustPackage rec {

     

       12
        
         pname = "songrec";

     

       13
       +
         version = "0.2.1";

     

       14
        
       

     

       15
        
         src = fetchFromGitHub {

     

       16
        
           owner = "marin-m";

     

       17
        
           repo = pname;

     

       18
        
           rev = version;

     

       19
       +
           sha256 = "sha256-pKHKM4XOuuZCr4neMe1AVqWMuZghwYNe+ifJCQhXG/c=";

     

       20
        
         };

     

       21
        
       

     

       22
       +
         cargoSha256 = "sha256-J3ezXBOGJwzIPTHXujHpswsgh9PFy110AOQ2pPJNm10=";

     

       23
        
       

     

       24
        
         nativeBuildInputs = [ pkg-config ];

     

       25

+2 -2

pkgs/applications/graphics/sane/backends/airscan/default.nix

···

       2
        
       , libxml2, gnutls, sane-backends }:

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "sane-airscan";

     

       5
       -
         version = "0.99.26";

     

       6
        
       

     

       7
        
         nativeBuildInputs = [ meson ninja pkg-config ];

     

       8
        
         buildInputs = [ avahi gnutls libjpeg libpng libxml2 sane-backends ];

     
···

       11
        
           owner = "alexpevzner";

     

       12
        
           repo = pname;

     

       13
        
           rev = version;

     

       14
       -
           sha256 = "08snfg5zx9924ryww0kxf1kgl085yw7fg6l4f1kzlhcmqf1958w5";

     

       15
        
         };

     

       16
        
       

     

       17
        
         meta = with lib; {

···

       2
        
       , libxml2, gnutls, sane-backends }:

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "sane-airscan";

     

       5
       +
         version = "0.99.27";

     

       6
        
       

     

       7
        
         nativeBuildInputs = [ meson ninja pkg-config ];

     

       8
        
         buildInputs = [ avahi gnutls libjpeg libpng libxml2 sane-backends ];

     
···

       11
        
           owner = "alexpevzner";

     

       12
        
           repo = pname;

     

       13
        
           rev = version;

     

       14
       +
           sha256 = "sha256-29IPoLF4rmq8sGTi5RmpT1Fq8RJJlaepTt+2GWDU3es=";

     

       15
        
         };

     

       16
        
       

     

       17
        
         meta = with lib; {

+2 -2

pkgs/applications/misc/cheat/default.nix

···

       3
        
       

     

       4
        
       buildGoModule rec {

     

       5
        
         pname = "cheat";

     

       6
       -
         version = "4.2.2";

     

       7
        
       

     

       8
        
         src = fetchFromGitHub {

     

       9
        
           owner = "cheat";

     

       10
        
           repo = "cheat";

     

       11
        
           rev = version;

     

       12
       -
           sha256 = "sha256-YKGCZm0BaFLi+kujl04B4IU1qay15XNfvelxfUkCP8o=";

     

       13
        
         };

     

       14
        
       

     

       15
        
         subPackages = [ "cmd/cheat" ];

···

       3
        
       

     

       4
        
       buildGoModule rec {

     

       5
        
         pname = "cheat";

     

       6
       +
         version = "4.2.3";

     

       7
        
       

     

       8
        
         src = fetchFromGitHub {

     

       9
        
           owner = "cheat";

     

       10
        
           repo = "cheat";

     

       11
        
           rev = version;

     

       12
       +
           sha256 = "sha256-F0p309rY0PeeOU1K9Had6qI6DCHgzauuuTjMfWoZYBQ=";

     

       13
        
         };

     

       14
        
       

     

       15
        
         subPackages = [ "cmd/cheat" ];

+2 -2

pkgs/applications/networking/cluster/cilium/default.nix

···

       2
        
       

     

       3
        
       buildGoModule rec {

     

       4
        
         pname = "cilium-cli";

     

       5
       -
         version = "0.9.0";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "cilium";

     

       9
        
           repo = pname;

     

       10
        
           rev = "v${version}";

     

       11
       -
           sha256 = "05qc1fcf4ahl1zvxv92mq3awiy5b1rq6r9l896b4hkp0m5lx9m3c";

     

       12
        
         };

     

       13
        
       

     

       14
        
         vendorSha256 = null;

···

       2
        
       

     

       3
        
       buildGoModule rec {

     

       4
        
         pname = "cilium-cli";

     

       5
       +
         version = "0.9.2";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "cilium";

     

       9
        
           repo = pname;

     

       10
        
           rev = "v${version}";

     

       11
       +
           sha256 = "sha256-vIm5PkRyh41jtvDrLDxFVzSkhFipYYYEEY0/qxbOXGE=";

     

       12
        
         };

     

       13
        
       

     

       14
        
         vendorSha256 = null;

+2 -2

pkgs/applications/networking/cluster/terraform/default.nix

···

       195
        
         };

     

       196
        
       

     

       197
        
         terraform_1_0 = mkTerraform {

     

       198
       -
           version = "1.0.9";

     

       199
       -
           sha256 = "0g97l53xrcafjrzz5inij4q4aaadibn5ilr5j39a6569pkvcvsh3";

     

       200
        
           vendorSha256 = "00cl42w1mzsi9qd09wydfvp5f2h7lxaay6s2dv0mf47k6h7prf42";

     

       201
        
           patches = [ ./provider-path-0_15.patch ];

     

       202
        
           passthru = { inherit plugins; };

···

       195
        
         };

     

       196
        
       

     

       197
        
         terraform_1_0 = mkTerraform {

     

       198
       +
           version = "1.0.10";

     

       199
       +
           sha256 = "1jcgp9q99785m85754ipza7b3dd3g58adpnyh5w2imqj01cas6mb";

     

       200
        
           vendorSha256 = "00cl42w1mzsi9qd09wydfvp5f2h7lxaay6s2dv0mf47k6h7prf42";

     

       201
        
           patches = [ ./provider-path-0_15.patch ];

     

       202
        
           passthru = { inherit plugins; };

+2 -2

pkgs/applications/networking/instant-messengers/tangram/default.nix

···

       5
        
       

     

       6
        
       stdenv.mkDerivation rec {

     

       7
        
         pname = "tangram";

     

       8
       -
         version = "1.3.1";

     

       9
        
       

     

       10
        
         src = fetchFromGitHub {

     

       11
        
           owner = "sonnyp";

     

       12
        
           repo = "Tangram";

     

       13
        
           rev = "v${version}";

     

       14
       -
           sha256 = "0bhs9s6c2k06i3cx01h2102lgl7g6vxm3k63jkkhh2bwdpc9kvn3";

     

       15
        
           fetchSubmodules = true;

     

       16
        
         };

     

       17

···

       5
        
       

     

       6
        
       stdenv.mkDerivation rec {

     

       7
        
         pname = "tangram";

     

       8
       +
         version = "1.3.2";

     

       9
        
       

     

       10
        
         src = fetchFromGitHub {

     

       11
        
           owner = "sonnyp";

     

       12
        
           repo = "Tangram";

     

       13
        
           rev = "v${version}";

     

       14
       +
           sha256 = "sha256-WI0H3bforQ6Jc/+TWFT1zUs4KRtWwvXY2/va+Fnd+iU=";

     

       15
        
           fetchSubmodules = true;

     

       16
        
         };

     

       17

+2 -2

pkgs/applications/networking/instant-messengers/utox/default.nix

···

       5
        
       stdenv.mkDerivation rec {

     

       6
        
         pname = "utox";

     

       7
        
       

     

       8
       -
         version = "0.17.0";

     

       9
        
       

     

       10
        
         src = fetchFromGitHub {

     

       11
        
           owner  = "uTox";

     

       12
        
           repo   = "uTox";

     

       13
        
           rev    = "v${version}";

     

       14
       -
           sha256 = "12wbq883il7ikldayh8hm0cjfrkp45vn05xx9s1jbfz6gmkidyar";

     

       15
        
           fetchSubmodules = true;

     

       16
        
         };

     

       17

···

       5
        
       stdenv.mkDerivation rec {

     

       6
        
         pname = "utox";

     

       7
        
       

     

       8
       +
         version = "0.18.1";

     

       9
        
       

     

       10
        
         src = fetchFromGitHub {

     

       11
        
           owner  = "uTox";

     

       12
        
           repo   = "uTox";

     

       13
        
           rev    = "v${version}";

     

       14
       +
           sha256 = "sha256-DxnolxUTn+CL6TbZHKLHOUMTHhtTSWufzzOTRpKjOwc=";

     

       15
        
           fetchSubmodules = true;

     

       16
        
         };

     

       17

+2 -2

pkgs/applications/networking/p2p/tixati/default.nix

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "tixati";

     

       5
       -
         version = "2.84";

     

       6
        
       

     

       7
        
         src = fetchurl {

     

       8
        
           url = "https://download2.tixati.com/download/tixati-${version}-1.x86_64.manualinstall.tar.gz";

     

       9
       -
           sha256 = "sha256-l3giWCMymUk5z4r4sEBZoeCh3K8jAp8TSf+xvhjeAEU=";

     

       10
        
         };

     

       11
        
       

     

       12
        
         installPhase = ''

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "tixati";

     

       5
       +
         version = "2.85";

     

       6
        
       

     

       7
        
         src = fetchurl {

     

       8
        
           url = "https://download2.tixati.com/download/tixati-${version}-1.x86_64.manualinstall.tar.gz";

     

       9
       +
           sha256 = "sha256-grmJ52x2NcsgXw5BWrEGF9+7TYS/45HgHUXuZB+hVK4=";

     

       10
        
         };

     

       11
        
       

     

       12
        
         installPhase = ''

+13 -4

pkgs/applications/radio/sdrpp/default.nix

···

       1
        
       { stdenv, lib, fetchFromGitHub, cmake, pkg-config

     

       2
       -
       , libX11, glfw, glew, fftwFloat, volk

     

       3
        
       # Sources

     

       4
        
       , airspy_source ? true, airspy

     

       5
        
       , airspyhf_source ? true, airspyhf

     
···

       13
        
       , sdrplay_source ? false, sdrplay

     

       14
        
       , soapy_source ? true, soapysdr

     

       15
        
       , spyserver_source ? true

     

       16
       -
       , plutosdr_source ? true, libiio, libad9361

     

       17
        
       # Sinks

     

       18
        
       , audio_sink ? true, rtaudio

     

       19
        
       , portaudio_sink ? false, portaudio

     
···

       42
        
           hash = "sha256-g9tpWvVRMXRhPfgvOeJhX6IMouF9+tLUr9wo5r35i/c=";

     

       43
        
         };

     

       44
        
       

     

       0
        
       
     

       0
        
       
     

       45
        
         postPatch = ''

     

       46
        
           substituteInPlace CMakeLists.txt \

     

       47
       -
             --replace "/usr" $out

     

       0
        
       
     

       48
        
           substituteInPlace decoder_modules/m17_decoder/src/m17dsp.h \

     

       49
        
             --replace "codec2.h" "codec2/codec2.h"

     

       50
        
         '';

     
···

       52
        
         nativeBuildInputs = [ cmake pkg-config ];

     

       53
        
       

     

       54
        
         buildInputs = [ glfw glew fftwFloat volk ]

     

       0
        
       
     

       55
        
           ++ lib.optional stdenv.isLinux libX11

     

       56
        
           ++ lib.optional airspy_source airspy

     

       57
        
           ++ lib.optional airspyhf_source airspyhf

     
···

       95
        
           OPT_BUILD_RIGCTL_SERVER = rigctl_server;

     

       96
        
         };

     

       97
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       98
        
         NIX_CFLAGS_COMPILE = "-fpermissive";

     

       99
        
       

     

       0
        
       
     

       0
        
       
     

       100
        
         meta = with lib; {

     

       101
        
           description = "Cross-Platform SDR Software";

     

       102
        
           homepage = "https://github.com/AlexandreRouma/SDRPlusPlus";

     

       103
        
           license = licenses.gpl3Only;

     

       104
       -
           platforms = platforms.linux;

     

       105
        
           maintainers = with maintainers; [ sikmir ];

     

       106
        
         };

     

       107
        
       }

···

       1
        
       { stdenv, lib, fetchFromGitHub, cmake, pkg-config

     

       2
       +
       , libX11, glfw, glew, fftwFloat, volk, AppKit

     

       3
        
       # Sources

     

       4
        
       , airspy_source ? true, airspy

     

       5
        
       , airspyhf_source ? true, airspyhf

     
···

       13
        
       , sdrplay_source ? false, sdrplay

     

       14
        
       , soapy_source ? true, soapysdr

     

       15
        
       , spyserver_source ? true

     

       16
       +
       , plutosdr_source ? stdenv.isLinux, libiio, libad9361

     

       17
        
       # Sinks

     

       18
        
       , audio_sink ? true, rtaudio

     

       19
        
       , portaudio_sink ? false, portaudio

     
···

       42
        
           hash = "sha256-g9tpWvVRMXRhPfgvOeJhX6IMouF9+tLUr9wo5r35i/c=";

     

       43
        
         };

     

       44
        
       

     

       45
       +
         patches = [ ./runtime-prefix.patch ];

     

       46
       +
       

     

       47
        
         postPatch = ''

     

       48
        
           substituteInPlace CMakeLists.txt \

     

       49
       +
             --replace "/usr/share" "share" \

     

       50
       +
             --replace "set(CMAKE_INSTALL_PREFIX" "#set(CMAKE_INSTALL_PREFIX"

     

       51
        
           substituteInPlace decoder_modules/m17_decoder/src/m17dsp.h \

     

       52
        
             --replace "codec2.h" "codec2/codec2.h"

     

       53
        
         '';

     
···

       55
        
         nativeBuildInputs = [ cmake pkg-config ];

     

       56
        
       

     

       57
        
         buildInputs = [ glfw glew fftwFloat volk ]

     

       58
       +
           ++ lib.optional stdenv.isDarwin AppKit

     

       59
        
           ++ lib.optional stdenv.isLinux libX11

     

       60
        
           ++ lib.optional airspy_source airspy

     

       61
        
           ++ lib.optional airspyhf_source airspyhf

     
···

       99
        
           OPT_BUILD_RIGCTL_SERVER = rigctl_server;

     

       100
        
         };

     

       101
        
       

     

       102
       +
         CXXFLAGS = lib.optional stdenv.cc.isClang "-std=c++17";

     

       103
       +
         LDFLAGS = lib.optional stdenv.cc.isClang "-lc++fs";

     

       104
       +
       

     

       105
        
         NIX_CFLAGS_COMPILE = "-fpermissive";

     

       106
        
       

     

       107
       +
         hardeningDisable = lib.optional stdenv.cc.isClang "format";

     

       108
       +
       

     

       109
        
         meta = with lib; {

     

       110
        
           description = "Cross-Platform SDR Software";

     

       111
        
           homepage = "https://github.com/AlexandreRouma/SDRPlusPlus";

     

       112
        
           license = licenses.gpl3Only;

     

       113
       +
           platforms = platforms.unix;

     

       114
        
           maintainers = with maintainers; [ sikmir ];

     

       115
        
         };

     

       116
        
       }

+60

pkgs/applications/radio/sdrpp/runtime-prefix.patch

···

       1
       +
       From a80a739163d2013ec400223a68a387f4f9297b2a Mon Sep 17 00:00:00 2001

     

       2
       +
       From: Nikolay Korotkiy <sikmir@gmail.com>

     

       3
       +
       Date: Fri, 29 Oct 2021 01:38:21 +0300

     

       4
       +
       Subject: [PATCH] Fix sdrpp breaking every time the package is rebuilt.

     

       5
       +
       

     

       6
       +
       On NixOS, the INSTALL_PREFIX changes on every rebuild to the package, but sdrpp

     

       7
       +
       fills it in as part of the default config and then installs that config

     

       8
       +
       to the users home folder. Fix this by not substituting @INSTALL_PREFIX@ in the

     

       9
       +
       default config until runtime.

     

       10
       +
       ---

     

       11
       +
        core/src/core.cpp            | 8 ++++++--

     

       12
       +
        core/src/gui/main_window.cpp | 6 ++++++

     

       13
       +
        2 files changed, 12 insertions(+), 2 deletions(-)

     

       14
       +
       

     

       15
       +
       diff --git a/core/src/core.cpp b/core/src/core.cpp

     

       16
       +
       index 9546e60..98d6065 100644

     

       17
       +
       --- a/core/src/core.cpp

     

       18
       +
       +++ b/core/src/core.cpp

     

       19
       +
       @@ -242,8 +242,8 @@ int sdrpp_main(int argc, char *argv[]) {

     

       20
       +
            defConfig["modulesDirectory"] = "./modules";

     

       21
       +
            defConfig["resourcesDirectory"] = "./res";

     

       22
       +
        #else

     

       23
       +
       -    defConfig["modulesDirectory"] = INSTALL_PREFIX "/lib/sdrpp/plugins";

     

       24
       +
       -    defConfig["resourcesDirectory"] = INSTALL_PREFIX "/share/sdrpp";

     

       25
       +
       +    defConfig["modulesDirectory"] = "@prefix@/lib/sdrpp/plugins";

     

       26
       +
       +    defConfig["resourcesDirectory"] = "@prefix@/share/sdrpp";

     

       27
       +
        #endif

     

       28
       +
        

     

       29
       +
            // Load config

     

       30
       +
       @@ -290,6 +290,10 @@ int sdrpp_main(int argc, char *argv[]) {

     

       31
       +
            int winHeight = core::configManager.conf["windowSize"]["h"];

     

       32
       +
            maximized = core::configManager.conf["maximized"];

     

       33
       +
            std::string resDir = core::configManager.conf["resourcesDirectory"];

     

       34
       +
       +    {

     

       35
       +
       +        std::size_t pos = resDir.find("@prefix@");

     

       36
       +
       +        if (pos != std::string::npos) resDir.replace(pos, 8, INSTALL_PREFIX);

     

       37
       +
       +    }

     

       38
       +
            json bandColors = core::configManager.conf["bandColors"];

     

       39
       +
            core::configManager.release();

     

       40
       +
        

     

       41
       +
       diff --git a/core/src/gui/main_window.cpp b/core/src/gui/main_window.cpp

     

       42
       +
       index 954dbd6..52f0eed 100644

     

       43
       +
       --- a/core/src/gui/main_window.cpp

     

       44
       +
       +++ b/core/src/gui/main_window.cpp

     

       45
       +
       @@ -44,6 +44,12 @@ void MainWindow::init() {

     

       46
       +
            json menuElements = core::configManager.conf["menuElements"];

     

       47
       +
            std::string modulesDir = core::configManager.conf["modulesDirectory"];

     

       48
       +
            std::string resourcesDir = core::configManager.conf["resourcesDirectory"];

     

       49
       +
       +    {

     

       50
       +
       +        std::size_t pos = modulesDir.find("@prefix@");

     

       51
       +
       +        if (pos != std::string::npos) modulesDir.replace(pos, 8, INSTALL_PREFIX);

     

       52
       +
       +        pos = resourcesDir.find("@prefix@");

     

       53
       +
       +        if (pos != std::string::npos) resourcesDir.replace(pos, 8, INSTALL_PREFIX);

     

       54
       +
       +    }

     

       55
       +
            core::configManager.release();

     

       56
       +
        

     

       57
       +
            // Load menu elements

     

       58
       +
       -- 

     

       59
       +
       2.33.0

     

       60
       +

+2 -2

pkgs/applications/radio/xlog/default.nix

···

       1
        
       { lib, stdenv, fetchurl, glib, gtk2, pkg-config, hamlib }:

     

       2
        
       stdenv.mkDerivation rec {

     

       3
        
         pname = "xlog";

     

       4
       -
         version = "2.0.23";

     

       5
        
       

     

       6
        
         src = fetchurl {

     

       7
        
           url = "https://download.savannah.gnu.org/releases/xlog/${pname}-${version}.tar.gz";

     

       8
       -
           sha256 = "sha256-JSPyXOJbYOCeWY6h0v8fbmBkf1Dop1gdmnn4gKdBgac=";

     

       9
        
         };

     

       10
        
       

     

       11
        
         # glib-2.62 deprecations

···

       1
        
       { lib, stdenv, fetchurl, glib, gtk2, pkg-config, hamlib }:

     

       2
        
       stdenv.mkDerivation rec {

     

       3
        
         pname = "xlog";

     

       4
       +
         version = "2.0.24";

     

       5
        
       

     

       6
        
         src = fetchurl {

     

       7
        
           url = "https://download.savannah.gnu.org/releases/xlog/${pname}-${version}.tar.gz";

     

       8
       +
           sha256 = "sha256-jUU6xt3H9bY9CAQRTFQjprlsC77VwjIB/6sSRNzE+Lw=";

     

       9
        
         };

     

       10
        
       

     

       11
        
         # glib-2.62 deprecations

+7 -7

pkgs/development/compilers/rust/make-rust-platform.nix

···

       1
       -
       { buildPackages, callPackage, stdenv }@prev:

     

       2
        
       

     

       3
       -
       { rustc, cargo, stdenv ? prev.stdenv, ... }:

     

       4
        
       

     

       5
        
       rec {

     

       6
        
         rust = {

     
···

       9
        
       

     

       10
        
         fetchCargoTarball = buildPackages.callPackage ../../../build-support/rust/fetchCargoTarball.nix {

     

       11
        
           git = buildPackages.gitMinimal;

     

       12
       -
           inherit stdenv cargo;

     

       13
        
         };

     

       14
        
       

     

       15
        
         buildRustPackage = callPackage ../../../build-support/rust {

     

       16
        
           git = buildPackages.gitMinimal;

     

       17
       -
           inherit stdenv cargoBuildHook cargoCheckHook cargoInstallHook cargoSetupHook

     

       18
        
             fetchCargoTarball importCargoLock rustc;

     

       19
        
         };

     

       20
        
       

     

       21
        
         importCargoLock = buildPackages.callPackage ../../../build-support/rust/import-cargo-lock.nix {};

     

       22
        
       

     

       23
        
         rustcSrc = callPackage ./rust-src.nix {

     

       24
       -
           inherit stdenv rustc;

     

       25
        
         };

     

       26
        
       

     

       27
        
         rustLibSrc = callPackage ./rust-lib-src.nix {

     

       28
       -
           inherit stdenv rustc;

     

       29
        
         };

     

       30
        
       

     

       31
        
         # Hooks

     

       32
        
         inherit (callPackage ../../../build-support/rust/hooks {

     

       33
       -
           inherit stdenv cargo rustc;

     

       34
        
         }) cargoBuildHook cargoCheckHook cargoInstallHook cargoSetupHook maturinBuildHook;

     

       35
        
       }

···

       1
       +
       { buildPackages, callPackage }:

     

       2
        
       

     

       3
       +
       { rustc, cargo, ... }:

     

       4
        
       

     

       5
        
       rec {

     

       6
        
         rust = {

     
···

       9
        
       

     

       10
        
         fetchCargoTarball = buildPackages.callPackage ../../../build-support/rust/fetchCargoTarball.nix {

     

       11
        
           git = buildPackages.gitMinimal;

     

       12
       +
           inherit cargo;

     

       13
        
         };

     

       14
        
       

     

       15
        
         buildRustPackage = callPackage ../../../build-support/rust {

     

       16
        
           git = buildPackages.gitMinimal;

     

       17
       +
           inherit cargoBuildHook cargoCheckHook cargoInstallHook cargoSetupHook

     

       18
        
             fetchCargoTarball importCargoLock rustc;

     

       19
        
         };

     

       20
        
       

     

       21
        
         importCargoLock = buildPackages.callPackage ../../../build-support/rust/import-cargo-lock.nix {};

     

       22
        
       

     

       23
        
         rustcSrc = callPackage ./rust-src.nix {

     

       24
       +
           inherit rustc;

     

       25
        
         };

     

       26
        
       

     

       27
        
         rustLibSrc = callPackage ./rust-lib-src.nix {

     

       28
       +
           inherit rustc;

     

       29
        
         };

     

       30
        
       

     

       31
        
         # Hooks

     

       32
        
         inherit (callPackage ../../../build-support/rust/hooks {

     

       33
       +
           inherit cargo rustc;

     

       34
        
         }) cargoBuildHook cargoCheckHook cargoInstallHook cargoSetupHook maturinBuildHook;

     

       35
        
       }

+4 -3

pkgs/development/interpreters/bats/default.nix

···

       1
       -
       { stdenv, lib, fetchzip, bash, makeWrapper, coreutils, gnugrep, doCheck ? true }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "bats";

     

       5
       -
         version = "1.4.1";

     

       6
        
       

     

       7
        
         src = fetchzip {

     

       8
        
           url = "https://github.com/bats-core/bats-core/archive/v${version}.tar.gz";

     

       9
       -
           hash = "sha256-bGZXjq6zG9MJgDccpVYATsgYhhb1Zf7Deoa/DoSv8QE=";

     

       10
        
         };

     

       11
        
       

     

       12
        
         nativeBuildInputs = [ makeWrapper ];

     
···

       21
        
         '';

     

       22
        
       

     

       23
        
         inherit doCheck;

     

       0
        
       
     

       24
        
         checkPhase = ''

     

       25
        
           # TODO: cut if https://github.com/bats-core/bats-core/issues/418 allows

     

       26
        
           sed -i '/test works even if PATH is reset/a skip' test/bats.bats

···

       1
       +
       { stdenv, lib, fetchzip, bash, makeWrapper, coreutils, gnugrep, ncurses, doCheck ? true }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "bats";

     

       5
       +
         version = "1.5.0";

     

       6
        
       

     

       7
        
         src = fetchzip {

     

       8
        
           url = "https://github.com/bats-core/bats-core/archive/v${version}.tar.gz";

     

       9
       +
           hash = "sha256-MEkMi2w8G9FZhE3JvzzbqObcErQ9WFXy5mtKwQOoxbk=";

     

       10
        
         };

     

       11
        
       

     

       12
        
         nativeBuildInputs = [ makeWrapper ];

     
···

       21
        
         '';

     

       22
        
       

     

       23
        
         inherit doCheck;

     

       24
       +
         checkInputs = [ ncurses ];

     

       25
        
         checkPhase = ''

     

       26
        
           # TODO: cut if https://github.com/bats-core/bats-core/issues/418 allows

     

       27
        
           sed -i '/test works even if PATH is reset/a skip' test/bats.bats

+2 -2

pkgs/development/libraries/amdvlk/default.nix

···

       21
        
       

     

       22
        
       in stdenv.mkDerivation rec {

     

       23
        
         pname = "amdvlk";

     

       24
       -
         version = "2021.Q3.4";

     

       25
        
       

     

       26
        
         src = fetchRepoProject {

     

       27
        
           name = "${pname}-src";

     

       28
        
           manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git";

     

       29
        
           rev = "refs/tags/v-${version}";

     

       30
       -
           sha256 = "Rmx5vicxKXstI8TdxeFVjEFe71XJOyzp5L6VyDNuXmM=";

     

       31
        
         };

     

       32
        
       

     

       33
        
         buildInputs = [

···

       21
        
       

     

       22
        
       in stdenv.mkDerivation rec {

     

       23
        
         pname = "amdvlk";

     

       24
       +
         version = "2021.Q3.7";

     

       25
        
       

     

       26
        
         src = fetchRepoProject {

     

       27
        
           name = "${pname}-src";

     

       28
        
           manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git";

     

       29
        
           rev = "refs/tags/v-${version}";

     

       30
       +
           sha256 = "sha256-0Q6c10lQSxgqOB6X6F8LyeF2aoyicmp0tZlknuZjQHE=";

     

       31
        
         };

     

       32
        
       

     

       33
        
         buildInputs = [

+2 -2

pkgs/development/tools/azure-functions-core-tools/default.nix

···

       17
        
       

     

       18
        
       stdenv.mkDerivation rec {

     

       19
        
         pname = "azure-functions-core-tools";

     

       20
       -
         version = "3.0.3734";

     

       21
        
       

     

       22
        
         src = fetchurl {

     

       23
        
           url = "https://github.com/Azure/${pname}/releases/download/${version}/Azure.Functions.Cli.linux-x64.${version}.zip";

     

       24
       -
           sha256 = "sha256-27kUnXSnDKZ/m8d1KAZG5DrFzB5uqlCLgtN7lXJ+eTY=";

     

       25
        
         };

     

       26
        
       

     

       27
        
         buildInputs = [

···

       17
        
       

     

       18
        
       stdenv.mkDerivation rec {

     

       19
        
         pname = "azure-functions-core-tools";

     

       20
       +
         version = "3.0.3785";

     

       21
        
       

     

       22
        
         src = fetchurl {

     

       23
        
           url = "https://github.com/Azure/${pname}/releases/download/${version}/Azure.Functions.Cli.linux-x64.${version}.zip";

     

       24
       +
           sha256 = "sha256-NdTEFQaG8eFengjzQr51ezehIHFvQZqmrjpjWk4vZKo=";

     

       25
        
         };

     

       26
        
       

     

       27
        
         buildInputs = [

+2 -2

pkgs/development/tools/build-managers/qbs/default.nix

···

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "qbs";

     

       5
        
       

     

       6
       -
         version = "1.20.0";

     

       7
        
       

     

       8
        
         src = fetchFromGitHub {

     

       9
        
           owner = "qbs";

     

       10
        
           repo = "qbs";

     

       11
        
           rev = "v${version}";

     

       12
       -
           sha256 = "sha256-gKabKjd8GT5eFmobUFK6IUQ+b8Jjn/Kr68i1fXgJS4Q=";

     

       13
        
         };

     

       14
        
       

     

       15
        
         nativeBuildInputs = [ qmake ];

···

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "qbs";

     

       5
        
       

     

       6
       +
         version = "1.20.1";

     

       7
        
       

     

       8
        
         src = fetchFromGitHub {

     

       9
        
           owner = "qbs";

     

       10
        
           repo = "qbs";

     

       11
        
           rev = "v${version}";

     

       12
       +
           sha256 = "sha256-tqpQ+TpcpD6o/7CtJOMfBQHGK0OX3pVhPHdpVHXplFs=";

     

       13
        
         };

     

       14
        
       

     

       15
        
         nativeBuildInputs = [ qmake ];

+2 -2

pkgs/development/tools/roswell/default.nix

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "roswell";

     

       5
       -
         version = "21.06.14.110";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "roswell";

     

       9
        
           repo = pname;

     

       10
        
           rev = "v${version}";

     

       11
       -
           sha256 = "18hxhz7skxvzabz5z0yjky4f3fsyfanafh0imkn5macp8aw3wsfm";

     

       12
        
         };

     

       13
        
       

     

       14
        
         patches = [

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "roswell";

     

       5
       +
         version = "21.10.14.111";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "roswell";

     

       9
        
           repo = pname;

     

       10
        
           rev = "v${version}";

     

       11
       +
           sha256 = "sha256-K4RDNTY8g6MNjjiwXMmYaZm0fChJ1C1eTpc0h7ja1ds=";

     

       12
        
         };

     

       13
        
       

     

       14
        
         patches = [

+3 -3

pkgs/development/tools/rust/cargo-feature/default.nix

···

       2
        
       

     

       3
        
       rustPlatform.buildRustPackage rec {

     

       4
        
         pname = "cargo-feature";

     

       5
       -
         version = "0.5.3";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "Riey";

     

       9
        
           repo = pname;

     

       10
        
           rev = "v${version}";

     

       11
       -
           sha256 = "sha256-aUzmD5Dt0obXWDdZT6/Bzun2R1TLQYYELrN4xEG4hq8=";

     

       12
        
         };

     

       13
        
       

     

       14
       -
         cargoSha256 = "sha256-R8OaxlBAkK5YQPejOdLuCMeQlCbPcC/VQm9WHm31v54=";

     

       15
        
       

     

       16
        
         buildInputs = lib.optional stdenv.isDarwin libiconv;

     

       17

···

       2
        
       

     

       3
        
       rustPlatform.buildRustPackage rec {

     

       4
        
         pname = "cargo-feature";

     

       5
       +
         version = "0.5.5";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "Riey";

     

       9
        
           repo = pname;

     

       10
        
           rev = "v${version}";

     

       11
       +
           sha256 = "sha256-0Ski+LytE636HHduisYJJq3khRsaJJ4YhpmaU5On348=";

     

       12
        
         };

     

       13
        
       

     

       14
       +
         cargoSha256 = "sha256-PA/s/BrqUftdGc5Lvd0glL9Dr8GLX9pYMq6WRRUQwEk=";

     

       15
        
       

     

       16
        
         buildInputs = lib.optional stdenv.isDarwin libiconv;

     

       17

+2 -2

pkgs/games/trackballs/default.nix

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "trackballs";

     

       5
       -
         version = "1.3.2";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "trackballs";

     

       9
        
           repo = pname;

     

       10
        
           rev = "v${version}";

     

       11
       -
           sha256 = "G+KfQgqk+iI+Beb/ZRul2ArCBcvwYQ/ftEWzdrtwb18=";

     

       12
        
         };

     

       13
        
       

     

       14
        
         nativeBuildInputs = [ cmake ];

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "trackballs";

     

       5
       +
         version = "1.3.3";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "trackballs";

     

       9
        
           repo = pname;

     

       10
        
           rev = "v${version}";

     

       11
       +
           sha256 = "sha256-fCoQqGXwcpcq/gl67XXY5/wEvCM0ZZTV8LhjC+tnRuo=";

     

       12
        
         };

     

       13
        
       

     

       14
        
         nativeBuildInputs = [ cmake ];

+2 -2

pkgs/misc/tpm2-pkcs11/default.nix

···

       6
        
       

     

       7
        
       stdenv.mkDerivation rec {

     

       8
        
         pname = "tpm2-pkcs11";

     

       9
       -
         version = "1.5.0";

     

       10
        
       

     

       11
        
         src = fetchFromGitHub {

     

       12
        
           owner = "tpm2-software";

     

       13
        
           repo = pname;

     

       14
        
           rev = version;

     

       15
       -
           sha256 = "0sm73a762c7qd6x3f052m00d7daprifimsfa17dfdf4jvy9fqy56";

     

       16
        
         };

     

       17
        
       

     

       18
        
         patches = lib.singleton (

···

       6
        
       

     

       7
        
       stdenv.mkDerivation rec {

     

       8
        
         pname = "tpm2-pkcs11";

     

       9
       +
         version = "1.7.0";

     

       10
        
       

     

       11
        
         src = fetchFromGitHub {

     

       12
        
           owner = "tpm2-software";

     

       13
        
           repo = pname;

     

       14
        
           rev = version;

     

       15
       +
           sha256 = "sha256-Z9w6mIFen8Lf1l59XrMtR/Je2BZZycsOLxKS0VS4r4c=";

     

       16
        
         };

     

       17
        
       

     

       18
        
         patches = lib.singleton (

+2 -2

pkgs/os-specific/linux/sinit/default.nix

···

       3
        
         s = # Generated upstream information

     

       4
        
         rec {

     

       5
        
           baseName="sinit";

     

       6
       -
           version="1.0";

     

       7
        
           name="${baseName}-${version}";

     

       8
        
           url="https://git.suckless.org/sinit/";

     

       9
       -
           sha256="0cf8yylgrrj1wxm5v6jdlbnxpx97m38yxrc9nmv1l8hldjqsj9pc";

     

       10
        
           rev = "refs/tags/v${version}";

     

       11
        
         };

     

       12
        
         buildInputs = [

···

       3
        
         s = # Generated upstream information

     

       4
        
         rec {

     

       5
        
           baseName="sinit";

     

       6
       +
           version="1.1";

     

       7
        
           name="${baseName}-${version}";

     

       8
        
           url="https://git.suckless.org/sinit/";

     

       9
       +
           sha256="sha256-VtXkgixgElKKOT26uKN9feXDVjjtSgTWvcgk5o5MLmw=";

     

       10
        
           rev = "refs/tags/v${version}";

     

       11
        
         };

     

       12
        
         buildInputs = [

+1

pkgs/servers/sql/postgresql/ext/timescaledb.nix

···

       16
        
         src = fetchFromGitHub {

     

       17
        
           owner  = "timescale";

     

       18
        
           repo   = "timescaledb";

     

       0
        
       
     

       19
        
           rev    = "refs/tags/${version}";

     

       20
        
           sha256 = "0j8fbhf69q0074c02ilzdrhwc1ciyw6dq48217xxv274df2lcxzd";

     

       21
        
         };

···

       16
        
         src = fetchFromGitHub {

     

       17
        
           owner  = "timescale";

     

       18
        
           repo   = "timescaledb";

     

       19
       +
           # some branches are named like tags which confuses git

     

       20
        
           rev    = "refs/tags/${version}";

     

       21
        
           sha256 = "0j8fbhf69q0074c02ilzdrhwc1ciyw6dq48217xxv274df2lcxzd";

     

       22
        
         };

+2 -2

pkgs/servers/squid/default.nix

···

       4
        
       

     

       5
        
       stdenv.mkDerivation rec {

     

       6
        
         pname = "squid";

     

       7
       -
         version = "4.16";

     

       8
        
       

     

       9
        
         src = fetchurl {

     

       10
        
           url = "http://www.squid-cache.org/Versions/v4/${pname}-${version}.tar.xz";

     

       11
       -
           sha256 = "sha256-fgDokXV8HALa5UbJiY9EDGAxtoTYwkPW7atSkHbjumM=";

     

       12
        
         };

     

       13
        
       

     

       14
        
         nativeBuildInputs = [ pkg-config ];

···

       4
        
       

     

       5
        
       stdenv.mkDerivation rec {

     

       6
        
         pname = "squid";

     

       7
       +
         version = "4.17";

     

       8
        
       

     

       9
        
         src = fetchurl {

     

       10
        
           url = "http://www.squid-cache.org/Versions/v4/${pname}-${version}.tar.xz";

     

       11
       +
           sha256 = "sha256-y5KKwIx8hrFRscj4J6vhqE2DGBoqhuDVEihhY+HjFBg=";

     

       12
        
         };

     

       13
        
       

     

       14
        
         nativeBuildInputs = [ pkg-config ];

+2 -2

pkgs/tools/admin/chamber/default.nix

···

       2
        
       

     

       3
        
       buildGoModule rec {

     

       4
        
         pname = "chamber";

     

       5
       -
         version = "2.10.3";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "segmentio";

     

       9
        
           repo = pname;

     

       10
        
           rev = "v${version}";

     

       11
       -
           sha256 = "sha256-nIIoU+iz2uOglNaqGIhQ2kUjpFOyOx+flXXwu02UG6Y=";

     

       12
        
         };

     

       13
        
       

     

       14
        
         CGO_ENABLED = 0;

···

       2
        
       

     

       3
        
       buildGoModule rec {

     

       4
        
         pname = "chamber";

     

       5
       +
         version = "2.10.6";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "segmentio";

     

       9
        
           repo = pname;

     

       10
        
           rev = "v${version}";

     

       11
       +
           sha256 = "sha256-8VnFpzm5St0AYFzups2ILQ/MrQRZLQ1xY9JjlGVBmZk=";

     

       12
        
         };

     

       13
        
       

     

       14
        
         CGO_ENABLED = 0;

+3 -3

pkgs/tools/backup/bupstash/default.nix

···

       1
        
       { lib, fetchFromGitHub, installShellFiles, rustPlatform, ronn, pkg-config, libsodium }:

     

       2
        
       rustPlatform.buildRustPackage rec {

     

       3
        
         pname = "bupstash";

     

       4
       -
         version = "0.10.2";

     

       5
        
       

     

       6
        
         src = fetchFromGitHub {

     

       7
        
           owner = "andrewchambers";

     

       8
        
           repo = pname;

     

       9
        
           rev = "v${version}";

     

       10
       -
           sha256 = "sha256-0PKQYvKmAGP4/15nKhB+aZh8PF9dtDFjXEuPCA5tDYk=";

     

       11
        
         };

     

       12
        
       

     

       13
       -
         cargoSha256 = "sha256-6zVWKVtTL6zbB4Uulq+sK4vm3qAC0B5kf0DmDv5aneo=";

     

       14
        
       

     

       15
        
         nativeBuildInputs = [ ronn pkg-config installShellFiles ];

     

       16
        
         buildInputs = [ libsodium ];

···

       1
        
       { lib, fetchFromGitHub, installShellFiles, rustPlatform, ronn, pkg-config, libsodium }:

     

       2
        
       rustPlatform.buildRustPackage rec {

     

       3
        
         pname = "bupstash";

     

       4
       +
         version = "0.10.3";

     

       5
        
       

     

       6
        
         src = fetchFromGitHub {

     

       7
        
           owner = "andrewchambers";

     

       8
        
           repo = pname;

     

       9
        
           rev = "v${version}";

     

       10
       +
           sha256 = "sha256-YN5pIXJRTQXqFGuXvyoSlYJEjAZ4wIYEKjEeF8qIJCI=";

     

       11
        
         };

     

       12
        
       

     

       13
       +
         cargoSha256 = "sha256-Erpg+Sktx+L2X9k6g1ngOyM8MNoucGcScOSPMB7vld8=";

     

       14
        
       

     

       15
        
         nativeBuildInputs = [ ronn pkg-config installShellFiles ];

     

       16
        
         buildInputs = [ libsodium ];

+1 -1

pkgs/tools/backup/duplicity/default.nix

···

       138
        
       

     

       139
        
         meta = with lib; {

     

       140
        
           description = "Encrypted bandwidth-efficient backup using the rsync algorithm";

     

       141
       -
           homepage = "https://www.nongnu.org/duplicity";

     

       142
        
           license = licenses.gpl2Plus;

     

       143
        
           platforms = platforms.unix;

     

       144
        
         };

···

       138
        
       

     

       139
        
         meta = with lib; {

     

       140
        
           description = "Encrypted bandwidth-efficient backup using the rsync algorithm";

     

       141
       +
           homepage = "https://duplicity.gitlab.io/duplicity-web/";

     

       142
        
           license = licenses.gpl2Plus;

     

       143
        
           platforms = platforms.unix;

     

       144
        
         };

+2 -2

pkgs/tools/misc/remind/default.nix

···

       16
        
       in

     

       17
        
       tcl.mkTclDerivation rec {

     

       18
        
         pname = "remind";

     

       19
       -
         version = "03.03.07";

     

       20
        
       

     

       21
        
         src = fetchurl {

     

       22
        
           url = "https://dianne.skoll.ca/projects/remind/download/remind-${version}.tar.gz";

     

       23
       -
           sha256 = "sha256-h8lOKdHhiVT/XSIkfX7KMHzmIeEdIsFCCPkD9oo7ij0=";

     

       24
        
         };

     

       25
        
       

     

       26
        
         propagatedBuildInputs = tclLibraries;

···

       16
        
       in

     

       17
        
       tcl.mkTclDerivation rec {

     

       18
        
         pname = "remind";

     

       19
       +
         version = "03.03.09";

     

       20
        
       

     

       21
        
         src = fetchurl {

     

       22
        
           url = "https://dianne.skoll.ca/projects/remind/download/remind-${version}.tar.gz";

     

       23
       +
           sha256 = "sha256-yQh6jGkRNkQvPoguRmd6025pCEsvO7w8W3YNO2vztvM=";

     

       24
        
         };

     

       25
        
       

     

       26
        
         propagatedBuildInputs = tclLibraries;

+2 -2

pkgs/tools/networking/swagger-codegen3/default.nix

···

       1
        
       { lib, stdenv, fetchurl, jre, makeWrapper }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
       -
         version = "3.0.25";

     

       5
        
         pname = "swagger-codegen";

     

       6
        
       

     

       7
        
         jarfilename = "${pname}-cli-${version}.jar";

     
···

       12
        
       

     

       13
        
         src = fetchurl {

     

       14
        
           url = "https://repo1.maven.org/maven2/io/swagger/codegen/v3/${pname}-cli/${version}/${jarfilename}";

     

       15
       -
           sha256 = "1rdz45kmmg60fs7ddnla1xq30nah6s6rd18fqbjbjxng8r92brnd";

     

       16
        
         };

     

       17
        
       

     

       18
        
         dontUnpack = true;

···

       1
        
       { lib, stdenv, fetchurl, jre, makeWrapper }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
       +
         version = "3.0.29";

     

       5
        
         pname = "swagger-codegen";

     

       6
        
       

     

       7
        
         jarfilename = "${pname}-cli-${version}.jar";

     
···

       12
        
       

     

       13
        
         src = fetchurl {

     

       14
        
           url = "https://repo1.maven.org/maven2/io/swagger/codegen/v3/${pname}-cli/${version}/${jarfilename}";

     

       15
       +
           sha256 = "sha256-sEwqUmtWaoBV0QmdP8ibm3neqWHk7+tWLAuO2FaCUtQ=";

     

       16
        
         };

     

       17
        
       

     

       18
        
         dontUnpack = true;

+3 -3

pkgs/tools/security/yubikey-touch-detector/default.nix

···

       2
        
       

     

       3
        
       buildGoModule rec {

     

       4
        
         pname = "yubikey-touch-detector";

     

       5
       -
         version = "1.9.1";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "maximbaz";

     

       9
        
           repo = "yubikey-touch-detector";

     

       10
        
           rev = version;

     

       11
       -
           sha256 = "sha256-I9dRCQhbXd8K1zp291z9XVwHI9DcxgvrzYaHICZH5v0=";

     

       12
        
         };

     

       13
       -
         vendorSha256 = "sha256-UeDLGwYrXwLOtQt/8fEmficc/1j0x+zr/JLa6lLF5cs=";

     

       14
        
       

     

       15
        
         nativeBuildInputs = [ pkg-config ];

     

       16

···

       2
        
       

     

       3
        
       buildGoModule rec {

     

       4
        
         pname = "yubikey-touch-detector";

     

       5
       +
         version = "1.9.3";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "maximbaz";

     

       9
        
           repo = "yubikey-touch-detector";

     

       10
        
           rev = version;

     

       11
       +
           sha256 = "sha256-f6j+YNYASH0Adg3236QijApALd/yXJjNMYEdP0Pifw0=";

     

       12
        
         };

     

       13
       +
         vendorSha256 = "sha256-bmFbxMU3PEWpYI0eQw/1RRDP+JGfUY8kOCeTWbdVt9k=";

     

       14
        
       

     

       15
        
         nativeBuildInputs = [ pkg-config ];

     

       16

+2 -2

pkgs/tools/system/btop/default.nix

···

       5
        
       

     

       6
        
       stdenv.mkDerivation rec {

     

       7
        
         pname = "btop";

     

       8
       -
         version = "1.0.18";

     

       9
        
       

     

       10
        
         src = fetchFromGitHub {

     

       11
        
           owner = "aristocratos";

     

       12
        
           repo = pname;

     

       13
        
           rev = "v${version}";

     

       14
       -
           sha256 = "sha256-TUrCSpwbUP28COHAAFIdR5Kw18I35nBkiKU62IHCN4o=";

     

       15
        
         };

     

       16
        
       

     

       17
        
         installFlags = [ "PREFIX=$(out)" ];

···

       5
        
       

     

       6
        
       stdenv.mkDerivation rec {

     

       7
        
         pname = "btop";

     

       8
       +
         version = "1.0.20";

     

       9
        
       

     

       10
        
         src = fetchFromGitHub {

     

       11
        
           owner = "aristocratos";

     

       12
        
           repo = pname;

     

       13
        
           rev = "v${version}";

     

       14
       +
           sha256 = "sha256-QMuixP4+wYVcF3s848cw6103PGDON4Inj2Nypt4FGIU=";

     

       15
        
         };

     

       16
        
       

     

       17
        
         installFlags = [ "PREFIX=$(out)" ];

+2 -2

pkgs/tools/wayland/cliphist/default.nix

···

       2
        
       

     

       3
        
       buildGoModule rec {

     

       4
        
         pname = "cliphist";

     

       5
       -
         version = "0.1.0";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "sentriz";

     

       9
        
           repo = pname;

     

       10
        
           rev = "v${version}";

     

       11
       -
           sha256 = "sha256-CZW7dhOd7E74VNjnvhxvSSUZQtbkGi4uRUM9YQCuJZw=";

     

       12
        
         };

     

       13
        
       

     

       14
        
         vendorSha256 = "sha256-UrKSDvskGwHjwkb/fjvaJZ8xXFD98BFeSJxwJpc8A+M=";

···

       2
        
       

     

       3
        
       buildGoModule rec {

     

       4
        
         pname = "cliphist";

     

       5
       +
         version = "0.3.0";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "sentriz";

     

       9
        
           repo = pname;

     

       10
        
           rev = "v${version}";

     

       11
       +
           sha256 = "sha256-fx33m7DCp5N9VGI/H/IO66ECdFLobRRAAuRGNu4gzSk=";

     

       12
        
         };

     

       13
        
       

     

       14
        
         vendorSha256 = "sha256-UrKSDvskGwHjwkb/fjvaJZ8xXFD98BFeSJxwJpc8A+M=";

+3 -1

pkgs/top-level/all-packages.nix

···

       19330
        
       

     

       19331
        
         sdrplay = callPackage ../applications/radio/sdrplay {};

     

       19332
        
       

     

       19333
       -
         sdrpp = callPackage ../applications/radio/sdrpp { };

     

       0
        
       
     

       0
        
       
     

       19334
        
       

     

       19335
        
         sblim-sfcc = callPackage ../development/libraries/sblim-sfcc {};

     

       19336

···

       19330
        
       

     

       19331
        
         sdrplay = callPackage ../applications/radio/sdrplay {};

     

       19332
        
       

     

       19333
       +
         sdrpp = callPackage ../applications/radio/sdrpp {

     

       19334
       +
           inherit (darwin.apple_sdk.frameworks) AppKit;

     

       19335
       +
         };

     

       19336
        
       

     

       19337
        
         sblim-sfcc = callPackage ../development/libraries/sblim-sfcc {};

     

       19338