danderson/ofborg
0
0
Fork 0
forked from the-distro/ofborg
Code Pull requests Activity

nixpkgs: 2018-02-23 -> 2018-04-11

Browse source
This commit is contained in:
Daiderd Jordan 2018-04-12 21:35:07 +02:00
parent ee6fb69566
commit efdd718f08
No known key found for this signature in database
GPG key ID: D02435D05B810C96
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
nix/nixpkgs.json
View file

@ -1,7 +1,7 @@
{ {
"url": "https://github.com/nixos/nixpkgs-channels.git", "url": "https://github.com/nixos/nixpkgs-channels.git",
"rev": "c2fbd472a4ebaae739257a3df93aef25f19dd04f", "rev": "2e855dc6b0cd88767a8a5df2faff9e66e1cd7f18",
"date": "2018-02-23T08:08:30+00:00", "date": "2018-04-11T10:16:39+08:00",
"sha256": "07mir6nqb98mbykabppgj4dli66h18qsyi4zqp640x22k6bkp2vp", "sha256": "08s6mfh5a05kd2qs3hmza50ng3pyhd3qha4nanwwk0s8fjzqnv4a",
"fetchSubmodules": true "fetchSubmodules": true
} }

4
shell.nix
View file

@ -15,7 +15,7 @@ let
curl curl
bash bash
] ]
++ stdenv.lib.optional useNix1 nix; ++ stdenv.lib.optional useNix1 nix1;
# HISTFILE = "${src}/.bash_hist"; # HISTFILE = "${src}/.bash_hist";
}; };
@ -32,7 +32,7 @@ let
pkgconfig pkgconfig
git git
] ]
++ stdenv.lib.optional useNix1 nix ++ stdenv.lib.optional useNix1 nix1
++ stdenv.lib.optional stdenv.isDarwin pkgs.darwin.Security; ++ stdenv.lib.optional stdenv.isDarwin pkgs.darwin.Security;
HISTFILE = "${toString ./.}/.bash_hist"; HISTFILE = "${toString ./.}/.bash_hist";