diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-18 06:01:33 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-18 06:01:33 +0000 |
commit | f2eada4ab85be29a3a32282704b436e0fd26334a (patch) | |
tree | 160ca327c7dfe485ab90f5f6eae4f0a3b348da24 /pkgs/development/interpreters | |
parent | 382fdc7ad3184c7d47f54feb535a970fe64a0f35 (diff) | |
parent | ff4f2b6b85c9446001d6a410549223afe141f101 (diff) | |
download | nixlib-f2eada4ab85be29a3a32282704b436e0fd26334a.tar nixlib-f2eada4ab85be29a3a32282704b436e0fd26334a.tar.gz nixlib-f2eada4ab85be29a3a32282704b436e0fd26334a.tar.bz2 nixlib-f2eada4ab85be29a3a32282704b436e0fd26334a.tar.lz nixlib-f2eada4ab85be29a3a32282704b436e0fd26334a.tar.xz nixlib-f2eada4ab85be29a3a32282704b436e0fd26334a.tar.zst nixlib-f2eada4ab85be29a3a32282704b436e0fd26334a.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/interpreters')
-rw-r--r-- | pkgs/development/interpreters/clojure/clooj.nix | 8 | ||||
-rw-r--r-- | pkgs/development/interpreters/eff/default.nix | 7 | ||||
-rw-r--r-- | pkgs/development/interpreters/gnu-apl/default.nix | 1 | ||||
-rw-r--r-- | pkgs/development/interpreters/pyrex/0.9.5.nix | 6 | ||||
-rw-r--r-- | pkgs/development/interpreters/pyrex/0.9.6.nix | 6 |
5 files changed, 9 insertions, 19 deletions
diff --git a/pkgs/development/interpreters/clojure/clooj.nix b/pkgs/development/interpreters/clojure/clooj.nix index 810d783d4fb5..42d6d67ee15b 100644 --- a/pkgs/development/interpreters/clojure/clooj.nix +++ b/pkgs/development/interpreters/clojure/clooj.nix @@ -1,14 +1,12 @@ { lib, stdenv, fetchurl, jre, makeWrapper }: -let version = "0.4.4"; in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "clooj"; - inherit version; + version = "0.4.4"; jar = fetchurl { # mirrored as original mediafire.com source does not work without user interaction - url = "https://archive.org/download/clooj-0.4.4-standalone/clooj-0.4.4-standalone.jar"; + url = "https://archive.org/download/clooj-${version}-standalone/clooj-${version}-standalone.jar"; sha256 = "0hbc29bg2a86rm3sx9kvj7h7db9j0kbnrb706wsfiyk3zi3bavnd"; }; diff --git a/pkgs/development/interpreters/eff/default.nix b/pkgs/development/interpreters/eff/default.nix index 8dba500c15bd..cddb773ec168 100644 --- a/pkgs/development/interpreters/eff/default.nix +++ b/pkgs/development/interpreters/eff/default.nix @@ -1,11 +1,8 @@ { lib, stdenv, fetchFromGitHub, which, ocamlPackages }: -let version = "5.0"; in - -stdenv.mkDerivation { - +stdenv.mkDerivation rec { pname = "eff"; - inherit version; + version = "5.0"; src = fetchFromGitHub { owner = "matijapretnar"; diff --git a/pkgs/development/interpreters/gnu-apl/default.nix b/pkgs/development/interpreters/gnu-apl/default.nix index 108da08b80d7..0f666dd9af5d 100644 --- a/pkgs/development/interpreters/gnu-apl/default.nix +++ b/pkgs/development/interpreters/gnu-apl/default.nix @@ -36,7 +36,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = [ maintainers.kovirobi ]; platforms = with platforms; linux ++ darwin; - inherit version; mainProgram = "apl"; longDescription = '' diff --git a/pkgs/development/interpreters/pyrex/0.9.5.nix b/pkgs/development/interpreters/pyrex/0.9.5.nix index a9c71c6fcf70..3fb909b0bb0d 100644 --- a/pkgs/development/interpreters/pyrex/0.9.5.nix +++ b/pkgs/development/interpreters/pyrex/0.9.5.nix @@ -1,10 +1,8 @@ { lib, fetchurl, python2Packages }: -let version = "0.9.5.1.1"; in - -python2Packages.buildPythonPackage { +python2Packages.buildPythonPackage rec { pname = "pyrex"; - inherit version; + version = "0.9.5.1.1"; src = fetchurl { url = "https://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-${version}.tar.gz"; diff --git a/pkgs/development/interpreters/pyrex/0.9.6.nix b/pkgs/development/interpreters/pyrex/0.9.6.nix index 12429c05fe63..e9d8d3097093 100644 --- a/pkgs/development/interpreters/pyrex/0.9.6.nix +++ b/pkgs/development/interpreters/pyrex/0.9.6.nix @@ -1,10 +1,8 @@ { lib, fetchurl, python2Packages }: -let version = "0.9.6.4"; in - -python2Packages.buildPythonPackage { +python2Packages.buildPythonPackage rec { pname = "pyrex"; - inherit version; + version = "0.9.6.4"; src = fetchurl { url = "https://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-${version}.tar.gz"; |