aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Nipper <nipsy@bitgnome.net>2026-02-07 15:05:08 -0800
committerMark Nipper <nipsy@bitgnome.net>2026-02-07 15:05:08 -0800
commitad8ef4dcf55f03d293815b5a5a29f60732b2399c (patch)
tree2244ccb4720ba4f27932c73b001163a6d07ea31b
parent57d5429f0898b4135c49f2f0fbe351a0fb845977 (diff)
downloadnix-ad8ef4dcf55f03d293815b5a5a29f60732b2399c.tar
nix-ad8ef4dcf55f03d293815b5a5a29f60732b2399c.tar.gz
nix-ad8ef4dcf55f03d293815b5a5a29f60732b2399c.tar.bz2
nix-ad8ef4dcf55f03d293815b5a5a29f60732b2399c.tar.lz
nix-ad8ef4dcf55f03d293815b5a5a29f60732b2399c.tar.xz
nix-ad8ef4dcf55f03d293815b5a5a29f60732b2399c.tar.zst
nix-ad8ef4dcf55f03d293815b5a5a29f60732b2399c.zip
Revert "Work around broken ISP routing"
This reverts commit 57d5429f0898b4135c49f2f0fbe351a0fb845977.
Diffstat (limited to '')
-rw-r--r--flake.nix6
-rwxr-xr-xscripts/pretty-rebuild10
2 files changed, 3 insertions, 13 deletions
diff --git a/flake.nix b/flake.nix
index 168291d..9e412b9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -25,9 +25,9 @@
nixos-hardware.url = "github:nixos/nixos-hardware";
# persistent base NixOS URLs
- nixpkgs-master.url = "file:///dev/shm/master.tar.gz";
- nixpkgs-stable.url = "file:///dev/shm/stable.tar.gz";
- nixpkgs.url = "file:///dev/shm/unstable.tar.gz";
+ nixpkgs-master.url = "git+ssh://git@ssh.github.com:443/NixOS/nixpkgs";
+ nixpkgs-stable.url = "git+ssh://git@ssh.github.com:443/NixOS/nixpkgs?ref=nixos-25.11";
+ nixpkgs.url = "git+ssh://git@ssh.github.com:443/NixOS/nixpkgs?ref=nixos-unstable";
# per https://nixos-and-flakes.thiscute.world/nixos-with-flakes/downgrade-or-upgrade-packages
#nixpkgs-67e692392.url = "github:nixos/nixpkgs/67e69239226f37168d1adb8d29bd61150756a03e";
diff --git a/scripts/pretty-rebuild b/scripts/pretty-rebuild
index 733f4b6..53c8dcc 100755
--- a/scripts/pretty-rebuild
+++ b/scripts/pretty-rebuild
@@ -7,16 +7,6 @@ else
args=("--flake .#$(hostname -s)" ${=@})
fi
-while read branch file; do
- ssh king curl -L --output-dir /dev/shm -o ${file}.tar.gz https://api.github.com/repos/NixOS/nixpkgs/tarball/${branch}
- scp king:/dev/shm/${file}.tar.gz /dev/shm
- ssh king rm /dev/shm/${file}.tar.gz
-done <<EOF
-release-25.11 stable
-nixos-unstable unstable
-master master
-EOF
-
cd /etc/nixos && \
nix flake update && \
nixos-rebuild switch --upgrade --show-trace ${=args} && \