diff --git a/flake.lock b/flake.lock index b120de39a..5b62bc200 100644 --- a/flake.lock +++ b/flake.lock @@ -61,11 +61,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1710184940, - "narHash": "sha256-FzYm4td3FJfzOAuEkCXt3KdUgZuA072OAQXqIq+IAMo=", + "lastModified": 1710677371, + "narHash": "sha256-yqjXunc+Zvqf6rcH7W9wMvhr18jMZhDvIdnretlfj78=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "45b75bf534592c0c1c881a1c447f7fdb37a87eaf", + "rev": "f890211817b941d9ed9de48d62ba8553fa2c20f3", "type": "github" }, "original": { @@ -152,11 +152,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1710031547, - "narHash": "sha256-pkUg3hOKuGWMGF9WEMPPN/G4pqqdbNGJQ54yhyQYDVY=", + "lastModified": 1710636348, + "narHash": "sha256-/kB+ZWSdkZjbZ0FTqm0u84sf2jFS+30ysaEajmBjtoY=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "630ebdc047ca96d8126e16bb664c7730dc52f6e6", + "rev": "fa827dda806c5aa98f454da4c567991ab8ce422c", "type": "github" }, "original": { @@ -167,11 +167,11 @@ }, "nixpkgs-next-unpatched": { "locked": { - "lastModified": 1710337169, - "narHash": "sha256-u2/74bhQuWykUZDWUIhHd6IpZiaQ0hSpTBbx0y9opkE=", + "lastModified": 1711022479, + "narHash": "sha256-MjOP3LgJiVmBPdJ8kjis6xWWpiCW8x/eFcAkbL36AtA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4ee0840ba2ecc50458ab1677d108afcd691f4815", + "rev": "33cddc79aa062e243c59d3ac36b8b938f267748a", "type": "github" }, "original": { @@ -183,11 +183,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1710033658, - "narHash": "sha256-yiZiVKP5Ya813iYLho2+CcFuuHpaqKc/CoxOlANKcqM=", + "lastModified": 1710628718, + "narHash": "sha256-y+l3eH53UlENaYa1lmnCBHusZb1kxBEFd2/c7lDsGpw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b17375d3bb7c79ffc52f3538028b2ec06eb79ef8", + "rev": "6dc11d9859d6a18ab0c5e5829a5b8e4810658de3", "type": "github" }, "original": { @@ -199,11 +199,11 @@ }, "nixpkgs-unpatched": { "locked": { - "lastModified": 1710339354, - "narHash": "sha256-+P5ccUPiLouHexb8aJrUOVOIja9qm+fG57pgAu7uIRs=", + "lastModified": 1711043170, + "narHash": "sha256-UURzpCgi6OAMjqEMEpV1mmtCTbrHmzkxxR5vszeqXgs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2dbc8f62d8af7a1ab962e4b20d12b25ddcb86ced", + "rev": "783b241f949bea90e3347ce516ad8af84bde3126", "type": "github" }, "original": { @@ -223,11 +223,11 @@ ] }, "locked": { - "lastModified": 1710317949, - "narHash": "sha256-bwReMiWPA2wYBvKEMhO8pJcu+o+7ocy5hGkSoawTHu0=", + "lastModified": 1710857677, + "narHash": "sha256-imrQlTr3vZsnad16djnYDI9ICVaJfKEH6rB7F9xka74=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "771cb198c281db6918829651f194bf4db32e342d", + "rev": "7d053c33b7a130ddada43ba09b089244390b3a23", "type": "github" }, "original": { @@ -254,11 +254,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1710195194, - "narHash": "sha256-KFxCJp0T6TJOz1IOKlpRdpsCr9xsvlVuWY/VCiAFnTE=", + "lastModified": 1710644594, + "narHash": "sha256-RquCuzxfy4Nr8DPbdp3D/AsbYep21JgQzG8aMH9jJ4A=", "owner": "Mic92", "repo": "sops-nix", - "rev": "e52d8117b330f690382f1d16d81ae43daeb4b880", + "rev": "83b68a0e8c94b72cdd0a6e547a14ca7eb1c03616", "type": "github" }, "original": { @@ -311,11 +311,11 @@ ] }, "locked": { - "lastModified": 1707981105, - "narHash": "sha256-YCU1eNslBHabjP+OCY+BxPycEFO9SRUts10MrN9QORE=", + "lastModified": 1710845014, + "narHash": "sha256-qae28wYfrv3hfgmGXyyclY1p5rcpzMRICYttZ/s07HA=", "ref": "refs/heads/master", - "rev": "bb10cd8853d05191e4d62947d93687c462e92c30", - "revCount": 235, + "rev": "9a3b2d74c3e6d177fd1317d03f4e3eecca7beb7b", + "revCount": 236, "type": "git", "url": "https://git.uninsane.org/colin/uninsane" }, diff --git a/hosts/common/programs/element-desktop.nix b/hosts/common/programs/element-desktop.nix index f569b6e49..f2c4b99c1 100644 --- a/hosts/common/programs/element-desktop.nix +++ b/hosts/common/programs/element-desktop.nix @@ -8,8 +8,8 @@ { sane.programs.element-desktop = { packageUnwrapped = pkgs.element-desktop.override { - # use pre-build electron because otherwise it takes 4 hrs to build from source. - electron = pkgs.electron-bin; + # use pre-built electron because otherwise it takes 4 hrs to build from source. + electron = pkgs.electron_28-bin; }; suggestedPrograms = [ "gnome-keyring" diff --git a/nixpatches/list.nix b/nixpatches/list.nix index a10a6bec3..d9827952d 100644 --- a/nixpatches/list.nix +++ b/nixpatches/list.nix @@ -40,21 +40,12 @@ in [ hash = "sha256-AzkMYm9Pm85Xfm+nd44oKIULZYGyMXulmjFbutouysc="; }) - (fetchpatch' { - prUrl = "https://github.com/NixOS/nixpkgs/pull/288518"; - saneCommit = "20c9492d303be7cbad560e3d83bc47ab4b1e93f7"; - title = "procmail: support cross compilation"; - # hash = "sha256-cC9GBF5tCeJ2GDSjMjlG4hYStIJPEoRBAK9/KhJiiIo="; - hash = "sha256-MzAwT1Ss3ltlljton+8atyz6PomSr1u1TuHXkigAovo="; - merged.staging = "20240312120000"; - merged.staging-next = "20240312120000"; - }) - - (fetchpatch' { - prUrl = "https://github.com/NixOS/nixpkgs/pull/292415"; - title = "sway/hyprland: cross compilation fixes"; - hash = "sha256-3BGZK5Plx1IJzKHv19RwcRWQ4S+cbUbsPbEzpxFEYsI="; - }) + # TODO: rebase (or split into smaller PRs) + # (fetchpatch' { + # prUrl = "https://github.com/NixOS/nixpkgs/pull/292415"; + # title = "sway/hyprland: cross compilation fixes"; + # hash = "sha256-3BGZK5Plx1IJzKHv19RwcRWQ4S+cbUbsPbEzpxFEYsI="; + # }) # (fetchpatch' { # title = "nixos/slskd: allow omitting username from yaml config";