From f8dd9f78919cb62f83aaed4f618f47d42c59585f Mon Sep 17 00:00:00 2001 From: matt1432 Date: Sun, 22 Sep 2024 14:05:24 -0400 Subject: [PATCH] chore: unpin hyprland and nextcloud, switch back to nixos-unstable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake Inputs: • Updated input 'astal': 'github:Aylur/astal/5ae0a9e' (2024-09-21) → 'github:Aylur/astal/8cab7d0' (2024-09-22) • Updated input 'home-manager': 'github:nix-community/home-manager/14929f7' (2024-09-21) → 'github:nix-community/home-manager/04213d1' (2024-09-22) • Updated input 'hyprland': 'git+https://github.com/hyprwm/Hyprland?ref=refs/heads/main&rev=b248d59&submodules=1' (2024-09-18) → 'git+https://github.com/hyprwm/Hyprland?ref=refs/heads/main&rev=e5ff19a&submodules=1' (2024-09-22) • Updated input 'jovian': 'github:Jovian-Experiments/Jovian-NixOS/faf4c74' (2024-09-21) → 'github:Jovian-Experiments/Jovian-NixOS/d71bcb4' (2024-09-22) • Updated input 'nix-gaming': 'github:fufexan/nix-gaming/7ea77f2' (2024-09-20) → 'github:fufexan/nix-gaming/43a085b' (2024-09-22) • Updated input 'nix-index-db': 'github:Mic92/nix-index-database/c1b0fa0' (2024-09-16) → 'github:Mic92/nix-index-database/c7515c2' (2024-09-22) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/eca2693' (2024-09-21) → 'github:NixOS/nixpkgs/c04d565' (2024-09-19) • Updated input 'nixpkgs-wayland': 'github:nix-community/nixpkgs-wayland/ff23ca1' (2024-09-21) → 'github:nix-community/nixpkgs-wayland/a1318d7' (2024-09-22) Docker Images: • nextcloud fpm: sha256:74e016552a6f908fa3700c0dfa3757fb20f8ff2a630cd357ebbdc9c359a53bf0 → sha256:724553f742322d67f34282be46b414572d4e0cd46ccd54d2f2a24b6a87a472b0 • ghcr.io/linuxserver/radarr latest: sha256:dfbce5095045fc1c15058318342ee590ab50379854b13464dd2ca17b10c4beb4 → sha256:df843d96b812d858b94377ffed1918424ece6735038a19e8ff93730277757b65 --- .../docker/media/radarr/images/radarr.nix | 4 +- .../docker/nextcloud/images/nextcloud.nix | 6 +- flake.lock | 99 ++++++++++--------- flake.nix | 3 +- inputs.nix | 4 - outputs.nix | 2 +- 6 files changed, 60 insertions(+), 58 deletions(-) diff --git a/devices/nos/modules/docker/media/radarr/images/radarr.nix b/devices/nos/modules/docker/media/radarr/images/radarr.nix index 13dbd464..88c9689a 100644 --- a/devices/nos/modules/docker/media/radarr/images/radarr.nix +++ b/devices/nos/modules/docker/media/radarr/images/radarr.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage { imageName = "ghcr.io/linuxserver/radarr"; - imageDigest = "sha256:dfbce5095045fc1c15058318342ee590ab50379854b13464dd2ca17b10c4beb4"; - sha256 = "0f0j5ci4x23xm79vczp1i1m68nqydkqy1qad3k7gqmkx7zl3b8rm"; + imageDigest = "sha256:df843d96b812d858b94377ffed1918424ece6735038a19e8ff93730277757b65"; + sha256 = "0bmbrn58xkc38fcysd9pqg6jwjzd5w5msdb6nh9j9h3g09ivi303"; finalImageName = "ghcr.io/linuxserver/radarr"; finalImageTag = "latest"; } diff --git a/devices/nos/modules/docker/nextcloud/images/nextcloud.nix b/devices/nos/modules/docker/nextcloud/images/nextcloud.nix index 651f5dbf..12d0b8fe 100644 --- a/devices/nos/modules/docker/nextcloud/images/nextcloud.nix +++ b/devices/nos/modules/docker/nextcloud/images/nextcloud.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage { imageName = "nextcloud"; - imageDigest = "sha256:74e016552a6f908fa3700c0dfa3757fb20f8ff2a630cd357ebbdc9c359a53bf0"; - sha256 = "0ysq5fh4dkxvprzqd9wdsrwwj7mhj3a2nsinwz14r7shv1jzhra8"; + imageDigest = "sha256:724553f742322d67f34282be46b414572d4e0cd46ccd54d2f2a24b6a87a472b0"; + sha256 = "042an85vz29gb8ipd3sprnslhly3v1zz0qiib2dyibgq1f82qz3q"; finalImageName = "nextcloud"; - finalImageTag = "29.0.6-fpm"; + finalImageTag = "fpm"; } diff --git a/flake.lock b/flake.lock index 026a8fae..f0b367cf 100644 --- a/flake.lock +++ b/flake.lock @@ -79,11 +79,11 @@ ] }, "locked": { - "lastModified": 1726955409, - "narHash": "sha256-pu2ourufLyqabnf6XaDrb/jDo/6Dm3D2oOQXHMpUtwg=", + "lastModified": 1727022015, + "narHash": "sha256-ka7aRbReUE6ImjQV8KabMHoojUgb3gtn1/9drMFTtBk=", "owner": "Aylur", "repo": "astal", - "rev": "5ae0a9ed1cba13242d12ffe2ad4848eac7dd8915", + "rev": "8cab7d039e2cf783033a5f1f26cf8be42b0d158e", "type": "github" }, "original": { @@ -534,11 +534,11 @@ ] }, "locked": { - "lastModified": 1726902823, - "narHash": "sha256-Gkc7pwTVLKj4HSvRt8tXNvosl8RS9hrBAEhOjAE0Tt4=", + "lastModified": 1726985855, + "narHash": "sha256-NJPGK030Y3qETpWBhj9oobDQRbXdXOPxtu+YgGvZ84o=", "owner": "nix-community", "repo": "home-manager", - "rev": "14929f7089268481d86b83ed31ffd88713dcd415", + "rev": "04213d1ce4221f5d9b40bcee30706ce9a91d148d", "type": "github" }, "original": { @@ -612,17 +612,16 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1726677836, - "narHash": "sha256-JRmVRTZr6N3p9OgvKQrrtmNAPQEtgSX3L3tKy1mf6zA=", + "lastModified": 1726995313, + "narHash": "sha256-HTbsXJDFugdQ794d1Bnh8eRSY7AlunIxd7jFW9kkKNM=", "ref": "refs/heads/main", - "rev": "b248d59713d99a8338d25f4765fd2f564069f98b", - "revCount": 5233, + "rev": "e5ff19ac0f2c8d53a0c847d06a17676e636d6447", + "revCount": 5247, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" }, "original": { - "rev": "b248d59713d99a8338d25f4765fd2f564069f98b", "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -779,11 +778,11 @@ ] }, "locked": { - "lastModified": 1724966483, - "narHash": "sha256-WXDgKIbzjYKczxSZOsJplCS1i1yrTUpsDPuJV/xpYLo=", + "lastModified": 1726874949, + "narHash": "sha256-PNnIpwGqpTvMU3N2r0wMQwK1E+t4Bb5fbJwblQvr+80=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "8976e3f6a5357da953a09511d0c7f6a890fb6ec2", + "rev": "d97af4f6bd068c03a518b597675e598f57ea2291", "type": "github" }, "original": { @@ -829,11 +828,11 @@ ] }, "locked": { - "lastModified": 1721324119, - "narHash": "sha256-SOOqIT27/X792+vsLSeFdrNTF+OSRp5qXv6Te+fb2Qg=", + "lastModified": 1726840673, + "narHash": "sha256-HIPEXyRRVZoqD6U+lFS1B0tsIU7p83FaB9m7KT/x6mQ=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "a048a6cb015340bd82f97c1f40a4b595ca85cc30", + "rev": "b68dab23fc922eae99306988133ee80a40b39ca5", "type": "github" }, "original": { @@ -895,11 +894,11 @@ ] }, "locked": { - "lastModified": 1726902390, - "narHash": "sha256-ESAD6AkxsQdV/j5ZBcO4Vg94J7Xd0nfpiEZpJtwSEhg=", + "lastModified": 1726982842, + "narHash": "sha256-ePXZ+VRceMVy8T0Cg6vCuF1l73ko+n2sgeG6od4u2/E=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "faf4c746c068dd8e41b1fa5f18beeabd34d4064c", + "rev": "d71bcb4cbc45b7a4a79cb5188fe3d2adcc52d520", "type": "github" }, "original": { @@ -936,11 +935,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1726600542, - "narHash": "sha256-4ZP8rYtad1Z0LY3vZ1eYSRUzqPd3x7K0j7SpP3vReWc=", + "lastModified": 1727007123, + "narHash": "sha256-B2WqDa4Sd7EVrGfxnVSCL39yOKWqn14vhhTGlbtd+48=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "e0cc0b05b0296fdc52fa683d47a3470dfe4f79ea", + "rev": "e4bb2b4962e79814c38862dce5eca90af3de6a3c", "type": "github" }, "original": { @@ -1148,11 +1147,11 @@ "umu": "umu" }, "locked": { - "lastModified": 1726853411, - "narHash": "sha256-+R8HmKGNV2PKUTmCyLKQeDCCpUqur23ucKR63M2SWAQ=", + "lastModified": 1726969451, + "narHash": "sha256-PuRj1ZoHkvUBak10HD55n7v3SDx5zCwn3av0JEoJteI=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "7ea77f2f1cd535c4d952128b349eca0b8a16d196", + "rev": "43a085bb0d25ec065838b3c5434627b87c686295", "type": "github" }, "original": { @@ -1212,11 +1211,11 @@ ] }, "locked": { - "lastModified": 1726449931, - "narHash": "sha256-1AX7MyYzP7sNgZiGF8jwehCCI75y2kBGwACeryJs+yE=", + "lastModified": 1726975622, + "narHash": "sha256-bPDZosnom0+02ywmMZAvmj7zvsQ6mVv/5kmvSgbTkaY=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "c1b0fa0bec5478185eae2fd3f39b9e906fc83995", + "rev": "c7515c2fdaf2e1f3f49856cef6cec95bb2138417", "type": "github" }, "original": { @@ -1277,16 +1276,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1726929174, - "narHash": "sha256-MbKM2df9xF9USr9uuOaB6p1s1ZzFzLZGIIifD3BTTWg=", + "lastModified": 1726755586, + "narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "eca2693230fe59318102f3726d2da305312c04a4", + "rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable-small", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -1325,11 +1324,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1726362065, - "narHash": "sha256-4h15WKdrs9zf6DGaeeV7ntU/pHHGkH6geYt1QBW0CP4=", + "lastModified": 1726966855, + "narHash": "sha256-25ByioeOBFcnitO5lM/Mufnv/u7YtHEHEM8QFuiS40k=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "9db4db09d82e4b2207bfa7f1e747a4f49d214555", + "rev": "575704ff85d3a41dc5bfef7b55380cbc7b87f3c2", "type": "github" }, "original": { @@ -1408,11 +1407,11 @@ ] }, "locked": { - "lastModified": 1726957911, - "narHash": "sha256-5IvPhLClfuWfMkb+xBPbTT1IDlF2XG2P5BgvDnwUkLI=", + "lastModified": 1727008402, + "narHash": "sha256-vvdMGNwaSQDjctSeRwzyW5aEYsfmZC15+cCqBAbHn9Q=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "ff23ca197583acd3874d3fa3b610614ee4d2ab1f", + "rev": "a1318d7743b0cc32406082bfaba6ba1c9d47a8fe", "type": "github" }, "original": { @@ -1962,11 +1961,11 @@ }, "locked": { "dir": "packaging/nix", - "lastModified": 1726301236, - "narHash": "sha256-0JQH9RYdGL1NUaQE5syA/SmbxuZ6NTLn3FduapSXUXA=", + "lastModified": 1726768365, + "narHash": "sha256-5yQJ3krsZioC+Nim4/oaOjKp3CXFWolTFMpXnUBcYtE=", "ref": "refs/heads/main", - "rev": "e06443981e3bf09cbc70aaffe245e4a03f1a6df7", - "revCount": 715, + "rev": "e42043a26639cfb69d14c6945ecdebe2bb3c42fc", + "revCount": 727, "submodules": true, "type": "git", "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix" @@ -2033,6 +2032,14 @@ "hyprland", "hyprlang" ], + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "hyprwayland-scanner": [ + "hyprland", + "hyprwayland-scanner" + ], "nixpkgs": [ "hyprland", "nixpkgs" @@ -2043,11 +2050,11 @@ ] }, "locked": { - "lastModified": 1726046979, - "narHash": "sha256-6SEsjurq9cdTkITA6d49ncAJe4O/8CgRG5/F//s6Xh8=", + "lastModified": 1726933538, + "narHash": "sha256-xTqnMoJsEojuvqJLuM+U7EZ7q71efaj3pbvjutq4TXc=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "e695669fd8e1d1be9eaae40f35e00f8bd8b64c18", + "rev": "4880c50146d0c2a3152d2b02f79253810c330c11", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index c851d700..64213eb6 100644 --- a/flake.nix +++ b/flake.nix @@ -140,7 +140,6 @@ nixpkgs.follows = "nixpkgs"; systems.follows = "systems"; }; - rev = "b248d59713d99a8338d25f4765fd2f564069f98b"; submodules = true; type = "git"; url = "https://github.com/hyprwm/Hyprland"; @@ -264,7 +263,7 @@ }; nixpkgs = { owner = "NixOS"; - ref = "nixos-unstable-small"; + ref = "nixos-unstable"; repo = "nixpkgs"; type = "github"; }; diff --git a/inputs.nix b/inputs.nix index 5b11ca73..276c2d43 100644 --- a/inputs.nix +++ b/inputs.nix @@ -113,10 +113,6 @@ let type = "git"; url = "https://github.com/hyprwm/Hyprland"; submodules = true; - rev = "b248d59713d99a8338d25f4765fd2f564069f98b"; - - # FIXME: discord crashes https://github.com/hyprwm/Hyprland/issues/7846 - # rev = "94140e886ea8c4ac34478d290c212f0f5454ab2e"; }; hyprland-plugins = mkHyprDep { diff --git a/outputs.nix b/outputs.nix index f06eabc1..dfd39fa1 100644 --- a/outputs.nix +++ b/outputs.nix @@ -11,7 +11,7 @@ nixpkgs = mkInput { owner = "NixOS"; repo = "nixpkgs"; - ref = "nixos-unstable-small"; + ref = "nixos-unstable"; }; home-manager = mkDep {