diff options
author | Vladimír Čunát <v@cunat.cz> | 2021-03-17 09:09:58 +0100 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2021-03-17 09:09:58 +0100 |
commit | 6ef2f00f1d035cc98319578160ca842dd0162606 (patch) | |
tree | ae59475131619f31290a4354fbc89f9a68e23c3f /pkgs | |
parent | eba81031491d3e2a66a99b23625e238636f80ddd (diff) |
concurrencykit: remove in favor of duplicate libck
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/concurrencykit/default.nix | 24 | ||||
-rw-r--r-- | pkgs/development/libraries/libck/default.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
4 files changed, 2 insertions, 27 deletions
diff --git a/pkgs/development/libraries/concurrencykit/default.nix b/pkgs/development/libraries/concurrencykit/default.nix deleted file mode 100644 index 968c395d701f2..0000000000000 --- a/pkgs/development/libraries/concurrencykit/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "concurrencykit"; - version = "0.6.0"; - - src = fetchurl { - url = "http://concurrencykit.org/releases/ck-${version}.tar.gz"; - sha256 = "1pv21p7sjwwmbs2xblpy1lqk53r2i212yrqyjlr5dr3rlv87vqnp"; - }; - - #Deleting this line causes "Unknown option --disable-static" - configurePhase = "./configure --prefix=$out"; - - enableParallelBuilding = true; - - meta = with lib; { - description = "A library of safe, high-performance concurrent data structures"; - homepage = "http://concurrencykit.org"; - license = licenses.bsd2; - platforms = platforms.unix; - maintainers = [ maintainers.thoughtpolice ]; - }; -} diff --git a/pkgs/development/libraries/libck/default.nix b/pkgs/development/libraries/libck/default.nix index accb6556011d4..a46a7b33900ad 100644 --- a/pkgs/development/libraries/libck/default.nix +++ b/pkgs/development/libraries/libck/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { license = with licenses; [ asl20 bsd2 ]; homepage = "http://concurrencykit.org/"; platforms = platforms.unix; - maintainers = with maintainers; [ chessai ]; + maintainers = with maintainers; [ chessai thoughtpolice ]; }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 22e91ae0160ba..7ea157bb5646e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -105,6 +105,7 @@ mapAliases ({ codimd = hedgedoc; # added 2020-11-29 compton = picom; # added 2019-12-02 compton-git = compton; # added 2019-05-20 + concurrencykit = libck; # added 2021-03 conntrack_tools = conntrack-tools; # added 2018-05 cool-old-term = cool-retro-term; # added 2015-01-31 coprthr = throw "coprthr has been removed."; # added 2019-12-08 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8b40b3f8877e5..877f5fa9292e6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3266,8 +3266,6 @@ in colordiff = callPackage ../tools/text/colordiff { }; - concurrencykit = callPackage ../development/libraries/concurrencykit { }; - connect = callPackage ../tools/networking/connect { }; conspy = callPackage ../os-specific/linux/conspy {}; |