ehmry/genodepkgs
ehmry
/
genodepkgs
2
0
Fork 0
Code Releases Activity

Add Nim compiler wrapper

This commit is contained in:
Ehmry - 2019-10-16 15:41:29 +02:00
parent ea9c2d30a6
commit a851525b16
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
default.nix
View File

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

2
nixpkgs.nix
View File

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

3
release.nix
View File

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