nim2: init 2.0.0
This commit is contained in:
parent
c740ca0e9b
commit
380a34d03c
|
@ -2,8 +2,8 @@
|
||||||
# https://nim-lang.org/docs/nimc.html
|
# https://nim-lang.org/docs/nimc.html
|
||||||
|
|
||||||
{ lib, callPackage, buildPackages, stdenv, fetchurl, fetchgit, fetchFromGitHub
|
{ lib, callPackage, buildPackages, stdenv, fetchurl, fetchgit, fetchFromGitHub
|
||||||
, makeWrapper, openssl, pcre, readline, boehmgc, sqlite, nim-unwrapped
|
, makeWrapper, openssl, pcre, readline, boehmgc, sqlite, Security, nim-unwrapped
|
||||||
, nimble-unwrapped, Security }:
|
, nim-unwrapped-2, nimble-unwrapped, nim }:
|
||||||
|
|
||||||
let
|
let
|
||||||
parseCpu = platform:
|
parseCpu = platform:
|
||||||
|
@ -72,25 +72,15 @@ let
|
||||||
nimHost = parsePlatform stdenv.hostPlatform;
|
nimHost = parsePlatform stdenv.hostPlatform;
|
||||||
nimTarget = parsePlatform stdenv.targetPlatform;
|
nimTarget = parsePlatform stdenv.targetPlatform;
|
||||||
|
|
||||||
bootstrapCompiler = stdenv.mkDerivation {
|
|
||||||
pname = "nim-bootstrap";
|
|
||||||
inherit (nim-unwrapped) version src preBuild;
|
|
||||||
enableParallelBuilding = true;
|
|
||||||
installPhase = ''
|
|
||||||
runHook preInstall
|
|
||||||
install -Dt $out/bin bin/nim
|
|
||||||
runHook postInstall
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
in {
|
in {
|
||||||
|
|
||||||
nim-unwrapped = stdenv.mkDerivation rec {
|
nim-unwrapped = stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "nim-unwrapped";
|
pname = "nim-unwrapped";
|
||||||
version = "1.6.14";
|
version = "1.6.14";
|
||||||
strictDeps = true;
|
strictDeps = true;
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://nim-lang.org/download/nim-${version}.tar.xz";
|
url = "https://nim-lang.org/download/nim-${finalAttrs.version}.tar.xz";
|
||||||
hash = "sha256-0HDS8oriQA33/kpJ7OufRc1TmQaxB0gYVqCveo+oLck=";
|
hash = "sha256-0HDS8oriQA33/kpJ7OufRc1TmQaxB0gYVqCveo+oLck=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -108,7 +98,18 @@ in {
|
||||||
# Mangle store paths of modules to prevent runtime dependence.
|
# Mangle store paths of modules to prevent runtime dependence.
|
||||||
] ++ lib.optional (!stdenv.hostPlatform.isWindows) ./toLocation.patch;
|
] ++ lib.optional (!stdenv.hostPlatform.isWindows) ./toLocation.patch;
|
||||||
|
|
||||||
configurePhase = ''
|
configurePhase = let
|
||||||
|
bootstrapCompiler = stdenv.mkDerivation {
|
||||||
|
pname = "nim-bootstrap";
|
||||||
|
inherit (finalAttrs) version src preBuild;
|
||||||
|
enableParallelBuilding = true;
|
||||||
|
installPhase = ''
|
||||||
|
runHook preInstall
|
||||||
|
install -Dt $out/bin bin/nim
|
||||||
|
runHook postInstall
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
in ''
|
||||||
runHook preConfigure
|
runHook preConfigure
|
||||||
cp ${bootstrapCompiler}/bin/nim bin/
|
cp ${bootstrapCompiler}/bin/nim bin/
|
||||||
echo 'define:nixbuild' >> config/nim.cfg
|
echo 'define:nixbuild' >> config/nim.cfg
|
||||||
|
@ -154,7 +155,25 @@ in {
|
||||||
mainProgram = "nim";
|
mainProgram = "nim";
|
||||||
maintainers = with maintainers; [ ehmry ];
|
maintainers = with maintainers; [ ehmry ];
|
||||||
};
|
};
|
||||||
};
|
});
|
||||||
|
|
||||||
|
nim-unwrapped-2 = nim-unwrapped.overrideAttrs (finalAttrs: rec {
|
||||||
|
version = "2.0.0";
|
||||||
|
src = fetchurl {
|
||||||
|
url = "https://nim-lang.org/download/nim-${version}.tar.xz";
|
||||||
|
hash = "sha256-vWEB2EADb7eOk6ad9s8/n9DCHNdUtpX/hKO0rdjtCvc=";
|
||||||
|
};
|
||||||
|
patches = [
|
||||||
|
./NIM_CONFIG_DIR.patch
|
||||||
|
# Override compiler configuration via an environmental variable
|
||||||
|
|
||||||
|
./nixbuild.patch
|
||||||
|
# Load libraries at runtime by absolute path
|
||||||
|
|
||||||
|
./extra-mangling.patch
|
||||||
|
# Mangle store paths of modules to prevent runtime dependence.
|
||||||
|
];
|
||||||
|
});
|
||||||
|
|
||||||
nimble-unwrapped = stdenv.mkDerivation rec {
|
nimble-unwrapped = stdenv.mkDerivation rec {
|
||||||
pname = "nimble-unwrapped";
|
pname = "nimble-unwrapped";
|
||||||
|
@ -169,8 +188,7 @@ in {
|
||||||
};
|
};
|
||||||
|
|
||||||
depsBuildBuild = [ nim-unwrapped ];
|
depsBuildBuild = [ nim-unwrapped ];
|
||||||
buildInputs = [ openssl ]
|
buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security;
|
||||||
++ lib.optional stdenv.isDarwin Security;
|
|
||||||
|
|
||||||
nimFlags = [ "--cpu:${nimHost.cpu}" "--os:${nimHost.os}" "-d:release" ];
|
nimFlags = [ "--cpu:${nimHost.cpu}" "--os:${nimHost.os}" "-d:release" ];
|
||||||
|
|
||||||
|
@ -194,147 +212,157 @@ in {
|
||||||
mainProgram = "nimble";
|
mainProgram = "nimble";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
} // (let
|
||||||
|
wrapNim = { nim', nimble', patches }:
|
||||||
|
let
|
||||||
|
targetPlatformConfig = stdenv.targetPlatform.config;
|
||||||
|
self = stdenv.mkDerivation (finalAttrs: {
|
||||||
|
name = "${targetPlatformConfig}-nim-wrapper-${nim'.version}";
|
||||||
|
inherit (nim') version;
|
||||||
|
preferLocalBuild = true;
|
||||||
|
strictDeps = true;
|
||||||
|
|
||||||
nim = let
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
nim' = buildPackages.nim-unwrapped;
|
|
||||||
nimble' = buildPackages.nimble-unwrapped;
|
|
||||||
inherit (stdenv) targetPlatform;
|
|
||||||
self = stdenv.mkDerivation {
|
|
||||||
name = "${targetPlatform.config}-nim-wrapper-${nim'.version}";
|
|
||||||
inherit (nim') version;
|
|
||||||
preferLocalBuild = true;
|
|
||||||
strictDeps = true;
|
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper ];
|
# Needed for any nim package that uses the standard library's
|
||||||
|
# 'std/sysrand' module.
|
||||||
|
depsTargetTargetPropagated = lib.optional stdenv.isDarwin Security;
|
||||||
|
|
||||||
# Needed for any nim package that uses the standard library's
|
inherit patches;
|
||||||
# 'std/sysrand' module.
|
|
||||||
depsTargetTargetPropagated = lib.optional stdenv.isDarwin Security;
|
|
||||||
|
|
||||||
patches = [
|
unpackPhase = ''
|
||||||
./nim.cfg.patch
|
runHook preUnpack
|
||||||
# Remove configurations that clash with ours
|
tar xf ${nim'.src} nim-$version/config
|
||||||
];
|
cd nim-$version
|
||||||
|
runHook postUnpack
|
||||||
unpackPhase = ''
|
|
||||||
runHook preUnpack
|
|
||||||
tar xf ${nim'.src} nim-$version/config
|
|
||||||
cd nim-$version
|
|
||||||
runHook postUnpack
|
|
||||||
'';
|
|
||||||
|
|
||||||
dontConfigure = true;
|
|
||||||
|
|
||||||
buildPhase =
|
|
||||||
# Configure the Nim compiler to use $CC and $CXX as backends
|
|
||||||
# The compiler is configured by two configuration files, each with
|
|
||||||
# a different DSL. The order of evaluation matters and that order
|
|
||||||
# is not documented, so duplicate the configuration across both files.
|
|
||||||
''
|
|
||||||
runHook preBuild
|
|
||||||
cat >> config/config.nims << WTF
|
|
||||||
|
|
||||||
switch("os", "${nimTarget.os}")
|
|
||||||
switch("cpu", "${nimTarget.cpu}")
|
|
||||||
switch("define", "nixbuild")
|
|
||||||
|
|
||||||
# Configure the compiler using the $CC set by Nix at build time
|
|
||||||
import strutils
|
|
||||||
let cc = getEnv"CC"
|
|
||||||
if cc.contains("gcc"):
|
|
||||||
switch("cc", "gcc")
|
|
||||||
elif cc.contains("clang"):
|
|
||||||
switch("cc", "clang")
|
|
||||||
WTF
|
|
||||||
|
|
||||||
mv config/nim.cfg config/nim.cfg.old
|
|
||||||
cat > config/nim.cfg << WTF
|
|
||||||
os = "${nimTarget.os}"
|
|
||||||
cpu = "${nimTarget.cpu}"
|
|
||||||
define:"nixbuild"
|
|
||||||
WTF
|
|
||||||
|
|
||||||
cat >> config/nim.cfg < config/nim.cfg.old
|
|
||||||
rm config/nim.cfg.old
|
|
||||||
|
|
||||||
cat >> config/nim.cfg << WTF
|
|
||||||
|
|
||||||
clang.cpp.exe %= "\$CXX"
|
|
||||||
clang.cpp.linkerexe %= "\$CXX"
|
|
||||||
clang.exe %= "\$CC"
|
|
||||||
clang.linkerexe %= "\$CC"
|
|
||||||
gcc.cpp.exe %= "\$CXX"
|
|
||||||
gcc.cpp.linkerexe %= "\$CXX"
|
|
||||||
gcc.exe %= "\$CC"
|
|
||||||
gcc.linkerexe %= "\$CC"
|
|
||||||
WTF
|
|
||||||
|
|
||||||
runHook postBuild
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
wrapperArgs = lib.optionals (!(stdenv.isDarwin && stdenv.isAarch64)) [
|
dontConfigure = true;
|
||||||
"--prefix PATH : ${lib.makeBinPath [ buildPackages.gdb ]}:${
|
|
||||||
placeholder "out"
|
|
||||||
}/bin"
|
|
||||||
# Used by nim-gdb
|
|
||||||
|
|
||||||
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ openssl pcre ]}"
|
buildPhase =
|
||||||
# These libraries may be referred to by the standard library.
|
# Configure the Nim compiler to use $CC and $CXX as backends
|
||||||
# This is broken for cross-compilation because the package
|
# The compiler is configured by two configuration files, each with
|
||||||
# set will be shifted back by nativeBuildInputs.
|
# a different DSL. The order of evaluation matters and that order
|
||||||
|
# is not documented, so duplicate the configuration across both files.
|
||||||
|
''
|
||||||
|
runHook preBuild
|
||||||
|
cat >> config/config.nims << WTF
|
||||||
|
|
||||||
"--set NIM_CONFIG_PATH ${placeholder "out"}/etc/nim"
|
switch("os", "${nimTarget.os}")
|
||||||
# Use the custom configuration
|
switch("cpu", "${nimTarget.cpu}")
|
||||||
];
|
switch("define", "nixbuild")
|
||||||
|
|
||||||
installPhase = ''
|
# Configure the compiler using the $CC set by Nix at build time
|
||||||
runHook preInstall
|
import strutils
|
||||||
|
let cc = getEnv"CC"
|
||||||
|
if cc.contains("gcc"):
|
||||||
|
switch("cc", "gcc")
|
||||||
|
elif cc.contains("clang"):
|
||||||
|
switch("cc", "clang")
|
||||||
|
WTF
|
||||||
|
|
||||||
mkdir -p $out/bin $out/etc
|
mv config/nim.cfg config/nim.cfg.old
|
||||||
|
cat > config/nim.cfg << WTF
|
||||||
|
os = "${nimTarget.os}"
|
||||||
|
cpu = "${nimTarget.cpu}"
|
||||||
|
define:"nixbuild"
|
||||||
|
WTF
|
||||||
|
|
||||||
cp -r config $out/etc/nim
|
cat >> config/nim.cfg < config/nim.cfg.old
|
||||||
|
rm config/nim.cfg.old
|
||||||
|
|
||||||
|
cat >> config/nim.cfg << WTF
|
||||||
|
|
||||||
|
clang.cpp.exe %= "\$CXX"
|
||||||
|
clang.cpp.linkerexe %= "\$CXX"
|
||||||
|
clang.exe %= "\$CC"
|
||||||
|
clang.linkerexe %= "\$CC"
|
||||||
|
gcc.cpp.exe %= "\$CXX"
|
||||||
|
gcc.cpp.linkerexe %= "\$CXX"
|
||||||
|
gcc.exe %= "\$CC"
|
||||||
|
gcc.linkerexe %= "\$CC"
|
||||||
|
WTF
|
||||||
|
|
||||||
|
runHook postBuild
|
||||||
|
'';
|
||||||
|
|
||||||
|
wrapperArgs = lib.optionals (!(stdenv.isDarwin && stdenv.isAarch64)) [
|
||||||
|
"--prefix PATH : ${lib.makeBinPath [ buildPackages.gdb ]}:${
|
||||||
|
placeholder "out"
|
||||||
|
}/bin"
|
||||||
|
# Used by nim-gdb
|
||||||
|
|
||||||
|
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ openssl pcre ]}"
|
||||||
|
# These libraries may be referred to by the standard library.
|
||||||
|
# This is broken for cross-compilation because the package
|
||||||
|
# set will be shifted back by nativeBuildInputs.
|
||||||
|
|
||||||
|
"--set NIM_CONFIG_PATH ${placeholder "out"}/etc/nim"
|
||||||
|
# Use the custom configuration
|
||||||
|
];
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
runHook preInstall
|
||||||
|
|
||||||
|
mkdir -p $out/bin $out/etc
|
||||||
|
|
||||||
|
cp -r config $out/etc/nim
|
||||||
|
|
||||||
|
for binpath in ${nim'}/bin/nim?*; do
|
||||||
|
local binname=`basename $binpath`
|
||||||
|
makeWrapper \
|
||||||
|
$binpath $out/bin/${targetPlatformConfig}-$binname \
|
||||||
|
$wrapperArgs
|
||||||
|
ln -s $out/bin/${targetPlatformConfig}-$binname $out/bin/$binname
|
||||||
|
done
|
||||||
|
|
||||||
for binpath in ${nim'}/bin/nim?*; do
|
|
||||||
local binname=`basename $binpath`
|
|
||||||
makeWrapper \
|
makeWrapper \
|
||||||
$binpath $out/bin/${targetPlatform.config}-$binname \
|
${nim'}/nim/bin/nim $out/bin/${targetPlatformConfig}-nim \
|
||||||
|
--set-default CC $(command -v $CC) \
|
||||||
|
--set-default CXX $(command -v $CXX) \
|
||||||
$wrapperArgs
|
$wrapperArgs
|
||||||
ln -s $out/bin/${targetPlatform.config}-$binname $out/bin/$binname
|
ln -s $out/bin/${targetPlatformConfig}-nim $out/bin/nim
|
||||||
done
|
|
||||||
|
|
||||||
makeWrapper \
|
makeWrapper \
|
||||||
${nim'}/nim/bin/nim $out/bin/${targetPlatform.config}-nim \
|
${nim'}/bin/testament $out/bin/${targetPlatformConfig}-testament \
|
||||||
--set-default CC $(command -v $CC) \
|
$wrapperArgs
|
||||||
--set-default CXX $(command -v $CXX) \
|
ln -s $out/bin/${targetPlatformConfig}-testament $out/bin/testament
|
||||||
$wrapperArgs
|
|
||||||
ln -s $out/bin/${targetPlatform.config}-nim $out/bin/nim
|
|
||||||
|
|
||||||
makeWrapper \
|
'' + lib.strings.optionalString (nimble' != null) ''
|
||||||
${nim'}/bin/testament $out/bin/${targetPlatform.config}-testament \
|
makeWrapper \
|
||||||
$wrapperArgs
|
${nimble'}/bin/nimble $out/bin/${targetPlatformConfig}-nimble \
|
||||||
ln -s $out/bin/${targetPlatform.config}-testament $out/bin/testament
|
--suffix PATH : $out/bin
|
||||||
|
ln -s $out/bin/${targetPlatformConfig}-nimble $out/bin/nimble
|
||||||
|
|
||||||
makeWrapper \
|
'' + ''
|
||||||
${nimble'}/bin/nimble $out/bin/${targetPlatform.config}-nimble \
|
runHook postInstall
|
||||||
--suffix PATH : $out/bin
|
'';
|
||||||
ln -s $out/bin/${targetPlatform.config}-nimble $out/bin/nimble
|
|
||||||
|
|
||||||
runHook postInstall
|
passthru = {
|
||||||
'';
|
nim = nim';
|
||||||
|
nimble = nimble';
|
||||||
|
};
|
||||||
|
|
||||||
passthru = {
|
meta = nim'.meta // {
|
||||||
nim = nim';
|
description = nim'.meta.description
|
||||||
nimble = nimble';
|
+ " (${targetPlatformConfig} wrapper)";
|
||||||
};
|
platforms = with lib.platforms; unix ++ genode;
|
||||||
|
};
|
||||||
meta = nim'.meta // {
|
});
|
||||||
description = nim'.meta.description
|
in self // {
|
||||||
+ " (${targetPlatform.config} wrapper)";
|
pkgs = callPackage ../../../top-level/nim-packages.nix { nim = self; };
|
||||||
platforms = with lib.platforms; unix ++ genode;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
in self // {
|
in {
|
||||||
pkgs = callPackage ../../../top-level/nim-packages.nix { nim = self; };
|
|
||||||
|
nim = wrapNim {
|
||||||
|
nim' = buildPackages.nim-unwrapped;
|
||||||
|
nimble' = buildPackages.nimble-unwrapped;
|
||||||
|
patches = [ ./nim.cfg.patch ];
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
nim2 = wrapNim {
|
||||||
|
nim' = buildPackages.nim-unwrapped-2;
|
||||||
|
nimble' = null;
|
||||||
|
patches = [ ./nim2.cfg.patch ];
|
||||||
|
};
|
||||||
|
})
|
||||||
|
|
41
pkgs/development/compilers/nim/nim2.cfg.patch
Normal file
41
pkgs/development/compilers/nim/nim2.cfg.patch
Normal file
|
@ -0,0 +1,41 @@
|
||||||
|
diff --git a/config/nim.cfg b/config/nim.cfg
|
||||||
|
index 1470de780..8a12f741a 100644
|
||||||
|
--- a/config/nim.cfg
|
||||||
|
+++ b/config/nim.cfg
|
||||||
|
@@ -9,8 +9,6 @@
|
||||||
|
# Environment variables can be accessed like so:
|
||||||
|
# gcc.path %= "$CC_PATH"
|
||||||
|
|
||||||
|
-cc = gcc
|
||||||
|
-
|
||||||
|
# additional options always passed to the compiler:
|
||||||
|
--parallel_build: "0" # 0 to auto-detect number of processors
|
||||||
|
|
||||||
|
@@ -22,27 +20,6 @@ cc = gcc
|
||||||
|
|
||||||
|
threads:on
|
||||||
|
|
||||||
|
-# Examples of how to setup a cross-compiler:
|
||||||
|
-# Nim can target architectures and OSes different than the local host
|
||||||
|
-# Syntax: <arch>.<os>.gcc.exe = "<compiler executable>"
|
||||||
|
-# <arch>.<os>.gcc.linkerexe = "<linker executable>"
|
||||||
|
-
|
||||||
|
-# ARM e.g. Raspberry Pi 2: gcc-arm-linux-gnueabihf package on Debian/Ubuntu
|
||||||
|
-arm.linux.gcc.exe = "arm-linux-gnueabihf-gcc"
|
||||||
|
-arm.linux.gcc.linkerexe = "arm-linux-gnueabihf-gcc"
|
||||||
|
-# ARM64/aarch64 e.g. Raspberry Pi 3: gcc-aarch64-linux-gnu package on Debian/Ubuntu
|
||||||
|
-arm64.linux.gcc.exe = "aarch64-linux-gnu-gcc"
|
||||||
|
-arm64.linux.gcc.linkerexe = "aarch64-linux-gnu-gcc"
|
||||||
|
-# RISC-V: gcc-riscv64-linux-gnu package on Debian/Ubuntu
|
||||||
|
-riscv32.linux.gcc.exe = "riscv64-linux-gnu-gcc"
|
||||||
|
-riscv32.linux.gcc.linkerexe = "riscv64-linux-gnu-gcc"
|
||||||
|
-riscv64.linux.gcc.exe = "riscv64-linux-gnu-gcc"
|
||||||
|
-riscv64.linux.gcc.linkerexe = "riscv64-linux-gnu-gcc"
|
||||||
|
-
|
||||||
|
-# For OpenWRT, you will also need to adjust PATH to point to your toolchain.
|
||||||
|
-mips.linux.gcc.exe = "mips-openwrt-linux-gcc"
|
||||||
|
-mips.linux.gcc.linkerexe = "mips-openwrt-linux-gcc"
|
||||||
|
-
|
||||||
|
|
||||||
|
path="$lib/deprecated/core"
|
||||||
|
path="$lib/deprecated/pure"
|
|
@ -1,13 +0,0 @@
|
||||||
if [ -e .attrs.sh ]; then source .attrs.sh; fi
|
|
||||||
source $stdenv/setup
|
|
||||||
export HOME=$NIX_BUILD_TOP
|
|
||||||
|
|
||||||
nimble --accept --noSSLCheck develop "${pkgname}@${version}"
|
|
||||||
# TODO: bring in the certificates for Nimble to verify the fetch of
|
|
||||||
# the package list.
|
|
||||||
|
|
||||||
pkgdir=${NIX_BUILD_TOP}/${pkgname}
|
|
||||||
|
|
||||||
find "$pkgdir" -name .git -print0 | xargs -0 rm -rf
|
|
||||||
|
|
||||||
cp -a "$pkgdir" "$out"
|
|
|
@ -1,20 +0,0 @@
|
||||||
{ lib, makeOverridable, stdenv, gitMinimal, nim, cacert }:
|
|
||||||
|
|
||||||
makeOverridable (
|
|
||||||
|
|
||||||
{ pname, version, hash ? lib.fakeHash,
|
|
||||||
|
|
||||||
meta ? { }, passthru ? { }, preferLocalBuild ? true }:
|
|
||||||
stdenv.mkDerivation {
|
|
||||||
inherit version meta passthru preferLocalBuild;
|
|
||||||
pname = pname + "-src";
|
|
||||||
pkgname = pname;
|
|
||||||
builder = ./builder.sh;
|
|
||||||
nativeBuildInputs = [ gitMinimal nim ];
|
|
||||||
outputHash = hash;
|
|
||||||
outputHashAlgo = null;
|
|
||||||
outputHashMode = "recursive";
|
|
||||||
impureEnvVars = lib.fetchers.proxyImpureEnvVars
|
|
||||||
++ [ "GIT_PROXY_COMMAND" "SOCKS_SERVER" ];
|
|
||||||
GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt";
|
|
||||||
})
|
|
|
@ -16671,8 +16671,9 @@ with pkgs;
|
||||||
|
|
||||||
inherit (callPackages ../development/compilers/nim
|
inherit (callPackages ../development/compilers/nim
|
||||||
{ inherit (darwin) Security; }
|
{ inherit (darwin) Security; }
|
||||||
) nim-unwrapped nimble-unwrapped nim;
|
) nim-unwrapped nim-unwrapped-2 nimble-unwrapped nim nim2;
|
||||||
nimPackages = recurseIntoAttrs nim.pkgs;
|
nimPackages = recurseIntoAttrs nim.pkgs;
|
||||||
|
nim2Packages = recurseIntoAttrs nim2.pkgs;
|
||||||
|
|
||||||
nrpl = callPackage ../development/tools/nrpl { };
|
nrpl = callPackage ../development/tools/nrpl { };
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,6 @@ lib.makeScope newScope (self:
|
||||||
callPackage ../development/nim-packages/build-nim-package {
|
callPackage ../development/nim-packages/build-nim-package {
|
||||||
inherit (buildPackages.buildPackages.nimPackages) nim_builder;
|
inherit (buildPackages.buildPackages.nimPackages) nim_builder;
|
||||||
};
|
};
|
||||||
fetchNimble = callPackage ../development/nim-packages/fetch-nimble { };
|
|
||||||
|
|
||||||
asciigraph = callPackage ../development/nim-packages/asciigraph { };
|
asciigraph = callPackage ../development/nim-packages/asciigraph { };
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue