diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-03-08 18:01:16 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-08 18:01:16 +0000 |
commit | d47f26379adf02bb973cbae487c2dcf40d3613bd (patch) | |
tree | fca453db0514ec48d01cb3dcdb0b9d9103de78c8 /pkgs/development/interpreters | |
parent | 4a35c770221bf9dea0da66b9e92702c5da144581 (diff) | |
parent | 55face65be766a52d8277404b3b2023778e7f408 (diff) | |
download | nixlib-d47f26379adf02bb973cbae487c2dcf40d3613bd.tar nixlib-d47f26379adf02bb973cbae487c2dcf40d3613bd.tar.gz nixlib-d47f26379adf02bb973cbae487c2dcf40d3613bd.tar.bz2 nixlib-d47f26379adf02bb973cbae487c2dcf40d3613bd.tar.lz nixlib-d47f26379adf02bb973cbae487c2dcf40d3613bd.tar.xz nixlib-d47f26379adf02bb973cbae487c2dcf40d3613bd.tar.zst nixlib-d47f26379adf02bb973cbae487c2dcf40d3613bd.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/interpreters')
-rw-r--r-- | pkgs/development/interpreters/chibi/default.nix | 24 | ||||
-rw-r--r-- | pkgs/development/interpreters/elixir/generic-builder.nix | 2 | ||||
-rw-r--r-- | pkgs/development/interpreters/racket/minimal.nix | 5 |
3 files changed, 15 insertions, 16 deletions
diff --git a/pkgs/development/interpreters/chibi/default.nix b/pkgs/development/interpreters/chibi/default.nix index c0ee8988c094..4a8b639071ab 100644 --- a/pkgs/development/interpreters/chibi/default.nix +++ b/pkgs/development/interpreters/chibi/default.nix @@ -1,18 +1,8 @@ { lib, stdenv, fetchFromGitHub, makeWrapper }: -let - version = "0.10"; - name = "chibi-scheme-${version}"; -in -stdenv.mkDerivation { - inherit name; - meta = { - homepage = "https://github.com/ashinn/chibi-scheme"; - description = "Small Footprint Scheme for use as a C Extension Language"; - platforms = lib.platforms.all; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.DerGuteMoritz ]; - }; +stdenv.mkDerivation rec { + version = "0.10"; + pname = "chibi-scheme"; src = fetchFromGitHub { owner = "ashinn"; @@ -36,4 +26,12 @@ stdenv.mkDerivation { --replace "/usr/bin/env chibi-scheme" "$out/bin/chibi-scheme" done ''; + + meta = { + homepage = "https://github.com/ashinn/chibi-scheme"; + description = "Small Footprint Scheme for use as a C Extension Language"; + platforms = lib.platforms.all; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.DerGuteMoritz ]; + }; } diff --git a/pkgs/development/interpreters/elixir/generic-builder.nix b/pkgs/development/interpreters/elixir/generic-builder.nix index 646fd70ff8f9..5f08386c9f51 100644 --- a/pkgs/development/interpreters/elixir/generic-builder.nix +++ b/pkgs/development/interpreters/elixir/generic-builder.nix @@ -25,7 +25,7 @@ in assert versionAtLeast (getVersion erlang) minimumOTPVersion; stdenv.mkDerivation ({ - name = "${baseName}-${version}"; + pname = "${baseName}"; inherit src version debugInfo; diff --git a/pkgs/development/interpreters/racket/minimal.nix b/pkgs/development/interpreters/racket/minimal.nix index e56945ed651d..b73cdaff5d3e 100644 --- a/pkgs/development/interpreters/racket/minimal.nix +++ b/pkgs/development/interpreters/racket/minimal.nix @@ -2,9 +2,10 @@ }: racket.overrideAttrs (oldAttrs: rec { - name = "racket-minimal-${oldAttrs.version}"; + pname = "racket-minimal"; + version = oldAttrs.version; src = oldAttrs.src.override { - inherit name; + name = "${pname}-${version}"; sha256 = "sha256-FZlUWvjtioe4S8gPetj7vdneVX6jEFguJo4j2wJsKAw="; }; |