From b6bb8b9e3a552ad9bdc4ae2218cb005e427c435b Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 21 Dec 2021 12:48:22 +0100 Subject: [PATCH] cl-launch: refactor --- .../tools/misc/cl-launch/default.nix | 34 ++++++------------- .../tools/misc/cl-launch/default.upstream | 2 -- 2 files changed, 11 insertions(+), 25 deletions(-) delete mode 100644 pkgs/development/tools/misc/cl-launch/default.upstream diff --git a/pkgs/development/tools/misc/cl-launch/default.nix b/pkgs/development/tools/misc/cl-launch/default.nix index 4fe93694ab77..35cfd01ff925 100644 --- a/pkgs/development/tools/misc/cl-launch/default.nix +++ b/pkgs/development/tools/misc/cl-launch/default.nix @@ -1,22 +1,11 @@ -{lib, stdenv, fetchurl}: -let - s = # Generated upstream information - rec { - baseName="cl-launch"; - version="4.1.4.1"; - name="${baseName}-${version}"; - hash="09450yknzb0m3375lg4k8gdypmk3xwl8m1krv1kvhylmrm3995mz"; - url="http://common-lisp.net/project/xcvb/cl-launch/cl-launch-4.1.4.1.tar.gz"; - sha256="09450yknzb0m3375lg4k8gdypmk3xwl8m1krv1kvhylmrm3995mz"; - }; - buildInputs = [ - ]; -in -stdenv.mkDerivation { - inherit (s) name version; - inherit buildInputs; +{ lib, stdenv, fetchurl }: +stdenv.mkDerivation rec { + pname = "cl-launch"; + version = "4.1.4.1"; + src = fetchurl { - inherit (s) url sha256; + url = "http://common-lisp.net/project/xcvb/cl-launch/cl-launch-${version}.tar.gz"; + sha256 = "sha256-v5aURs2Verhn2HmGiijvY9br20OTPFrOGBWsb6cHhSQ="; }; preConfigure = '' @@ -28,11 +17,10 @@ stdenv.mkDerivation { sed -e 's/\t\t@/\t\t/g' -i Makefile ''; - meta = { - inherit (s) version; + meta = with lib; { description = "Common Lisp launcher script"; - license = lib.licenses.llgpl21 ; - maintainers = [lib.maintainers.raskin]; - platforms = lib.platforms.unix; + license = licenses.llgpl21; + maintainers = with maintainers; [ raskin ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/misc/cl-launch/default.upstream b/pkgs/development/tools/misc/cl-launch/default.upstream deleted file mode 100644 index ff7ee9446d28..000000000000 --- a/pkgs/development/tools/misc/cl-launch/default.upstream +++ /dev/null @@ -1,2 +0,0 @@ -url http://common-lisp.net/project/xcvb/cl-launch/ -version_link '.-[0-9].*[0-9][.]tar[.][a-z0-9]*$'