mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-19 00:08:32 +01:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
ffbac7335b
67 changed files with 491 additions and 256 deletions
|
|
@ -558,6 +558,7 @@ in {
|
|||
input.gid = ids.gids.input;
|
||||
kvm.gid = ids.gids.kvm;
|
||||
render.gid = ids.gids.render;
|
||||
sgx.gid = ids.gids.sgx;
|
||||
shadow.gid = ids.gids.shadow;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -639,7 +639,7 @@ in
|
|||
qemu-libvirtd = 301;
|
||||
kvm = 302; # default udev rules from systemd requires these
|
||||
render = 303; # default udev rules from systemd requires these
|
||||
# zeronet = 304; # removed 2019-01-03
|
||||
sgx = 304; # default udev rules from systemd requires these
|
||||
lirc = 305;
|
||||
lidarr = 306;
|
||||
slurm = 307;
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ in
|
|||
environment.systemPackages = [ pkgs.dconf ];
|
||||
|
||||
# Needed for unwrapped applications
|
||||
environment.variables.GIO_EXTRA_MODULES = mkIf cfg.enable [ "${pkgs.dconf.lib}/lib/gio/modules" ];
|
||||
environment.sessionVariables.GIO_EXTRA_MODULES = mkIf cfg.enable [ "${pkgs.dconf.lib}/lib/gio/modules" ];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ with lib;
|
|||
|
||||
systemd.packages = [ pkgs.glib-networking ];
|
||||
|
||||
environment.variables.GIO_EXTRA_MODULES = [ "${pkgs.glib-networking.out}/lib/gio/modules" ];
|
||||
environment.sessionVariables.GIO_EXTRA_MODULES = [ "${pkgs.glib-networking.out}/lib/gio/modules" ];
|
||||
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ in
|
|||
services.udev.packages = [ pkgs.libmtp.bin ];
|
||||
|
||||
# Needed for unwrapped applications
|
||||
environment.variables.GIO_EXTRA_MODULES = [ "${cfg.package}/lib/gio/modules" ];
|
||||
environment.sessionVariables.GIO_EXTRA_MODULES = [ "${cfg.package}/lib/gio/modules" ];
|
||||
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "texstudio";
|
||||
version = "4.0.2";
|
||||
version = "4.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "${pname}-org";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-SCrWoIZan8mFwQoXaXvM0Ujdhcic3FbmfgKZSFXFBGE=";
|
||||
sha256 = "sha256-zsZBqheHrjd17pXDIG0qWd7KI/zhNl3sQS5No0WvnBY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake wrapQtAppsHook pkg-config ];
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "binance";
|
||||
version = "1.26.0";
|
||||
version = "1.27.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/binance/desktop/releases/download/v${version}/${pname}-${version}-amd64-linux.deb";
|
||||
sha256 = "sha256-UNqz/0IQ1nWANk83X7IVwvZTJayqNO5xPS6oECCgqHI=";
|
||||
sha256 = "sha256-klOzCYI2vSkSV7O9WlKny2wt+etl1K8zFjGlUNIOZdI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -14,11 +14,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mkgmap";
|
||||
version = "4813";
|
||||
version = "4827";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.mkgmap.org.uk/download/mkgmap-r${version}-src.tar.gz";
|
||||
sha256 = "Zx3j3ITsL3eOMVYxKLnfzwPMkr+BQ+soK+zhzYbnnak=";
|
||||
sha256 = "2vK52NXE0LJq3nqFi08zliwRQwWFiQSsiAU412zjkQM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -13,11 +13,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "splitter";
|
||||
version = "643";
|
||||
version = "645";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.mkgmap.org.uk/download/splitter-r${version}-src.tar.gz";
|
||||
sha256 = "gyMCQAKnP4FDcHEgJiiftKhBEG9N92etpwKBnmIbzhU=";
|
||||
sha256 = "Y9feRNDjmwUbSOwxfMIaYIycCvOBMihq5LkuKbALVDY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
# SHA of ${version} for the tool's help output. Unfortunately this is needed in build flags.
|
||||
let rev = "dc78b39a6ff0a1a94a29fa0fd72bcbe5d95004be";
|
||||
let rev = "237bd35906f5c4bed1f4de4aa58cc6a6a676d4fd";
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "sonobuoy";
|
||||
version = "0.55.0"; # Do not forget to update `rev` above
|
||||
version = "0.55.1"; # Do not forget to update `rev` above
|
||||
|
||||
ldflags =
|
||||
let t = "github.com/vmware-tanzu/sonobuoy";
|
||||
|
|
@ -20,7 +20,7 @@ buildGoModule rec {
|
|||
owner = "vmware-tanzu";
|
||||
repo = "sonobuoy";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-fMZju0Cd1JtVC+EKHwW3ZGsB2m0V3UIHsKQMbvf4i5Y=";
|
||||
sha256 = "sha256-pHpnh+6O9yjnDA8u0jyLvqNQbXC+xz8fRn47aQNdOAo=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-jPKCWTFABKRZCg6X5VVdrmOU/ZFc7yGD7R8RJrpcITg=";
|
||||
|
|
|
|||
|
|
@ -3,12 +3,12 @@ electron, libsecret }:
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tutanota-desktop";
|
||||
version = "3.89.5";
|
||||
version = "3.89.23";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/tutao/tutanota/releases/download/tutanota-release-${version}/${pname}-${version}-unpacked-linux.tar.gz";
|
||||
name = "tutanota-desktop-${version}.tar.gz";
|
||||
sha256 = "sha256-DBqeLoHPr/OwiA3cWO5MYoHSBqrEmP8j8q+rd50hYH8=";
|
||||
sha256 = "sha256-iYFcTttmt5rygC1uxX74BHvPmEDUVBdiPOh7FEQcmyE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -18,13 +18,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "khronos";
|
||||
version = "3.6.1";
|
||||
version = "3.6.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lainsce";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-+gZy8cdekM26J1ujqFmfBXTctXc9E//EY42ZoLq9rBs=";
|
||||
sha256 = "sha256-EFoW/2IZuCo6sg7q87XRrJJ7dmYtVZr2bJQUEiiMiVI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "clingo";
|
||||
version = "5.5.0";
|
||||
version = "5.5.1";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/potassco/clingo/archive/v${version}.tar.gz";
|
||||
sha256 = "sha256-6xKtNi5IprjaFNadfk8kKjKzuPRanUjycLWCytnk0mU=";
|
||||
sha256 = "sha256-KBCwGNkz5HqbgXbDxPVcqxMXC8B2+wRI8eZVVXMVpLI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -1,31 +1,47 @@
|
|||
{lib, stdenv, fetchurl, wxGTK, perl, python2, zlib, libGLU, libGL, libX11}:
|
||||
{lib, stdenv, fetchurl, wxGTK, perl, python3, zlib, libGLU, libGL, libX11, SDL2}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "golly";
|
||||
version = "3.3";
|
||||
version = "4.1";
|
||||
|
||||
src = fetchurl {
|
||||
sha256 = "1j3ksnar4rdam4xiyspgyrs1pifbvxfxkrn65brkwxpx39mpgzc8";
|
||||
sha256 = "1j30dpzy6wh8fv1j2750hzc6wb0nhk83knl9fapccxgxw9n5lrbc";
|
||||
url="mirror://sourceforge/project/golly/golly/golly-${version}/golly-${version}-src.tar.gz";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
wxGTK perl python2 zlib libGLU libGL libX11
|
||||
wxGTK perl python3 zlib libGLU libGL libX11 SDL2
|
||||
];
|
||||
|
||||
setSourceRoot = ''
|
||||
sourceRoot=$(echo */gui-wx/configure)
|
||||
sourceRoot=$(echo */gui-wx/)
|
||||
'';
|
||||
|
||||
postPatch = ''
|
||||
sed -e '/gollydir =/agollydir += "/../share/golly/";' -i wxgolly.cpp
|
||||
grep share/golly wxgolly.cpp
|
||||
|
||||
sed -e 's@PYTHON_SHLIB@${python3}/lib/libpython3.so@' -i wxprefs.cpp
|
||||
sed -e 's@PERL_SHLIB@'"$(find "${perl}/lib/" -name libperl.so)"'@' -i wxprefs.cpp
|
||||
! grep _SHLIB *.cpp
|
||||
|
||||
grep /lib/libpython wxprefs.cpp
|
||||
grep /libperl wxprefs.cpp
|
||||
'';
|
||||
|
||||
# Link against Python explicitly as it is needed for scripts
|
||||
makeFlags=[
|
||||
"AM_LDFLAGS="
|
||||
"-f" "makefile-gtk"
|
||||
"ENABLE_SOUND=1" "ENABLE_PERL=1"
|
||||
];
|
||||
NIX_LDFLAGS="-l${python2.libPrefix} -lperl";
|
||||
preConfigure=''
|
||||
export NIX_LDFLAGS="$NIX_LDFLAGS -L$(dirname "$(find ${perl} -name libperl.so)")"
|
||||
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE
|
||||
-DPYTHON_SHLIB=$(basename "$(
|
||||
readlink -f ${python2}/lib/libpython*.so)")"
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p "$out/bin"
|
||||
cp ../golly ../bgolly "$out/bin"
|
||||
|
||||
mkdir -p "$out/share/doc/golly/"
|
||||
cp ../docs/* "$out/share/doc/golly/"
|
||||
|
||||
mkdir -p "$out/share/golly"
|
||||
cp -r ../{Help,Patterns,Scripts,Rules} "$out/share/golly"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "git-repo";
|
||||
version = "2.17.3";
|
||||
version = "2.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "android";
|
||||
repo = "tools_repo";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ez+Egl9vvfEZbeIEx7hHmH2Lhyvl93UHRkvkHaG46RQ=";
|
||||
sha256 = "sha256-eW+FjTsTWzHxyNlsP5dvV3TFtEz4cLWwyF4bmqsDW2k=";
|
||||
};
|
||||
|
||||
# Fix 'NameError: name 'ssl' is not defined'
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ustreamer";
|
||||
version = "4.6";
|
||||
version = "4.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pikvm";
|
||||
repo = "ustreamer";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-FBgnE9EKZf3aYrGNf9cday9r4Q7Ztu7g+0LnFKAhvrI=";
|
||||
sha256 = "sha256-dYwR+D2g4PxYyhsH9mGwgzTQ2Vw5UpMSomTl828gFvM=";
|
||||
};
|
||||
|
||||
buildInputs = [ libbsd libevent libjpeg ];
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "containerd";
|
||||
version = "1.5.7";
|
||||
version = "1.5.8";
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
|
|
@ -18,7 +18,7 @@ buildGoModule rec {
|
|||
owner = "containerd";
|
||||
repo = "containerd";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-BHVlGXyTkaiRkG8WG1LdtxrQs8nKS8djZFnO/AfKBUw=";
|
||||
sha256 = "sha256-XIAByE2/eVG8DAZXstKs51LQYdVPcPQuIlST3xCclrU=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
SF_redirect () {
|
||||
redirect
|
||||
redirect 99
|
||||
process 'http://[a-z]+[.]dl[.]sourceforge[.]net/' 'mirror://sourceforge/'
|
||||
process '[?].*' ''
|
||||
}
|
||||
|
|
|
|||
|
|
@ -69,8 +69,8 @@ version_link () {
|
|||
|
||||
redirect () {
|
||||
CURRENT_URL="$(curl -I -L --max-redirs "${1:-99}" "$CURRENT_URL" |
|
||||
grep -E '^Location: ' | position_choice "${2:-999999}" "$3" |
|
||||
sed -e 's/^Location: //; s/\r//')"
|
||||
grep -E '^[Ll]ocation: ' | position_choice "${2:-999999}" "$3" |
|
||||
sed -e 's/^[Ll]ocation: //; s/\r//')"
|
||||
echo "Redirected: $*"
|
||||
echo "URL: $CURRENT_URL" >&2
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,13 +19,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ghex";
|
||||
version = "3.41.0";
|
||||
version = "3.41.1";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/ghex/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "KcdG8ihzteQVvDly29PdYNalH3CA5qPpVsNNZHrjRKI=";
|
||||
sha256 = "i3nPAJ6uXEfK0KtT4hmcOm+y86thh381m+1SR3DuYfc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -55,11 +55,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-boxes";
|
||||
version = "41.1";
|
||||
version = "41.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1wzhm8n485cqhbai4qshgrwl05ix881g8gjshilrj6vg8p1li79h";
|
||||
sha256 = "u3G2zflFOBjyblV0Tl5ZUN2TJ5PQ6Ot+n/h78Mvvwz0=";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
|
|
|||
|
|
@ -22,11 +22,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-connections";
|
||||
version = "41.1";
|
||||
version = "41.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-ia9eWM2D6mLl+abwMadKOFUIW6KS8OqFgGQIs6+DTug=";
|
||||
hash = "sha256-WrmUKPPOn4qDdDK2e3XbxSi5U6QpOotWVE34g0b+VxM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -28,11 +28,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "eog";
|
||||
version = "41.0";
|
||||
version = "41.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-kX3ghv2X/T7JMPoHyIut0r4fXQrmueVpyYYATgNZqaw=";
|
||||
sha256 = "sha256-huG5ujnaz3QiavpFermDtBJTuJ9he/VBOcrQiS0C2Kk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -42,11 +42,11 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-software";
|
||||
version = "41.1";
|
||||
version = "41.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-software/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "eil3Ziga8tvsyssQJMcT7ISYxoJ++RJG6d6Grpof4Xs=";
|
||||
sha256 = "OErdrMh4QlOoeXGBSweS+9LJQfpEiw+UOLv1dJgszBc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -17,11 +17,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "yelp";
|
||||
version = "41.1";
|
||||
version = "41.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/yelp/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-RWpkFWR7zusBWbkLNVP/MocozymmCPzggCQjJQTMuHQ=";
|
||||
sha256 = "sha256-sAvwM/At15ttPyVQMccd+NbtOOVSyHC485GjdHJMQ8U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -42,7 +42,12 @@ let
|
|||
elvis-erlang = callPackage ./elvis-erlang { };
|
||||
|
||||
# BEAM-based languages.
|
||||
elixir = elixir_1_12;
|
||||
elixir = elixir_1_13;
|
||||
|
||||
elixir_1_13 = lib'.callElixir ../interpreters/elixir/1.13.nix {
|
||||
inherit erlang;
|
||||
debugInfo = true;
|
||||
};
|
||||
|
||||
elixir_1_12 = lib'.callElixir ../interpreters/elixir/1.12.nix {
|
||||
inherit erlang;
|
||||
|
|
@ -64,17 +69,8 @@ let
|
|||
debugInfo = true;
|
||||
};
|
||||
|
||||
elixir_1_8 = lib'.callElixir ../interpreters/elixir/1.8.nix {
|
||||
erlang = pkgs.beam.interpreters.erlangR23;
|
||||
debugInfo = true;
|
||||
};
|
||||
|
||||
# Remove old versions of elixir, when the supports fades out:
|
||||
# https://hexdocs.pm/elixir/compatibility-and-deprecations.html
|
||||
elixir_1_7 = lib'.callElixir ../interpreters/elixir/1.7.nix {
|
||||
inherit erlang;
|
||||
debugInfo = true;
|
||||
};
|
||||
|
||||
elixir_ls = callPackage ./elixir-ls { inherit elixir fetchMixDeps mixRelease; };
|
||||
|
||||
|
|
|
|||
|
|
@ -87,6 +87,7 @@ in
|
|||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "open-watcom-bin";
|
||||
version = "1.9";
|
||||
name = "${pname}-unwrapped-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://ftp.openwatcom.org/install/open-watcom-c-linux-${version}";
|
||||
119
pkgs/development/compilers/open-watcom/v2.nix
Normal file
119
pkgs/development/compilers/open-watcom/v2.nix
Normal file
|
|
@ -0,0 +1,119 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
|
||||
# Docs cause an immense increase in build time, up to 2 additional hours
|
||||
, withDocs ? false
|
||||
, dosbox
|
||||
, ghostscript
|
||||
, withGUI ? false
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "open-watcom-v2";
|
||||
version = "unstable-2021-11-30";
|
||||
name = "${pname}-unwrapped-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-watcom";
|
||||
repo = "open-watcom-v2";
|
||||
rev = "982c958eb4840e1c6a98773ba0600f652500f5a7";
|
||||
sha256 = "18dp9nd1gjnpd1870149v67vzxbna25l6zi052z1r51xvaqwc3cx";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs *.sh
|
||||
|
||||
for dateSource in cmnvars.sh bld/wipfc/configure; do
|
||||
substituteInPlace $dateSource \
|
||||
--replace '`date ' '`date -ud "@$SOURCE_DATE_EPOCH" '
|
||||
done
|
||||
|
||||
substituteInPlace bld/watcom/h/banner.h \
|
||||
--replace '__DATE__' "\"$(date -ud "@$SOURCE_DATE_EPOCH" +'%b %d %Y')\"" \
|
||||
--replace '__TIME__' "\"$(date -ud "@$SOURCE_DATE_EPOCH" +'%T')\""
|
||||
|
||||
substituteInPlace build/makeinit \
|
||||
--replace '%__CYEAR__' '%OWCYEAR'
|
||||
'' + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
|
||||
substituteInPlace build/mif/local.mif \
|
||||
--replace '-static' ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ ]
|
||||
++ lib.optional (withDocs || withGUI) dosbox
|
||||
++ lib.optional withDocs ghostscript;
|
||||
|
||||
configurePhase = ''
|
||||
runHook preConfigure
|
||||
|
||||
export OWROOT=$(realpath $PWD)
|
||||
export OWTOOLS=${if stdenv.cc.isClang then "CLANG" else "GCC"}
|
||||
export OWDOCBUILD=${if withDocs then "1" else "0"}
|
||||
export OWGHOSTSCRIPTPATH=${lib.optionalString withDocs "${ghostscript}/bin"}
|
||||
export OWGUINOBUILD=${if withGUI then "0" else "1"}
|
||||
export OWNOBUILD=
|
||||
export OWDISTRBUILD=0
|
||||
export OWDOSBOX=${lib.optionalString (withDocs || withGUI) "${dosbox}/bin/dosbox"}
|
||||
export OWVERBOSE=0
|
||||
export OWRELROOT=$out
|
||||
|
||||
source cmnvars.sh
|
||||
|
||||
runHook postConfigure
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
./build.sh build
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
./build.sh cprel
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
# Stripping breaks many tools
|
||||
dontStrip = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "The v2 fork of the Open Watcom suite of compilers and tools";
|
||||
longDescription = ''
|
||||
A fork of Open Watcom: A C/C++/Fortran compiler and assembler suite
|
||||
targeting a multitude of architectures (x86, IA-32, Alpha AXP, MIPS,
|
||||
PowerPC) and operating systems (DOS, OS/2, Windows, Linux).
|
||||
|
||||
Main differences from Open Watcom 1.9:
|
||||
|
||||
- New two-phase build system - Open Watcom can be built by the host's
|
||||
native C/C++ compiler or by itself
|
||||
- Code generator properly initializes pointers by DLL symbol addresses
|
||||
- DOS tools now support long file names (LFN) if appropriate LFN driver
|
||||
is loaded by DOS
|
||||
- Open Watcom is ported to 64-bit hosts (Win64, Linux x64)
|
||||
- Librarian supports x64 CPU object modules and libraries
|
||||
- RDOS 32-bit C run-time compact memory model libraries are fixed
|
||||
- Resource compiler and Resource editors support Win64 executables
|
||||
- Open Watcom text editor is now self-contained, it can be used as
|
||||
standalone tool without any requirements for any additional files or
|
||||
configuration
|
||||
- Broken C++ compiler pre-compiled header template support is fixed
|
||||
- Many C++ compiler crashes are fixed
|
||||
- Debugger has no length limit for any used environment variable
|
||||
'' + lib.optionalString (!withDocs) ''
|
||||
|
||||
The documentation has been excluded from this build for build time reasons. It can be found here:
|
||||
https://github.com/open-watcom/open-watcom-v2/wiki/Open-Watcom-Documentation
|
||||
'';
|
||||
homepage = "https://open-watcom.github.io";
|
||||
license = licenses.watcom;
|
||||
platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "x86_64-windows" "i686-windows" ];
|
||||
maintainers = with maintainers; [ OPNA2608 ];
|
||||
};
|
||||
}
|
||||
128
pkgs/development/compilers/open-watcom/wrapper.nix
Normal file
128
pkgs/development/compilers/open-watcom/wrapper.nix
Normal file
|
|
@ -0,0 +1,128 @@
|
|||
# Arguments that this derivation gets when it is created with `callPackage`
|
||||
{ stdenv
|
||||
, lib
|
||||
, symlinkJoin
|
||||
, makeWrapper
|
||||
, runCommand
|
||||
, file
|
||||
}:
|
||||
|
||||
open-watcom:
|
||||
|
||||
let
|
||||
wrapper =
|
||||
{}:
|
||||
let
|
||||
binDirs = with stdenv.hostPlatform; if isWindows then [
|
||||
(lib.optionalString is64bit "binnt64")
|
||||
"binnt"
|
||||
(lib.optionalString is32bit "binw")
|
||||
] else if (isDarwin && is64bit) then [
|
||||
"osx64"
|
||||
] else [
|
||||
(lib.optionalString is64bit "binl64")
|
||||
"binl"
|
||||
];
|
||||
includeDirs = with stdenv.hostPlatform; [
|
||||
"h"
|
||||
]
|
||||
++ lib.optional isWindows "h/nt"
|
||||
++ lib.optional isLinux "lh";
|
||||
listToDirs = list: lib.strings.concatMapStringsSep ":" (dir: "${placeholder "out"}/${dir}") list;
|
||||
name = "${open-watcom.pname}-${open-watcom.version}";
|
||||
in
|
||||
symlinkJoin {
|
||||
inherit name;
|
||||
|
||||
paths = [ open-watcom ];
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
|
||||
postBuild = ''
|
||||
mkdir $out/bin
|
||||
|
||||
for binDir in ${lib.strings.concatStringsSep " " binDirs}; do
|
||||
for exe in $(find ${open-watcom}/$binDir \
|
||||
-type f -executable \
|
||||
${lib.optionalString stdenv.hostPlatform.isLinux "-not -iname '*.so' -not -iname '*.exe'"} \
|
||||
); do
|
||||
if [ ! -f $out/bin/$(basename $exe) ]; then
|
||||
makeWrapper $exe $out/bin/$(basename $exe) \
|
||||
--set WATCOM ${open-watcom} \
|
||||
--prefix PATH : ${listToDirs binDirs} \
|
||||
--set EDPATH ${open-watcom}/eddat \
|
||||
--set INCLUDE ${listToDirs includeDirs}
|
||||
fi
|
||||
done
|
||||
done
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
unwrapped = open-watcom;
|
||||
tests = let
|
||||
wrapped = wrapper { };
|
||||
in {
|
||||
simple = runCommand "${name}-test-simple" { nativeBuildInputs = [ wrapped ]; } ''
|
||||
cat <<EOF >test.c
|
||||
#include <stdio.h>
|
||||
int main() {
|
||||
printf ("Testing OpenWatcom C89 compiler.\n");
|
||||
return 0;
|
||||
}
|
||||
EOF
|
||||
cat test.c
|
||||
# Darwin target not supported, only host
|
||||
wcl386 -fe=test_c test.c
|
||||
${lib.optionalString (!stdenv.hostPlatform.isDarwin) "./test_c"}
|
||||
|
||||
cat <<EOF >test.cpp
|
||||
#include <string>
|
||||
#include <iostream>
|
||||
int main() {
|
||||
std::cout << "Testing OpenWatcom C++ library implementation." << std::endl;
|
||||
watcom::istring HELLO ("HELLO");
|
||||
if (HELLO != "hello") {
|
||||
return 1;
|
||||
}
|
||||
if (HELLO.find ("ello") != 1) {
|
||||
return 2;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
EOF
|
||||
cat test.cpp
|
||||
# Darwin target not supported, only host
|
||||
wcl386 -fe=test_cpp test.cpp
|
||||
${lib.optionalString (!stdenv.hostPlatform.isDarwin) "./test_cpp"}
|
||||
touch $out
|
||||
'';
|
||||
cross = runCommand "${name}-test-cross" { nativeBuildInputs = [ wrapped file ]; } ''
|
||||
cat <<EOF >test.c
|
||||
#include <stdio.h>
|
||||
int main() {
|
||||
printf ("Testing OpenWatcom cross-compilation.\n");
|
||||
return 0;
|
||||
}
|
||||
EOF
|
||||
cat test.c
|
||||
|
||||
echo "Test compiling"
|
||||
wcl386 -bcl=linux -fe=linux test.c
|
||||
wcl386 -bcl=nt -fe=nt test.c
|
||||
wcl386 -bcl=dos4g -fe=dos4g test.c
|
||||
wcl -bcl=windows -fe=windows test.c
|
||||
wcl -bcl=dos -fe=dos test.c
|
||||
|
||||
echo "Test file format"
|
||||
file ./linux | grep "32-bit" | grep "Linux"
|
||||
file ./nt.exe | grep "PE32" | grep "Windows"
|
||||
file ./dos4g.exe | grep "MS-DOS" | grep "LE executable"
|
||||
file ./windows.exe | grep "MS-DOS" | grep "Windows 3.x"
|
||||
file ./dos.exe | grep "MS-DOS" | grep -v "LE" | grep -v "Windows 3.x"
|
||||
touch $out
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
in
|
||||
lib.makeOverridable wrapper
|
||||
36
pkgs/development/embedded/arduino/arduino-core/chrootenv.nix
Normal file
36
pkgs/development/embedded/arduino/arduino-core/chrootenv.nix
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
{ lib, buildFHSUserEnv, arduino-core-unwrapped, withGui ? false, withTeensyduino ? false }:
|
||||
let
|
||||
arduino-unwrapped = arduino-core-unwrapped.override { inherit withGui withTeensyduino; };
|
||||
in
|
||||
buildFHSUserEnv {
|
||||
name = "arduino";
|
||||
|
||||
targetPkgs =
|
||||
pkgs: (with pkgs; [
|
||||
ncurses
|
||||
arduino-unwrapped
|
||||
zlib
|
||||
(python3.withPackages (p: with p; [
|
||||
pyserial
|
||||
]))
|
||||
]);
|
||||
multiPkgs = null;
|
||||
|
||||
extraInstallCommands = ''
|
||||
${lib.optionalString withGui ''
|
||||
# desktop file
|
||||
mkdir -p $out/share/applications
|
||||
cp ${arduino-core-unwrapped.src}/build/linux/dist/desktop.template $out/share/applications/arduino.desktop
|
||||
substituteInPlace $out/share/applications/arduino.desktop \
|
||||
--replace '<BINARY_LOCATION>' "$out/bin/arduino" \
|
||||
--replace '<ICON_NAME>' "$out/share/arduino/icons/128x128/apps/arduino.png"
|
||||
# icon file
|
||||
mkdir -p $out/share/arduino
|
||||
cp -r ${arduino-core-unwrapped.src}/build/shared/icons $out/share/arduino
|
||||
''}
|
||||
'';
|
||||
|
||||
runScript = "arduino";
|
||||
|
||||
meta = arduino-core-unwrapped.meta;
|
||||
}
|
||||
|
|
@ -69,17 +69,16 @@ let
|
|||
xorg.libXxf86vm
|
||||
zlib
|
||||
];
|
||||
teensy_architecture = if stdenv.hostPlatform.isx86_32 then "linux32"
|
||||
else if stdenv.hostPlatform.isx86_64 then "linux64"
|
||||
else if stdenv.hostPlatform.isAarch64 then "linuxaarch64"
|
||||
else if stdenv.hostPlatform.isAarch32 then "linuxarm"
|
||||
else throw "${stdenv.hostPlatform.system} is not supported in teensy";
|
||||
teensy_architecture =
|
||||
if stdenv.hostPlatform.isx86_32 then "linux32"
|
||||
else if stdenv.hostPlatform.isx86_64 then "linux64"
|
||||
else if stdenv.hostPlatform.isAarch64 then "linuxaarch64"
|
||||
else if stdenv.hostPlatform.isAarch32 then "linuxarm"
|
||||
else throw "${stdenv.hostPlatform.system} is not supported in teensy";
|
||||
|
||||
pname = (if withTeensyduino then "teensyduino" else "arduino")
|
||||
+ lib.optionalString (!withGui) "-core";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
inherit pname;
|
||||
pname = (if withTeensyduino then "teensyduino" else "arduino") + lib.optionalString (!withGui) "-core";
|
||||
version = "1.8.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
|
@ -195,8 +194,8 @@ stdenv.mkDerivation rec {
|
|||
chmod +w ./TeensyduinoInstall.${teensy_architecture}
|
||||
upx -d ./TeensyduinoInstall.${teensy_architecture}
|
||||
patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
|
||||
--set-rpath "${teensy_libpath}" \
|
||||
./TeensyduinoInstall.${teensy_architecture}
|
||||
--set-rpath "${teensy_libpath}" \
|
||||
./TeensyduinoInstall.${teensy_architecture}
|
||||
chmod +x ./TeensyduinoInstall.${teensy_architecture}
|
||||
./TeensyduinoInstall.${teensy_architecture} --dir=$out/share/arduino
|
||||
# Check for successful installation
|
||||
|
|
@ -213,8 +212,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
preFixup = ''
|
||||
for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* \) ); do
|
||||
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true
|
||||
patchelf --set-rpath ${rpath}:$out/lib $file || true
|
||||
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true
|
||||
patchelf --set-rpath ${rpath}:$out/lib $file || true
|
||||
done
|
||||
|
||||
${lib.concatMapStringsSep "\n"
|
||||
|
|
@ -235,15 +234,15 @@ stdenv.mkDerivation rec {
|
|||
${lib.optionalString withTeensyduino ''
|
||||
# Patch the Teensy loader binary
|
||||
patchelf --debug \
|
||||
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
|
||||
--set-rpath "${teensy_libpath}" \
|
||||
$out/share/arduino/hardware/tools/teensy{,_ports,_reboot,_restart,_serialmon}
|
||||
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
|
||||
--set-rpath "${teensy_libpath}" \
|
||||
$out/share/arduino/hardware/tools/teensy{,_ports,_reboot,_restart,_serialmon}
|
||||
''}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Open-source electronics prototyping platform";
|
||||
homepage = "http://arduino.cc/";
|
||||
homepage = "https://www.arduino.cc/";
|
||||
license = if withTeensyduino then licenses.unfreeRedistributable else licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ antono auntie robberer bjornfor bergey ];
|
||||
|
|
|
|||
9
pkgs/development/interpreters/elixir/1.13.nix
Normal file
9
pkgs/development/interpreters/elixir/1.13.nix
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
{ mkDerivation }:
|
||||
|
||||
# How to obtain `sha256`:
|
||||
# nix-prefetch-url --unpack https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz
|
||||
mkDerivation {
|
||||
version = "1.13.0";
|
||||
sha256 = "1rkrx9kbs2nhkmzydm02r4wkb8wxwmg8iv0nqilpzj0skkxd6k8w";
|
||||
minimumOTPVersion = "22";
|
||||
}
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
{ mkDerivation }:
|
||||
|
||||
mkDerivation {
|
||||
version = "1.7.4";
|
||||
sha256 = "0f8j4pib13kffiihagdwl3xqs3a1ak19qz3z8fpyfxn9dnjiinla";
|
||||
minimumOTPVersion = "19";
|
||||
}
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
{ mkDerivation }:
|
||||
|
||||
mkDerivation {
|
||||
version = "1.8.2";
|
||||
sha256 = "1n77cpcl2b773gmj3m9s24akvj9gph9byqbmj2pvlsmby4aqwckq";
|
||||
minimumOTPVersion = "20";
|
||||
}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, cmake, boost, python2}:
|
||||
{ lib, stdenv, fetchurl, cmake, boost, python3 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "avro-c++";
|
||||
|
|
@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1ars58bfw83s8f1iqbhnqp4n9wc9cxsph0gs2a8k7r9fi09vja2k";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ python2 boost ];
|
||||
nativeBuildInputs = [ cmake python3 ];
|
||||
buildInputs = [ boost ];
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace test/SchemaTests.cc --replace "BOOST_CHECKPOINT" "BOOST_TEST_CHECKPOINT"
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "duckdb";
|
||||
version = "0.3.0";
|
||||
version = "0.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-SvihG6PdHQ+03JAXdkuzvGug4lw0ngcxYigS7R7yK9g=";
|
||||
sha256 = "sha256-apTU7WgKw/YEnT4maibyffqOrCoVwHPOkNINlAmtYYI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pangomm";
|
||||
version= "2.48.1";
|
||||
version= "2.48.2";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-d2rVPnkeQxBrf0D/CDS+5uTrHGrXy20hVUb3o98O3E0=";
|
||||
sha256 = "sha256-4ddVIsU/RieZh1zSR/m0nJHO1LGr5oOHrDWycTktTqU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -5,46 +5,34 @@
|
|||
, findlib
|
||||
, ocamlbuild
|
||||
, oasis
|
||||
, ocaml_optcomp
|
||||
, camlp4
|
||||
, num
|
||||
}:
|
||||
|
||||
let param =
|
||||
if lib.versionAtLeast ocaml.version "4.03"
|
||||
then {
|
||||
version = "0.8.1";
|
||||
sha256 = "03vzrybdpjydbpil97zmir71kpsn2yxkjnzysma7fvybk8ll4zh9";
|
||||
buildInputs = [ num ];
|
||||
} else {
|
||||
version = "0.7.1";
|
||||
sha256 = "0gg3nr3iic4rwqrcc0qvfm9x0x57zclvdsnpy0z8rv2fl5isbzms";
|
||||
};
|
||||
in
|
||||
if !lib.versionAtLeast ocaml.version "4.03"
|
||||
then throw "ocsigen-deriving is not available of OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
let inherit (param) version; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "ocsigen-deriving";
|
||||
inherit version;
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ocaml${ocaml.version}-ocsigen-deriving";
|
||||
version = "0.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ocsigen";
|
||||
repo = "deriving";
|
||||
rev = version;
|
||||
inherit (param) sha256;
|
||||
sha256 = "sha256:09rp9mrr551na0nmclpxddlrkb6l2d7763xv14xfx467kff3z0wf";
|
||||
};
|
||||
|
||||
buildInputs = [ ocaml findlib ocamlbuild oasis ocaml_optcomp camlp4 ]
|
||||
++ (param.buildInputs or [ ]);
|
||||
|
||||
createFindlibDestdir = true;
|
||||
|
||||
buildInputs = [ ocaml findlib ocamlbuild oasis camlp4 num ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/ocsigen/deriving";
|
||||
description = "Extension to OCaml for deriving functions from type declarations";
|
||||
license = lib.licenses.mit;
|
||||
platforms = ocaml.meta.platforms or [ ];
|
||||
inherit (ocaml.meta) platforms;
|
||||
maintainers = with lib.maintainers; [
|
||||
gal_bolle
|
||||
vbgl
|
||||
|
|
|
|||
|
|
@ -1,12 +0,0 @@
|
|||
# OASIS_START
|
||||
# DO NOT EDIT (digest: ec844fa3189acb2a866b89a69d111ba4)
|
||||
version = "1.6"
|
||||
description = "Optional compilation with cpp-like directives"
|
||||
requires = "camlp4"
|
||||
archive(syntax, preprocessor) = "optcomp.cma"
|
||||
archive(syntax, toploop) = "optcomp.cma"
|
||||
archive(syntax, preprocessor, native) = "optcomp.cmxa"
|
||||
archive(syntax, preprocessor, native, plugin) = "optcomp.cmxs"
|
||||
exists_if = "optcomp.cma"
|
||||
# OASIS_STOP
|
||||
|
||||
|
|
@ -1,51 +0,0 @@
|
|||
{ stdenv, lib, fetchFromGitHub, fetchpatch, ocaml, findlib, ocamlbuild, camlp4 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ocaml-optcomp";
|
||||
version = "1.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "diml";
|
||||
repo = "optcomp";
|
||||
rev = version;
|
||||
sha256 = "sha256-UCLYDk19ukraOqVxVlA/rXX81texPPqFgAEqHZ9YEEI=";
|
||||
};
|
||||
|
||||
patches =
|
||||
let inherit (lib) optional versionAtLeast; in
|
||||
optional (versionAtLeast ocaml.version "4.02") (fetchpatch {
|
||||
url = "https://github.com/diml/optcomp/commit/b7f809360c9794b383a4bc0492f6df381276b429.patch";
|
||||
sha256 = "1n095lk94jq1rwi0l24g2wbgms7249wdd31n0ji895dr6755s93y";
|
||||
})
|
||||
;
|
||||
|
||||
createFindlibDestdir = true;
|
||||
|
||||
buildInputs = [ ocaml findlib ocamlbuild camlp4 ];
|
||||
|
||||
configurePhase = ''
|
||||
cp ${./META} META
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
ocamlbuild src/optcomp.cmxs src/optcomp.cma src/optcomp_o.native src/optcomp_r.native
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp _build/src/optcomp_o.native $out/bin/optcomp-o
|
||||
cp _build/src/optcomp_r.native $out/bin/optcomp-r
|
||||
ocamlfind install optcomp META _build/src/optcomp.{a,cma,cmxa,cmxs} _build/src/pa_optcomp.{cmi,cmx,mli}
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/diml/optcomp";
|
||||
description = "Optional compilation for OCaml with cpp-like directives";
|
||||
license = lib.licenses.bsd3;
|
||||
platforms = ocaml.meta.platforms or [ ];
|
||||
maintainers = [
|
||||
lib.maintainers.gal_bolle
|
||||
];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
, lib
|
||||
, fetchurl
|
||||
, instrument-control
|
||||
, arduino
|
||||
, arduino-core-unwrapped
|
||||
}:
|
||||
|
||||
buildOctavePackage rec {
|
||||
|
|
@ -18,9 +18,8 @@ buildOctavePackage rec {
|
|||
instrument-control
|
||||
];
|
||||
|
||||
# Might be able to use pkgs.arduino-core
|
||||
propagatedBuildInputs = [
|
||||
arduino
|
||||
arduino-core-unwrapped
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@ assert pariSupport -> pari != null;
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "cysignals";
|
||||
version = "1.10.3";
|
||||
version = "1.11.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-XEYGxDV3UCgxb3Jf23y4lOPK4Lb9L4YqDSlxdIRptDo=";
|
||||
sha256 = "72985b0ddd6d6f0084b9583562c39d818012420c4f7dd8bf31b55be45d3b95f8";
|
||||
};
|
||||
|
||||
# explicit check:
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "codeql";
|
||||
version = "2.7.0";
|
||||
version = "2.7.2";
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
|
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";
|
||||
sha256 = "sha256-KsgtuQ0ovccZTMm19LrxRU/JOcLzfkL6VRa6W7Tprnw=";
|
||||
sha256 = "sha256-BbSYIhSFXBge/jb88UumLkHH+xw+Rp9uSYnpdntZGws=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoPackage rec {
|
||||
pname = "delve";
|
||||
version = "1.7.2";
|
||||
version = "1.7.3";
|
||||
|
||||
goPackagePath = "github.com/go-delve/delve";
|
||||
excludedPackages = "\\(_fixtures\\|scripts\\|service/test\\)";
|
||||
|
|
@ -11,7 +11,7 @@ buildGoPackage rec {
|
|||
owner = "go-delve";
|
||||
repo = "delve";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Mye8Gh73yQ1fhjVpEOKBQGjdOzgMUqzdNiBjRRTteTg=";
|
||||
sha256 = "sha256-cqIU4nzS8l1JgW3DWRLpyCISDf2uPgw6CbVGyyvx0mg=";
|
||||
};
|
||||
|
||||
subPackages = [ "cmd/dlv" ];
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "dyff";
|
||||
version = "1.4.5";
|
||||
version = "1.4.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "homeport";
|
||||
repo = "dyff";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-TaGtl5TBQMHjY4/HmDUghyhrsc5fjSMmY+oqO+rKGo4=";
|
||||
sha256 = "sha256-xODOKKMGlpMePwO3A4IVReqsR1Kx0CwBjrhsvN+uDR4=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-3L3FtL/P+Jyvv0WESBvfSxJOl99v5QDyyzIqottB2EI=";
|
||||
vendorSha256 = "sha256-W882fD4O4lPVH27KWmkRsS58R6qw7ENhKA2UgpNKvTw=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/dyff"
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "efm-langserver";
|
||||
version = "0.0.37";
|
||||
version = "0.0.38";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mattn";
|
||||
repo = "efm-langserver";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-7weRR1+n0v2HHkM4iYAzWDazmPJUmJj5TQo+dG13B0M=";
|
||||
sha256 = "sha256-+Q3vSifPiE9PyxJnoapJ1CBKUioTHExwBbWJgWD1iNI=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-tca+1SRrFyvU8ttHmfMFiGXd1A8rQSEWm1Mc2qp0EfI=";
|
||||
|
|
|
|||
|
|
@ -18,11 +18,11 @@ let
|
|||
}.${lib.versions.majorMinor php.version} or (throw "Unsupported PHP version.");
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "php-blackfire";
|
||||
version = "1.69.0";
|
||||
version = "1.70.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire-php/blackfire-php_${version}_amd64.deb";
|
||||
sha256 = "5wE6yCl4N6PJiL2up9y/me/Sg2hZ4HnIKsbuhDzyFco=";
|
||||
sha256 = "BOdVZCLwMQwVHFgmigXrWZhqZFP+1aWkeq9r24609nI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,15 +2,15 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "terraform-ls";
|
||||
version = "0.23.0";
|
||||
version = "0.25.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hashicorp";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-hntHEBc1/KSg12x+gv32aNiA2cJ7PWBeftNhI8u+rlw=";
|
||||
sha256 = "sha256-iOSH7eFLsp31mW5ZsTUcJVPE1OBEXPLsoVYroYjwXtk=";
|
||||
};
|
||||
vendorSha256 = "sha256-usPIhXWdp/pSAFH0LepG1/Uolfr/1SExinrAjMuB6zg=";
|
||||
vendorSha256 = "sha256-s6urF9uZ9o8kkKfbRk22JuIv+f3ZlVAFR9c1vylhhoY=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.version=v${version}" "-X main.prerelease=" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -17,15 +17,15 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "deno";
|
||||
version = "1.16.3";
|
||||
version = "1.16.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "denoland";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-9qfBreviTcWgkvZCD7bSvCaC40G+u1v4geGissJ4jE4=";
|
||||
sha256 = "sha256-lEUEA8TAUCzTViGTSPz3Iw17BIIHr+oQXA0ldWe2T3w=";
|
||||
};
|
||||
cargoSha256 = "sha256-20o3JgpL4tHVDoH/l3yM7kCZyXu/vciA8ACubzRvPKA=";
|
||||
cargoSha256 = "sha256-Y/eN15B3aiIrvhuGykB9sQRGRajEC7t84JQ2U0dHAzo=";
|
||||
|
||||
# Install completions post-install
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@ let
|
|||
};
|
||||
in
|
||||
fetch_librusty_v8 {
|
||||
version = "0.35.0";
|
||||
version = "0.36.0";
|
||||
shas = {
|
||||
x86_64-linux = "sha256-vMqLxARbR39G7YSACvqxp+3WLDcfivDgMkvkAEtJ758=";
|
||||
aarch64-linux = "sha256-8rU4Z+eOt4RduiYM97uPiVLAspPkvmf7oeTVuVfBjII=";
|
||||
x86_64-darwin = "sha256-SIXXfK72FfwGv44Z+Qu+a5YAtUaqo/qEpMJZdpOdr3A=";
|
||||
aarch64-darwin = "sha256-FAzwPlST02O5b/T9cz+uKNp6GFhFrgQnmabrAjMfmWc=";
|
||||
x86_64-linux = "sha256-Ala3aT5oXrY+xwzXfB+pLr6gxfoSHcMen9elCbdS9mU=";
|
||||
aarch64-linux = "sha256-BQn/gsNnnuzEzmUzEvGZ8twP0QElgOiTgHe++o4OVCI=";
|
||||
x86_64-darwin = "sha256-YNgGgkrMdiVMe960LHz7BOB+mb/tIXBwGTveT7zrRMs=";
|
||||
aarch64-darwin = "sha256-g2bpxeBVVlsT87jR5VWBArM7yQ/F/MDLeiKHt4u5C5M=";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "alertmanager-irc-relay";
|
||||
version = "0.4.2";
|
||||
version = "0.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "alertmanager-irc-relay";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-/gZeIJN7xkDe7f+Q7zh16KG6RC+G/9MIPm3KQManVZ0=";
|
||||
sha256 = "sha256-ACOXrIeNDUFUwr50frW/miuW1eq29UvCYac5HCdXfx8=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-VLG15IXS/fXFMTCJKEqGW6qZ9aOLPhazidVsOywG+w4=";
|
||||
|
|
|
|||
|
|
@ -5,15 +5,15 @@
|
|||
, git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2021-11-11";
|
||||
version = "2021-12-02";
|
||||
pname = "oh-my-zsh";
|
||||
rev = "b3ba9978cc42a5031c7b68e3cf917ec2e64643bc";
|
||||
rev = "841f3cb0bb7663fa1062ffc59acb7b4581dc1d0f";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit rev;
|
||||
owner = "ohmyzsh";
|
||||
repo = "ohmyzsh";
|
||||
sha256 = "9a5eVMphQ0jay9ogc/9ZFS+vvHlXhPYCCo8kMdgVsnA=";
|
||||
sha256 = "Cn67FahvJAaAnO0MC1bBkVpIYByFR3EtrLoXs0beYHQ=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "eksctl";
|
||||
version = "0.71.0";
|
||||
version = "0.76.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "weaveworks";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-tXsMBry7KtzIhKFOjx30YhyXo2T+oA2RiKf1Yr2uWOI=";
|
||||
sha256 = "sha256-KhAS8JUM6dobcSJ/QaRhxv2jNpn6AFqiDRCdxeKHwZE=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-6egcoQEUe9OU5k0m8GVMU3EMStA9ICE7GiBSOj0olmY=";
|
||||
vendorSha256 = "sha256-6eiJR7DRx3zYKT3B1wBTGSvPQwYw3815K1V/Y9aBX5E=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "unrar";
|
||||
version = "6.0.7";
|
||||
version = "6.1.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.rarlab.com/rar/unrarsrc-${version}.tar.gz";
|
||||
sha256 = "sha256-pwKZQgBsvM7T87cyLsGXaD+Oe+QIlyyggJmxlsA49Rg=";
|
||||
sha256 = "sha256-PpZCH1aOQ4r23NrvcXxI65O4JdlwWOvLFzub/FeAe+M=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -31,13 +31,13 @@ with rec {
|
|||
|
||||
gccStdenv.mkDerivation rec {
|
||||
pname = "astc-encoder";
|
||||
version = "3.2";
|
||||
version = "3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ARM-software";
|
||||
repo = "astc-encoder";
|
||||
rev = version;
|
||||
sha256 = "sha256-1GVMzM4+viVqurkzJqTL3Yszld5zLmpjygT/z74HMLs=";
|
||||
sha256 = "sha256-5E26QzphF5HwVTH+92S4rT3IUAp9ravT/wxsmaH9IAM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -1,18 +1,35 @@
|
|||
{ lib, python2Packages, fetchFromGitHub
|
||||
{ lib, python3Packages, fetchFromGitHub
|
||||
, gtk3
|
||||
, pango
|
||||
, gobject-introspection
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
|
||||
with python2Packages; buildPythonApplication {
|
||||
with python3Packages; buildPythonApplication {
|
||||
pname = "escrotum";
|
||||
version = "unstable-2019-06-10";
|
||||
version = "unstable-2020-12-07";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Roger";
|
||||
repo = "escrotum";
|
||||
rev = "f6c300315cb4402e37f16b56aad2d206e24c5281";
|
||||
sha256 = "0x7za74lkwn3v6j9j04ifgdwdlx9akh1izkw7vkkzj9ag9qjrzb0";
|
||||
rev = "a41d0f11bb6af4f08e724b8ccddf8513d905c0d1";
|
||||
sha256 = "sha256-z0AyTbOEE60j/883X17mxgoaVlryNtn0dfEB0C18G2s=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pygtk numpy ];
|
||||
buildInputs = [
|
||||
gtk3
|
||||
pango
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
gobject-introspection
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ pygobject3 xcffib pycairo numpy ];
|
||||
|
||||
# Cannot find pango without strictDeps = false
|
||||
strictDeps = false;
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ddcutil";
|
||||
version = "1.2.0";
|
||||
version = "1.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rockowitz";
|
||||
repo = "ddcutil";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-MH7WnJgROgLvttQEbd/21mLRFElObp4KINy8RarqkRo=";
|
||||
sha256 = "sha256-mIYxGoITaFlHgqAfB6ZZFR3spGD0BElJZJJqFGM4r/I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
|
||||
let
|
||||
pname = "vector";
|
||||
version = "0.18.0";
|
||||
version = "0.18.1";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
inherit pname version;
|
||||
|
|
@ -37,10 +37,10 @@ rustPlatform.buildRustPackage {
|
|||
owner = "timberio";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-vkiTvJevslXEF2lDTr2IL2vFBQ+dj1N636Livncsso4=";
|
||||
sha256 = "sha256-OD7lYoTlQNdrWT1f+BAp6zI0N+9W2LOHNNgpvAMXKDM=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-u7GzqQex5pqU7DuueMfbxMSOpAzd+uLQTZ2laG/aC+4=";
|
||||
cargoSha256 = "sha256-BqnXXTNE1TmrF7pSOCQpnHHve0lCb9W6MbJXk2QHAOs=";
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ oniguruma openssl protobuf rdkafka zstd ]
|
||||
++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices ];
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "socat";
|
||||
version = "1.7.4.1";
|
||||
version = "1.7.4.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.dest-unreach.org/socat/download/${pname}-${version}.tar.bz2";
|
||||
sha256 = "1sbmqqvni3ss9wyay6ik5v81kxffkra80mh4ypgj74g82iba5b1z";
|
||||
sha256 = "sha256-ZpCp+ZkEV7UFCXonK78sv0zDVXYXb3ZkbjUksOkcF2M=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -14,11 +14,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "crowdin-cli";
|
||||
version = "3.7.1";
|
||||
version = "3.7.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/crowdin/${pname}/releases/download/${version}/${pname}.zip";
|
||||
sha256 = "sha256-WoDFBV1Nid1y57MIrTFMOB2yqHRUrvhp974Dz5agar0=";
|
||||
sha256 = "sha256-7p+Di4GcztwzybJTcFXlun15NFYbJN8eGmJ0y9bify0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles makeWrapper unzip ];
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ugrep";
|
||||
version = "3.3.8";
|
||||
version = "3.3.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Genivia";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-xVkInB2QmZjdcwzXQtmqKhuOjtkVDfY4fDB/wIqA3Jc=";
|
||||
sha256 = "sha256-Z+cNI/053/FFwNxYkbH5Zlp+BOWhP1o8xZ2LSmDaI5M=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "vgrep";
|
||||
version = "2.5.3";
|
||||
version = "2.5.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vrothberg";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-AFjVgFWNhRt8co2eeSGRutNA9peb3xd5sOW0QMSPufw=";
|
||||
sha256 = "sha256-pWRc1EjL09zFT/8HLrosuCJ5qTDj2VaizoI/Eu8jsgM=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "swayr";
|
||||
version = "0.10.0";
|
||||
version = "0.10.1";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~tsdh";
|
||||
repo = "swayr";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-nXJIgzm92OSSGHpN2+09Y8ILpU8Mf51vcVB0kMXBPZc=";
|
||||
sha256 = "sha256-xkNfdO/3MiI3BhCabGNYWkUXkLcLDQmcf+gd5u7KM6Q=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-vExZzJ3Rw+MiU4ikEqzIo51qZW0sxwE/zoVEdUKLXwY=";
|
||||
cargoSha256 = "sha256-FAg3vKSTHA0LVqAu7HE6vI9N1Ro58ZIp29qw2KUHpw4=";
|
||||
|
||||
patches = [
|
||||
./icon-paths.patch
|
||||
|
|
|
|||
|
|
@ -1273,7 +1273,8 @@ with pkgs;
|
|||
|
||||
arduino-cli = callPackage ../development/embedded/arduino/arduino-cli { };
|
||||
|
||||
arduino-core = callPackage ../development/embedded/arduino/arduino-core { };
|
||||
arduino-core = callPackage ../development/embedded/arduino/arduino-core/chrootenv.nix { };
|
||||
arduino-core-unwrapped = callPackage ../development/embedded/arduino/arduino-core { };
|
||||
|
||||
arduino-mk = callPackage ../development/embedded/arduino/arduino-mk {};
|
||||
|
||||
|
|
@ -12706,7 +12707,11 @@ with pkgs;
|
|||
|
||||
opam-installer = callPackage ../development/tools/ocaml/opam/installer.nix { };
|
||||
|
||||
open-watcom-bin = callPackage ../development/compilers/open-watcom-bin { };
|
||||
wrapWatcom = callPackage ../development/compilers/open-watcom/wrapper.nix { };
|
||||
open-watcom-v2-unwrapped = callPackage ../development/compilers/open-watcom/v2.nix { };
|
||||
open-watcom-v2 = wrapWatcom open-watcom-v2-unwrapped { };
|
||||
open-watcom-bin-unwrapped = callPackage ../development/compilers/open-watcom/bin.nix { };
|
||||
open-watcom-bin = wrapWatcom open-watcom-bin-unwrapped { };
|
||||
|
||||
passerine = callPackage ../development/compilers/passerine { };
|
||||
|
||||
|
|
@ -13300,7 +13305,7 @@ with pkgs;
|
|||
inherit (beam.interpreters)
|
||||
erlang erlangR24 erlangR23 erlangR22 erlangR21
|
||||
erlang_odbc erlang_javac erlang_odbc_javac erlang_basho_R16B02
|
||||
elixir elixir_1_12 elixir_1_11 elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7
|
||||
elixir elixir_1_13 elixir_1_12 elixir_1_11 elixir_1_10 elixir_1_9
|
||||
elixir_ls;
|
||||
|
||||
erlang_nox = beam_nox.interpreters.erlang;
|
||||
|
|
|
|||
|
|
@ -89,9 +89,9 @@ with beam; {
|
|||
|
||||
# Other Beam languages. These are built with `beam.interpreters.erlang`. To
|
||||
# access for example elixir built with different version of Erlang, use
|
||||
# `beam.packages.erlangR23.elixir`.
|
||||
# `beam.packages.erlangR24.elixir`.
|
||||
inherit (packages.erlang)
|
||||
elixir elixir_1_12 elixir_1_11 elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7 elixir_ls;
|
||||
elixir elixir_1_13 elixir_1_12 elixir_1_11 elixir_1_10 elixir_1_9 elixir_ls;
|
||||
|
||||
inherit (packages.erlang) lfe lfe_1_3;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -912,8 +912,6 @@ let
|
|||
|
||||
ocaml_oasis = callPackage ../development/tools/ocaml/oasis { };
|
||||
|
||||
ocaml_optcomp = callPackage ../development/ocaml-modules/optcomp { };
|
||||
|
||||
ocaml_pcre = callPackage ../development/ocaml-modules/pcre {};
|
||||
|
||||
ocaml-print-intf = callPackage ../development/ocaml-modules/ocaml-print-intf { };
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ makeScope newScope (self:
|
|||
writeRequiredOctavePackagesHook;
|
||||
|
||||
arduino = callPackage ../development/octave-modules/arduino {
|
||||
inherit (pkgs) arduino;
|
||||
inherit (pkgs) arduino-core-unwrapped;
|
||||
};
|
||||
|
||||
audio = callPackage ../development/octave-modules/audio { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue