diff options
author | Emery Hemingway <ehmry@posteo.net> | 2023-08-02 13:30:00 +0100 |
---|---|---|
committer | Emery Hemingway <ehmry@posteo.net> | 2023-08-21 07:32:46 +0100 |
commit | 380a34d03cd7cda2844483fb2d2c382b588aefaa (patch) | |
tree | 6225c0c5eda14d36a8c395a0ec9276a24f1d5573 | |
parent | c740ca0e9ba769b6932a3d58f68046dba4280cbb (diff) |
nim2: init 2.0.0
-rw-r--r-- | pkgs/development/compilers/nim/default.nix | 332 | ||||
-rw-r--r-- | pkgs/development/compilers/nim/nim2.cfg.patch | 41 | ||||
-rw-r--r-- | pkgs/development/nim-packages/fetch-nimble/builder.sh | 13 | ||||
-rw-r--r-- | pkgs/development/nim-packages/fetch-nimble/default.nix | 20 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 3 | ||||
-rw-r--r-- | pkgs/top-level/nim-packages.nix | 1 |
6 files changed, 223 insertions, 187 deletions
diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index 131a27b6f5445..f18671242130f 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -2,8 +2,8 @@ # https://nim-lang.org/docs/nimc.html { lib, callPackage, buildPackages, stdenv, fetchurl, fetchgit, fetchFromGitHub -, makeWrapper, openssl, pcre, readline, boehmgc, sqlite, nim-unwrapped -, nimble-unwrapped, Security }: +, makeWrapper, openssl, pcre, readline, boehmgc, sqlite, Security, nim-unwrapped +, nim-unwrapped-2, nimble-unwrapped, nim }: let parseCpu = platform: @@ -72,25 +72,15 @@ let nimHost = parsePlatform stdenv.hostPlatform; 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 { - nim-unwrapped = stdenv.mkDerivation rec { + nim-unwrapped = stdenv.mkDerivation (finalAttrs: { pname = "nim-unwrapped"; version = "1.6.14"; strictDeps = true; 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="; }; @@ -108,7 +98,18 @@ in { # Mangle store paths of modules to prevent runtime dependence. ] ++ 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 cp ${bootstrapCompiler}/bin/nim bin/ echo 'define:nixbuild' >> config/nim.cfg @@ -154,7 +155,25 @@ in { mainProgram = "nim"; 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 { pname = "nimble-unwrapped"; @@ -169,8 +188,7 @@ in { }; depsBuildBuild = [ nim-unwrapped ]; - buildInputs = [ openssl ] - ++ lib.optional stdenv.isDarwin Security; + buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; nimFlags = [ "--cpu:${nimHost.cpu}" "--os:${nimHost.os}" "-d:release" ]; @@ -194,147 +212,157 @@ in { mainProgram = "nimble"; }; }; - - nim = let - 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; - - patches = [ - ./nim.cfg.patch - # Remove configurations that clash with ours - ]; - - 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 +} // (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; + + nativeBuildInputs = [ makeWrapper ]; + + # Needed for any nim package that uses the standard library's + # 'std/sysrand' module. + depsTargetTargetPropagated = lib.optional stdenv.isDarwin Security; + + inherit patches; + + unpackPhase = '' + runHook preUnpack + tar xf ${nim'.src} nim-$version/config + cd nim-$version + runHook postUnpack ''; - 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 - ]; + 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)) [ + "--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 - installPhase = '' - runHook preInstall - - mkdir -p $out/bin $out/etc - - cp -r config $out/etc/nim + makeWrapper \ + ${nim'}/nim/bin/nim $out/bin/${targetPlatformConfig}-nim \ + --set-default CC $(command -v $CC) \ + --set-default CXX $(command -v $CXX) \ + $wrapperArgs + ln -s $out/bin/${targetPlatformConfig}-nim $out/bin/nim - for binpath in ${nim'}/bin/nim?*; do - local binname=`basename $binpath` makeWrapper \ - $binpath $out/bin/${targetPlatform.config}-$binname \ + ${nim'}/bin/testament $out/bin/${targetPlatformConfig}-testament \ $wrapperArgs - ln -s $out/bin/${targetPlatform.config}-$binname $out/bin/$binname - done - - makeWrapper \ - ${nim'}/nim/bin/nim $out/bin/${targetPlatform.config}-nim \ - --set-default CC $(command -v $CC) \ - --set-default CXX $(command -v $CXX) \ - $wrapperArgs - ln -s $out/bin/${targetPlatform.config}-nim $out/bin/nim - - makeWrapper \ - ${nim'}/bin/testament $out/bin/${targetPlatform.config}-testament \ - $wrapperArgs - ln -s $out/bin/${targetPlatform.config}-testament $out/bin/testament - - makeWrapper \ - ${nimble'}/bin/nimble $out/bin/${targetPlatform.config}-nimble \ - --suffix PATH : $out/bin - ln -s $out/bin/${targetPlatform.config}-nimble $out/bin/nimble - - runHook postInstall - ''; - - passthru = { - nim = nim'; - nimble = nimble'; - }; + ln -s $out/bin/${targetPlatformConfig}-testament $out/bin/testament - meta = nim'.meta // { - description = nim'.meta.description - + " (${targetPlatform.config} wrapper)"; - platforms = with lib.platforms; unix ++ genode; - }; + '' + lib.strings.optionalString (nimble' != null) '' + makeWrapper \ + ${nimble'}/bin/nimble $out/bin/${targetPlatformConfig}-nimble \ + --suffix PATH : $out/bin + ln -s $out/bin/${targetPlatformConfig}-nimble $out/bin/nimble + + '' + '' + runHook postInstall + ''; + + passthru = { + nim = nim'; + nimble = nimble'; + }; + + meta = nim'.meta // { + description = nim'.meta.description + + " (${targetPlatformConfig} wrapper)"; + platforms = with lib.platforms; unix ++ genode; + }; + }); + in self // { + pkgs = callPackage ../../../top-level/nim-packages.nix { nim = self; }; }; - in self // { - pkgs = callPackage ../../../top-level/nim-packages.nix { nim = self; }; +in { + + 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 ]; + }; +}) diff --git a/pkgs/development/compilers/nim/nim2.cfg.patch b/pkgs/development/compilers/nim/nim2.cfg.patch new file mode 100644 index 0000000000000..ef23d3a84623a --- /dev/null +++ b/pkgs/development/compilers/nim/nim2.cfg.patch @@ -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" diff --git a/pkgs/development/nim-packages/fetch-nimble/builder.sh b/pkgs/development/nim-packages/fetch-nimble/builder.sh deleted file mode 100644 index bc2f9bfc94f1b..0000000000000 --- a/pkgs/development/nim-packages/fetch-nimble/builder.sh +++ /dev/null @@ -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" diff --git a/pkgs/development/nim-packages/fetch-nimble/default.nix b/pkgs/development/nim-packages/fetch-nimble/default.nix deleted file mode 100644 index ccdacc8e27b9b..0000000000000 --- a/pkgs/development/nim-packages/fetch-nimble/default.nix +++ /dev/null @@ -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"; - }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 260974f0e50b3..4ea4a7f4a6d66 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16671,8 +16671,9 @@ with pkgs; inherit (callPackages ../development/compilers/nim { inherit (darwin) Security; } - ) nim-unwrapped nimble-unwrapped nim; + ) nim-unwrapped nim-unwrapped-2 nimble-unwrapped nim nim2; nimPackages = recurseIntoAttrs nim.pkgs; + nim2Packages = recurseIntoAttrs nim2.pkgs; nrpl = callPackage ../development/tools/nrpl { }; diff --git a/pkgs/top-level/nim-packages.nix b/pkgs/top-level/nim-packages.nix index 9bd4db77d2e98..5c379034176af 100644 --- a/pkgs/top-level/nim-packages.nix +++ b/pkgs/top-level/nim-packages.nix @@ -9,7 +9,6 @@ lib.makeScope newScope (self: callPackage ../development/nim-packages/build-nim-package { inherit (buildPackages.buildPackages.nimPackages) nim_builder; }; - fetchNimble = callPackage ../development/nim-packages/fetch-nimble { }; asciigraph = callPackage ../development/nim-packages/asciigraph { }; |