diff options
| author | David Morgan <djm_uk@protonmail.com> | 2026-08-03 15:32:20 +0100 |
|---|---|---|
| committer | David Morgan <djm_uk@protonmail.com> | 2026-08-03 15:32:20 +0100 |
| commit | dce6443da76dbd09366df293d11030fb831c6355 (patch) | |
| tree | aa3ac19b20a8b56a4a1283406c09e9d99d5a5db1 | |
| parent | 31ddfddc3f9d087fd54dca322149f98040d1c2c1 (diff) | |
| download | dotfiles-dce6443da76dbd09366df293d11030fb831c6355.tar.gz | |
Remove aarch64 check from modifications overlay
| -rw-r--r-- | nix-conf/flake.lock | 58 | ||||
| -rw-r--r-- | nix-conf/overlays/_version-overrides.nix | 21 | ||||
| -rw-r--r-- | nix-conf/overlays/modifications.nix | 58 |
3 files changed, 64 insertions, 73 deletions
diff --git a/nix-conf/flake.lock b/nix-conf/flake.lock index 4cfc982..9f86e32 100644 --- a/nix-conf/flake.lock +++ b/nix-conf/flake.lock @@ -61,11 +61,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1782949081, - "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=", + "lastModified": 1785627969, + "narHash": "sha256-4dtXQk/NMePegK/nWp5NSeuZKLATItOq61lpEvmXqGw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e", + "rev": "427bf4bd9435fdf21321c8cc628c24efc14c0f7a", "type": "github" }, "original": { @@ -82,11 +82,11 @@ ] }, "locked": { - "lastModified": 1782949081, - "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=", + "lastModified": 1785627969, + "narHash": "sha256-4dtXQk/NMePegK/nWp5NSeuZKLATItOq61lpEvmXqGw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e", + "rev": "427bf4bd9435fdf21321c8cc628c24efc14c0f7a", "type": "github" }, "original": { @@ -144,11 +144,11 @@ ] }, "locked": { - "lastModified": 1785306346, - "narHash": "sha256-DScBkW0fOgpGPK2trNoX3ryLTlaC14+gglFo/BhGJ4g=", + "lastModified": 1785531816, + "narHash": "sha256-vkMnV0JIyw+g/NmcfoajlGaAO+9a0ezia+FZohQJrik=", "owner": "nix-community", "repo": "home-manager", - "rev": "e705714e918c3b11affcdd15db2cbe3a070420a0", + "rev": "bf9ce9fec78f95f374e8dd3b503863a3ec128ebe", "type": "github" }, "original": { @@ -166,11 +166,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1785393064, - "narHash": "sha256-jpfFB/HvagR/PhUXLA5V3xd3mCbixVt+J6CJgESLq28=", + "lastModified": 1785753922, + "narHash": "sha256-cRnp7DSvT4BwRI04YSbA0Ocn1iY6+fN9KTfnsADHm3I=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "83f2093843abf507f1225d9cc98798d66af2f551", + "rev": "8a86f04f5cfbffc5b5d0b38ac24795ab4909b46b", "type": "github" }, "original": { @@ -207,11 +207,11 @@ ] }, "locked": { - "lastModified": 1785046085, - "narHash": "sha256-UiK+mmZJuLWQVhJ5b2wDzogIYWAesyRm6LA3h3Ulh3Y=", + "lastModified": 1785650611, + "narHash": "sha256-q4kR7g+pCcz6NASvoVPYu+CWWUurX03wogtBqGmR4h0=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "11665045df8b9938ef811a3bfdc65cffb02b4b70", + "rev": "dbc756c9d7287de19b3e0e38c928c47510d42c3e", "type": "github" }, "original": { @@ -222,11 +222,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1785301185, - "narHash": "sha256-eoS3KQTO0aPWXZvIaRbRAzSSHW3l5wdMFXtT1ISfoKA=", + "lastModified": 1785602060, + "narHash": "sha256-z7D96eESRM4CPV/XtwpwFn8IDdfLAmxz6lVWrGYXvR4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9bc02893134c733dd85de46ee4fb2fac696b5529", + "rev": "a5cbcfe954791221bfffe2307f7d1a1bf61a871e", "type": "github" }, "original": { @@ -238,11 +238,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1782614948, - "narHash": "sha256-ePjCwr1sNm9NYUqywL7QfK3JnlS015msC+eBu2zKlp8=", + "lastModified": 1785031560, + "narHash": "sha256-OmshNvn2vupOFpYinLUu+1Dnpu4n7Q5N3ggGVNHpkUI=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "db3f255737b94216eb71cce308e2912cf6bc2d7c", + "rev": "0e79af5e3d4dcfcd676ab5ba3f95d2e3352e078c", "type": "github" }, "original": { @@ -253,11 +253,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1785133411, - "narHash": "sha256-7S1XAczkWGQbntnS7lEDlvgyq4jYfTWBLv25CkTv7W0=", - "rev": "2f5a153c270b70cb0f8c11f46d96d6d3bc39f4e3", + "lastModified": 1785599192, + "narHash": "sha256-sTZnq3+3EKM1708T/icNNHH2t596/bu1jolSuj6UBbc=", + "rev": "6d65bfc1bcef2ef39a239d38e577e92a89fb0f07", "type": "tarball", - "url": "https://releases.nixos.org/nixos/26.05/nixos-26.05.6282.2f5a153c270b/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixos/26.05/nixos-26.05.6693.6d65bfc1bcef/nixexprs.tar.xz" }, "original": { "id": "nixpkgs", @@ -267,11 +267,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1785301185, - "narHash": "sha256-PlAXr9kpfXhMFU0OQ7qtE8FhLQo21WXFVGqIC85UFyc=", - "rev": "9bc02893134c733dd85de46ee4fb2fac696b5529", + "lastModified": 1785747939, + "narHash": "sha256-NqaCaIITVSDaBYdcWcfCyEu1erL7paTPEQbISQp9xwQ=", + "rev": "104240a772428cc2e20d8fd86c9ddbb886bbaff2", "type": "tarball", - "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1043539.9bc02893134c/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1046984.104240a77242/nixexprs.tar.xz" }, "original": { "id": "nixpkgs", diff --git a/nix-conf/overlays/_version-overrides.nix b/nix-conf/overlays/_version-overrides.nix index 0b222cc..7c304a2 100644 --- a/nix-conf/overlays/_version-overrides.nix +++ b/nix-conf/overlays/_version-overrides.nix @@ -1,23 +1,16 @@ { brave = null; - google-chrome = { - version = "151.0.7922.72"; - slug = "jzy33whkrvxpy4bxsfmxnqtcwi"; - hash = "sha256-KQybAFcO48waFskPomdFmx8jAsUVAm4jJe7mHAVaSyE="; - }; + google-chrome = null; - firefox = { - version = "153.0.1"; - sha512 = "107zghz81m526y5h9phhkdamx21ihqz4iqmrhflkwgcmx2lnvsh2j0d77lhjgz5zvmdsvsrdrghz7c1savy6qi90mgfy0krgfi1l39i"; - }; + firefox = null; - orbstack = null; + orbstack = { + version = "2.2.2-20903"; + hash = "sha256-Pi6ddG+RQfxrmZ8LNsHps+mChynGd8V/X+Be5Ni2TpE="; + }; slack = null; - zoom-us = { - version = "7.1.5.84650"; - hash = "sha256-Sc9wr2dBdvNwi507UZ9YVCTEQsz3RP2WWTJ5Z5ccgnk="; - }; + zoom-us = null; } diff --git a/nix-conf/overlays/modifications.nix b/nix-conf/overlays/modifications.nix index e6df8db..1312090 100644 --- a/nix-conf/overlays/modifications.nix +++ b/nix-conf/overlays/modifications.nix @@ -32,7 +32,7 @@ in ) ]; } -// prev.lib.optionalAttrs (prev.stdenv.isDarwin && prev.stdenv.isAarch64) ( +// prev.lib.optionalAttrs prev.stdenv.isDarwin ( prev.lib.optionalAttrs (v.brave != null) { brave = prev.brave.overrideAttrs ( finalAttrs: _: { @@ -44,6 +44,33 @@ in } ); } + // prev.lib.optionalAttrs (v.firefox != null) { + firefox-unwrapped = + import (prev.path + "/pkgs/applications/networking/browsers/firefox/packages/firefox.nix") + { + inherit (final) + stdenv + lib + callPackage + fetchurl + nixosTests + ; + buildMozillaMach = + args: + final.buildMozillaMach ( + args + // { + version = v.firefox.version; + packageVersion = v.firefox.version; + src = prev.fetchurl { + url = "mirror://mozilla/firefox/releases/${v.firefox.version}/source/firefox-${v.firefox.version}.source.tar.xz"; + inherit (v.firefox) sha512; + }; + } + ); + }; + firefox = final.wrapFirefox final.firefox-unwrapped { }; + } // prev.lib.optionalAttrs (v.google-chrome != null) { google-chrome = prev.google-chrome.overrideAttrs ( finalAttrs: _: { @@ -92,32 +119,3 @@ in ); } ) -// prev.lib.optionalAttrs prev.stdenv.isDarwin ( - prev.lib.optionalAttrs (v.firefox != null) { - firefox-unwrapped = - import (prev.path + "/pkgs/applications/networking/browsers/firefox/packages/firefox.nix") - { - inherit (final) - stdenv - lib - callPackage - fetchurl - nixosTests - ; - buildMozillaMach = - args: - final.buildMozillaMach ( - args - // { - version = v.firefox.version; - packageVersion = v.firefox.version; - src = prev.fetchurl { - url = "mirror://mozilla/firefox/releases/${v.firefox.version}/source/firefox-${v.firefox.version}.source.tar.xz"; - inherit (v.firefox) sha512; - }; - } - ); - }; - firefox = final.wrapFirefox final.firefox-unwrapped { }; - } -) |