From c474f84b5609d49883d8ada8316622735b7c1155 Mon Sep 17 00:00:00 2001 From: John Garcia Date: Sun, 25 Feb 2024 15:08:08 +0000 Subject: [PATCH 1/9] decent-sampler: 1.9.4 -> 1.10.0 --- pkgs/by-name/de/decent-sampler/package.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/de/decent-sampler/package.nix b/pkgs/by-name/de/decent-sampler/package.nix index 449a589c9086..9c4db8f90178 100644 --- a/pkgs/by-name/de/decent-sampler/package.nix +++ b/pkgs/by-name/de/decent-sampler/package.nix @@ -10,16 +10,15 @@ let pname = "decent-sampler"; - version = "1.9.4"; + version = "1.10.0"; - decent-sampler = stdenv.mkDerivation { + decent-sampler = stdenv.mkDerivation rec { inherit pname version; src = fetchzip { # dropbox link: https://www.dropbox.com/sh/dwyry6xpy5uut07/AABBJ84bjTTSQWzXGG5TOQpfa\ - url = "https://archive.org/download/decent-sampler-linux-static-download-mirror/Decent_Sampler-${version}-Linux-Static-x86_64.tar.gz"; - hash = "sha256-lTp/mukCwLNyeTcBT68eqa7aD0o11Bylbd93A5VCILU="; + hash = "sha256-KYCf/F2/ziuXDHim4FPZQBARiSywvQDJBzKbHua+3SM="; }; installPhase = '' From 6b6fc5949897a06841cf873ea203747e48dba2a4 Mon Sep 17 00:00:00 2001 From: John Garcia Date: Sun, 25 Feb 2024 15:22:45 +0000 Subject: [PATCH 2/9] decent-sampler: added vst plugins --- pkgs/by-name/de/decent-sampler/package.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/de/decent-sampler/package.nix b/pkgs/by-name/de/decent-sampler/package.nix index 9c4db8f90178..0b8b83b0c48e 100644 --- a/pkgs/by-name/de/decent-sampler/package.nix +++ b/pkgs/by-name/de/decent-sampler/package.nix @@ -25,6 +25,8 @@ let runHook preInstall install -Dm755 DecentSampler $out/bin/decent-sampler + install -Dm755 DecentSampler.so -t $out/lib/vst + install -d "$out/lib/vst3" && cp -r "DecentSampler.vst3" $out/lib/vst3 runHook postInstall ''; @@ -33,7 +35,7 @@ let in buildFHSEnv { - inherit pname version; + inherit (decent-sampler) pname version; targetPkgs = pkgs: [ alsa-lib @@ -45,6 +47,10 @@ buildFHSEnv { runScript = "decent-sampler"; + extraInstallCommands = '' + cp -r ${decent-sampler.outPath}/lib $out/lib + ''; + meta = with lib; { description = "An audio sample player"; longDescription = '' From 3b14bbb8af76a1d8c7e909be465503a34209ba9f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 28 Feb 2024 05:24:57 +0000 Subject: [PATCH 3/9] unit: 1.31.1 -> 1.32.0 --- pkgs/servers/http/unit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix index 6f75352796cd..d6c17dfb885f 100644 --- a/pkgs/servers/http/unit/default.nix +++ b/pkgs/servers/http/unit/default.nix @@ -28,14 +28,14 @@ let php82-unit = php82.override phpConfig; in stdenv.mkDerivation rec { - version = "1.31.1"; + version = "1.32.0"; pname = "unit"; src = fetchFromGitHub { owner = "nginx"; repo = pname; rev = version; - sha256 = "sha256-6hecOCEC2MeJJieOOamEf8ytpEVAGs5mB0H16lJDciU="; + sha256 = "sha256-u693Q6Gp8lFm3DX1q5i6W021bxD962NGBGDRxUtvGrk="; }; nativeBuildInputs = [ which ]; From 35f73ca4318bbfab24344a25a86a64eb7ca71427 Mon Sep 17 00:00:00 2001 From: John Garcia Date: Sun, 25 Feb 2024 15:24:22 +0000 Subject: [PATCH 4/9] decent-sampler: added icon and desktop file --- pkgs/by-name/de/decent-sampler/package.nix | 30 +++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/de/decent-sampler/package.nix b/pkgs/by-name/de/decent-sampler/package.nix index 0b8b83b0c48e..fdc728667220 100644 --- a/pkgs/by-name/de/decent-sampler/package.nix +++ b/pkgs/by-name/de/decent-sampler/package.nix @@ -1,6 +1,9 @@ { lib , stdenv , fetchzip +, fetchurl +, makeDesktopItem +, copyDesktopItems , buildFHSEnv , alsa-lib , freetype @@ -12,21 +15,41 @@ let pname = "decent-sampler"; version = "1.10.0"; - decent-sampler = stdenv.mkDerivation rec { + icon = fetchurl { + url = "https://archive.org/download/ds-256/DS256.png"; + hash = "sha256-SV8zY5QJ6uRSrLuGTmT1zwGoIIXCV9GD2ZNiqK+i1Bc="; + }; + + decent-sampler = stdenv.mkDerivation { inherit pname version; src = fetchzip { - # dropbox link: https://www.dropbox.com/sh/dwyry6xpy5uut07/AABBJ84bjTTSQWzXGG5TOQpfa\ + # dropbox links: https://www.dropbox.com/sh/dwyry6xpy5uut07/AABBJ84bjTTSQWzXGG5TOQpfa\ url = "https://archive.org/download/decent-sampler-linux-static-download-mirror/Decent_Sampler-${version}-Linux-Static-x86_64.tar.gz"; hash = "sha256-KYCf/F2/ziuXDHim4FPZQBARiSywvQDJBzKbHua+3SM="; }; + nativeBuildInputs = [ copyDesktopItems ]; + + desktopItems = [ + (makeDesktopItem { + type = "Application"; + name = "decent-sampler"; + desktopName = "Decent Sampler"; + comment = "DecentSampler player"; + icon = "decent-sampler"; + exec = "decent-sampler"; + categories = [ "Audio" "AudioVideo" ]; + }) + ]; + installPhase = '' runHook preInstall install -Dm755 DecentSampler $out/bin/decent-sampler install -Dm755 DecentSampler.so -t $out/lib/vst install -d "$out/lib/vst3" && cp -r "DecentSampler.vst3" $out/lib/vst3 + install -Dm444 ${icon} $out/share/pixmaps/decent-sampler.png runHook postInstall ''; @@ -48,7 +71,8 @@ buildFHSEnv { runScript = "decent-sampler"; extraInstallCommands = '' - cp -r ${decent-sampler.outPath}/lib $out/lib + cp -r ${decent-sampler}/lib $out/lib + cp -r ${decent-sampler}/share $out/share ''; meta = with lib; { From b2822f142b79db46f5b9709d6e43f7afc4880b25 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 4 Mar 2024 12:35:22 +0000 Subject: [PATCH 5/9] spotify-player: 0.16.3 -> 0.17.0 --- pkgs/applications/audio/spotify-player/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/spotify-player/default.nix b/pkgs/applications/audio/spotify-player/default.nix index c2b844da72da..0e4e5234ec00 100644 --- a/pkgs/applications/audio/spotify-player/default.nix +++ b/pkgs/applications/audio/spotify-player/default.nix @@ -33,16 +33,16 @@ assert lib.assertOneOf "withAudioBackend" withAudioBackend [ "" "alsa" "pulseaud rustPlatform.buildRustPackage rec { pname = "spotify-player"; - version = "0.16.3"; + version = "0.17.0"; src = fetchFromGitHub { owner = "aome510"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-8naLLHAVGB8ow88XjU3BpnNzY3SFC2F5uYin67hMc0E="; + hash = "sha256-fGDIlkTaRg+J6YcP9iBcJFuYm9F0UOA+v/26hhdg9/o="; }; - cargoHash = "sha256-NcNEZoERGOcMedLGJE7q9V9plx/7JSnbguZPFD1f4Qg="; + cargoHash = "sha256-oZNydOnD2+6gLAsT3YTSlWSQ06EftS7Tl/AvlTbL84U="; nativeBuildInputs = [ pkg-config From 579bb858e683a547e920ef79e0122d1531a15c79 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Wed, 6 Mar 2024 17:22:25 -0500 Subject: [PATCH 6/9] forgejo: 1.21.6-0 -> 1.21.7-0 Changelog: https://codeberg.org/forgejo/forgejo/releases/tag/v1.21.7-0 --- pkgs/applications/version-management/forgejo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/forgejo/default.nix b/pkgs/applications/version-management/forgejo/default.nix index 908d921c8d38..c76b6ee98408 100644 --- a/pkgs/applications/version-management/forgejo/default.nix +++ b/pkgs/applications/version-management/forgejo/default.nix @@ -39,17 +39,17 @@ let in buildGoModule rec { pname = "forgejo"; - version = "1.21.6-0"; + version = "1.21.7-0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "forgejo"; repo = "forgejo"; rev = "v${version}"; - hash = "sha256-YvLdqNo/zGutPnRVkcxCTcX7Xua0FXUs3veQ2NBgaAA="; + hash = "sha256-wYwQnZRIJSbwI+kOPedxnIdfhQ/wWxXpOpdfcFono6k="; }; - vendorHash = "sha256-5BznZiPZCwFEl74JVf7ujFtzsTyG6AcKvQG0LdaMKe4="; + vendorHash = "sha256-Mptfd1WoUXNQkw7sa/GxIO7s5V5/9VmVBtvPCjMsa/4="; subPackages = [ "." ]; From b4210fae558ab876e98b9f255b93223cd6184c58 Mon Sep 17 00:00:00 2001 From: Vincenzo Mantova <1962985+xworld21@users.noreply.github.com> Date: Thu, 7 Mar 2024 00:05:02 +0000 Subject: [PATCH 7/9] texlive.withPackages: build all outputs (#289756) --- pkgs/tools/typesetting/tex/texlive/build-tex-env.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix b/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix index 9a721168591f..85be581a3066 100644 --- a/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix +++ b/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix @@ -188,7 +188,6 @@ let passthru = lib.optionalAttrs (! __combine) (splitOutputs // { all = builtins.attrValues splitOutputs; - outputs = [ "out" ] ++ pkgList.nonEnvOutputs; }) // { # This is set primarily to help find-tarballs.nix to do its job requiredTeXPackages = builtins.filter lib.isDerivation (pkgList.bin ++ pkgList.nonbin @@ -440,14 +439,11 @@ let ; }).overrideAttrs (prev: { allowSubstitutes = true; } - # the outputsToInstall must be built by the main derivation for nix-profile-install to work // lib.optionalAttrs (! __combine) ({ - outputs = pkgList.outputsToInstall; + outputs = [ "out" ] ++ pkgList.nonEnvOutputs; meta = prev.meta // { inherit (pkgList) outputsToInstall; }; - } // (lib.mapAttrs' - (out: drv: { name = "otherOutput_" + out; value = drv; }) - (lib.getAttrs (builtins.tail pkgList.outputsToInstall) splitOutputs) - ) + } // builtins.listToAttrs + (map (out: { name = "otherOutput_" + out; value = splitOutputs.${out}; }) pkgList.nonEnvOutputs) ) ); in out) From ea564a2d70deb4f3568e7c151dde5ccba60e44b5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Mar 2024 01:39:55 +0000 Subject: [PATCH 8/9] ctlptl: 0.8.27 -> 0.8.28 --- pkgs/development/tools/ctlptl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ctlptl/default.nix b/pkgs/development/tools/ctlptl/default.nix index 307167b9a2d8..3c2abdd45497 100644 --- a/pkgs/development/tools/ctlptl/default.nix +++ b/pkgs/development/tools/ctlptl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ctlptl"; - version = "0.8.27"; + version = "0.8.28"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - hash = "sha256-4g5QfeAtPEUW7vwOwkJd8W3V6z1DxAmZngbrroCFr5M="; + hash = "sha256-GFCyFJrhl6VEnIuZNpIIYgdTHYxeBmaukpJ72xspwFM="; }; vendorHash = "sha256-DEUZbqHHYfjD5jGT5nn3UbWT1aODRsLailSorI/W6w4="; From 68f0ee54dfa3b5e4427b610cb1e304e3202a7dc5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Mar 2024 00:44:27 +0000 Subject: [PATCH 9/9] python312Packages.immutabledict: 4.1.0 -> 4.2.0 --- pkgs/development/python-modules/immutabledict/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/immutabledict/default.nix b/pkgs/development/python-modules/immutabledict/default.nix index 6a066fad36d8..5c1530263d22 100644 --- a/pkgs/development/python-modules/immutabledict/default.nix +++ b/pkgs/development/python-modules/immutabledict/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "immutabledict"; - version = "4.1.0"; + version = "4.2.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "corenting"; repo = "immutabledict"; rev = "refs/tags/v${version}"; - hash = "sha256-c76apNW6nlxL9paevqKpPw5RpDLMpYnbVabCCIrW3pw="; + hash = "sha256-NpNS8HAacgXm3rFtyd5uFgSURNbDf+YVS1aFx51kwEA="; }; nativeBuildInputs = [