Skip to content

Commit

Permalink
nixpkgs: 2020-06-07 -> 2020-09-11
Browse files Browse the repository at this point in the history
  • Loading branch information
LnL7 committed Sep 19, 2020
1 parent af0432f commit c9e91e6
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 8 deletions.
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM nix-base:2020-06-07
FROM nix-base:2020-09-11
RUN nix-store --init && nix-store --load-db < .reginfo

RUN mkdir -m 1777 -p /tmp \
&& mkdir -p /nix/var/nix/gcroots /nix/var/nix/profiles/per-user/root /root/.nix-defexpr /var/empty \
&& ln -s /nix/store/flb08j4x46i6zg3ldp3vvf7lkzz0q2sw-system-path /nix/var/nix/gcroots/booted-system \
&& ln -s /nix/store/7w80v91gd7lv23diick7waws1n3szgr3-system-path /nix/var/nix/gcroots/booted-system \
&& ln -s /nix/var/nix/profiles/per-user/root/profile /root/.nix-profile \
&& ln -s /nix/store/z124xpfhlsshxs775jrc8nd83chqkbzy-nixpkgs-20.09pre228453.dcb64ea42e6 /root/.nix-defexpr/nixos \
&& ln -s /nix/store/z124xpfhlsshxs775jrc8nd83chqkbzy-nixpkgs-20.09pre228453.dcb64ea42e6 /root/.nix-defexpr/nixpkgs
&& ln -s /nix/store/id92xjzzpkv5flzm4451ll6c1iwa87cm-nixpkgs-21.03pre243353.6d4b93323e7 /root/.nix-defexpr/nixos \
&& ln -s /nix/store/id92xjzzpkv5flzm4451ll6c1iwa87cm-nixpkgs-21.03pre243353.6d4b93323e7 /root/.nix-defexpr/nixpkgs
2 changes: 1 addition & 1 deletion default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ src ? ./srcs/2020-06-07.nix, nixpkgs ? <nixpkgs>, system ? builtins.currentSystem }:
{ src ? ./srcs/2020-09-11.nix, nixpkgs ? <nixpkgs>, system ? builtins.currentSystem }:

let
inherit (pkgs) dockerTools stdenv buildEnv writeText;
Expand Down
2 changes: 1 addition & 1 deletion latest/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM lnl7/nix:2020-06-07
FROM lnl7/nix:2020-09-11

RUN nix-env -f '<nixpkgs>' -iA \
curl \
Expand Down
18 changes: 18 additions & 0 deletions srcs/2020-09-11.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{ stdenv, fetchurl }:

stdenv.mkDerivation rec {
name = "nixpkgs-21.03pre243353.6d4b93323e7";
version = "2020-09-11";

src = fetchurl {
url = "https://releases.nixos.org/nixpkgs/${name}/nixexprs.tar.xz";
sha256 = "1ri1mqvihviz80765p3p59i2irhnbn7vbvah0aacpkks60m9m0id";
};

dontBuild = true;
preferLocalBuild = true;

installPhase = ''
cp -a . $out
'';
}
4 changes: 2 additions & 2 deletions ssh/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM lnl7/nix:2020-06-07
FROM lnl7/nix:2020-09-11

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

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

0 comments on commit c9e91e6

Please sign in to comment.