Skip to content

Commit c9e91e6

Browse files
committed
nixpkgs: 2020-06-07 -> 2020-09-11
1 parent af0432f commit c9e91e6

File tree

5 files changed

+26
-8
lines changed

5 files changed

+26
-8
lines changed

Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM nix-base:2020-06-07
1+
FROM nix-base:2020-09-11
22
RUN nix-store --init && nix-store --load-db < .reginfo
33

44
RUN mkdir -m 1777 -p /tmp \
55
&& mkdir -p /nix/var/nix/gcroots /nix/var/nix/profiles/per-user/root /root/.nix-defexpr /var/empty \
6-
&& ln -s /nix/store/flb08j4x46i6zg3ldp3vvf7lkzz0q2sw-system-path /nix/var/nix/gcroots/booted-system \
6+
&& ln -s /nix/store/7w80v91gd7lv23diick7waws1n3szgr3-system-path /nix/var/nix/gcroots/booted-system \
77
&& ln -s /nix/var/nix/profiles/per-user/root/profile /root/.nix-profile \
8-
&& ln -s /nix/store/z124xpfhlsshxs775jrc8nd83chqkbzy-nixpkgs-20.09pre228453.dcb64ea42e6 /root/.nix-defexpr/nixos \
9-
&& ln -s /nix/store/z124xpfhlsshxs775jrc8nd83chqkbzy-nixpkgs-20.09pre228453.dcb64ea42e6 /root/.nix-defexpr/nixpkgs
8+
&& ln -s /nix/store/id92xjzzpkv5flzm4451ll6c1iwa87cm-nixpkgs-21.03pre243353.6d4b93323e7 /root/.nix-defexpr/nixos \
9+
&& ln -s /nix/store/id92xjzzpkv5flzm4451ll6c1iwa87cm-nixpkgs-21.03pre243353.6d4b93323e7 /root/.nix-defexpr/nixpkgs

default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{ src ? ./srcs/2020-06-07.nix, nixpkgs ? <nixpkgs>, system ? builtins.currentSystem }:
1+
{ src ? ./srcs/2020-09-11.nix, nixpkgs ? <nixpkgs>, system ? builtins.currentSystem }:
22

33
let
44
inherit (pkgs) dockerTools stdenv buildEnv writeText;

latest/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM lnl7/nix:2020-06-07
1+
FROM lnl7/nix:2020-09-11
22

33
RUN nix-env -f '<nixpkgs>' -iA \
44
curl \

srcs/2020-09-11.nix

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{ stdenv, fetchurl }:
2+
3+
stdenv.mkDerivation rec {
4+
name = "nixpkgs-21.03pre243353.6d4b93323e7";
5+
version = "2020-09-11";
6+
7+
src = fetchurl {
8+
url = "https://releases.nixos.org/nixpkgs/${name}/nixexprs.tar.xz";
9+
sha256 = "1ri1mqvihviz80765p3p59i2irhnbn7vbvah0aacpkks60m9m0id";
10+
};
11+
12+
dontBuild = true;
13+
preferLocalBuild = true;
14+
15+
installPhase = ''
16+
cp -a . $out
17+
'';
18+
}

ssh/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM lnl7/nix:2020-06-07
1+
FROM lnl7/nix:2020-09-11
22

33
RUN nix-env -f '<nixpkgs>' -iA \
44
gnused \
@@ -21,4 +21,4 @@ ADD insecure_rsa /root/.ssh/id_rsa
2121
ADD insecure_rsa.pub /root/.ssh/authorized_keys
2222

2323
EXPOSE 22
24-
CMD ["/nix/store/0fyc1wr4ndxai9645w87ynd5js3pnxl9-openssh-8.2p1/bin/sshd", "-D", "-e"]
24+
CMD ["/nix/store/f772niv2vajba3fr7xhh3infynyxr7c7-openssh-8.3p1/bin/sshd", "-D", "-e"]

0 commit comments

Comments
 (0)