From d58475f1d6a0614a954a9d634705de4181b7bd8e Mon Sep 17 00:00:00 2001 From: "EEva (JPotier)" Date: Fri, 2 Apr 2021 11:58:55 +0300 Subject: [PATCH 1/2] Update reaper --- pkgs/reaper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/reaper/default.nix b/pkgs/reaper/default.nix index b3665d2..0a56b9f 100644 --- a/pkgs/reaper/default.nix +++ b/pkgs/reaper/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "reaper-${version}"; - version = "6.23"; + version = "6.26"; src = fetchurl { url = "https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_x86_64.tar.xz"; - sha256 = "1s9c8prqk38738hjaixiy8ljp94cqw7jq3160890477jyk6cvicd"; + sha256 = "0a7kznj0qn27r5313jrgcr2fqf7njgd4b0p2yh0brrwd7j2bw50k"; }; nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; From 47f5d882e4bf314db17405062c2ca2769d2ec4e4 Mon Sep 17 00:00:00 2001 From: "EEva (JPotier)" Date: Fri, 2 Apr 2021 12:00:01 +0300 Subject: [PATCH 2/2] Fix stdenv.lib deprecation --- pkgs/carla/default.nix | 6 +++--- pkgs/curie-font/default.nix | 4 ++-- pkgs/mopidy-mpd/default.nix | 4 ++-- pkgs/scientifica-font/default.nix | 4 ++-- pkgs/squeezer/default.nix | 4 ++-- pkgs/surge/default.nix | 3 ++- 6 files changed, 13 insertions(+), 12 deletions(-) diff --git a/pkgs/carla/default.nix b/pkgs/carla/default.nix index 6641e99..b0a2375 100644 --- a/pkgs/carla/default.nix +++ b/pkgs/carla/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchFromGitHub, alsaLib, file, fluidsynth, ffmpeg, jack2, +{ stdenv, lib, fetchFromGitHub, alsaLib, file, fluidsynth, ffmpeg, jack2, liblo, libpulseaudio, libsndfile, pkgconfig, python3Packages, which, withFrontend ? true, withQt ? true, qtbase ? null, wrapQtAppsHook ? null, withGtk2 ? true, gtk2 ? null, withGtk3 ? true, gtk3 ? null }: -with stdenv.lib; +with lib; assert withFrontend -> python3Packages ? pyqt5; assert withQt -> qtbase != null; @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = http://kxstudio.sf.net/carla; description = "An audio plugin host"; longDescription = '' diff --git a/pkgs/curie-font/default.nix b/pkgs/curie-font/default.nix index 830c0d2..2bd416c 100644 --- a/pkgs/curie-font/default.nix +++ b/pkgs/curie-font/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchgit, bdftopcf, mkfontdir, mkfontscale}: +{stdenv, lib, fetchgit, bdftopcf, mkfontdir, mkfontscale}: stdenv.mkDerivation rec { name = "curie-1.0"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { mkfontscale ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A slightly upscaled version of scientifica"; homepage = https://github.com/NerdyPepper/curie; license = lib.licences.ofl; diff --git a/pkgs/mopidy-mpd/default.nix b/pkgs/mopidy-mpd/default.nix index cbf6d25..5b5f6e9 100644 --- a/pkgs/mopidy-mpd/default.nix +++ b/pkgs/mopidy-mpd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages, mopidy }: +{ stdenv, lib, python3Packages, mopidy }: python3Packages.buildPythonApplication rec { pname = "Mopidy-MPD"; @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { # no tests implemented doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = https://github.com/mopidy/mopidy-mpd; description = "Mopidy extension for controlling playback from MPD clients"; license = licenses.asl20; diff --git a/pkgs/scientifica-font/default.nix b/pkgs/scientifica-font/default.nix index f2c18ff..a180bf4 100644 --- a/pkgs/scientifica-font/default.nix +++ b/pkgs/scientifica-font/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchgit, bdftopcf, mkfontdir, mkfontscale}: +{stdenv, lib, fetchgit, bdftopcf, mkfontdir, mkfontscale}: stdenv.mkDerivation rec { name = "scientifica-1.0"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { mkfontscale ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Tall, condensed, bitmap font for geeks"; homepage = https://github.com/NerdyPepper/scientifica; license = licences.ofl; diff --git a/pkgs/squeezer/default.nix b/pkgs/squeezer/default.nix index 7620b8d..02ba00a 100644 --- a/pkgs/squeezer/default.nix +++ b/pkgs/squeezer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchzip, unzip +{ stdenv, lib, fetchFromGitHub, fetchzip, unzip , alsaLib, astyle, clang, freetype, gnumake, libjack2, xorg }: @@ -79,7 +79,7 @@ in stdenv.mkDerivation rec { xorg.libXrandr ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.mzuther.de/en/software/squeezer"; description = "Flexible general-purpose audio compressor with a touch of citrus"; maintainers = [ maintainers.jpotier ]; diff --git a/pkgs/surge/default.nix b/pkgs/surge/default.nix index 46e098a..f0e482b 100644 --- a/pkgs/surge/default.nix +++ b/pkgs/surge/default.nix @@ -1,4 +1,5 @@ { stdenv +, lib , cmake , fetchFromGitHub , ncurses @@ -75,7 +76,7 @@ in stdenv.mkDerivation { cp -r target/lv2/Release/Surge.lv2 $out/lib/lv2/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Synthesizer plug-in with wavetables, originally by Claes Johanson"; homepage = "https://surge-synthesizer.github.io";