Skip to content

Commit

Permalink
update.sh: Use nix build from NixOS/nix#12107 to work around regressi…
Browse files Browse the repository at this point in the history
…on of NixOS/nix#9708

I got tired of manually running

```
/nix/store/bn0djaymav6qa4zg5vaskzcaija5nq2p-nix-2.26.0pre20241227_9111645/bin/nix flake update
```

for every update while waiting for the fix to make it upstreaam.
  • Loading branch information
aij committed Jan 15, 2025
1 parent 4a6d611 commit 2798e3c
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion stable
Submodule stable updated 69 files
+3 −2 .github/workflows/codeowners-v2.yml
+3 −2 lib/default.nix
+7 −5 lib/generators.nix
+43 −2 lib/lists.nix
+1 −1 lib/meta.nix
+24 −0 lib/tests/misc.nix
+1 −1 nixos/modules/hardware/video/nvidia.nix
+2 −1 nixos/modules/hardware/wooting.nix
+1 −1 nixos/modules/misc/version.nix
+2 −2 nixos/modules/services/backup/borgbackup.nix
+2 −1 nixos/modules/services/cluster/kubernetes/apiserver.nix
+2 −1 nixos/modules/services/cluster/kubernetes/proxy.nix
+2 −1 nixos/modules/services/databases/redis.nix
+8 −4 nixos/modules/services/desktops/pipewire/wireplumber.nix
+3 −0 nixos/modules/services/home-automation/home-assistant.nix
+2 −1 nixos/modules/services/home-automation/wyoming/faster-whisper.nix
+1 −1 nixos/modules/services/mail/dovecot.nix
+4 −3 nixos/modules/services/misc/gitlab.nix
+1 −1 nixos/modules/services/misc/snapper.nix
+1 −1 nixos/modules/services/monitoring/prometheus/exporters/smokeping.nix
+3 −2 nixos/modules/services/network-filesystems/ceph.nix
+3 −3 nixos/modules/services/networking/lxd-image-server.nix
+2 −1 nixos/modules/services/networking/smokeping.nix
+4 −2 nixos/modules/services/networking/tinyproxy.nix
+6 −3 nixos/modules/services/networking/wg-quick.nix
+8 −4 nixos/modules/services/networking/wireguard.nix
+1 −1 nixos/modules/services/security/certmgr.nix
+1 −1 nixos/modules/services/video/frigate.nix
+2 −2 nixos/modules/services/web-apps/bookstack.nix
+1 −1 nixos/modules/services/web-apps/castopod.nix
+1 −1 nixos/modules/services/web-apps/davis.nix
+1 −1 nixos/modules/services/web-apps/discourse.nix
+1 −1 nixos/modules/services/web-apps/dokuwiki.nix
+1 −1 nixos/modules/services/web-apps/firefly-iii-data-importer.nix
+1 −1 nixos/modules/services/web-apps/firefly-iii.nix
+1 −1 nixos/modules/services/web-apps/flarum.nix
+1 −1 nixos/modules/services/web-apps/freshrss.nix
+2 −1 nixos/modules/services/web-apps/galene.nix
+2 −2 nixos/modules/services/web-apps/monica.nix
+11 −9 nixos/modules/services/web-apps/nextcloud.nix
+10 −10 nixos/modules/services/web-apps/onlyoffice.nix
+2 −2 nixos/modules/services/web-apps/peertube.nix
+1 −1 nixos/modules/services/web-apps/privatebin.nix
+1 −1 nixos/modules/services/web-apps/rutorrent.nix
+2 −2 nixos/modules/services/web-apps/snipe-it.nix
+1 −1 nixos/modules/services/web-apps/zabbix.nix
+1 −1 nixos/modules/services/x11/display-managers/lightdm.nix
+2 −2 nixos/modules/system/activation/top-level.nix
+413 −413 pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+2 −2 pkgs/applications/networking/browsers/firefox/packages/firefox.nix
+2 −2 pkgs/applications/networking/mailreaders/thunderbird/packages.nix
+7 −0 pkgs/applications/networking/misc/zammad/default.nix
+3 −3 pkgs/by-name/fl/flyctl/package.nix
+3 −0 pkgs/by-name/fr/frigate/package.nix
+2 −2 pkgs/by-name/im/impl/package.nix
+3 −3 pkgs/by-name/lo/lock/package.nix
+1 −1 pkgs/by-name/ma/mattermost/package.nix
+3 −3 pkgs/by-name/ni/nixpkgs-review/package.nix
+2 −2 pkgs/by-name/pa/paperjam/package.nix
+41 −0 pkgs/by-name/pa/patchy/package.nix
+3 −3 pkgs/by-name/pr/prismlauncher-unwrapped/package.nix
+50 −0 pkgs/development/python-modules/amshan/default.nix
+37 −41 pkgs/development/python-modules/datalad/default.nix
+14 −14 pkgs/development/tools/electron/binary/info.json
+14 −14 pkgs/development/tools/electron/chromedriver/info.json
+12 −12 pkgs/development/tools/electron/info.json
+2 −2 pkgs/os-specific/linux/system76/default.nix
+34 −0 pkgs/servers/home-assistant/custom-components/amshan/package.nix
+2 −0 pkgs/top-level/python-packages.nix
2 changes: 1 addition & 1 deletion unstable
Submodule unstable updated 280 files
3 changes: 2 additions & 1 deletion update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ function do_update () {
git submodule update --remote

# Update flake.lock to match
nix flake update
# Use nix build from https://github.com/NixOS/nix/pull/12107 to work around regression of https://github.com/NixOS/nix/issues/9708
/nix/store/bn0djaymav6qa4zg5vaskzcaija5nq2p-nix-2.26.0pre20241227_9111645/bin/nix flake update

# Test that everything still builds
tests/machine-builds.sh
Expand Down

0 comments on commit 2798e3c

Please sign in to comment.