0b92af2 · ormolu · git.iko.soy

on master help sign in

nix: allow to pass the system attribute

0b92af2zimbatm6 years ago

default.nix+2−1

@@ -1,4 +1,5 @@

1−{ pkgs ? (import ./nix/nixpkgs)

1+{ pkgs ? (import ./nix/nixpkgs { inherit system; })

2+, system ? builtins.currentSystem

2, ormoluCompiler ? "ghc883" # the shell doesn't work with ghc8101 yet

3, ormoluCompiler ? "ghc883" # the shell doesn't work with ghc8101 yet

3}:

4}:

nix/nixpkgs/default.nix+5−1

@@ -1,3 +1,4 @@

1+{ system ? builtins.currentSystem }:

1let

2let

2 rev = "807ca93fadd5197c2260490de0c76e500562dc05";

3 rev = "807ca93fadd5197c2260490de0c76e500562dc05";

3 sha256 = "10yq8bnls77fh3pk5chkkb1sv5lbdgyk1rr2v9xn71rr1k2x563p";

4 sha256 = "10yq8bnls77fh3pk5chkkb1sv5lbdgyk1rr2v9xn71rr1k2x563p";

@@ -5,5 +6,8 @@ let

5 url = "https://github.com/NixOS/nixpkgs/archive/${rev}.tar.gz";

6 url = "https://github.com/NixOS/nixpkgs/archive/${rev}.tar.gz";

6 inherit sha256;

7 inherit sha256;

7 };

8 };

9+ pkgs = import nixpkgs {

10+ inherit system;

8− pkgs = import nixpkgs { config.allowUnfree = true; };

11+ config.allowUnfree = true;

12+ };

9in pkgs

13in pkgs

shell.nix+3−1

@@ -1,3 +1,5 @@

1−{ pkgs ? (import ./nix/nixpkgs) }:

1+{ pkgs ? (import ./nix/nixpkgs { inherit system; })

2+, system ? builtins.currentSystem

3+}:

3(import ./default.nix { inherit pkgs; }).dev.ormoluShell

5(import ./default.nix { inherit pkgs; }).dev.ormoluShell