From 435bceb69eb71bd98fd1f4b2ef27eaa3e9dedd7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Claes=20Wallin=20=28=E9=9F=8B=E5=98=89=E8=AA=A0=29?= Date: Mon, 5 Feb 2018 23:04:52 +0800 Subject: [PATCH 1/4] racket-minimal: init at 6.12.0 (same as racket) Racket without the bundled packages, such as Mr Racket. The essential package racket-libs is included, as well as libraries that live in collections. In particular, raco and the pkg library are still bundled. --- pkgs/development/interpreters/racket/default.nix | 9 +++++++-- pkgs/development/interpreters/racket/minimal.nix | 10 ++++++++++ pkgs/top-level/all-packages.nix | 1 + 3 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/interpreters/racket/minimal.nix diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 2397cce97ea..4a980ec418f 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -35,8 +35,13 @@ stdenv.mkDerivation rec { name = "racket-${version}"; version = "6.12"; - src = fetchurl { - url = "https://mirror.racket-lang.org/installers/${version}/${name}-src.tgz"; + src = (stdenv.lib.makeOverridable ({ name, sha256 }: + fetchurl rec { + url = "https://mirror.racket-lang.org/installers/${version}/${name}-src.tgz"; + inherit sha256; + } + )) { + inherit name; sha256 = "0cwcypzjfl9py1s695mhqkiapff7c1w29llsmdj7qgn58wl0apk5"; }; diff --git a/pkgs/development/interpreters/racket/minimal.nix b/pkgs/development/interpreters/racket/minimal.nix new file mode 100644 index 00000000000..d83bb9f194e --- /dev/null +++ b/pkgs/development/interpreters/racket/minimal.nix @@ -0,0 +1,10 @@ +{ racket +}: + +racket.overrideAttrs (oldAttrs: rec { + name = "racket-minimal-${oldAttrs.version}"; + src = oldAttrs.src.override { + inherit name; + sha256 = "0c565jy2y3gjl5lncd5adjsrj8c24p4i062kphv26ni5q1nn5ip5"; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1cf74474141..18984acf85a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7015,6 +7015,7 @@ with pkgs; # https://github.com/NixOS/nixpkgs/pull/31017#issuecomment-343574769 stdenv = overrideCC stdenv gcc7; }; + racket-minimal = callPackage ../development/interpreters/racket/minimal.nix { }; rakudo = callPackage ../development/interpreters/rakudo { inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; From ebf394be85b4cd34f68c9906c50e45e21ef88db7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Claes=20Wallin=20=28=E9=9F=8B=E5=98=89=E8=AA=A0=29?= Date: Sat, 10 Feb 2018 13:30:51 +0800 Subject: [PATCH 2/4] racket-minimal: add description --- pkgs/development/interpreters/racket/minimal.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/interpreters/racket/minimal.nix b/pkgs/development/interpreters/racket/minimal.nix index d83bb9f194e..900ee9f07e3 100644 --- a/pkgs/development/interpreters/racket/minimal.nix +++ b/pkgs/development/interpreters/racket/minimal.nix @@ -7,4 +7,11 @@ racket.overrideAttrs (oldAttrs: rec { inherit name; sha256 = "0c565jy2y3gjl5lncd5adjsrj8c24p4i062kphv26ni5q1nn5ip5"; }; + + description = "Racket without bundled packages, such as Mr Racket."; + longDescription = ''The essential package racket-libs is included, + as well as libraries that live in collections. In particular, raco + and the pkg library are still bundled. + ''; + }) From e87fb710851063b48731b4b8c4db2ae77270cd54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Claes=20Wallin=20=28=E9=9F=8B=E5=98=89=E8=AA=A0=29?= Date: Tue, 13 Feb 2018 08:05:35 +0800 Subject: [PATCH 3/4] racket-minimal: Correct description: Dr. Racket, not Mr. --- pkgs/development/interpreters/racket/minimal.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/racket/minimal.nix b/pkgs/development/interpreters/racket/minimal.nix index 900ee9f07e3..6f9549dc426 100644 --- a/pkgs/development/interpreters/racket/minimal.nix +++ b/pkgs/development/interpreters/racket/minimal.nix @@ -8,7 +8,7 @@ racket.overrideAttrs (oldAttrs: rec { sha256 = "0c565jy2y3gjl5lncd5adjsrj8c24p4i062kphv26ni5q1nn5ip5"; }; - description = "Racket without bundled packages, such as Mr Racket."; + description = "Racket without bundled packages, such as Dr. Racket."; longDescription = ''The essential package racket-libs is included, as well as libraries that live in collections. In particular, raco and the pkg library are still bundled. From a4763e1fd20c906475530cec669d8b37d5c3fec6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Claes=20Wallin=20=28=E9=9F=8B=E5=98=89=E8=AA=A0=29?= Date: Fri, 16 Feb 2018 12:25:34 +0800 Subject: [PATCH 4/4] racket-minimal: Add aarch64-linux to meta.platforms Move description and longDescription to meta -- they were accidentally in the parent set. --- pkgs/development/interpreters/racket/minimal.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/interpreters/racket/minimal.nix b/pkgs/development/interpreters/racket/minimal.nix index 6f9549dc426..6bac9a0f341 100644 --- a/pkgs/development/interpreters/racket/minimal.nix +++ b/pkgs/development/interpreters/racket/minimal.nix @@ -8,10 +8,12 @@ racket.overrideAttrs (oldAttrs: rec { sha256 = "0c565jy2y3gjl5lncd5adjsrj8c24p4i062kphv26ni5q1nn5ip5"; }; - description = "Racket without bundled packages, such as Dr. Racket."; - longDescription = ''The essential package racket-libs is included, - as well as libraries that live in collections. In particular, raco - and the pkg library are still bundled. - ''; - + meta = oldAttrs.meta // { + description = "Racket without bundled packages, such as Dr. Racket."; + longDescription = ''The essential package racket-libs is included, + as well as libraries that live in collections. In particular, raco + and the pkg library are still bundled. + ''; + platforms = [ "x86_64-linux" "aarch64-linux" ]; + }; })