2
0
Fork 0

Add Nim compiler wrapper

20.02
Emery Hemingway 3 years ago
parent ea9c2d30a6
commit a851525b16
  1. 4
      default.nix
  2. 2
      nixpkgs.nix
  3. 3
      release.nix

@ -19,7 +19,7 @@ let
toolchainOverlay = import ./toolchain-overlay;
# Overlay of toolchain patches
in { nixpkgs ? import ./nixpkgs.nix }:
in { nixpkgs ? import ./nixpkgs.nix, nim-overlay ? <nim-overlay> }:
import nixpkgs {
# Evaluate an overlayed Nixpkgs for a Genode target
@ -29,5 +29,5 @@ import nixpkgs {
isGenode = true;
imports = [ ./platform.nix ];
};
overlays = [ toolchainOverlay pkgOverlay ];
overlays = [ toolchainOverlay (import nim-overlay) pkgOverlay ];
}

@ -2,5 +2,5 @@
builtins.fetchGit {
url = "https://github.com/ehmry/nixpkgs.git";
ref = "hybrid-19.09";
rev = "84f61071bd0290b6295f6aa5798e6af9ffe3abeb";
rev = "0ceffd0334cb5139805591ff5e5934e8e440b7c1";
}

@ -9,10 +9,11 @@ let dhallPinned = import ./dhallPinnedNixpkgs.nix; in
, dhall-haskell ? <dhall-haskell>
, dhallNixpkgs ? dhallPinned.nixpkgs
, dhallNixpkgsStaticLinux ? dhallPinned.nixpkgsStaticLinux
, nim-overlay ? <nim-overlay>
}:
let
pkgs = import genodepkgs { inherit nixpkgs; };
pkgs = import genodepkgs { inherit nixpkgs nim-overlay; };
dhall-haskell' = import (dhall-haskell + "/release.nix") {
nixpkgs = dhallNixpkgs;
nixpkgsStaticLinux = dhallNixpkgsStaticLinux;

Loading…
Cancel
Save