From 6852ee5fec45a0b97f51ce75908d82539fb0abd3 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 12 May 2022 16:11:53 +0200 Subject: [PATCH 1/2] libbencodetools: unstable-2021-04-15 -> unstable-2022-05-11 --- .../libraries/libbencodetools/default.nix | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/libbencodetools/default.nix b/pkgs/development/libraries/libbencodetools/default.nix index 42e6fb9f4ede..93daedef235c 100644 --- a/pkgs/development/libraries/libbencodetools/default.nix +++ b/pkgs/development/libraries/libbencodetools/default.nix @@ -1,23 +1,30 @@ -{ stdenv, lib, fetchFromGitLab +{ stdenv +, lib +, fetchFromGitLab +, python3 }: stdenv.mkDerivation rec { pname = "libbencodetools"; - version = "unstable-2021-04-15"; + version = "unstable-2022-05-11"; src = fetchFromGitLab { owner = "heikkiorsila"; repo = "bencodetools"; - rev = "1ab11f6509a348975e8aec829d7abbf2f8e9b7d1"; - sha256 = "1i2dgvxxwj844yn45hnfx3785ljbvbkri0nv0jx51z4i08w7cz0h"; + rev = "384d78d297a561dddbbd0f4632f0c74c0db41577"; + sha256 = "1d699q9r33hkmmqkbh92ax54mcdf9smscmc0dza2gp4srkhr83qm"; }; postPatch = '' - patchShebangs . + patchShebangs configure + substituteInPlace configure \ + --replace 'python_install_option=""' 'python_install_option="--prefix=$out"' ''; - configureFlags = [ - "--without-python" + enableParallelBuilding = true; + + nativeBuildInputs = [ + python3 ]; meta = with lib; { From c2966329bdfcd0341d020559d8b6bc965890c050 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 12 May 2022 16:05:58 +0200 Subject: [PATCH 2/2] uade123: unstable-2021-05-21 -> 3.01 --- pkgs/applications/audio/uade123/default.nix | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/uade123/default.nix b/pkgs/applications/audio/uade123/default.nix index 8191fd381a4b..a18b38371e40 100644 --- a/pkgs/applications/audio/uade123/default.nix +++ b/pkgs/applications/audio/uade123/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitLab +, python3 , pkg-config , which , makeWrapper @@ -12,19 +13,21 @@ , vorbis-tools }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "uade123"; - version = "unstable-2021-05-21"; + version = "3.01"; src = fetchFromGitLab { owner = "uade-music-player"; repo = "uade"; - rev = "7169a46e777d19957cd7ff8ac31843203e725ddc"; - sha256 = "1dm7c924fy79y3wkb0qi71m1k6yw1x6j3whw7d0w4ka9hv6za03b"; + rev = "uade-${version}"; + sha256 = "0fam3g8mlzrirrac3iwcwsz9jmsqwdy7lkwwdr2q4pkq9cpmh8m5"; }; postPatch = '' - patchShebangs . + patchShebangs configure + substituteInPlace configure \ + --replace 'PYTHON_SETUP_ARGS=""' 'PYTHON_SETUP_ARGS="--prefix=$out"' substituteInPlace src/frontends/mod2ogg/mod2ogg2.sh.in \ --replace '-e stat' '-n stat' \ --replace '/usr/local' "$out" @@ -34,6 +37,7 @@ stdenv.mkDerivation { pkg-config which makeWrapper + python3 ]; buildInputs = [ @@ -43,6 +47,10 @@ stdenv.mkDerivation { lame flac vorbis-tools + (python3.withPackages (p: with p; [ + pillow + tqdm + ])) ]; configureFlags = [ @@ -58,6 +66,8 @@ stdenv.mkDerivation { --prefix PATH : $out/bin:${lib.makeBinPath [ sox lame flac vorbis-tools ]} # This is an old script, don't break expectations by renaming it ln -s $out/bin/mod2ogg2{.sh,} + wrapProgram $out/bin/generate_amiga_oscilloscope_view \ + --prefix PYTHONPATH : "$PYTHONPATH:$out/${python3.sitePackages}" ''; meta = with lib; {