diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-03-02 12:05:47 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-02 12:05:47 +0000 |
commit | 12423e2e92378862924e1f4ea3f51364852338b8 (patch) | |
tree | ce08ccaf5d775f9f06846d541955169959b8e84c /pkgs/development/interpreters | |
parent | cd1f27794e50f00122b16e78653368f776e8772e (diff) | |
parent | c02944e17d0d8ea91c9dc8878dc93697f7098838 (diff) | |
download | nixpkgs-12423e2e92378862924e1f4ea3f51364852338b8.tar nixpkgs-12423e2e92378862924e1f4ea3f51364852338b8.tar.gz nixpkgs-12423e2e92378862924e1f4ea3f51364852338b8.tar.bz2 nixpkgs-12423e2e92378862924e1f4ea3f51364852338b8.tar.lz nixpkgs-12423e2e92378862924e1f4ea3f51364852338b8.tar.xz nixpkgs-12423e2e92378862924e1f4ea3f51364852338b8.tar.zst nixpkgs-12423e2e92378862924e1f4ea3f51364852338b8.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/interpreters')
-rw-r--r-- | pkgs/development/interpreters/clisp/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/interpreters/clisp/hg.nix | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/interpreters/clisp/default.nix b/pkgs/development/interpreters/clisp/default.nix index 2a387d34f47..926308f0d30 100644 --- a/pkgs/development/interpreters/clisp/default.nix +++ b/pkgs/development/interpreters/clisp/default.nix @@ -24,11 +24,11 @@ assert x11Support -> (libX11 != null && libXau != null && libXt != null && libXpm != null && xorgproto != null && libXext != null); stdenv.mkDerivation rec { - v = "2.49"; - name = "clisp-${v}"; + version = "2.49"; + pname = "clisp"; src = fetchurl { - url = "mirror://gnu/clisp/release/${v}/${name}.tar.bz2"; + url = "mirror://gnu/clisp/release/${version}/clisp-${version}.tar.bz2"; sha256 = "8132ff353afaa70e6b19367a25ae3d5a43627279c25647c220641fed00f8e890"; }; diff --git a/pkgs/development/interpreters/clisp/hg.nix b/pkgs/development/interpreters/clisp/hg.nix index 7ab4134facb..7b10d2cad0e 100644 --- a/pkgs/development/interpreters/clisp/hg.nix +++ b/pkgs/development/interpreters/clisp/hg.nix @@ -23,8 +23,8 @@ assert x11Support -> (libX11 != null && libXau != null && libXt != null && libXpm != null && xorgproto != null && libXext != null); stdenv.mkDerivation rec { - v = "2.50pre20171114"; - name = "clisp-${v}"; + version = "2.50pre20171114"; + pname = "clisp"; src = fetchhg { url = "http://hg.code.sf.net/p/clisp/clisp"; |