From c2364f5a22d54ace8855ba2eee727df7ee8e020a Mon Sep 17 00:00:00 2001 From: Julien Moutinho <julm+julm-nix@sourcephile.fr> Date: Mon, 10 Oct 2022 16:38:44 +0200 Subject: [PATCH] nix: update inputs --- build | 2 +- flake.lock | 12 ++++++------ home-manager/profiles/essential.nix | 4 ++-- home-manager/profiles/science.nix | 4 +++- hosts/oignon.nix | 2 +- hosts/patate/backup/rsync-backup.nix | 3 +-- nixpkgs/overlays/podl.nix | 2 +- nixpkgs/patches.nix | 2 +- 8 files changed, 16 insertions(+), 15 deletions(-) diff --git a/build b/build index a3fac6f..5d7f29d 100755 --- a/build +++ b/build @@ -7,4 +7,4 @@ trap 'git reset private/root private/hosts' EXIT # prevent copying to /nix/store git rm -rf --cached --ignore-unmatch private/root private/hosts/* git reset private/hosts/"$host"/credentials private/hosts/"$host"/root/machine-id -time nix -L build "$@" -o hosts/"$host".root .\#nixosConfigurations."$host".config.system.build.toplevel +time nix -L build --keep-going "$@" -o hosts/"$host".root .\#nixosConfigurations."$host".config.system.build.toplevel diff --git a/flake.lock b/flake.lock index 007b82d..d9949e5 100644 --- a/flake.lock +++ b/flake.lock @@ -24,11 +24,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1656367977, - "narHash": "sha256-0hV17V9Up9pnAtPJ+787FhrsPnawxoTPA/VxgjRMrjc=", + "lastModified": 1666080735, + "narHash": "sha256-4YWYJgzt9mGuAvXAuEziYms+bYlk/1spyt3iLizRL5I=", "owner": "nix-community", "repo": "home-manager", - "rev": "3bf16c0fd141c28312be52945d1543f9ce557bb1", + "rev": "42f81ac107c5a9a177888080107094dba57f134e", "type": "github" }, "original": { @@ -62,11 +62,11 @@ }, "utils": { "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", "type": "github" }, "original": { diff --git a/home-manager/profiles/essential.nix b/home-manager/profiles/essential.nix index 3b54c82..7ee4ce0 100644 --- a/home-manager/profiles/essential.nix +++ b/home-manager/profiles/essential.nix @@ -46,9 +46,9 @@ home.packages = [ pkgs.testdisk pkgs.tree pkgs.usbutils - pkgs.utillinux + pkgs.util-linux pkgs.which - pkgs.xdg_utils + pkgs.xdg-utils ] ++ lib.optionals nixosConfig.services.xserver.enable [ pkgs.gparted ]; diff --git a/home-manager/profiles/science.nix b/home-manager/profiles/science.nix index 25e4687..489d08b 100644 --- a/home-manager/profiles/science.nix +++ b/home-manager/profiles/science.nix @@ -1,7 +1,9 @@ { pkgs, lib, config, ... }: { home.packages = [ - pkgs.geogebra + (pkgs.geogebra6.override { + electron = pkgs.electron_15; + }) pkgs.stellarium pkgs.wxmaxima #pkgs.zotero diff --git a/hosts/oignon.nix b/hosts/oignon.nix index 1b16a39..def0044 100644 --- a/hosts/oignon.nix +++ b/hosts/oignon.nix @@ -162,7 +162,7 @@ networking.firewall.extraCommands = '' ip46tables -A nixos-fw -i wg-intra -p tcp -m tcp --dport 8000 -j ACCEPT ''; -services.ipfs = { +services.kubo = { #enable = true; defaultMode = "online"; autoMount = true; diff --git a/hosts/patate/backup/rsync-backup.nix b/hosts/patate/backup/rsync-backup.nix index 0599b6e..3e4b7e1 100644 --- a/hosts/patate/backup/rsync-backup.nix +++ b/hosts/patate/backup/rsync-backup.nix @@ -31,8 +31,7 @@ home-manager.users.sevy = { ExecStart = pkgs.writeShellScript "rsync-backup" '' FS_LABEL=$1 set -eux - # FIXME: utillinux -> unit-linux when updating to 20.05 - DEVICE=$(${pkgs.utillinux}/bin/blkid -l -o device -t LABEL="$FS_LABEL") + DEVICE=$(${pkgs.util-linux}/bin/blkid -l -o device -t LABEL="$FS_LABEL") while ! ${pkgs.glib}/bin/gio mount --device "$DEVICE" do test ! -d /run/media/sevy/"$FS_LABEL" || break sleep 1 diff --git a/nixpkgs/overlays/podl.nix b/nixpkgs/overlays/podl.nix index f7116c3..d95c262 100644 --- a/nixpkgs/overlays/podl.nix +++ b/nixpkgs/overlays/podl.nix @@ -1,7 +1,7 @@ self: super: { podl = super.writeShellScriptBin "podl" '' PATH=${with self; lib.makeBinPath [ - coreutils utillinux findutils gnugrep gnused + coreutils util-linux findutils gnugrep gnused curl aria2 yt-dlp xmlstarlet file ]} ${builtins.readFile ./podl.sh} diff --git a/nixpkgs/patches.nix b/nixpkgs/patches.nix index 081e995..7376c4b 100644 --- a/nixpkgs/patches.nix +++ b/nixpkgs/patches.nix @@ -2,7 +2,7 @@ { meta.description = "openvpn"; url = "https://github.com/NixOS/nixpkgs/pull/109643.diff"; - sha256 = "sha256-7qwICOAqRyP73NSZHGrnKGlsK/pHI7ae0heNBvgHsSI="; + sha256 = "sha256-vlHKDmbIBp8oK6B8ZeMEo8uYdS/u2ex07ZfQcHCEtxQ="; } { meta.description = "wireguard"; -- 2.47.0