Merge staging-next into staging
This commit is contained in:
commit
853a47c140
|
@ -10,16 +10,16 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "songrec";
|
pname = "songrec";
|
||||||
version = "0.2.0";
|
version = "0.2.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "marin-m";
|
owner = "marin-m";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
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 ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
, libxml2, gnutls, sane-backends }:
|
, libxml2, gnutls, sane-backends }:
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "sane-airscan";
|
pname = "sane-airscan";
|
||||||
version = "0.99.26";
|
version = "0.99.27";
|
||||||
|
|
||||||
nativeBuildInputs = [ meson ninja pkg-config ];
|
nativeBuildInputs = [ meson ninja pkg-config ];
|
||||||
buildInputs = [ avahi gnutls libjpeg libpng libxml2 sane-backends ];
|
buildInputs = [ avahi gnutls libjpeg libpng libxml2 sane-backends ];
|
||||||
|
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
||||||
owner = "alexpevzner";
|
owner = "alexpevzner";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "08snfg5zx9924ryww0kxf1kgl085yw7fg6l4f1kzlhcmqf1958w5";
|
sha256 = "sha256-29IPoLF4rmq8sGTi5RmpT1Fq8RJJlaepTt+2GWDU3es=";
|
||||||
};
|
};
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
|
|
@ -3,13 +3,13 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "cheat";
|
pname = "cheat";
|
||||||
version = "4.2.2";
|
version = "4.2.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "cheat";
|
owner = "cheat";
|
||||||
repo = "cheat";
|
repo = "cheat";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-YKGCZm0BaFLi+kujl04B4IU1qay15XNfvelxfUkCP8o=";
|
sha256 = "sha256-F0p309rY0PeeOU1K9Had6qI6DCHgzauuuTjMfWoZYBQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
subPackages = [ "cmd/cheat" ];
|
subPackages = [ "cmd/cheat" ];
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "cilium-cli";
|
pname = "cilium-cli";
|
||||||
version = "0.9.0";
|
version = "0.9.2";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "cilium";
|
owner = "cilium";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "05qc1fcf4ahl1zvxv92mq3awiy5b1rq6r9l896b4hkp0m5lx9m3c";
|
sha256 = "sha256-vIm5PkRyh41jtvDrLDxFVzSkhFipYYYEEY0/qxbOXGE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = null;
|
vendorSha256 = null;
|
||||||
|
|
|
@ -195,8 +195,8 @@ rec {
|
||||||
};
|
};
|
||||||
|
|
||||||
terraform_1_0 = mkTerraform {
|
terraform_1_0 = mkTerraform {
|
||||||
version = "1.0.9";
|
version = "1.0.10";
|
||||||
sha256 = "0g97l53xrcafjrzz5inij4q4aaadibn5ilr5j39a6569pkvcvsh3";
|
sha256 = "1jcgp9q99785m85754ipza7b3dd3g58adpnyh5w2imqj01cas6mb";
|
||||||
vendorSha256 = "00cl42w1mzsi9qd09wydfvp5f2h7lxaay6s2dv0mf47k6h7prf42";
|
vendorSha256 = "00cl42w1mzsi9qd09wydfvp5f2h7lxaay6s2dv0mf47k6h7prf42";
|
||||||
patches = [ ./provider-path-0_15.patch ];
|
patches = [ ./provider-path-0_15.patch ];
|
||||||
passthru = { inherit plugins; };
|
passthru = { inherit plugins; };
|
||||||
|
|
|
@ -5,13 +5,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "tangram";
|
pname = "tangram";
|
||||||
version = "1.3.1";
|
version = "1.3.2";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "sonnyp";
|
owner = "sonnyp";
|
||||||
repo = "Tangram";
|
repo = "Tangram";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "0bhs9s6c2k06i3cx01h2102lgl7g6vxm3k63jkkhh2bwdpc9kvn3";
|
sha256 = "sha256-WI0H3bforQ6Jc/+TWFT1zUs4KRtWwvXY2/va+Fnd+iU=";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -5,13 +5,13 @@
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "utox";
|
pname = "utox";
|
||||||
|
|
||||||
version = "0.17.0";
|
version = "0.18.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "uTox";
|
owner = "uTox";
|
||||||
repo = "uTox";
|
repo = "uTox";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "12wbq883il7ikldayh8hm0cjfrkp45vn05xx9s1jbfz6gmkidyar";
|
sha256 = "sha256-DxnolxUTn+CL6TbZHKLHOUMTHhtTSWufzzOTRpKjOwc=";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -2,11 +2,11 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "tixati";
|
pname = "tixati";
|
||||||
version = "2.84";
|
version = "2.85";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://download2.tixati.com/download/tixati-${version}-1.x86_64.manualinstall.tar.gz";
|
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 = ''
|
installPhase = ''
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{ stdenv, lib, fetchFromGitHub, cmake, pkg-config
|
{ stdenv, lib, fetchFromGitHub, cmake, pkg-config
|
||||||
, libX11, glfw, glew, fftwFloat, volk
|
, libX11, glfw, glew, fftwFloat, volk, AppKit
|
||||||
# Sources
|
# Sources
|
||||||
, airspy_source ? true, airspy
|
, airspy_source ? true, airspy
|
||||||
, airspyhf_source ? true, airspyhf
|
, airspyhf_source ? true, airspyhf
|
||||||
|
@ -13,7 +13,7 @@
|
||||||
, sdrplay_source ? false, sdrplay
|
, sdrplay_source ? false, sdrplay
|
||||||
, soapy_source ? true, soapysdr
|
, soapy_source ? true, soapysdr
|
||||||
, spyserver_source ? true
|
, spyserver_source ? true
|
||||||
, plutosdr_source ? true, libiio, libad9361
|
, plutosdr_source ? stdenv.isLinux, libiio, libad9361
|
||||||
# Sinks
|
# Sinks
|
||||||
, audio_sink ? true, rtaudio
|
, audio_sink ? true, rtaudio
|
||||||
, portaudio_sink ? false, portaudio
|
, portaudio_sink ? false, portaudio
|
||||||
|
@ -42,9 +42,12 @@ stdenv.mkDerivation rec {
|
||||||
hash = "sha256-g9tpWvVRMXRhPfgvOeJhX6IMouF9+tLUr9wo5r35i/c=";
|
hash = "sha256-g9tpWvVRMXRhPfgvOeJhX6IMouF9+tLUr9wo5r35i/c=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [ ./runtime-prefix.patch ];
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
substituteInPlace CMakeLists.txt \
|
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 \
|
substituteInPlace decoder_modules/m17_decoder/src/m17dsp.h \
|
||||||
--replace "codec2.h" "codec2/codec2.h"
|
--replace "codec2.h" "codec2/codec2.h"
|
||||||
'';
|
'';
|
||||||
|
@ -52,6 +55,7 @@ stdenv.mkDerivation rec {
|
||||||
nativeBuildInputs = [ cmake pkg-config ];
|
nativeBuildInputs = [ cmake pkg-config ];
|
||||||
|
|
||||||
buildInputs = [ glfw glew fftwFloat volk ]
|
buildInputs = [ glfw glew fftwFloat volk ]
|
||||||
|
++ lib.optional stdenv.isDarwin AppKit
|
||||||
++ lib.optional stdenv.isLinux libX11
|
++ lib.optional stdenv.isLinux libX11
|
||||||
++ lib.optional airspy_source airspy
|
++ lib.optional airspy_source airspy
|
||||||
++ lib.optional airspyhf_source airspyhf
|
++ lib.optional airspyhf_source airspyhf
|
||||||
|
@ -95,13 +99,18 @@ stdenv.mkDerivation rec {
|
||||||
OPT_BUILD_RIGCTL_SERVER = rigctl_server;
|
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";
|
NIX_CFLAGS_COMPILE = "-fpermissive";
|
||||||
|
|
||||||
|
hardeningDisable = lib.optional stdenv.cc.isClang "format";
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Cross-Platform SDR Software";
|
description = "Cross-Platform SDR Software";
|
||||||
homepage = "https://github.com/AlexandreRouma/SDRPlusPlus";
|
homepage = "https://github.com/AlexandreRouma/SDRPlusPlus";
|
||||||
license = licenses.gpl3Only;
|
license = licenses.gpl3Only;
|
||||||
platforms = platforms.linux;
|
platforms = platforms.unix;
|
||||||
maintainers = with maintainers; [ sikmir ];
|
maintainers = with maintainers; [ sikmir ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
60
pkgs/applications/radio/sdrpp/runtime-prefix.patch
Normal file
60
pkgs/applications/radio/sdrpp/runtime-prefix.patch
Normal file
|
@ -0,0 +1,60 @@
|
||||||
|
From a80a739163d2013ec400223a68a387f4f9297b2a Mon Sep 17 00:00:00 2001
|
||||||
|
From: Nikolay Korotkiy <sikmir@gmail.com>
|
||||||
|
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
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
{ lib, stdenv, fetchurl, glib, gtk2, pkg-config, hamlib }:
|
{ lib, stdenv, fetchurl, glib, gtk2, pkg-config, hamlib }:
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "xlog";
|
pname = "xlog";
|
||||||
version = "2.0.23";
|
version = "2.0.24";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://download.savannah.gnu.org/releases/xlog/${pname}-${version}.tar.gz";
|
url = "https://download.savannah.gnu.org/releases/xlog/${pname}-${version}.tar.gz";
|
||||||
sha256 = "sha256-JSPyXOJbYOCeWY6h0v8fbmBkf1Dop1gdmnn4gKdBgac=";
|
sha256 = "sha256-jUU6xt3H9bY9CAQRTFQjprlsC77VwjIB/6sSRNzE+Lw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# glib-2.62 deprecations
|
# glib-2.62 deprecations
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{ buildPackages, callPackage, stdenv }@prev:
|
{ buildPackages, callPackage }:
|
||||||
|
|
||||||
{ rustc, cargo, stdenv ? prev.stdenv, ... }:
|
{ rustc, cargo, ... }:
|
||||||
|
|
||||||
rec {
|
rec {
|
||||||
rust = {
|
rust = {
|
||||||
|
@ -9,27 +9,27 @@ rec {
|
||||||
|
|
||||||
fetchCargoTarball = buildPackages.callPackage ../../../build-support/rust/fetchCargoTarball.nix {
|
fetchCargoTarball = buildPackages.callPackage ../../../build-support/rust/fetchCargoTarball.nix {
|
||||||
git = buildPackages.gitMinimal;
|
git = buildPackages.gitMinimal;
|
||||||
inherit stdenv cargo;
|
inherit cargo;
|
||||||
};
|
};
|
||||||
|
|
||||||
buildRustPackage = callPackage ../../../build-support/rust {
|
buildRustPackage = callPackage ../../../build-support/rust {
|
||||||
git = buildPackages.gitMinimal;
|
git = buildPackages.gitMinimal;
|
||||||
inherit stdenv cargoBuildHook cargoCheckHook cargoInstallHook cargoSetupHook
|
inherit cargoBuildHook cargoCheckHook cargoInstallHook cargoSetupHook
|
||||||
fetchCargoTarball importCargoLock rustc;
|
fetchCargoTarball importCargoLock rustc;
|
||||||
};
|
};
|
||||||
|
|
||||||
importCargoLock = buildPackages.callPackage ../../../build-support/rust/import-cargo-lock.nix {};
|
importCargoLock = buildPackages.callPackage ../../../build-support/rust/import-cargo-lock.nix {};
|
||||||
|
|
||||||
rustcSrc = callPackage ./rust-src.nix {
|
rustcSrc = callPackage ./rust-src.nix {
|
||||||
inherit stdenv rustc;
|
inherit rustc;
|
||||||
};
|
};
|
||||||
|
|
||||||
rustLibSrc = callPackage ./rust-lib-src.nix {
|
rustLibSrc = callPackage ./rust-lib-src.nix {
|
||||||
inherit stdenv rustc;
|
inherit rustc;
|
||||||
};
|
};
|
||||||
|
|
||||||
# Hooks
|
# Hooks
|
||||||
inherit (callPackage ../../../build-support/rust/hooks {
|
inherit (callPackage ../../../build-support/rust/hooks {
|
||||||
inherit stdenv cargo rustc;
|
inherit cargo rustc;
|
||||||
}) cargoBuildHook cargoCheckHook cargoInstallHook cargoSetupHook maturinBuildHook;
|
}) cargoBuildHook cargoCheckHook cargoInstallHook cargoSetupHook maturinBuildHook;
|
||||||
}
|
}
|
||||||
|
|
|
@ -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 {
|
stdenv.mkDerivation rec {
|
||||||
pname = "bats";
|
pname = "bats";
|
||||||
version = "1.4.1";
|
version = "1.5.0";
|
||||||
|
|
||||||
src = fetchzip {
|
src = fetchzip {
|
||||||
url = "https://github.com/bats-core/bats-core/archive/v${version}.tar.gz";
|
url = "https://github.com/bats-core/bats-core/archive/v${version}.tar.gz";
|
||||||
hash = "sha256-bGZXjq6zG9MJgDccpVYATsgYhhb1Zf7Deoa/DoSv8QE=";
|
hash = "sha256-MEkMi2w8G9FZhE3JvzzbqObcErQ9WFXy5mtKwQOoxbk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper ];
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
|
@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
inherit doCheck;
|
inherit doCheck;
|
||||||
|
checkInputs = [ ncurses ];
|
||||||
checkPhase = ''
|
checkPhase = ''
|
||||||
# TODO: cut if https://github.com/bats-core/bats-core/issues/418 allows
|
# 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
|
sed -i '/test works even if PATH is reset/a skip' test/bats.bats
|
||||||
|
|
|
@ -21,13 +21,13 @@ let
|
||||||
|
|
||||||
in stdenv.mkDerivation rec {
|
in stdenv.mkDerivation rec {
|
||||||
pname = "amdvlk";
|
pname = "amdvlk";
|
||||||
version = "2021.Q3.4";
|
version = "2021.Q3.7";
|
||||||
|
|
||||||
src = fetchRepoProject {
|
src = fetchRepoProject {
|
||||||
name = "${pname}-src";
|
name = "${pname}-src";
|
||||||
manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git";
|
manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git";
|
||||||
rev = "refs/tags/v-${version}";
|
rev = "refs/tags/v-${version}";
|
||||||
sha256 = "Rmx5vicxKXstI8TdxeFVjEFe71XJOyzp5L6VyDNuXmM=";
|
sha256 = "sha256-0Q6c10lQSxgqOB6X6F8LyeF2aoyicmp0tZlknuZjQHE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
|
|
@ -17,11 +17,11 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "azure-functions-core-tools";
|
pname = "azure-functions-core-tools";
|
||||||
version = "3.0.3734";
|
version = "3.0.3785";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/Azure/${pname}/releases/download/${version}/Azure.Functions.Cli.linux-x64.${version}.zip";
|
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 = [
|
buildInputs = [
|
||||||
|
|
|
@ -3,13 +3,13 @@
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "qbs";
|
pname = "qbs";
|
||||||
|
|
||||||
version = "1.20.0";
|
version = "1.20.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "qbs";
|
owner = "qbs";
|
||||||
repo = "qbs";
|
repo = "qbs";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-gKabKjd8GT5eFmobUFK6IUQ+b8Jjn/Kr68i1fXgJS4Q=";
|
sha256 = "sha256-tqpQ+TpcpD6o/7CtJOMfBQHGK0OX3pVhPHdpVHXplFs=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ qmake ];
|
nativeBuildInputs = [ qmake ];
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "roswell";
|
pname = "roswell";
|
||||||
version = "21.06.14.110";
|
version = "21.10.14.111";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "roswell";
|
owner = "roswell";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "18hxhz7skxvzabz5z0yjky4f3fsyfanafh0imkn5macp8aw3wsfm";
|
sha256 = "sha256-K4RDNTY8g6MNjjiwXMmYaZm0fChJ1C1eTpc0h7ja1ds=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
|
|
@ -2,16 +2,16 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "cargo-feature";
|
pname = "cargo-feature";
|
||||||
version = "0.5.3";
|
version = "0.5.5";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "Riey";
|
owner = "Riey";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
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;
|
buildInputs = lib.optional stdenv.isDarwin libiconv;
|
||||||
|
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "trackballs";
|
pname = "trackballs";
|
||||||
version = "1.3.2";
|
version = "1.3.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "trackballs";
|
owner = "trackballs";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "G+KfQgqk+iI+Beb/ZRul2ArCBcvwYQ/ftEWzdrtwb18=";
|
sha256 = "sha256-fCoQqGXwcpcq/gl67XXY5/wEvCM0ZZTV8LhjC+tnRuo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
|
|
|
@ -6,13 +6,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "tpm2-pkcs11";
|
pname = "tpm2-pkcs11";
|
||||||
version = "1.5.0";
|
version = "1.7.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "tpm2-software";
|
owner = "tpm2-software";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "0sm73a762c7qd6x3f052m00d7daprifimsfa17dfdf4jvy9fqy56";
|
sha256 = "sha256-Z9w6mIFen8Lf1l59XrMtR/Je2BZZycsOLxKS0VS4r4c=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = lib.singleton (
|
patches = lib.singleton (
|
||||||
|
|
|
@ -3,10 +3,10 @@ let
|
||||||
s = # Generated upstream information
|
s = # Generated upstream information
|
||||||
rec {
|
rec {
|
||||||
baseName="sinit";
|
baseName="sinit";
|
||||||
version="1.0";
|
version="1.1";
|
||||||
name="${baseName}-${version}";
|
name="${baseName}-${version}";
|
||||||
url="https://git.suckless.org/sinit/";
|
url="https://git.suckless.org/sinit/";
|
||||||
sha256="0cf8yylgrrj1wxm5v6jdlbnxpx97m38yxrc9nmv1l8hldjqsj9pc";
|
sha256="sha256-VtXkgixgElKKOT26uKN9feXDVjjtSgTWvcgk5o5MLmw=";
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
};
|
};
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
|
|
@ -16,6 +16,7 @@ stdenv.mkDerivation rec {
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "timescale";
|
owner = "timescale";
|
||||||
repo = "timescaledb";
|
repo = "timescaledb";
|
||||||
|
# some branches are named like tags which confuses git
|
||||||
rev = "refs/tags/${version}";
|
rev = "refs/tags/${version}";
|
||||||
sha256 = "0j8fbhf69q0074c02ilzdrhwc1ciyw6dq48217xxv274df2lcxzd";
|
sha256 = "0j8fbhf69q0074c02ilzdrhwc1ciyw6dq48217xxv274df2lcxzd";
|
||||||
};
|
};
|
||||||
|
|
|
@ -4,11 +4,11 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "squid";
|
pname = "squid";
|
||||||
version = "4.16";
|
version = "4.17";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://www.squid-cache.org/Versions/v4/${pname}-${version}.tar.xz";
|
url = "http://www.squid-cache.org/Versions/v4/${pname}-${version}.tar.xz";
|
||||||
sha256 = "sha256-fgDokXV8HALa5UbJiY9EDGAxtoTYwkPW7atSkHbjumM=";
|
sha256 = "sha256-y5KKwIx8hrFRscj4J6vhqE2DGBoqhuDVEihhY+HjFBg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "chamber";
|
pname = "chamber";
|
||||||
version = "2.10.3";
|
version = "2.10.6";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "segmentio";
|
owner = "segmentio";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-nIIoU+iz2uOglNaqGIhQ2kUjpFOyOx+flXXwu02UG6Y=";
|
sha256 = "sha256-8VnFpzm5St0AYFzups2ILQ/MrQRZLQ1xY9JjlGVBmZk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
CGO_ENABLED = 0;
|
CGO_ENABLED = 0;
|
||||||
|
|
|
@ -1,16 +1,16 @@
|
||||||
{ lib, fetchFromGitHub, installShellFiles, rustPlatform, ronn, pkg-config, libsodium }:
|
{ lib, fetchFromGitHub, installShellFiles, rustPlatform, ronn, pkg-config, libsodium }:
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "bupstash";
|
pname = "bupstash";
|
||||||
version = "0.10.2";
|
version = "0.10.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "andrewchambers";
|
owner = "andrewchambers";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
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 ];
|
nativeBuildInputs = [ ronn pkg-config installShellFiles ];
|
||||||
buildInputs = [ libsodium ];
|
buildInputs = [ libsodium ];
|
||||||
|
|
|
@ -138,7 +138,7 @@ pythonPackages.buildPythonApplication rec {
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Encrypted bandwidth-efficient backup using the rsync algorithm";
|
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;
|
license = licenses.gpl2Plus;
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
};
|
};
|
||||||
|
|
|
@ -16,11 +16,11 @@ let
|
||||||
in
|
in
|
||||||
tcl.mkTclDerivation rec {
|
tcl.mkTclDerivation rec {
|
||||||
pname = "remind";
|
pname = "remind";
|
||||||
version = "03.03.07";
|
version = "03.03.09";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://dianne.skoll.ca/projects/remind/download/remind-${version}.tar.gz";
|
url = "https://dianne.skoll.ca/projects/remind/download/remind-${version}.tar.gz";
|
||||||
sha256 = "sha256-h8lOKdHhiVT/XSIkfX7KMHzmIeEdIsFCCPkD9oo7ij0=";
|
sha256 = "sha256-yQh6jGkRNkQvPoguRmd6025pCEsvO7w8W3YNO2vztvM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = tclLibraries;
|
propagatedBuildInputs = tclLibraries;
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{ lib, stdenv, fetchurl, jre, makeWrapper }:
|
{ lib, stdenv, fetchurl, jre, makeWrapper }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
version = "3.0.25";
|
version = "3.0.29";
|
||||||
pname = "swagger-codegen";
|
pname = "swagger-codegen";
|
||||||
|
|
||||||
jarfilename = "${pname}-cli-${version}.jar";
|
jarfilename = "${pname}-cli-${version}.jar";
|
||||||
|
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://repo1.maven.org/maven2/io/swagger/codegen/v3/${pname}-cli/${version}/${jarfilename}";
|
url = "https://repo1.maven.org/maven2/io/swagger/codegen/v3/${pname}-cli/${version}/${jarfilename}";
|
||||||
sha256 = "1rdz45kmmg60fs7ddnla1xq30nah6s6rd18fqbjbjxng8r92brnd";
|
sha256 = "sha256-sEwqUmtWaoBV0QmdP8ibm3neqWHk7+tWLAuO2FaCUtQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
dontUnpack = true;
|
dontUnpack = true;
|
||||||
|
|
|
@ -2,15 +2,15 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "yubikey-touch-detector";
|
pname = "yubikey-touch-detector";
|
||||||
version = "1.9.1";
|
version = "1.9.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "maximbaz";
|
owner = "maximbaz";
|
||||||
repo = "yubikey-touch-detector";
|
repo = "yubikey-touch-detector";
|
||||||
rev = version;
|
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 ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
|
|
||||||
|
|
|
@ -5,13 +5,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "btop";
|
pname = "btop";
|
||||||
version = "1.0.18";
|
version = "1.0.20";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "aristocratos";
|
owner = "aristocratos";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-TUrCSpwbUP28COHAAFIdR5Kw18I35nBkiKU62IHCN4o=";
|
sha256 = "sha256-QMuixP4+wYVcF3s848cw6103PGDON4Inj2Nypt4FGIU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
installFlags = [ "PREFIX=$(out)" ];
|
installFlags = [ "PREFIX=$(out)" ];
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "cliphist";
|
pname = "cliphist";
|
||||||
version = "0.1.0";
|
version = "0.3.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "sentriz";
|
owner = "sentriz";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-CZW7dhOd7E74VNjnvhxvSSUZQtbkGi4uRUM9YQCuJZw=";
|
sha256 = "sha256-fx33m7DCp5N9VGI/H/IO66ECdFLobRRAAuRGNu4gzSk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "sha256-UrKSDvskGwHjwkb/fjvaJZ8xXFD98BFeSJxwJpc8A+M=";
|
vendorSha256 = "sha256-UrKSDvskGwHjwkb/fjvaJZ8xXFD98BFeSJxwJpc8A+M=";
|
||||||
|
|
|
@ -19320,7 +19320,9 @@ with pkgs;
|
||||||
|
|
||||||
sdrplay = callPackage ../applications/radio/sdrplay {};
|
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 {};
|
sblim-sfcc = callPackage ../development/libraries/sblim-sfcc {};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue