git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #118927 from magnetophon/geonkick

geonkick: 2.6.1 -> 2.8.0

commitd0f5090b2306ff73c04fcac7d39c3ba936c2ec85 authorSandro <sandro.jaeckel@gmail.com> dateTue 13 Apr 2021, 02:00 (6 years ago) parenteeb3107a9d4ba3
4 files changed+5−32
pkgs/applications/audio/geonkick/default.nix+4−5 pkgs/development/libraries/redkite/default.nix−25 pkgs/top-level/aliases.nix+1 pkgs/top-level/all-packages.nix−2
pkgs/applications/audio/geonkick/default.nix+4−5
@@ -1,24 +1,23 @@
1−{ lib, stdenv, fetchFromGitLab, cmake, pkg-config, redkite, libsndfile, rapidjson
1+{ lib, stdenv, fetchFromGitLab, cmake, pkg-config, libsndfile, rapidjson
22, libjack2, lv2, libX11, cairo }:
33
44stdenv.mkDerivation rec {
55 pname = "geonkick";
6− version = "2.6.1";
6+ version = "2.8.0";
77
88 src = fetchFromGitLab {
99 owner = "iurie-sw";
1010 repo = pname;
1111 rev = "v${version}";
12− sha256 = "1l647j11pb9lkknnh4q99mmfcvr644b02lfcdjh98z60vqm1s54c";
12+ sha256 = "0dpwdjyy6phhr1jm1cabj2gc3rfsdan513mijbgnpzkq9w9jfb60";
1313 };
1414
1515 nativeBuildInputs = [ cmake pkg-config ];
1616
17− buildInputs = [ redkite libsndfile rapidjson libjack2 lv2 libX11 cairo ];
17+ buildInputs = [ libsndfile rapidjson libjack2 lv2 libX11 cairo ];
1818
1919 # https://github.com/iurie-sw/geonkick/issues/120
2020 cmakeFlags = [
21− "-DGKICK_REDKITE_SDK_PATH=${redkite}"
2221 "-DCMAKE_INSTALL_LIBDIR=lib"
2322 ];
2423
pkgs/development/libraries/redkite/default.nixdeleted−25
@@ -1,25 +0,0 @@
1−{ lib, stdenv, fetchFromGitHub, cmake, cairo }:
2−
3−stdenv.mkDerivation rec {
4− pname = "redkite";
5− version = "1.3.1";
6−
7− src = fetchFromGitHub {
8− owner = "iurie-sw";
9− repo = pname;
10− rev = "v${version}";
11− sha256 = "sha256-bf8kz9RyhDDuUHKiKvLiQLBIEXbIyoy3yuKfSpSYYv0=";
12− };
13−
14− nativeBuildInputs = [ cmake ];
15−
16− buildInputs = [ cairo ];
17−
18− meta = with lib; {
19− homepage = "https://gitlab.com/iurie-sw/redkite";
20− description = "A small GUI toolkit";
21− license = licenses.gpl3Plus;
22− platforms = platforms.linux;
23− maintainers = [ maintainers.magnetophon ];
24− };
25−}
pkgs/top-level/aliases.nix+1
@@ -623,6 +623,7 @@ mapAliases ({
623623 rfkill = throw "rfkill has been removed, as it's included in util-linux"; # added 2020-08-23
624624 riak-cs = throw "riak-cs is not maintained anymore"; # added 2020-10-14
625625 radare2-cutter = cutter; # added 2021-03-30
626+ redkite = throw "redkite was archived by upstream"; # added 2021-04-12
626627 rkt = throw "rkt was archived by upstream"; # added 2020-05-16
627628 ruby_2_0_0 = throw "ruby_2_0_0 was deprecated on 2018-02-13: use a newer version of ruby";
628629 ruby_2_1_0 = throw "ruby_2_1_0 was deprecated on 2018-02-13: use a newer version of ruby";
pkgs/top-level/all-packages.nix−2
@@ -17132,8 +17132,6 @@ in
1713217132
1713317133 randomx = callPackage ../development/libraries/randomx { };
1713417134
17135− redkite = callPackage ../development/libraries/redkite { };
17136−
1713717135 resolv_wrapper = callPackage ../development/libraries/resolv_wrapper { };
1713817136
1713917137 rhino = callPackage ../development/libraries/java/rhino {