Skip to content

Commit 172a798

Browse files
committed
fix shell
1 parent dead2b5 commit 172a798

4 files changed

Lines changed: 13 additions & 9 deletions

File tree

default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{ nixpkgs ? <nixpkgs>
1+
{ nixpkgs ? import ./nix/nixpkgs.nix
22
, system ? builtins.currentSystem
33
}:
44
import nixpkgs {

flake.nix

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@
1313
# Real developers use Linux for development :-p
1414
system = "x86_64-linux";
1515

16-
pkgs = import nixpkgs {
17-
inherit system;
18-
overlays = [ (import ./overlay.nix) ];
16+
pkgs = import ./. {
17+
inherit nixpkgs system;
1918
};
2019
in
2120
{

nix/nixpkgs.nix

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
let
2+
# nixpkgs is only used for development. Don't add it to the flake.lock.
3+
gitRev = "500d695aac9ea67195812f309890a911fbc96bda";
4+
in
5+
builtins.fetchTarball {
6+
url = "https://github.com/NixOS/nixpkgs/archive/${gitRev}.tar.gz";
7+
sha256 = "sha256-ya3rCWKDbPWMVsh89/Z1mCJ9HFa5/DKdjcgcKkWB1xs=";
8+
}

shell.nix

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
#!/usr/bin/env nix-build
22
# Used to test the shell
3-
{ pkgs ? import <nixpkgs> { } }:
4-
let
5-
mkDevShell = pkgs.callPackage ./. { };
6-
in
7-
mkDevShell.fromTOML ./devshell.toml
3+
{ pkgs ? import ./. { } }:
4+
pkgs.mkDevShell.fromTOML ./devshell.toml

0 commit comments

Comments
 (0)