diff options
Diffstat (limited to '')
| -rw-r--r-- | flake.lock | 24 | ||||
| -rw-r--r-- | flake.nix | 9 | ||||
| -rw-r--r-- | modules/by-name/di/disks/module.nix | 1 | ||||
| -rwxr-xr-x | modules/by-name/lf/lf/commands/base.sh | 4 | ||||
| -rw-r--r-- | modules/by-name/lf/lf/module.nix | 2 | ||||
| -rwxr-xr-x | modules/by-name/lf/lf/wrappers/ll/ll.sh | 2 | ||||
| -rw-r--r-- | modules/by-name/ni/nixos-shell/module.nix | 2 | ||||
| -rwxr-xr-x | modules/by-name/ni/nixos-shell/nixos-shell.sh | 2 | ||||
| -rwxr-xr-x | pkgs/by-name/fu/fupdate-sys/fupdate-sys.sh | 2 | ||||
| -rwxr-xr-x | pkgs/by-name/gi/git-edit-index/git-edit-index.sh | 2 | ||||
| -rwxr-xr-x | pkgs/by-name/lf/lf-make-map/tests/cases/child_insert/test.sh | 2 | ||||
| -rwxr-xr-x | pkgs/by-name/lf/lf-make-map/tests/cases/simple/test.sh | 2 | ||||
| -rwxr-xr-x | pkgs/by-name/sc/screenshot_persistent/screenshot_persistent.sh | 2 | ||||
| -rwxr-xr-x | pkgs/update_pkgs.sh | 2 |
14 files changed, 24 insertions, 34 deletions
diff --git a/flake.lock b/flake.lock index 299ff9ec..d2cad25b 100644 --- a/flake.lock +++ b/flake.lock @@ -308,16 +308,10 @@ "crane": [ "crane" ], - "flake-compat": [ - "flake-compat" - ], - "flake-parts": [ - "flake-parts" - ], "nixpkgs": [ "nixpkgs-stable" ], - "pre-commit-hooks-nix": [ + "pre-commit": [ "pre-commit-hooks" ], "rust-overlay": [ @@ -325,16 +319,16 @@ ] }, "locked": { - "lastModified": 1737639419, - "narHash": "sha256-AEEDktApTEZ5PZXNDkry2YV2k6t0dTgLPEmAZbnigXU=", + "lastModified": 1765382359, + "narHash": "sha256-RJmgVDzjRI18BWVogG6wpsl1UCuV6ui8qr4DJ1LfWZ8=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "a65905a09e2c43ff63be8c0e86a93712361f871e", + "rev": "e8c096ade12ec9130ff931b0f0e25d2f1bc63607", "type": "github" }, "original": { "owner": "nix-community", - "ref": "v0.4.2", + "ref": "v1.0.0", "repo": "lanzaboote", "type": "github" } @@ -471,16 +465,16 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1764939437, - "narHash": "sha256-4TLFHUwXraw9Df5mXC/vCrJgb50CRr3CzUzF0Mn3CII=", + "lastModified": 1765838191, + "narHash": "sha256-m5KWt1nOm76ILk/JSCxBM4MfK3rYY7Wq9/TZIIeGnT8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "00d2457e2f608b4be6fe8b470b0a36816324b0ae", + "rev": "c6f52ebd45e5925c188d1a20119978aa4ffd5ef6", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index fc8218a9..73ddc175 100644 --- a/flake.nix +++ b/flake.nix @@ -13,7 +13,7 @@ inputs = { # base - nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-25.05"; + nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-25.11"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small"; # open nixpkgs prs @@ -147,7 +147,6 @@ inputs = { flake-parts.follows = "flake-parts"; nixpkgs.follows = "nixpkgs"; - nuschtosSearch.follows = "nuschtosSearch"; systems.follows = "systems"; }; }; @@ -184,14 +183,12 @@ }; }; lanzaboote = { - url = "github:nix-community/lanzaboote/v0.4.2"; + url = "github:nix-community/lanzaboote/v1.0.0"; inputs = { nixpkgs.follows = "nixpkgs-stable"; - flake-compat.follows = "flake-compat"; - flake-parts.follows = "flake-parts"; crane.follows = "crane"; rust-overlay.follows = "rust-overlay"; - pre-commit-hooks-nix.follows = "pre-commit-hooks"; + pre-commit.follows = "pre-commit-hooks"; }; }; nix-index-database = { diff --git a/modules/by-name/di/disks/module.nix b/modules/by-name/di/disks/module.nix index a1515bcb..3e9d4614 100644 --- a/modules/by-name/di/disks/module.nix +++ b/modules/by-name/di/disks/module.nix @@ -17,7 +17,6 @@ # FIXME: The iso redeploy requires a bigger efi partition <2024-05-12> cfg = config.soispha.disks; defaultMountOptions = [ - "space_cache" # Use some disk space for cache "compress=zstd:3" # This saves disk space, at a performance cost "noatime" # should have some performance upsides, and I don't use it anyways "lazytime" # make time changes in memory diff --git a/modules/by-name/lf/lf/commands/base.sh b/modules/by-name/lf/lf/commands/base.sh index 7c6851c0..7003d76c 100755 --- a/modules/by-name/lf/lf/commands/base.sh +++ b/modules/by-name/lf/lf/commands/base.sh @@ -41,11 +41,11 @@ prompt() { # set -- "$@" "$file" # done < "$(echo "$fx" | tmp)" tmp() { - __base_tmp_temporary_file="$(mktemp --tmpdir="$__base_tmp_temporary_directory" lf_commands_tmp_fun_XXXXXXXX )" + __base_tmp_temporary_file="$(mktemp -t --tmpdir="$__base_tmp_temporary_directory" lf_commands_tmp_fun_XXXXXXXX )" cat >"$__base_tmp_temporary_file" echo "$__base_tmp_temporary_file" } -__base_tmp_temporary_directory="$(mktemp --directory lf_commands_tmp_fun_XXXXXXXXXXXX)" +__base_tmp_temporary_directory="$(mktemp -t --directory lf_commands_tmp_fun_XXXXXXXXXXXX)" trap 'rm --recursive "$__base_tmp_temporary_directory"' EXIT # Run a lf command on the current lf client diff --git a/modules/by-name/lf/lf/module.nix b/modules/by-name/lf/lf/module.nix index 28b627bd..8dfd0c52 100644 --- a/modules/by-name/lf/lf/module.nix +++ b/modules/by-name/lf/lf/module.nix @@ -100,7 +100,7 @@ in { # and keep running through `autoquit = false`. # (Otherwise, the remote command is silently dropped: https://github.com/gokcehan/lf/issues/495) &{{ - tmp="$(mktemp lf_make_map_dynamic_mapping_source_XXXXX)" + tmp="$(mktemp -t lf_make_map_dynamic_mapping_source_XXXXX)" ${lib.getExe pkgs.lf-make-map} --depth 4 generate ~/media ~/repos ~/documents >"$tmp" lf -remote "send $id source $tmp" diff --git a/modules/by-name/lf/lf/wrappers/ll/ll.sh b/modules/by-name/lf/lf/wrappers/ll/ll.sh index 462e03db..ce29fd97 100755 --- a/modules/by-name/lf/lf/wrappers/ll/ll.sh +++ b/modules/by-name/lf/lf/wrappers/ll/ll.sh @@ -10,7 +10,7 @@ # You should have received a copy of the License along with this program. # If not, see <https://www.gnu.org/licenses/gpl-3.0.txt>. -last_directory="$(mktemp ll_last_directory_XXXXXXX)" +last_directory="$(mktemp -t ll_last_directory_XXXXXXX)" cleanup() { rm "$last_directory" } diff --git a/modules/by-name/ni/nixos-shell/module.nix b/modules/by-name/ni/nixos-shell/module.nix index 219f080d..8dda2890 100644 --- a/modules/by-name/ni/nixos-shell/module.nix +++ b/modules/by-name/ni/nixos-shell/module.nix @@ -91,7 +91,7 @@ in { modules = [ { # TODO(@bpeetz): This should be bumped each release. <2025-05-17> - system.stateVersion = "25.05"; + system.stateVersion = "25.11"; } cfg.configuration.value diff --git a/modules/by-name/ni/nixos-shell/nixos-shell.sh b/modules/by-name/ni/nixos-shell/nixos-shell.sh index 99476e9d..3b34019a 100755 --- a/modules/by-name/ni/nixos-shell/nixos-shell.sh +++ b/modules/by-name/ni/nixos-shell/nixos-shell.sh @@ -10,7 +10,7 @@ # You should have received a copy of the License along with this program. # If not, see <https://www.gnu.org/licenses/gpl-3.0.txt>. -SHARED_DIR="$(mktemp --directory "nixos_shell_XXXXXXXXX")" +SHARED_DIR="$(mktemp -t --directory "nixos_shell_XXXXXXXXX")" cleanup() { rm --recursive "$SHARED_DIR" } diff --git a/pkgs/by-name/fu/fupdate-sys/fupdate-sys.sh b/pkgs/by-name/fu/fupdate-sys/fupdate-sys.sh index 991830b3..57ced766 100755 --- a/pkgs/by-name/fu/fupdate-sys/fupdate-sys.sh +++ b/pkgs/by-name/fu/fupdate-sys/fupdate-sys.sh @@ -151,7 +151,7 @@ msg2 "Updating git repository..." git pull --rebase # We use a tempfile, to make this truly async. -default_branch=$(mktemp fupdate_flake_XXXX) +default_branch=$(mktemp -t fupdate_flake_XXXX) cleanup() { rm "$default_branch" } diff --git a/pkgs/by-name/gi/git-edit-index/git-edit-index.sh b/pkgs/by-name/gi/git-edit-index/git-edit-index.sh index a78db1e0..a9434381 100755 --- a/pkgs/by-name/gi/git-edit-index/git-edit-index.sh +++ b/pkgs/by-name/gi/git-edit-index/git-edit-index.sh @@ -56,7 +56,7 @@ materialize_file() { } edit() { - files_to_add="$(mktemp git_edit_index_XXXXX)" + files_to_add="$(mktemp -t git_edit_index_XXXXX)" cleanup() { rm "$files_to_add" } diff --git a/pkgs/by-name/lf/lf-make-map/tests/cases/child_insert/test.sh b/pkgs/by-name/lf/lf-make-map/tests/cases/child_insert/test.sh index efe8fe79..af6a1391 100755 --- a/pkgs/by-name/lf/lf-make-map/tests/cases/child_insert/test.sh +++ b/pkgs/by-name/lf/lf-make-map/tests/cases/child_insert/test.sh @@ -10,7 +10,7 @@ # You should have received a copy of the License along with this program. # If not, see <https://www.gnu.org/licenses/gpl-3.0.txt>. -test="$(mktemp --directory lf_make_map_test_XXXX)" +test="$(mktemp --directory -t lf_make_map_test_XXXX)" cleanup() { rm --recursive "$test" diff --git a/pkgs/by-name/lf/lf-make-map/tests/cases/simple/test.sh b/pkgs/by-name/lf/lf-make-map/tests/cases/simple/test.sh index 656fd2a1..22f97009 100755 --- a/pkgs/by-name/lf/lf-make-map/tests/cases/simple/test.sh +++ b/pkgs/by-name/lf/lf-make-map/tests/cases/simple/test.sh @@ -12,7 +12,7 @@ # We need to hard code this, so that our output matches the golden sample. base="/tmp/tmp.DfcgjemfCG" -test="$(mktemp --directory lf_make_temp_test_XXXXX)" +test="$(mktemp --directory -t lf_make_temp_test_XXXXX)" [ -d "$base" ] && { echo "$base already exists!" diff --git a/pkgs/by-name/sc/screenshot_persistent/screenshot_persistent.sh b/pkgs/by-name/sc/screenshot_persistent/screenshot_persistent.sh index dfaed457..f67293cd 100755 --- a/pkgs/by-name/sc/screenshot_persistent/screenshot_persistent.sh +++ b/pkgs/by-name/sc/screenshot_persistent/screenshot_persistent.sh @@ -10,7 +10,7 @@ # shellcheck shell=bash -tmp="$(mktemp screenshot_persistent_XXXXX)" +tmp="$(mktemp -t screenshot_persistent_XXXXX)" if grim -g "$(slurp)" "$tmp"; then name="$(rofi -dmenu -p "Name of screenshot: " -l 0)" diff --git a/pkgs/update_pkgs.sh b/pkgs/update_pkgs.sh index 32fc6758..d036142e 100755 --- a/pkgs/update_pkgs.sh +++ b/pkgs/update_pkgs.sh @@ -19,7 +19,7 @@ cd "$(dirname "$0")" || die "Bug: run with the wrong first arg: '$0'!" cd ./by-name || die "(BUG): The directory './by-name' does not exist?" # First check if all the update scripts conform to the standard -files_with_update="$(mktemp update_pkgs_XXXXX)" +files_with_update="$(mktemp -t update_pkgs_XXXXX)" trap 'rm "$files_with_update"' EXIT fd '^update.sh$' . --type file --extension sh --max-depth 3 | while read -r file; do |
