diff options
-rw-r--r-- | pkgs/development/beam-modules/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/interpreters/lfe/1.2.nix | 7 | ||||
-rw-r--r-- | pkgs/development/interpreters/lfe/1.3.nix | 43 | ||||
-rw-r--r-- | pkgs/development/interpreters/lfe/2.1.nix | 7 | ||||
-rw-r--r-- | pkgs/development/interpreters/lfe/fix-rebar-config.patch | 21 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 5 | ||||
-rw-r--r-- | pkgs/top-level/beam-packages.nix | 4 |
7 files changed, 20 insertions, 71 deletions
diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 22d2b337f1cb2..98d9de9e70b2b 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -75,8 +75,8 @@ let elixir-ls = callPackage ./elixir-ls { inherit elixir fetchMixDeps mixRelease; }; - lfe = lfe_1_3; - lfe_1_3 = lib'.callLFE ../interpreters/lfe/1.3.nix { inherit erlang buildRebar3 buildHex; }; + lfe = lfe_2_1; + lfe_2_1 = lib'.callLFE ../interpreters/lfe/2.1.nix { inherit erlang buildRebar3 buildHex; }; # Non hex packages. Examples how to build Rebar/Mix packages with and # without helper functions buildRebar3 and buildMix. diff --git a/pkgs/development/interpreters/lfe/1.2.nix b/pkgs/development/interpreters/lfe/1.2.nix deleted file mode 100644 index b81acdaa499eb..0000000000000 --- a/pkgs/development/interpreters/lfe/1.2.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ mkDerivation }: - -mkDerivation { - version = "1.2.1"; - sha256 = "0j5gjlsk92y14kxgvd80q9vwyhmjkphpzadcswyjxikgahwg1avz"; - maximumOTPVersion = "19"; -} diff --git a/pkgs/development/interpreters/lfe/1.3.nix b/pkgs/development/interpreters/lfe/1.3.nix deleted file mode 100644 index 52df5c0254472..0000000000000 --- a/pkgs/development/interpreters/lfe/1.3.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ fetchpatch, mkDerivation }: - -let - _fetchpatch = - { rev, sha256 }: - fetchpatch { - url = "https://github.com/rvirding/lfe/commit/${rev}.patch"; - inherit sha256; - }; - fetchPatches = map _fetchpatch; -in - -mkDerivation { - version = "1.3"; - sha256 = "0pgwi0h0d34353m39jin8dxw4yykgfcg90k6pc4qkjyrg40hh4l6"; - maximumOTPVersion = "21"; - patches = fetchPatches [ - { - rev = "b457e5d521bb35008e6049fab31b4073cc10d583"; - sha256 = "1zrq1b3291xhb0jsirgb5s8hacq5xvz7xidsp29aqcnpazdvivdc"; - } - { - rev = "5fe9f37741b7d53bd43109fd3435e1437f124a0d"; - sha256 = "1anqlcbih52lc0wynf58r67w1jhn264lz49rczwgh19pqg92dvqf"; - } - { - rev = "b8f3e06511cb6805cf3a904c1589b27f33f3958d"; - sha256 = "1zqafc0asm9m6cq7r0brvfawv69fqggy1phif3zknjmpicf25pqf"; - } - { - rev = "40c239a608460e55563edb68c1b6faca57518b54"; - sha256 = "03av5115jwyammw337xzy50l6api5h0wbwwda5vzw0w10zwb2z8y"; - } - { - rev = "5faa7106419263689bfc0bc08a7451ccb1fba718"; - sha256 = "0ml5yh5b3rn4ympks4bpx409hkra0i79zvq80azk0kmbjd869fxp"; - } - { - rev = "9ff978693babcfd043d741b5c6940920b8315892"; - sha256 = "04968dmp527wbkdv7dqpaj3nsyjls93whc1b5hx73b39dvl3n3y1"; - } - ]; -} diff --git a/pkgs/development/interpreters/lfe/2.1.nix b/pkgs/development/interpreters/lfe/2.1.nix new file mode 100644 index 0000000000000..2dff2ade66c1a --- /dev/null +++ b/pkgs/development/interpreters/lfe/2.1.nix @@ -0,0 +1,7 @@ +{ fetchpatch, mkDerivation }: + +mkDerivation { + version = "2.1.1"; + sha256 = "sha256-HUOVBzUaU0ixIfPPctwR2TPijxJjcFY3dJ8Z7Ot2bpE="; + maximumOTPVersion = "25"; +} diff --git a/pkgs/development/interpreters/lfe/fix-rebar-config.patch b/pkgs/development/interpreters/lfe/fix-rebar-config.patch index ac385351b1cfa..991ee4225dbd9 100644 --- a/pkgs/development/interpreters/lfe/fix-rebar-config.patch +++ b/pkgs/development/interpreters/lfe/fix-rebar-config.patch @@ -1,29 +1,24 @@ diff --git a/rebar.config b/rebar.config -index 1d5a68e..a86ee39 100644 +index 1204a6f..7e2c102 100644 --- a/rebar.config +++ b/rebar.config -@@ -2,20 +2,20 @@ - - {erl_opts, [debug_info]}. - --{profiles, [{test, [{deps, [proper]}]}]}. -+%%{profiles, [{test, [{deps, [proper]}]}]}. +@@ -23,16 +23,16 @@ {pre_hooks, [{"(linux|darwin|solaris|freebsd|netbsd|openbsd)", ct, - "bin/lfe bin/lfec" + "bin/lfescript bin/lfec" - " -o $REBAR_DEPS_DIR/lfe/test" + " -o test" " test/*_SUITE.lfe"}, {"(linux|darwin|solaris|freebsd|netbsd|openbsd)", eunit, - "bin/lfe bin/lfec" + "bin/lfescript bin/lfec" - " -o $REBAR_DEPS_DIR/lfe/ebin" + " -o ebin" - " test/clj-tests.lfe"}, + " test/clj-tests.lfe test/maps-tests.lfe"}, %% TODO: Test this on a win32 box %% {"win32", ct, - %% "bin/lfe bin/lfec -o $REBAR_DEPS_DIR/lfe/test test/*_SUITE.lfe"} + %% "bin/lfescript bin/lfec -o $REBAR_DEPS_DIR/lfe/test test/*_SUITE.lfe"} {"(linux|darwin|solaris|freebsd|netbsd|openbsd)", app_compile, -- "bin/lfe bin/lfec -o $REBAR_DEPS_DIR/lfe/ebin src/*.lfe"} -+ "bin/lfe bin/lfec -o ebin src/*.lfe"} +- "bin/lfescript bin/lfec -o $REBAR_DEPS_DIR/lfe/ebin src/*.lfe"} ++ "bin/lfescript bin/lfec -o ebin src/*.lfe"} %% TODO: equivalent win32 hook ]}. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6814849d058ef..6a89a3a9de261 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16586,9 +16586,8 @@ with pkgs; inherit (beam.packages.erlang) erlang-ls erlfmt elvis-erlang rebar rebar3 rebar3WithPlugins - fetchHex beamPackages; - - inherit (beam.packages.erlang_21) lfe lfe_1_3; + fetchHex beamPackages + lfe lfe_2_1; gnudatalanguage = callPackage ../development/interpreters/gnudatalanguage { inherit (llvmPackages) openmp; diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index 8b40783baed16..079b3c51f4407 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -116,9 +116,7 @@ in # access for example elixir built with different version of Erlang, use # `beam.packages.erlang_24.elixir`. inherit (self.packages.erlang) - elixir elixir_1_14 elixir_1_13 elixir_1_12 elixir_1_11 elixir_1_10 elixir-ls; - - inherit (self.packages.erlang) lfe lfe_1_3; + elixir elixir_1_14 elixir_1_13 elixir_1_12 elixir_1_11 elixir_1_10 elixir-ls lfe lfe_2_1; } // interpretersAliases; # Helper function to generate package set with a specific Erlang version. |