From 2388beb62bc6b3686d1feb7ec1ee41daca879155 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Mon, 9 Oct 2023 23:22:07 -0300 Subject: [PATCH 1/2] cdk: migrate to by-name --- .../libraries/cdk/default.nix => by-name/cd/cdk/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/libraries/cdk/default.nix => by-name/cd/cdk/package.nix} (100%) diff --git a/pkgs/development/libraries/cdk/default.nix b/pkgs/by-name/cd/cdk/package.nix similarity index 100% rename from pkgs/development/libraries/cdk/default.nix rename to pkgs/by-name/cd/cdk/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f6ca8b1f03f2..5e36e8534ded 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20988,8 +20988,6 @@ with pkgs; cddlib = callPackage ../development/libraries/cddlib { }; - cdk = callPackage ../development/libraries/cdk { }; - cdk-go = callPackage ../tools/security/cdk-go { }; cdo = callPackage ../development/libraries/cdo { }; From ac9186c2b4119c1fcb71e4287696295ef79aba0c Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Mon, 9 Oct 2023 23:50:05 -0300 Subject: [PATCH 2/2] cdk: 5.0-20221025 -> 5.0-20230201 --- pkgs/by-name/cd/cdk/package.nix | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/cd/cdk/package.nix b/pkgs/by-name/cd/cdk/package.nix index 27b7b9b9c8c3..410e341cf0fc 100644 --- a/pkgs/by-name/cd/cdk/package.nix +++ b/pkgs/by-name/cd/cdk/package.nix @@ -1,15 +1,16 @@ -{ lib, stdenv, fetchurl, ncurses }: +{ lib +, stdenv +, fetchurl +, ncurses +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cdk"; - version = "5.0-20221025"; + version = "5.0-20230201"; src = fetchurl { - urls = [ - "ftp://ftp.invisible-island.net/cdk/cdk-${version}.tgz" - "https://invisible-mirror.net/archives/cdk/cdk-${version}.tgz" - ]; - hash = "sha256-A8z6Icn8PWHd0P2hnaVFNZBVu+71ociC37n/SPN0avI="; + url = "https://invisible-mirror.net/archives/cdk/cdk-${finalAttrs.version}.tgz"; + hash = "sha256-oxJ7Wf5QX16Jjao90VsM9yShJ0zmgWW3eb4vKdTE8vY="; }; buildInputs = [ @@ -18,12 +19,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with lib; { + meta = { description = "Curses development kit"; homepage = "https://invisible-island.net/cdk/"; - changelog = "https://invisible-island.net/cdk/CHANGES"; - license = licenses.mit; - maintainers = with maintainers; [ raskin ]; - platforms = platforms.linux; + changelog = "https://invisible-island.net/cdk/CHANGES.html"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ raskin AndersonTorres ]; + inherit (ncurses.meta) platforms; }; -} +})