From cf19085158a2c28120b5effe874b904cc0f567c7 Mon Sep 17 00:00:00 2001 From: Noah Masur <7386960+nmasur@users.noreply.github.com> Date: Fri, 21 Jun 2024 17:08:38 -0600 Subject: [PATCH] update lockfile and i guess rebuild everything on macos --- flake.lock | 70 ++++++++++++++++++++++-------------------------------- flake.nix | 1 + 2 files changed, 29 insertions(+), 42 deletions(-) diff --git a/flake.lock b/flake.lock index 0ae2a41..1e5f5e3 100644 --- a/flake.lock +++ b/flake.lock @@ -108,11 +108,11 @@ ] }, "locked": { - "lastModified": 1718588625, - "narHash": "sha256-8ZbrJq1jcmyzJ4SDkvd8JOZD4/fNUHpL4cpqVe4w3CU=", + "lastModified": 1718846788, + "narHash": "sha256-9dtXYtEkmXoUJV+PGLqscqF7qTn4AIhAKpFWRFU2NYs=", "owner": "nix-community", "repo": "disko", - "rev": "8262659fc990cecdf6a8de74c3de7b6ec58c2276", + "rev": "e1174d991944a01eaaa04bc59c6281edca4c0e6e", "type": "github" }, "original": { @@ -145,11 +145,11 @@ ] }, "locked": { - "lastModified": 1718758004, - "narHash": "sha256-obzisI1zXWfBlTXcAOfznFsIe698ZOnACi10DcL7FU0=", + "lastModified": 1718930737, + "narHash": "sha256-+nKJ/VP6X+hirXqRry3GzdNn4OJvOdB4nRnJY22ixFw=", "owner": "bandithedoge", "repo": "nixpkgs-firefox-darwin", - "rev": "f6046245f1803f0127c0b2879c42d29d56246c3f", + "rev": "087919070dffc9798a8cb753e97babe287f06c25", "type": "github" }, "original": { @@ -267,11 +267,11 @@ ] }, "locked": { - "lastModified": 1718788307, - "narHash": "sha256-SqiOz0sljM0GjyQEVinPXQxaGcbOXw5OgpCWGPgh/vo=", + "lastModified": 1718983978, + "narHash": "sha256-lp6stESwTLBZUQ5GBivxwNehShmBp4jqeX/1xahM61w=", "owner": "nix-community", "repo": "home-manager", - "rev": "d7830d05421d0ced83a0f007900898bdcaf2a2ca", + "rev": "c559542f0aa87971a7f4c1b3478fe33cc904b902", "type": "github" }, "original": { @@ -286,14 +286,16 @@ "cl-nix-lite": "cl-nix-lite", "flake-compat": "flake-compat", "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { - "lastModified": 1718336101, - "narHash": "sha256-ynZTySa2iTry8be1NZMrnDoya1vZBfM3chBzHNHEYZw=", + "lastModified": 1718893255, + "narHash": "sha256-NdSDGdz5eU/EcnGn8ECP1V+mn5hyGOZQ4ybv2bWTpuk=", "owner": "hraban", "repo": "mac-app-util", - "rev": "a3873969fc0198b308881cbd9a1863e6ca429f26", + "rev": "1857b26aceaf64c2b6a357eb83cf34139b6365cc", "type": "github" }, "original": { @@ -412,17 +414,17 @@ }, "nixpkgs": { "locked": { - "lastModified": 1717868076, - "narHash": "sha256-c83Y9t815Wa34khrux81j8K8ET94ESmCuwORSKm2bQY=", - "owner": "NixOS", + "lastModified": 1718895438, + "narHash": "sha256-k3JqJrkdoYwE3fHE6xGDY676AYmyh4U2Zw+0Bwe5DLU=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "cd18e2ae9ab8e2a0a8d715b60c91b54c0ac35ff9", + "rev": "d603719ec6e294f034936c0d0dc06f689d91b6c3", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", + "ref": "nixos-unstable", "repo": "nixpkgs", - "rev": "cd18e2ae9ab8e2a0a8d715b60c91b54c0ac35ff9", "type": "github" } }, @@ -442,29 +444,13 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1718530797, - "narHash": "sha256-pup6cYwtgvzDpvpSCFh1TEUjw2zkNpk8iolbKnyFmmU=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "b60ebf54c15553b393d144357375ea956f89e9a9", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nur": { "locked": { - "lastModified": 1718811866, - "narHash": "sha256-Jlm9c42Qk+eQbe2Wr3RHiN/MSc3MK7VE07qlmDqW2xU=", + "lastModified": 1719001822, + "narHash": "sha256-rbEP1CTzYvdSAKf1a729De9t8GMIrZ5GmD+PdYCnrgg=", "owner": "nix-community", "repo": "nur", - "rev": "f7c97149b8b5d0bf7943702577eabb530f7b5f4d", + "rev": "e7edcaeae9db01224266febe88eb7d3411055636", "type": "github" }, "original": { @@ -525,11 +511,11 @@ "nvim-treesitter-src": { "flake": false, "locked": { - "lastModified": 1718803654, - "narHash": "sha256-IiD9eTwF1+nGt0TmAJOyDuVrZk9z426gX1Y+KFkylEI=", + "lastModified": 1718957498, + "narHash": "sha256-GEuKEAZxLGMkyjdJGzrIKNR1X10RHlACC6s1lNOq7aw=", "owner": "nvim-treesitter", "repo": "nvim-treesitter", - "rev": "66ae8748fd4e8550c8b17cf115c9739aea1e4067", + "rev": "b967bbc27b564001c3d3b8ea93444cf6d0b21d23", "type": "github" }, "original": { @@ -590,7 +576,7 @@ "nextcloud-snappymail": "nextcloud-snappymail", "nix2vim": "nix2vim", "nixos-generators": "nixos-generators", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "nixpkgs-caddy": "nixpkgs-caddy", "nur": "nur", "nvim-lint-src": "nvim-lint-src", diff --git a/flake.nix b/flake.nix index 128acdf..60b811c 100644 --- a/flake.nix +++ b/flake.nix @@ -40,6 +40,7 @@ # Better App install management in macOS mac-app-util = { url = "github:hraban/mac-app-util"; + inputs.nixpkgs.follows = "nixpkgs"; # Use system packages list for their inputs }; # Manage disk format and partitioning