Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
209875d860
|
|
@ -14,7 +14,7 @@ nixpkgs follows the [official elixir deprecation schedule](https://hexdocs.pm/el
|
|||
|
||||
All BEAM-related expressions are available via the top-level `beam` attribute, which includes:
|
||||
|
||||
- `interpreters`: a set of compilers running on the BEAM, including multiple Erlang/OTP versions (`beam.interpreters.erlangR22`, etc), Elixir (`beam.interpreters.elixir`) and LFE (Lisp Flavoured Erlang) (`beam.interpreters.lfe`).
|
||||
- `interpreters`: a set of compilers running on the BEAM, including multiple Erlang/OTP versions (`beam.interpreters.erlang_22`, etc), Elixir (`beam.interpreters.elixir`) and LFE (Lisp Flavoured Erlang) (`beam.interpreters.lfe`).
|
||||
|
||||
- `packages`: a set of package builders (Mix and rebar3), each compiled with a specific Erlang/OTP version, e.g. `beam.packages.erlang22`.
|
||||
|
||||
|
|
@ -22,7 +22,7 @@ The default Erlang compiler, defined by `beam.interpreters.erlang`, is aliased a
|
|||
|
||||
To create a package builder built with a custom Erlang version, use the lambda, `beam.packagesWith`, which accepts an Erlang/OTP derivation and produces a package builder similar to `beam.packages.erlang`.
|
||||
|
||||
Many Erlang/OTP distributions available in `beam.interpreters` have versions with ODBC and/or Java enabled or without wx (no observer support). For example, there's `beam.interpreters.erlangR22_odbc_javac`, which corresponds to `beam.interpreters.erlangR22` and `beam.interpreters.erlangR22_nox`, which corresponds to `beam.interpreters.erlangR22`.
|
||||
Many Erlang/OTP distributions available in `beam.interpreters` have versions with ODBC and/or Java enabled or without wx (no observer support). For example, there's `beam.interpreters.erlang_22_odbc_javac`, which corresponds to `beam.interpreters.erlang_22` and `beam.interpreters.erlang_22_nox`, which corresponds to `beam.interpreters.erlang_22`.
|
||||
|
||||
## Build Tools {#build-tools}
|
||||
|
||||
|
|
@ -154,7 +154,7 @@ Here is how your `default.nix` file would look for a phoenix project.
|
|||
with import <nixpkgs> { };
|
||||
|
||||
let
|
||||
# beam.interpreters.erlangR23 is available if you need a particular version
|
||||
# beam.interpreters.erlang_23 is available if you need a particular version
|
||||
packages = beam.packagesWith beam.interpreters.erlang;
|
||||
|
||||
pname = "your_project";
|
||||
|
|
@ -274,7 +274,7 @@ Usually, we need to create a `shell.nix` file and do our development inside of t
|
|||
|
||||
with pkgs;
|
||||
let
|
||||
elixir = beam.packages.erlangR24.elixir_1_12;
|
||||
elixir = beam.packages.erlang_24.elixir_1_12;
|
||||
in
|
||||
mkShell {
|
||||
buildInputs = [ elixir ];
|
||||
|
|
|
|||
|
|
@ -15727,6 +15727,12 @@
|
|||
github = "deviant";
|
||||
githubId = 68829907;
|
||||
};
|
||||
vaci = {
|
||||
email = "vaci@vaci.org";
|
||||
github = "vaci";
|
||||
githubId = 6882568;
|
||||
name = "Vaci";
|
||||
};
|
||||
vaibhavsagar = {
|
||||
email = "vaibhavsagar@gmail.com";
|
||||
matrix = "@vaibhavsagar:matrix.org";
|
||||
|
|
|
|||
|
|
@ -25,13 +25,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tauon";
|
||||
version = "7.5.0";
|
||||
version = "7.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Taiko2k";
|
||||
repo = "TauonMusicBox";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-9/mzh8lRBjd7d9oEyG1XGWmOdgPEFCVjHZxDnAhYDwc=";
|
||||
hash = "sha256-oQ3mcDrWWIT/2fu4MBw+0GjxWGFw1aLSTvmaKSDsdz4=";
|
||||
};
|
||||
|
||||
postUnpack = ''
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -6,7 +6,7 @@ rec {
|
|||
version = "111.0.1";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "e7d248b845cb524efc28818e0a0cad06ba5acac30219886191b702b61314388d10a1690c6d704b0a70d2bc2c4b1f04ed02350dcb9dce9c56503d2af3baefe4d3";
|
||||
sha512 = "b16c9399a19cb1de2d865a023d54fbe71c23a363ea4d36cd58f41f64f7ad04bc1b9d8a8448943417516e17337e0ee2afd370c29a72b51b0947161f4ffab6935f";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles, stdenv }:
|
||||
|
||||
let
|
||||
version = "0.41.1";
|
||||
sha256 = "0nrwhq336n0aj1c51difgxk9an8d1j4yfkxn9sgzw9dq50rrrinf";
|
||||
manifestsSha256 = "1rrmdbaian8wskcyaa2nifp4mp4bz0nqgwz6ah5r0ywg48cfq2gm";
|
||||
version = "0.41.2";
|
||||
sha256 = "0c4in6k6l9kjskcapi6gap9jkbrrfd106z6nbs48afr30cv2wp24";
|
||||
manifestsSha256 = "0kc9s5289s5b1slk2w3sr28yk9hg3lmrpy00mw3im3k6aqgrk9j0";
|
||||
|
||||
manifests = fetchzip {
|
||||
url =
|
||||
|
|
@ -23,13 +23,14 @@ in buildGoModule rec {
|
|||
inherit sha256;
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-Oh1FBTHkICQZ79qf8XCL7ifi5Wd3jrIDupBKzYo+AEA=";
|
||||
vendorSha256 = "sha256-ez4yaFZ5JROdu9boN5wI/XGMqLo8OKW6b0FZsJeFw4w=";
|
||||
|
||||
postUnpack = ''
|
||||
cp -r ${manifests} source/cmd/flux/manifests
|
||||
'';
|
||||
|
||||
patches = [ ./patches/disable-tests-ssh_key.patch ];
|
||||
# disable tests that require network access
|
||||
rm source/cmd/flux/create_secret_git_test.go
|
||||
'';
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.VERSION=${version}" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,19 +0,0 @@
|
|||
--- flux/cmd/flux/create_secret_git_test.go.orig 2021-12-07 13:46:21.196278468 +0100
|
||||
+++ flux/cmd/flux/create_secret_git_test.go 2021-12-07 13:49:51.668566955 +0100
|
||||
@@ -20,16 +20,6 @@
|
||||
args: "create secret git podinfo-auth --url=https://github.com/stefanprodan/podinfo --username=my-username --password=my-password --namespace=my-namespace --export",
|
||||
assert: assertGoldenFile("./testdata/create_secret/git/secret-git-basic.yaml"),
|
||||
},
|
||||
- {
|
||||
- name: "ssh key",
|
||||
- args: "create secret git podinfo-auth --url=ssh://git@github.com/stefanprodan/podinfo --private-key-file=./testdata/create_secret/git/ecdsa.private --namespace=my-namespace --export",
|
||||
- assert: assertGoldenFile("testdata/create_secret/git/git-ssh-secret.yaml"),
|
||||
- },
|
||||
- {
|
||||
- name: "ssh key with password",
|
||||
- args: "create secret git podinfo-auth --url=ssh://git@github.com/stefanprodan/podinfo --private-key-file=./testdata/create_secret/git/ecdsa-password.private --password=password --namespace=my-namespace --export",
|
||||
- assert: assertGoldenFile("testdata/create_secret/git/git-ssh-secret-password.yaml"),
|
||||
- },
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
|
|
@ -25,13 +25,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "forgejo";
|
||||
version = "1.18.5-0";
|
||||
version = "1.19.0-2";
|
||||
|
||||
src = fetchurl {
|
||||
name = "${pname}-src-${version}.tar.gz";
|
||||
# see https://codeberg.org/forgejo/forgejo/releases
|
||||
url = "https://codeberg.org/attachments/bb93c0c9-98c4-465c-bcff-e07ac3ee72a3";
|
||||
hash = "sha256-jyaJ7W/K1Nn44ZhyJHZD+dKObU3hYx6mmDzvbvrR7gw=";
|
||||
url = "https://codeberg.org/attachments/2bf497db-fa91-4260-9c98-5c791b6b397c";
|
||||
hash = "sha256-neDIT+V3qHR8xgP4iy4TJQ6PCWO3svpSA7FLCacQSMI=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gh";
|
||||
version = "2.25.0";
|
||||
version = "2.25.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cli";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-utJX7GkShTY0Gj2usQ+WeyYJ47j+PG2iwTKXtSgGjpE=";
|
||||
hash = "sha256-CE3Ds9z5CB49Hb9IVuDKwRjGwuw+0d5zBpw2IVsO7Tc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-nn2DzjcXHiuSaiEuWNZTAZ3+OKrEpRzUPzqmH+gZ9sY=";
|
||||
|
|
|
|||
|
|
@ -2,15 +2,17 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "docker-buildx";
|
||||
version = "0.9.1";
|
||||
version = "0.10.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "docker";
|
||||
repo = "buildx";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-nJR+wpWa7y8Mq6WWj1ZH/FRCtar40XP2fwyl1hMgELI=";
|
||||
sha256 = "sha256-hYEFboZa6RGiy0wr7NEWaf5KCz/O7KGXTc6c9hMmoXk=";
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
ldflags = [
|
||||
|
|
@ -32,6 +34,6 @@ buildGoModule rec {
|
|||
description = "Docker CLI plugin for extended build capabilities with BuildKit";
|
||||
homepage = "https://github.com/docker/buildx";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ maintainers.ivan-babrou ];
|
||||
maintainers = with maintainers; [ ivan-babrou developer-guy ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -158,7 +158,7 @@ stdenv.mkDerivation ({
|
|||
latest=$(list-git-tags --url=https://github.com/erlang/otp.git | sed -n 's/^OTP-${major}/${major}/p' | sort -V | tail -1)
|
||||
if [ "$latest" != "${version}" ]; then
|
||||
nixpkgs="$(git rev-parse --show-toplevel)"
|
||||
nix_file="$nixpkgs/pkgs/development/interpreters/erlang/R${major}.nix"
|
||||
nix_file="$nixpkgs/pkgs/development/interpreters/erlang/${major}.nix"
|
||||
update-source-version ${baseName}R${major} "$latest" --version-key=version --print-changes --file="$nix_file"
|
||||
else
|
||||
echo "${baseName}R${major} is already up-to-date"
|
||||
|
|
|
|||
|
|
@ -1,7 +0,0 @@
|
|||
{ mkDerivation }:
|
||||
|
||||
mkDerivation {
|
||||
version = "1.2.1";
|
||||
sha256 = "0j5gjlsk92y14kxgvd80q9vwyhmjkphpzadcswyjxikgahwg1avz";
|
||||
maximumOTPVersion = "19";
|
||||
}
|
||||
|
|
@ -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";
|
||||
}
|
||||
];
|
||||
}
|
||||
7
pkgs/development/interpreters/lfe/2.1.nix
Normal file
7
pkgs/development/interpreters/lfe/2.1.nix
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
{ fetchpatch, mkDerivation }:
|
||||
|
||||
mkDerivation {
|
||||
version = "2.1.1";
|
||||
sha256 = "sha256-HUOVBzUaU0ixIfPPctwR2TPijxJjcFY3dJ8Z7Ot2bpE=";
|
||||
maximumOTPVersion = "25";
|
||||
}
|
||||
|
|
@ -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
|
||||
]}.
|
||||
|
|
|
|||
|
|
@ -18,13 +18,9 @@ let
|
|||
|
||||
proper = buildHex {
|
||||
name = "proper";
|
||||
version = "1.1.1-beta";
|
||||
version = "1.4.0";
|
||||
|
||||
sha256 = "0hnkhs761yjynw9382w8wm4j3x0r7lllzavaq2kh9n7qy3zc1rdx";
|
||||
|
||||
configurePhase = ''
|
||||
${erlang}/bin/escript write_compile_flags include/compile_flags.hrl
|
||||
'';
|
||||
sha256 = "sha256-GChYQhhb0z772pfRNKXLWgiEOE2zYRn+4OPPpIhWjLs=";
|
||||
};
|
||||
|
||||
in
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
, fetchFromGitHub
|
||||
, aiohttp
|
||||
, semver
|
||||
, asynctest
|
||||
, deepmerge
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
|
|
@ -35,7 +34,6 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
asynctest
|
||||
deepmerge
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
|
|
@ -46,7 +44,7 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/blebox/blebox_uniapi/blob/${src.rev}/HISTORY.rst";
|
||||
changelog = "https://github.com/blebox/blebox_uniapi/blob/${version}/HISTORY.rst";
|
||||
description = "Python API for accessing BleBox smart home devices";
|
||||
homepage = "https://github.com/blebox/blebox_uniapi";
|
||||
license = licenses.asl20;
|
||||
|
|
|
|||
|
|
@ -34,6 +34,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
ln -sf $out/codeql/tools/linux64/lib64trace.so $out/codeql/tools/linux64/libtrace.so
|
||||
|
||||
sed -i 's%\$CODEQL_DIST/tools/\$CODEQL_PLATFORM/java-aarch64%\${jdk17}%g' $out/codeql/codeql
|
||||
sed -i 's%\$CODEQL_DIST/tools/\$CODEQL_PLATFORM/java%\${jdk17}%g' $out/codeql/codeql
|
||||
|
||||
ln -s $out/codeql/codeql $out/bin/
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "metals";
|
||||
version = "0.11.10";
|
||||
version = "0.11.11";
|
||||
|
||||
deps = stdenv.mkDerivation {
|
||||
name = "${pname}-deps-${version}";
|
||||
|
|
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
outputHashMode = "recursive";
|
||||
outputHashAlgo = "sha256";
|
||||
outputHash = "sha256-CNLBDsyiEOmMGA9r8eU+3z75VYps21kHnLpB1LYC7W4=";
|
||||
outputHash = "sha256-oz4lrRnpVzc9kN+iJv+mtV/S1wdMKwJBkKpvmWCSwE0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper setJavaClassPath ];
|
||||
|
|
|
|||
89
pkgs/games/aaaaxy/default.nix
Normal file
89
pkgs/games/aaaaxy/default.nix
Normal file
|
|
@ -0,0 +1,89 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, buildGoModule
|
||||
, alsa-lib
|
||||
, libglvnd
|
||||
, libX11
|
||||
, libXcursor
|
||||
, libXext
|
||||
, libXi
|
||||
, libXinerama
|
||||
, libXrandr
|
||||
, libXxf86vm
|
||||
, go-licenses
|
||||
, pkg-config
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "aaaaxy";
|
||||
version = "1.3.372";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "divVerent";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-vm3wA8lzoaJ5iGwf2nZ0EvoSATHGftQ77lwdEjGe2RU=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
vendorHash = "sha256-WEK7j7FMiue0Fl1R+To5GKwvM03pjc1nKig/wePEAAY=";
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
libglvnd
|
||||
libX11 libXcursor libXext libXi libXinerama libXrandr
|
||||
libXxf86vm
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
go-licenses
|
||||
pkg-config
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Without patching, "go run" fails with the error message:
|
||||
# package github.com/google/go-licenses: no Go files in /build/source/vendor/github.com/google/go-licenses
|
||||
substituteInPlace scripts/build-licenses.sh --replace \
|
||||
'$GO run ''${GO_FLAGS} github.com/google/go-licenses' 'go-licenses'
|
||||
'';
|
||||
|
||||
makeFlags = [
|
||||
"BUILDTYPE=release"
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
AAAAXY_BUILD_USE_VERSION_FILE=true make $makeFlags
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
install -Dm755 'aaaaxy' -t "$out/bin/"
|
||||
install -Dm444 'aaaaxy.svg' -t "$out/share/icons/hicolor/scalable/apps/"
|
||||
install -Dm644 'aaaaxy.png' -t "$out/share/icons/hicolor/128x128/apps/"
|
||||
install -Dm644 'aaaaxy.desktop' -t "$out/share/applications/"
|
||||
install -Dm644 'io.github.divverent.aaaaxy.metainfo.xml' -t "$out/share/metainfo/"
|
||||
'';
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
# Can't get GLX to work even though it seems to work in their CI system:
|
||||
# [FATAL] RunGame exited abnormally: APIUnavailable: GLX: GLX extension not found
|
||||
# xvfb-run sh scripts/regression-test-demo.sh aaaaxy \
|
||||
# "on track for Any%, All Paths and No Teleports" \
|
||||
# ./aaaaxy assets/demos/benchmark.dem
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A nonlinear 2D puzzle platformer taking place in impossible spaces";
|
||||
homepage = "https://divverent.github.io/aaaaxy/";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ Luflosi ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -48,5 +48,6 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ mic92 ];
|
||||
mainProgram = "nvme";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
179
pkgs/servers/aeron/default.nix
Normal file
179
pkgs/servers/aeron/default.nix
Normal file
|
|
@ -0,0 +1,179 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
jdk11,
|
||||
gradle,
|
||||
makeWrapper,
|
||||
perl,
|
||||
writeText
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "aeron";
|
||||
version = "1.40.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "real-logic";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-4C5YofA/wxwa7bfc6IqsDrw8CLQWKoVBCIe8Ec7ifAg=";
|
||||
};
|
||||
|
||||
deps = stdenv.mkDerivation {
|
||||
name = "${pname}-deps";
|
||||
inherit src;
|
||||
|
||||
nativeBuildInputs = [
|
||||
gradle
|
||||
jdk11
|
||||
perl
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
export GRADLE_USER_HOME=$(mktemp -d);
|
||||
gradle \
|
||||
--console plain \
|
||||
--no-daemon \
|
||||
--system-prop org.gradle.java.home="${jdk11.home}" \
|
||||
--exclude-task javadoc \
|
||||
build
|
||||
'';
|
||||
|
||||
# Mavenize dependency paths
|
||||
# e.g. org.codehaus.groovy/groovy/2.4.0/{hash}/groovy-2.4.0.jar -> org/codehaus/groovy/groovy/2.4.0/groovy-2.4.0.jar
|
||||
installPhase = ''
|
||||
find "$GRADLE_USER_HOME/caches/modules-2" -type f -regex '.*\.\(jar\|pom\)' \
|
||||
| perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \
|
||||
| sh
|
||||
ln -s "$out/com/squareup/okio/okio/2.10.0/okio-jvm-2.10.0.jar" "$out/com/squareup/okio/okio/2.10.0/okio-2.10.0.jar"
|
||||
'';
|
||||
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
outputHash = "sha256-1hvQyEiCMfIw6wv9GOEehX0wrtBnAilVuTGUWAGoH6k=";
|
||||
};
|
||||
|
||||
# Point to our local deps repo
|
||||
gradleInit = writeText "init.gradle" ''
|
||||
settingsEvaluated { settings ->
|
||||
settings.pluginManagement {
|
||||
repositories {
|
||||
clear()
|
||||
maven { url '${deps}' }
|
||||
}
|
||||
}
|
||||
}
|
||||
gradle.projectsLoaded {
|
||||
rootProject.allprojects {
|
||||
repositories {
|
||||
clear()
|
||||
maven { url '${deps}' }
|
||||
}
|
||||
}
|
||||
}
|
||||
'';
|
||||
|
||||
# replace buildSrc
|
||||
buildSrc = writeText "build.gradle" ''
|
||||
repositories {
|
||||
clear()
|
||||
maven { url '${deps}' }
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation 'org.asciidoctor:asciidoctorj:2.5.5'
|
||||
implementation 'org.eclipse.jgit:org.eclipse.jgit:5.13.1.202206130422-r'
|
||||
}
|
||||
'';
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
|
||||
inherit pname src version;
|
||||
|
||||
buildInputs = [
|
||||
jdk11
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
gradle
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
export GRADLE_USER_HOME=$(mktemp -d)
|
||||
cp ${buildSrc} ./buildSrc/build.gradle
|
||||
|
||||
gradle \
|
||||
--console plain \
|
||||
--exclude-task checkstyleMain \
|
||||
--exclude-task checkstyleGenerated \
|
||||
--exclude-task checkstyleGeneratedTest \
|
||||
--exclude-task checkstyleMain \
|
||||
--exclude-task checkstyleTest \
|
||||
--exclude-task javadoc \
|
||||
--exclude-task test \
|
||||
--init-script "${gradleInit}" \
|
||||
--no-daemon \
|
||||
--offline \
|
||||
--project-prop VERSION=${version} \
|
||||
--system-prop org.gradle.java.home="${jdk11.home}" \
|
||||
assemble
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -D --mode=0444 --target-directory="$out/share/java" \
|
||||
"./aeron-all/build/libs/aeron-all-${version}.jar" \
|
||||
"./aeron-agent/build/libs/aeron-agent-${version}.jar" \
|
||||
"./aeron-archive/build/libs/aeron-archive-${version}.jar" \
|
||||
"./aeron-client/build/libs/aeron-client-${version}.jar"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
function wrap {
|
||||
makeWrapper "${jdk11}/bin/java" "$out/bin/$1" \
|
||||
--add-flags "--add-opens java.base/sun.nio.ch=ALL-UNNAMED" \
|
||||
--add-flags "--class-path $out/share/java/aeron-all-${version}.jar" \
|
||||
--add-flags "$2"
|
||||
}
|
||||
|
||||
wrap "${pname}-media-driver" io.aeron.driver.MediaDriver
|
||||
wrap "${pname}-stat" io.aeron.samples.AeronStat
|
||||
wrap "${pname}-archiving-media-driver" io.aeron.archive.ArchivingMediaDriver
|
||||
wrap "${pname}-archive-tool" io.aeron.archive.ArchiveTool
|
||||
wrap "${pname}-logging-agent" io.aeron.agent.DynamicLoggingAgent
|
||||
wrap "${pname}-cluster-tool" io.aeron.cluster.ClusterTool
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
gradle \
|
||||
--console plain \
|
||||
--init-script "${gradleInit}" \
|
||||
--no-daemon \
|
||||
--offline \
|
||||
--project-prop VERSION=${version} \
|
||||
--system-prop org.gradle.java.home="${jdk11.home}" \
|
||||
test
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Low-latency messaging library";
|
||||
homepage = "https://aeron.io/";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ maintainers.vaci ];
|
||||
};
|
||||
}
|
||||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "cloudfox";
|
||||
version = "1.10.0";
|
||||
version = "1.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "BishopFox";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-kB6nH/5/76r9SGyaFPXjwgZ+b5ha85Z7v1GFNgqluDY=";
|
||||
hash = "sha256-VhrWDeY2RmEvWQ9rGMde662y8j64YcKyzNdRS0V5FXc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-v8rEsp2mDgfjCO2VvWNIxex8F350MDnZ40bR4szv+3o=";
|
||||
|
|
|
|||
51
pkgs/tools/security/cloudhunter/default.nix
Normal file
51
pkgs/tools/security/cloudhunter/default.nix
Normal file
|
|
@ -0,0 +1,51 @@
|
|||
{ lib
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "cloudhunter";
|
||||
version = "0.7.0";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "belane";
|
||||
repo = "CloudHunter";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-yRl3x1dboOcoPeKxpUEhDk8OJx1hynEJRHL9/Su8OyA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace cloudhunter.py \
|
||||
--replace "'permutations.txt'" "'$out/share/permutations.txt'" \
|
||||
--replace "'resolvers.txt'" "'$out/share/resolvers.txt'"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
beautifulsoup4
|
||||
dnspython
|
||||
requests
|
||||
tldextract
|
||||
urllib3
|
||||
xmltodict
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -vD cloudhunter.py $out/bin/cloudhunter
|
||||
install -vD permutations-big.txt permutations.txt resolvers.txt -t $out/share
|
||||
install -vd $out/${python3.sitePackages}/
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
# Project has no tests
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Cloud bucket scanner";
|
||||
homepage = "https://github.com/belane/CloudHunter";
|
||||
changelog = "https://github.com/belane/CloudHunter/releases/tag/v${version}";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -5,12 +5,12 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sbsigntool";
|
||||
version = "0.9.4";
|
||||
version = "0.9.5";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.kernel.org/pub/scm/linux/kernel/git/jejb/sbsigntools.git";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-dbjdA+hjII/k7wABTTJV5RBdy4KlNkFlBWEaX4zn5vg=";
|
||||
hash = "sha256-5DInWgl1gThjjfGOsts1H1s1GbMCkd0gjbmG3gA3Fhg=";
|
||||
};
|
||||
|
||||
patches = [ ./autoconf.patch ];
|
||||
|
|
|
|||
|
|
@ -133,17 +133,17 @@ let
|
|||
# (https://tug.org/historic/).
|
||||
urlPrefixes = [
|
||||
# tlnet-final snapshot
|
||||
#"http://ftp.math.utah.edu/pub/tex/historic/systems/texlive/${bin.texliveYear}/tlnet-final/archive"
|
||||
#"ftp://tug.org/texlive/historic/${bin.texliveYear}/tlnet-final/archive"
|
||||
"http://ftp.math.utah.edu/pub/tex/historic/systems/texlive/${bin.texliveYear}/tlnet-final/archive"
|
||||
"ftp://tug.org/texlive/historic/${bin.texliveYear}/tlnet-final/archive"
|
||||
|
||||
# Daily snapshots hosted by one of the texlive release managers
|
||||
"https://texlive.info/tlnet-archive/${snapshot.year}/${snapshot.month}/${snapshot.day}/tlnet/archive"
|
||||
#"https://texlive.info/tlnet-archive/${snapshot.year}/${snapshot.month}/${snapshot.day}/tlnet/archive"
|
||||
];
|
||||
|
||||
tlpdb = fetchurl {
|
||||
# use the same mirror(s) as urlPrefixes below
|
||||
# use the same mirror(s) as urlPrefixes above
|
||||
urls = map (up: "${up}/../tlpkg/texlive.tlpdb.xz") urlPrefixes;
|
||||
hash = "sha256-i8DE3/rZmtp+gODJWeHV1VcCK5cgHUgmywf3Q/agTOA=";
|
||||
hash = "sha256-vm7DmkH/h183pN+qt1p1wZ6peT2TcMk/ae0nCXsCoMw=";
|
||||
};
|
||||
|
||||
tlpdb-nix = runCommand "tlpdb.nix" {
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
|
@ -439,6 +439,7 @@ mapAliases ({
|
|||
enyo-doom = enyo-launcher; # Added 2022-09-09
|
||||
epoxy = libepoxy; # Added 2021-11-11
|
||||
epsxe = throw "epsxe has been removed from nixpkgs, as it was unmaintained."; # added 2021-12-15
|
||||
inherit (beam.interpreters) erlangR25 erlangR24 erlangR23 erlangR22 erlangR21; # added 2023-03-21
|
||||
esniper = throw "esniper has been removed because upstream no longer maintains it (and it no longer works)"; # Added 2021-04-12
|
||||
etcdctl = throw "'etcdctl' has been renamed to/replaced by 'etcd'"; # Converted to throw 2022-02-22
|
||||
eteroj.lv2 = throw "'eteroj.lv2' has been renamed to/replaced by 'open-music-kontrollers.eteroj'"; # Added 2022-03-09
|
||||
|
|
|
|||
|
|
@ -3096,6 +3096,8 @@ with pkgs;
|
|||
|
||||
cloudfox = callPackage ../tools/security/cloudfox { };
|
||||
|
||||
cloudhunter = callPackage ../tools/security/cloudhunter { };
|
||||
|
||||
cloudsmith-cli = callPackage ../development/tools/cloudsmith-cli { };
|
||||
|
||||
codeql = callPackage ../development/tools/analysis/codeql { };
|
||||
|
|
@ -8160,9 +8162,7 @@ with pkgs;
|
|||
|
||||
sbctl = callPackage ../tools/security/sbctl { };
|
||||
|
||||
sbsigntool = callPackage ../tools/security/sbsigntool {
|
||||
openssl = openssl_1_1;
|
||||
};
|
||||
sbsigntool = callPackage ../tools/security/sbsigntool { };
|
||||
|
||||
sonic-server = callPackage ../servers/search/sonic-server { };
|
||||
|
||||
|
|
@ -16579,7 +16579,7 @@ with pkgs;
|
|||
};
|
||||
|
||||
inherit (beam.interpreters)
|
||||
erlang erlangR25 erlangR24 erlangR23 erlangR22 erlangR21
|
||||
erlang erlang_25 erlang_24 erlang_23 erlang_22 erlang_21
|
||||
erlang_odbc erlang_javac erlang_odbc_javac
|
||||
elixir elixir_1_14 elixir_1_13 elixir_1_12 elixir_1_11 elixir_1_10
|
||||
elixir-ls;
|
||||
|
|
@ -16589,9 +16589,8 @@ with pkgs;
|
|||
inherit (beam.packages.erlang)
|
||||
erlang-ls erlfmt elvis-erlang
|
||||
rebar rebar3 rebar3WithPlugins
|
||||
fetchHex beamPackages;
|
||||
|
||||
inherit (beam.packages.erlangR21) lfe lfe_1_3;
|
||||
fetchHex beamPackages
|
||||
lfe lfe_2_1;
|
||||
|
||||
gnudatalanguage = callPackage ../development/interpreters/gnudatalanguage {
|
||||
inherit (llvmPackages) openmp;
|
||||
|
|
@ -17211,6 +17210,8 @@ with pkgs;
|
|||
|
||||
adtool = callPackage ../tools/admin/adtool { };
|
||||
|
||||
aeron = callPackage ../servers/aeron { };
|
||||
|
||||
inherit (callPackage ../development/tools/alloy { })
|
||||
alloy5
|
||||
alloy6
|
||||
|
|
@ -24744,7 +24745,7 @@ with pkgs;
|
|||
etcd_3_4 = callPackage ../servers/etcd/3.4.nix { };
|
||||
etcd_3_5 = callPackage ../servers/etcd/3.5.nix { };
|
||||
|
||||
ejabberd = callPackage ../servers/xmpp/ejabberd { erlang = erlangR24; };
|
||||
ejabberd = callPackage ../servers/xmpp/ejabberd { erlang = erlang_24; };
|
||||
|
||||
exhibitor = callPackage ../servers/exhibitor { };
|
||||
|
||||
|
|
@ -35222,6 +35223,8 @@ with pkgs;
|
|||
|
||||
_90secondportraits = callPackage ../games/90secondportraits { love = love_0_10; };
|
||||
|
||||
aaaaxy = callPackage ../games/aaaaxy { };
|
||||
|
||||
ace-of-penguins = callPackage ../games/ace-of-penguins { };
|
||||
|
||||
among-sus = callPackage ../games/among-sus { };
|
||||
|
|
|
|||
|
|
@ -12,12 +12,25 @@
|
|||
|
||||
let
|
||||
self = beam;
|
||||
|
||||
# Aliases added 2023-03-21
|
||||
versionLoop = f: lib.lists.foldr (version: acc: (f version) // acc) { } [ "25" "24" "23" "22" "21" ];
|
||||
|
||||
interpretersAliases = versionLoop (version: {
|
||||
"erlangR${version}" = self.interpreters."erlang_${version}";
|
||||
"erlangR${version}_odbc" = self.interpreters."erlang_${version}_odbc";
|
||||
"erlangR${version}_javac" = self.interpreters."erlang_${version}_javac";
|
||||
"erlangR${version}_odbc_javac" = self.interpreters."erlang_${version}_odbc_javac";
|
||||
});
|
||||
|
||||
packagesAliases = versionLoop (version: { "erlangR${version}" = self.packages."erlang_${version}"; });
|
||||
|
||||
in
|
||||
|
||||
{
|
||||
beamLib = callPackage ../development/beam-modules/lib.nix { };
|
||||
|
||||
latestVersion = "erlangR25";
|
||||
latestVersion = "erlang_25";
|
||||
|
||||
# Each
|
||||
interpreters = {
|
||||
|
|
@ -29,37 +42,34 @@ in
|
|||
|
||||
# Standard Erlang versions, using the generic builder.
|
||||
|
||||
# R25
|
||||
erlangR25 = self.beamLib.callErlang ../development/interpreters/erlang/R25.nix {
|
||||
erlang_25 = self.beamLib.callErlang ../development/interpreters/erlang/25.nix {
|
||||
wxGTK = wxGTK32;
|
||||
parallelBuild = true;
|
||||
autoconf = buildPackages.autoconf269;
|
||||
inherit wxSupport systemdSupport;
|
||||
};
|
||||
erlangR25_odbc = self.interpreters.erlangR25.override { odbcSupport = true; };
|
||||
erlangR25_javac = self.interpreters.erlangR25.override { javacSupport = true; };
|
||||
erlangR25_odbc_javac = self.interpreters.erlangR25.override {
|
||||
erlang_25_odbc = self.interpreters.erlang_25.override { odbcSupport = true; };
|
||||
erlang_25_javac = self.interpreters.erlang_25.override { javacSupport = true; };
|
||||
erlang_25_odbc_javac = self.interpreters.erlang_25.override {
|
||||
javacSupport = true;
|
||||
odbcSupport = true;
|
||||
};
|
||||
|
||||
# R24
|
||||
erlangR24 = self.beamLib.callErlang ../development/interpreters/erlang/R24.nix {
|
||||
erlang_24 = self.beamLib.callErlang ../development/interpreters/erlang/24.nix {
|
||||
wxGTK = wxGTK32;
|
||||
# Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508
|
||||
parallelBuild = true;
|
||||
autoconf = buildPackages.autoconf269;
|
||||
inherit wxSupport systemdSupport;
|
||||
};
|
||||
erlangR24_odbc = self.interpreters.erlangR24.override { odbcSupport = true; };
|
||||
erlangR24_javac = self.interpreters.erlangR24.override { javacSupport = true; };
|
||||
erlangR24_odbc_javac = self.interpreters.erlangR24.override {
|
||||
erlang_24_odbc = self.interpreters.erlang_24.override { odbcSupport = true; };
|
||||
erlang_24_javac = self.interpreters.erlang_24.override { javacSupport = true; };
|
||||
erlang_24_odbc_javac = self.interpreters.erlang_24.override {
|
||||
javacSupport = true;
|
||||
odbcSupport = true;
|
||||
};
|
||||
|
||||
# R23
|
||||
erlangR23 = self.beamLib.callErlang ../development/interpreters/erlang/R23.nix {
|
||||
erlang_23 = self.beamLib.callErlang ../development/interpreters/erlang/23.nix {
|
||||
openssl = openssl_1_1;
|
||||
wxGTK = wxGTK32;
|
||||
# Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508
|
||||
|
|
@ -67,15 +77,14 @@ in
|
|||
autoconf = buildPackages.autoconf269;
|
||||
inherit wxSupport systemdSupport;
|
||||
};
|
||||
erlangR23_odbc = self.interpreters.erlangR23.override { odbcSupport = true; };
|
||||
erlangR23_javac = self.interpreters.erlangR23.override { javacSupport = true; };
|
||||
erlangR23_odbc_javac = self.interpreters.erlangR23.override {
|
||||
erlang_23_odbc = self.interpreters.erlang_23.override { odbcSupport = true; };
|
||||
erlang_23_javac = self.interpreters.erlang_23.override { javacSupport = true; };
|
||||
erlang_23_odbc_javac = self.interpreters.erlang_23.override {
|
||||
javacSupport = true;
|
||||
odbcSupport = true;
|
||||
};
|
||||
|
||||
# R22
|
||||
erlangR22 = self.beamLib.callErlang ../development/interpreters/erlang/R22.nix {
|
||||
erlang_22 = self.beamLib.callErlang ../development/interpreters/erlang/22.nix {
|
||||
openssl = openssl_1_1;
|
||||
wxGTK = wxGTK32;
|
||||
# Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508
|
||||
|
|
@ -83,35 +92,32 @@ in
|
|||
autoconf = buildPackages.autoconf269;
|
||||
inherit wxSupport systemdSupport;
|
||||
};
|
||||
erlangR22_odbc = self.interpreters.erlangR22.override { odbcSupport = true; };
|
||||
erlangR22_javac = self.interpreters.erlangR22.override { javacSupport = true; };
|
||||
erlangR22_odbc_javac = self.interpreters.erlangR22.override {
|
||||
erlang_22_odbc = self.interpreters.erlang_22.override { odbcSupport = true; };
|
||||
erlang_22_javac = self.interpreters.erlang_22.override { javacSupport = true; };
|
||||
erlang_22_odbc_javac = self.interpreters.erlang_22.override {
|
||||
javacSupport = true;
|
||||
odbcSupport = true;
|
||||
};
|
||||
|
||||
# R21
|
||||
erlangR21 = self.beamLib.callErlang ../development/interpreters/erlang/R21.nix {
|
||||
erlang_21 = self.beamLib.callErlang ../development/interpreters/erlang/21.nix {
|
||||
openssl = openssl_1_1;
|
||||
wxGTK = wxGTK32;
|
||||
autoconf = buildPackages.autoconf269;
|
||||
inherit wxSupport systemdSupport;
|
||||
};
|
||||
erlangR21_odbc = self.interpreters.erlangR21.override { odbcSupport = true; };
|
||||
erlangR21_javac = self.interpreters.erlangR21.override { javacSupport = true; };
|
||||
erlangR21_odbc_javac = self.interpreters.erlangR21.override {
|
||||
erlang_21_odbc = self.interpreters.erlang_21.override { odbcSupport = true; };
|
||||
erlang_21_javac = self.interpreters.erlang_21.override { javacSupport = true; };
|
||||
erlang_21_odbc_javac = self.interpreters.erlang_21.override {
|
||||
javacSupport = true;
|
||||
odbcSupport = true;
|
||||
};
|
||||
|
||||
# Other Beam languages. These are built with `beam.interpreters.erlang`. To
|
||||
# access for example elixir built with different version of Erlang, use
|
||||
# `beam.packages.erlangR24.elixir`.
|
||||
# `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.
|
||||
packagesWith = erlang:
|
||||
|
|
@ -122,10 +128,10 @@ in
|
|||
packages = {
|
||||
erlang = self.packages.${self.latestVersion};
|
||||
|
||||
erlangR25 = self.packagesWith self.interpreters.erlangR25;
|
||||
erlangR24 = self.packagesWith self.interpreters.erlangR24;
|
||||
erlangR23 = self.packagesWith self.interpreters.erlangR23;
|
||||
erlangR22 = self.packagesWith self.interpreters.erlangR22;
|
||||
erlangR21 = self.packagesWith self.interpreters.erlangR21;
|
||||
};
|
||||
erlang_25 = self.packagesWith self.interpreters.erlang_25;
|
||||
erlang_24 = self.packagesWith self.interpreters.erlang_24;
|
||||
erlang_23 = self.packagesWith self.interpreters.erlang_23;
|
||||
erlang_22 = self.packagesWith self.interpreters.erlang_22;
|
||||
erlang_21 = self.packagesWith self.interpreters.erlang_21;
|
||||
} // packagesAliases;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue