kfm/niveum
1
0
Fork 0
mirror of https://github.com/kmein/niveum synced 2026-03-21 12:21:08 +01:00
Code Releases Activity

feat: upgrade nix

Browse Source
This commit is contained in:
Kierán Meinhardt
2021-12-30 14:08:05 +01:00
parent ed788d318f
commit b877eaa1b7
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
configs/nix.nix
View File

@@ -7,9 +7,8 @@
(import <stockholm/krebs/5pkgs>) (import <stockholm/krebs/5pkgs>)
]; ];
}; };
# enable `nix flake`
nix = { nix = {
package = pkgs.nix; package = pkgs.nixUnstable;
# extraOptions = "experimental-features = nix-command flakes"; extraOptions = "experimental-features = nix-command flakes";
}; };
} }

8
deploy.nix
View File

@@ -1,9 +1,13 @@
let let
krops = builtins.fetchGit (gitFromJson .versions/krops.json); importJson = (import <nixpkgs/lib>).importJSON;
krops = let kropsVersion = importJson .versions/krops.json; in builtins.fetchGit {
rev = kropsVersion.rev;
url = kropsVersion.url;
};
lib = import "${krops}/lib"; lib = import "${krops}/lib";
pkgs = import "${krops}/pkgs" {}; pkgs = import "${krops}/pkgs" {};
importJson = (import <nixpkgs> {}).lib.importJSON;
gitFromJson = path: gitFromJson = path:
let let
object = importJson path; object = importJson path;

5
shell.nix
View File

@@ -1,9 +1,8 @@
{ pkgs ? import <nixpkgs> { } { pkgs ? import <nixpkgs> { }
, lib ? import <nixpkgs/lib>
, release ? "21.11" , release ? "21.11"
}: }:
let let
inherit (pkgs) lib;
dependencies = { dependencies = {
nixpkgs = { nixpkgs = {
ref = "refs/heads/nixos-${release}"; ref = "refs/heads/nixos-${release}";
@@ -73,7 +72,7 @@ in pkgs.mkShell {
(let (let
deployCommand = pkgs.writers.writeDash "niveum-deploy-one" '' deployCommand = pkgs.writers.writeDash "niveum-deploy-one" ''
${pkgs.git}/bin/git diff $(${pkgs.openssh}/bin/ssh "$1" cat /etc/niveum/version) ${pkgs.git}/bin/git diff $(${pkgs.openssh}/bin/ssh "$1" cat /etc/niveum/version)
eval "$(${pkgs.nix}/bin/nix-build --no-out-link "${toString ./.}/deploy.nix" -A "$1")" eval "$(${pkgs.nixUnstable}/bin/nix-build --no-out-link "${toString ./.}/deploy.nix" -A "$1")"
''; '';
in pkgs.writers.writeDashBin "niveum-deploy" '' in pkgs.writers.writeDashBin "niveum-deploy" ''
deploy() { deploy() {