Skip to content

Commit

Permalink
Merge master into staging-next
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions[bot] authored Mar 7, 2024
2 parents 5e0cda9 + 413506a commit 590e65a
Show file tree
Hide file tree
Showing 274 changed files with 1,997 additions and 710 deletions.
4 changes: 2 additions & 2 deletions pkgs/applications/audio/airwindows-lv2/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

stdenv.mkDerivation rec {
pname = "airwindows-lv2";
version = "26.2";
version = "28.0";
src = fetchFromSourcehut {
owner = "~hannes";
repo = pname;
rev = "v${version}";
sha256 = "sha256-GpfglGC7zD275lm9OsBmqDC90E/vVUqslm7HjPgm74M=";
sha256 = "sha256-1GWkdNCn98ttsF2rPLZE0+GJdatgkLewFQyx9Frr2sM=";
};

nativeBuildInputs = [ meson ninja pkg-config ];
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/audio/cava/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@

stdenv.mkDerivation rec {
pname = "cava";
version = "0.10.0";
version = "0.10.1";

src = fetchFromGitHub {
owner = "karlstav";
repo = "cava";
rev = version;
hash = "sha256-AQR1qc6HgkUkXBRf7kGy4QdtfCj+YVDlYSEIWOutkTk=";
hash = "sha256-hndlEuKbI8oHvm0dosO0loQAw/U2qasoJ+4K8JG7I2Q=";
};

buildInputs = [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/audio/easyeffects/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@

stdenv.mkDerivation rec {
pname = "easyeffects";
version = "7.1.3";
version = "7.1.4";

src = fetchFromGitHub {
owner = "wwmm";
repo = "easyeffects";
rev = "v${version}";
hash = "sha256-OJy8HhojfpUwWo3zg+FgdFI4pMzWA61VMsdPE03MfeE=";
hash = "sha256-UNS7kHyxHB4VneELXGn2G8T8EeKUpjb1ib2q0G+gf/s=";
};

nativeBuildInputs = [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/audio/gbsplay/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
pname = "gbsplay";
version = "0.0.95";
version = "0.0.96";

src = fetchFromGitHub {
owner = "mmitch";
repo = "gbsplay";
rev = version;
sha256 = "sha256-s6TGAWwIm2raXk3kA3D0/fg+Hn3O/lerPlxGOryXIBQ=";
sha256 = "sha256-2sYPP+urcSP67mHzbjRiL9BYgkIpONr7fPPbGQmBOqU=";
};

configureFlags = [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/audio/giada/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@

stdenv.mkDerivation rec {
pname = "giada";
version = "0.26.1";
version = "1.0.0";

src = fetchFromGitHub {
owner = "monocasual";
repo = pname;
rev = version;
sha256 = "sha256-tONxVxzOFbwnuaW6YoHVZOmgd5S11qz38hcI+yQgjrQ=";
sha256 = "sha256-vTOUS9mI4B3yRNnM2dNCH7jgMuD3ztdhe1FMgXUIt58=";
fetchSubmodules = true;
};

Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/audio/linuxsampler/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@

stdenv.mkDerivation rec {
pname = "linuxsampler";
version = "2.2.0";
version = "2.3.0";

src = fetchurl {
url = "https://download.linuxsampler.org/packages/${pname}-${version}.tar.bz2";
sha256 = "sha256-xNFjxrrC0B8Oj10HIQ1AmI7pO34HuYRyyUaoB2MDmYw=";
sha256 = "sha256-Ii+dylTUXmazP8NVjAAMdHs7NK+puml0IrF4fc6DEls=";
};

preConfigure = ''
Expand Down
21 changes: 17 additions & 4 deletions pkgs/applications/audio/ncspot/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,23 @@
, withPulseAudio ? false, libpulseaudio
, withPortAudio ? false, portaudio
, withMPRIS ? true, withNotify ? true, dbus
, nix-update-script
, testers
, ncspot
}:

rustPlatform.buildRustPackage rec {
pname = "ncspot";
version = "1.0.0";
version = "1.1.0";

src = fetchFromGitHub {
owner = "hrkfdn";
repo = "ncspot";
rev = "v${version}";
hash = "sha256-NHrpJC6cF/YAcyqZ4bRQdSdjDNhkEV7U2P/S4LSADao=";
hash = "sha256-RgA3jV/vD6qgIVQCZ0Sm+9CST4SlqN4MUurVM3nIdh0=";
};

cargoHash = "sha256-HT084XewXwZByL5KZhyymqU7sy99SAjYIWysm3qGvWU=";
cargoHash = "sha256-8ZUgm1O4NmZpxgNRKnh1MNhiFNoBWQHo22kyP3hWJwI=";

nativeBuildInputs = [ pkg-config ]
++ lib.optional withClipboard python3;
Expand Down Expand Up @@ -53,12 +56,22 @@ rustPlatform.buildRustPackage rec {
++ lib.optional withMPRIS "mpris"
++ lib.optional withNotify "notify";

postInstall = ''
install -D --mode=444 $src/misc/ncspot.desktop $out/share/applications/${pname}.desktop
install -D --mode=444 $src/images/logo.svg $out/share/icons/hicolor/scalable/apps/${pname}.png
'';

passthru = {
updateScript = nix-update-script { };
tests.version = testers.testVersion { package = ncspot; };
};

meta = with lib; {
description = "Cross-platform ncurses Spotify client written in Rust, inspired by ncmpc and the likes";
homepage = "https://github.com/hrkfdn/ncspot";
changelog = "https://github.com/hrkfdn/ncspot/releases/tag/v${version}";
license = licenses.bsd2;
maintainers = [ maintainers.marsam ];
maintainers = with maintainers; [ marsam liff ];
mainProgram = "ncspot";
};
}
4 changes: 2 additions & 2 deletions pkgs/applications/audio/praat/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@

stdenv.mkDerivation (finalAttrs: {
pname = "praat";
version = "6.4.05";
version = "6.4.06";

src = fetchFromGitHub {
owner = "praat";
repo = "praat";
rev = "v${finalAttrs.version}";
hash = "sha256-ctCDxE//vH4i22bKYBs14pdmp+1M6K+w7Tm22ZoGOf8=";
hash = "sha256-eZYNXNmxrvI+jR1UEgXrsUTriZ8zTTwM9cEy7HgiZzs=";
};

nativeBuildInputs = [
Expand Down
6 changes: 3 additions & 3 deletions pkgs/applications/audio/psst/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "psst";
version = "unstable-2024-01-28";
version = "unstable-2024-03-04";

src = fetchFromGitHub {
owner = "jpochyla";
repo = pname;
rev = "38422b1795c98d8d0e3bc8dc479d12f8d5bd7154";
hash = "sha256-VTbjlSfkbon38IPBCazwrZtWR8dH9mE0sSVIlmxcUks=";
rev = "0cb4f6964b5ba771182ccfe005260a86a494ef92";
hash = "sha256-W+MFToyvYDQuC/8DqigvENxzJ6QGQOAeAdmdWG6+qZk=";
};

cargoLock = {
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/psst/make-build-reproducible.patch
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ index fcbd491..2d71ee3 100644
-pub const GIT_VERSION: &str = git_version!();
-pub const BUILD_TIME: &str = include!(concat!(env!("OUT_DIR"), "/build-time.txt"));
-pub const REMOTE_URL: &str = include!(concat!(env!("OUT_DIR"), "/remote-url.txt"));
+pub const GIT_VERSION: &str = "38422b1795c98d8d0e3bc8dc479d12f8d5bd7154";
+pub const GIT_VERSION: &str = "0cb4f6964b5ba771182ccfe005260a86a494ef92";
+pub const BUILD_TIME: &str = "1970-01-01 00:00:00";
+pub const REMOTE_URL: &str = "https://github.com/jpochyla/psst";

Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/audio/puredata/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@

stdenv.mkDerivation rec {
pname = "puredata";
version = "0.54-0";
version = "0.54-1";

src = fetchurl {
url = "http://msp.ucsd.edu/Software/pd-${version}.src.tar.gz";
hash = "sha256-6MFKfYV5CWxuOsm1V4LaYChIRIlx0Qcwah5SbtBFZIU=";
hash = "sha256-hcPUvTYgtAHntdWEeHoFIIKylMTE7us1g9dwnZP9BMI=";
};

nativeBuildInputs = [ autoreconfHook gettext makeWrapper ];
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/audio/rhvoice/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@

stdenv.mkDerivation rec {
pname = "rhvoice";
version = "1.8.0";
version = "1.14.0";

src = fetchFromGitHub {
owner = "RHVoice";
repo = "RHVoice";
rev = version;
fetchSubmodules = true;
hash = "sha256-G5886rjBaAp0AXcr07O0q7K1OXTayfIbd4zniKwDiLw=";
hash = "sha256-eduKnxSTIDTxcW3ExueNxVKf8SjmXkVeTfHvJ0eyBPY=";
};

patches = [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/audio/snd/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@

stdenv.mkDerivation rec {
pname = "snd";
version = "24.0";
version = "24.1";

src = fetchurl {
url = "mirror://sourceforge/snd/snd-${version}.tar.gz";
sha256 = "sha256-DU7AtPoLH+WXXsmree8GbHePvNYmPP7MxYSfhEzgOtU=";
sha256 = "sha256-hC6GddYjBD6p4zwHD3fCvZZLwpRiNKOb6aaHstRhA1M=";
};

nativeBuildInputs = [ pkg-config ];
Expand Down
8 changes: 4 additions & 4 deletions pkgs/applications/audio/touchosc/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ in

stdenv.mkDerivation rec {
pname = "touchosc";
version = "1.2.7.190";
version = "1.2.9.200";

suffix = {
aarch64-linux = "linux-arm64";
Expand All @@ -56,9 +56,9 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://hexler.net/pub/${pname}/${pname}-${version}-${suffix}.deb";
hash = {
aarch64-linux = "sha256-VUsT14miAkCjaGWwcsREBgd5uhKLOIHaH9/jfQECVZ4=";
armv7l-linux = "sha256-x5zpeuIEfimiGmM9YWBSaXknIZdpO9RzQjE/bYMt16g=";
x86_64-linux = "sha256-LdMDFNHIWBcaAf+q2JPOm8MqtkaQ+6Drrqkyrrpx6MM=";
aarch64-linux = "sha256-JrpwD4xD4t9e3qmBCl6hfHv/InnRBRsYIsNNrxwQojo=";
armv7l-linux = "sha256-8e50jznyHUJt9aL5K/emp0T8VSLdXMuBl6KCMot8kIY=";
x86_64-linux = "sha256-lQi1HFW53LdS6Q86s0exp0WmTMTz4g48yZC73DaM2lo=";
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
};

Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/blockchains/bitcoin-abc/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@

mkDerivation rec {
pname = "bitcoin" + lib.optionalString (!withGui) "d" + "-abc";
version = "0.28.10";
version = "0.28.11";

src = fetchFromGitHub {
owner = "bitcoin-ABC";
repo = "bitcoin-abc";
rev = "v${version}";
hash = "sha256-Z43ksM9LX7augeP8VQ1wrfCCoLLS8zuGfnrWbLvdh50=";
hash = "sha256-JOAEaz9b89qIpHOJ+aHMu8RVpEvzuVtFv8plUMKcmlM=";
};

nativeBuildInputs = [ pkg-config cmake ];
Expand Down
6 changes: 3 additions & 3 deletions pkgs/applications/blockchains/trezor-suite/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

let
pname = "trezor-suite";
version = "24.2.2";
version = "24.2.4";
name = "${pname}-${version}";

suffix = {
Expand All @@ -19,8 +19,8 @@ let
src = fetchurl {
url = "https://github.com/trezor/${pname}/releases/download/v${version}/Trezor-Suite-${version}-${suffix}.AppImage";
hash = { # curl -Lfs https://github.com/trezor/trezor-suite/releases/latest/download/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/'
aarch64-linux = "sha512-8ws6umKaHGJQNRp6JV+X4W347bQeO1XSLRgJcLU2A+3qH8U7o/6G9rbTMhRlFNsDtIfyqWjn5W5FcXmZCk7kFw==";
x86_64-linux = "sha512-s1MwQeEYmOM+OxdqryP3FaZEMxOk5c9nHvxZerSe+jXQMkQLhy0ivXCIz2KXoxUxxEiVgwu/uemv19FLy+q0MQ==";
aarch64-linux = "sha512-25nyubEf4Vkjz6jumoQwmqTppJdby0vBVztF2eGZmLA81qysx9cpHboVKqQM3dEPBlYO7EVNSeW9d7qEenweBA==";
x86_64-linux = "sha512-oI7D6eRSzUzMphgJByYFsQ1xcHTKj+SOuDG+8Pb7nX8HVb8tiRqKY+ZZ87LAJppM75eXvf3X1hRNRk5PlI2ELA==";
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
};

Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/graphics/hydrus/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@

python3Packages.buildPythonPackage rec {
pname = "hydrus";
version = "559";
version = "564";
format = "other";

src = fetchFromGitHub {
owner = "hydrusnetwork";
repo = "hydrus";
rev = "refs/tags/v${version}";
hash = "sha256-+aYrqt1sifCe6/qS4kZyx0CLSHEoutFk6cyxmOXmN7Q=";
hash = "sha256-U2Z04bFrSJBCk6RwLcKr/x+Pia9V5UHjpUi8AzaCf9o=";
};

nativeBuildInputs = [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/graphics/lightburn/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

stdenv.mkDerivation rec {
pname = "lightburn";
version = "1.5.00";
version = "1.5.02";

nativeBuildInputs = [
p7zip
Expand All @@ -15,7 +15,7 @@ stdenv.mkDerivation rec {

src = fetchurl {
url = "https://github.com/LightBurnSoftware/deployment/releases/download/${version}/LightBurn-Linux64-v${version}.7z";
sha256 = "sha256-KnhwulPpYdN6x1n9TD89Gv1Y20tSmKWT2WcuhoTMg3Y=";
sha256 = "sha256-1gmiPWrNk3T8WJ9u/4UzrhwxOcPUKyWIqtwqJiXA4c4=";
};

buildInputs = [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/graphics/yacreader/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@

mkDerivation rec {
pname = "yacreader";
version = "9.13.1";
version = "9.14.2";

src = fetchFromGitHub {
owner = "YACReader";
repo = pname;
rev = version;
sha256 = "sha256-kiacyHA/G0TnRH/96RqDTF7vdDnf2POMw/iSgtSRbmM=";
sha256 = "sha256-gQ4Aaapini6j3lCtowFbrfwbe91aFl50hp1EfxTO8uY=";
};

nativeBuildInputs = [ qmake pkg-config ];
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/misc/camunda-modeler/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@

stdenvNoCC.mkDerivation rec {
pname = "camunda-modeler";
version = "5.19.0";
version = "5.20.0";

src = fetchurl {
url = "https://github.com/camunda/camunda-modeler/releases/download/v${version}/camunda-modeler-${version}-linux-x64.tar.gz";
hash = "sha256-EKtdja55KFF394sHIh1C/cXxdjedBPbmHzicDVrbXCA=";
hash = "sha256-W8//7sU/ewA99ea3lDPi+IbdAdswt9rukdjoQWj2H9Q=";
};
sourceRoot = "camunda-modeler-${version}-linux-x64";

Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/misc/cubiomes-viewer/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@

stdenv.mkDerivation rec {
pname = "cubiomes-viewer";
version = "3.4.2";
version = "4.0.1";

src = fetchFromGitHub {
owner = "Cubitect";
repo = pname;
rev = version;
sha256 = "sha256-bZXsCRT2qBq7N3h2C7WQDDoQsJGlz3rDT7OZ0fUGtiI=";
sha256 = "sha256-UUvNSTM98r8D/Q+/pPTXwGzW4Sl1qhgem4WsFRfybuo=";
fetchSubmodules = true;
};

Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/misc/ddcui/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@

mkDerivation rec {
pname = "ddcui";
version = "0.4.2";
version = "0.5.4";

src = fetchFromGitHub {
owner = "rockowitz";
repo = "ddcui";
rev = "v${version}";
sha256 = "sha256-T4/c8K1P/o91DWJik/9HtHav948vbVa40qPdy7nKmos=";
sha256 = "sha256-/20gPMUTRhC58YFlblahOEdDHLVhbzwpU3n55NtLAcM=";
};

nativeBuildInputs = [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/misc/fetchmail/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
pname = "fetchmail";
version = "6.4.37";
version = "6.4.38";

src = fetchurl {
url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz";
sha256 = "sha256-ShguXYk+mr5qw3rnHlQmUfzm1gYjT8c1wqquGGV+aeo=";
sha256 = "sha256-pstOqGOsYdJC/7LbVko5EjdhV40+QNcc57bykFvmCdk=";
};

buildInputs = [ openssl python3 ];
Expand Down
Loading

0 comments on commit 590e65a

Please sign in to comment.