emily/nixos-images
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge #97 #105

Browse source 
97: flake.lock: Update r=Mic92 a=nix-eval-jobs-bot



105: noninteractive: Add zfs packages r=Mic92 a=dantefromhell



Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: dantefromhell <90508808+dantefromhell@users.noreply.github.com>
This commit is contained in:
bors[bot] 2023-06-11 03:37:52 +00:00 committed by GitHub
commit e252d40dab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
flake.lock
View file

@ -5,11 +5,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1683508929, "lastModified": 1686150639,
"narHash": "sha256-AqkIrwewCL8+zlkqhNxheF+kOfyakzZDk43SqRTIqRE=", "narHash": "sha256-QHorMn3tgvCE0BM4QlNb/7vuquz11cS2ke1GSfmgiPo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "2a59f5cf641607dbecb0cfec3ae32247e4aeb311", "rev": "f1178c6e72b7d8ab2b55990397969324822275eb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -20,11 +20,11 @@
}, },
"nixos-2211": { "nixos-2211": {
"locked": { "locked": {
"lastModified": 1684141842, "lastModified": 1686174588,
"narHash": "sha256-sbdzOwBDcyzz/Dr1ztdF+tElMyM/cgx+4XxVgz+NLRM=", "narHash": "sha256-3TWcRhBeCzW+sWZbusLkWdL2wTmwIPt3E0TyA43BkRA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2eb0795720849ae19c068e39b17362d3ebcd585c", "rev": "51d9b86c045e8b1f7a4b4ff106c7d83b3a6f53c7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -36,11 +36,11 @@
}, },
"nixos-unstable": { "nixos-unstable": {
"locked": { "locked": {
"lastModified": 1684106623, "lastModified": 1686131476,
"narHash": "sha256-Fxw/lWpx+Cr1sJQ+1msdPBnrRuO0ll1eT48+ym0oqDg=", "narHash": "sha256-d/VZjsgW7dBwqN77EcQ4HqQifpATkT5WnCvYbovIhf0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8fb30f6066a87a91c21241f1993a26ff57005486", "rev": "32d8e07a8ea673bc9b8c0f8106fb0b776c6ea6a8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -52,11 +52,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1683442750, "lastModified": 1685894048,
"narHash": "sha256-IiJ0WWW6OcCrVFl1ijE+gTaP0ChFfV6dNkJR05yStmw=", "narHash": "sha256-QKqv1QS+22k9oxncj1AnAxeqS5jGnQiUW3Jq3B+dI1w=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "eb751d65225ec53de9cf3d88acbf08d275882389", "rev": "2e56a850786211972d99d2bb39665a9b5a1801d6",
"type": "github" "type": "github"
}, },
"original": { "original": {

1
nix/noninteractive.nix
View file

@ -21,6 +21,7 @@
environment.defaultPackages = lib.mkForce [ environment.defaultPackages = lib.mkForce [
pkgs.rsync pkgs.rsync
pkgs.parted pkgs.parted
pkgs.zfs
]; ];
# zfs support is accidentally disabled by excluding base.nix, re-enable it # zfs support is accidentally disabled by excluding base.nix, re-enable it