NexVeridian/docker-nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #36 from maydayv7/patch-1

Browse source 
fix: Enable Nix `experimental-features` in `cachix-flakes` image
This commit is contained in:
Jonas Chevalier 2022-01-02 14:45:45 +01:00 • committed by GitHub
commit 98182ffc0e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
images/cachix-flakes/default.nix
View file

@ -1,6 +1,10 @@
{ docker-nixpkgs { docker-nixpkgs
, nixFlakes , cachix
}: }:
docker-nixpkgs.cachix.override { (docker-nixpkgs.nix-flakes.override {
nix = nixFlakes; extraContents = [ cachix ];
} }).overrideAttrs (prev: {
meta = (prev.meta or { }) // {
description = "Nix and Cachix image";
};
})

2
images/cachix/default.nix
View file

@ -1,9 +1,7 @@
{ docker-nixpkgs { docker-nixpkgs
, cachix , cachix
, nix
}: }:
(docker-nixpkgs.nix.override { (docker-nixpkgs.nix.override {
nix = nix;
extraContents = [ cachix ]; extraContents = [ cachix ];
}).overrideAttrs (prev: { }).overrideAttrs (prev: {
meta = (prev.meta or { }) // { meta = (prev.meta or { }) // {

3
images/nix-flakes/default.nix
View file

@ -1,6 +1,7 @@
{ docker-nixpkgs { docker-nixpkgs
, nixFlakes , nixFlakes
, writeTextFile , writeTextFile
, extraContents ? [ ]
}: }:
docker-nixpkgs.nix.override { docker-nixpkgs.nix.override {
nix = nixFlakes; nix = nixFlakes;
@ -12,5 +13,5 @@ docker-nixpkgs.nix.override {
experimental-features = nix-command flakes experimental-features = nix-command flakes
''; '';
}) })
]; ] ++ extraContents;
} }