summary refs log tree commit diff
diff options
context:
space:
mode:
authorAnthony Roussel <anthony@roussel.dev>2023-01-08 21:55:38 +0100
committerAnthony Roussel <anthony@roussel.dev>2023-01-08 21:55:38 +0100
commit679aa9c62c992b2cb46edb7301f23305745e2333 (patch)
tree6c5fbceb2a696ed78a442f454d0d78afb0081a90
parent082e0c7ca78adce1cb25f7f984199af226bdff0d (diff)
downloadnixpkgs-679aa9c62c992b2cb46edb7301f23305745e2333.tar
nixpkgs-679aa9c62c992b2cb46edb7301f23305745e2333.tar.gz
nixpkgs-679aa9c62c992b2cb46edb7301f23305745e2333.tar.bz2
nixpkgs-679aa9c62c992b2cb46edb7301f23305745e2333.tar.lz
nixpkgs-679aa9c62c992b2cb46edb7301f23305745e2333.tar.xz
nixpkgs-679aa9c62c992b2cb46edb7301f23305745e2333.tar.zst
nixpkgs-679aa9c62c992b2cb46edb7301f23305745e2333.zip
cdk: 5.0-20210109 -> 5.0-20221025
-rw-r--r--pkgs/development/libraries/cdk/default.nix18
-rw-r--r--pkgs/development/libraries/cdk/parallel.patch13
2 files changed, 7 insertions, 24 deletions
diff --git a/pkgs/development/libraries/cdk/default.nix b/pkgs/development/libraries/cdk/default.nix
index 2700a9cbad8..27b7b9b9c8c 100644
--- a/pkgs/development/libraries/cdk/default.nix
+++ b/pkgs/development/libraries/cdk/default.nix
@@ -2,23 +2,18 @@
 
 stdenv.mkDerivation rec {
   pname = "cdk";
-  version ="5.0-20210109";
-
-  buildInputs = [
-    ncurses
-  ];
+  version = "5.0-20221025";
 
   src = fetchurl {
     urls = [
       "ftp://ftp.invisible-island.net/cdk/cdk-${version}.tgz"
       "https://invisible-mirror.net/archives/cdk/cdk-${version}.tgz"
     ];
-    sha256 = "sha256-xBbJh793tPGycD18XkM7qUWMi+Uma/RUy/gBrYfnKTY=";
+    hash = "sha256-A8z6Icn8PWHd0P2hnaVFNZBVu+71ociC37n/SPN0avI=";
   };
 
-  patches = [
-    # Proposed upstream as https://lists.gnu.org/archive/html/bug-ncurses/2021-12/msg00004.html
-    ./parallel.patch
+  buildInputs = [
+    ncurses
   ];
 
   enableParallelBuilding = true;
@@ -26,8 +21,9 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Curses development kit";
     homepage = "https://invisible-island.net/cdk/";
-    license = licenses.bsdOriginal ;
-    maintainers = [ maintainers.raskin ];
+    changelog = "https://invisible-island.net/cdk/CHANGES";
+    license = licenses.mit;
+    maintainers = with maintainers; [ raskin ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/cdk/parallel.patch b/pkgs/development/libraries/cdk/parallel.patch
deleted file mode 100644
index 729c71e96af..00000000000
--- a/pkgs/development/libraries/cdk/parallel.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -296,7 +296,9 @@ LIB_OBJECT	= @LIB_OBJECT@
- 
- all sources :: $(AUTO_SRC)
- 
--$(OBJECTS) :	include/cdk_config.h
-+# make sure we generate all headers before trying
-+# to build first source file.
-+$(OBJECTS) :	$(MY_HDR)
- 
- #
- # Standard library directive.