diff --git a/pkgs/applications/audio/geonkick/default.nix b/pkgs/applications/audio/geonkick/default.nix index 6812cb4ef0f..5eece77373f 100644 --- a/pkgs/applications/audio/geonkick/default.nix +++ b/pkgs/applications/audio/geonkick/default.nix @@ -1,24 +1,23 @@ -{ lib, stdenv, fetchFromGitLab, cmake, pkg-config, redkite, libsndfile, rapidjson +{ lib, stdenv, fetchFromGitLab, cmake, pkg-config, libsndfile, rapidjson , libjack2, lv2, libX11, cairo }: stdenv.mkDerivation rec { pname = "geonkick"; - version = "2.6.1"; + version = "2.8.0"; src = fetchFromGitLab { owner = "iurie-sw"; repo = pname; rev = "v${version}"; - sha256 = "1l647j11pb9lkknnh4q99mmfcvr644b02lfcdjh98z60vqm1s54c"; + sha256 = "0dpwdjyy6phhr1jm1cabj2gc3rfsdan513mijbgnpzkq9w9jfb60"; }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ redkite libsndfile rapidjson libjack2 lv2 libX11 cairo ]; + buildInputs = [ libsndfile rapidjson libjack2 lv2 libX11 cairo ]; # https://github.com/iurie-sw/geonkick/issues/120 cmakeFlags = [ - "-DGKICK_REDKITE_SDK_PATH=${redkite}" "-DCMAKE_INSTALL_LIBDIR=lib" ]; diff --git a/pkgs/development/libraries/redkite/default.nix b/pkgs/development/libraries/redkite/default.nix deleted file mode 100644 index eb3d7629a4e..00000000000 --- a/pkgs/development/libraries/redkite/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, cairo }: - -stdenv.mkDerivation rec { - pname = "redkite"; - version = "1.3.1"; - - src = fetchFromGitHub { - owner = "iurie-sw"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-bf8kz9RyhDDuUHKiKvLiQLBIEXbIyoy3yuKfSpSYYv0="; - }; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ cairo ]; - - meta = with lib; { - homepage = "https://gitlab.com/iurie-sw/redkite"; - description = "A small GUI toolkit"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = [ maintainers.magnetophon ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 720d2dcdd9e..e00c042c8a4 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -621,6 +621,7 @@ mapAliases ({ rfkill = throw "rfkill has been removed, as it's included in util-linux"; # added 2020-08-23 riak-cs = throw "riak-cs is not maintained anymore"; # added 2020-10-14 radare2-cutter = cutter; # added 2021-03-30 + redkite = throw "redkite was archived by upstream"; # added 2021-04-12 rkt = throw "rkt was archived by upstream"; # added 2020-05-16 ruby_2_0_0 = throw "ruby_2_0_0 was deprecated on 2018-02-13: use a newer version of ruby"; ruby_2_1_0 = throw "ruby_2_1_0 was deprecated on 2018-02-13: use a newer version of ruby"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 91e3e9c70a3..89d37c83b7b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17107,8 +17107,6 @@ in randomx = callPackage ../development/libraries/randomx { }; - redkite = callPackage ../development/libraries/redkite { }; - resolv_wrapper = callPackage ../development/libraries/resolv_wrapper { }; rhino = callPackage ../development/libraries/java/rhino {