From c125ee77365a9b9520bbbfc6129cf800f0a6fc5a Mon Sep 17 00:00:00 2001 From: Mic92 <96200+Mic92@users.noreply.github.com> Date: Sun, 16 Mar 2025 03:22:31 +0000 Subject: [PATCH 1/2] [create-pull-request] automated change --- dev/private.narHash | 2 +- dev/private/flake.lock | 24 ++++++++++++------------ flake.lock | 6 +++--- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dev/private.narHash b/dev/private.narHash index cc468b6..3e0b014 100644 --- a/dev/private.narHash +++ b/dev/private.narHash @@ -1 +1 @@ -sha256-7uy6PG2JDkYKlyf3bXSCT6g352Ka/bNkrVkfpSav8lM= \ No newline at end of file +sha256-PqGJ0GyDAKVBqjtjSHZIyXUvohBSv6Z1MzR7T3oTzls= \ No newline at end of file diff --git a/dev/private/flake.lock b/dev/private/flake.lock index 48a94d3..d796423 100644 --- a/dev/private/flake.lock +++ b/dev/private/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1736508663, - "narHash": "sha256-ZOaGwa+WnB7Zn3YXimqjmIugAnHePdXCmNu+AHkq808=", + "lastModified": 1741955947, + "narHash": "sha256-2lbURKclgKqBNm7hVRtWh0A7NrdsibD0EaWhahUVhhY=", "owner": "nix-community", "repo": "home-manager", - "rev": "2532b500c3ed2b8940e831039dcec5a5ea093afc", + "rev": "4e12151c9e014e2449e0beca2c0e9534b96a26b4", "type": "github" }, "original": { @@ -27,11 +27,11 @@ ] }, "locked": { - "lastModified": 1736370755, - "narHash": "sha256-iWcjToBpx4PUd74uqvIGAfqqVfyrvRLRauC/SxEKIF0=", + "lastModified": 1742013980, + "narHash": "sha256-34YbfwABU5nb0F5eaaJE3ujldaNDhmyxw7CWqhXJV08=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "57733bd1dc81900e13438e5b4439239f1b29db0e", + "rev": "9175b4bb5f127fb7b5784b14f7e01abff24c378f", "type": "github" }, "original": { @@ -42,11 +42,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1736200483, - "narHash": "sha256-JO+lFN2HsCwSLMUWXHeOad6QUxOuwe9UOAF/iSl1J4I=", + "lastModified": 1741862977, + "narHash": "sha256-prZ0M8vE/ghRGGZcflvxCu40ObKaB+ikn74/xQoNrGQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3f0a8ac25fb674611b98089ca3a5dd6480175751", + "rev": "cdd2ef009676ac92b715ff26630164bb88fec4e0", "type": "github" }, "original": { @@ -71,11 +71,11 @@ ] }, "locked": { - "lastModified": 1736154270, - "narHash": "sha256-p2r8xhQZ3TYIEKBoiEhllKWQqWNJNoT9v64Vmg4q8Zw=", + "lastModified": 1739829690, + "narHash": "sha256-mL1szCeIsjh6Khn3nH2cYtwO5YXG6gBiTw1A30iGeDU=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "13c913f5deb3a5c08bb810efd89dc8cb24dd968b", + "rev": "3d0579f5cc93436052d94b73925b48973a104204", "type": "github" }, "original": { diff --git a/flake.lock b/flake.lock index c62af20..ed1214b 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1741708242, - "narHash": "sha256-cNRqdQD4sZpN7JLqxVOze4+WsWTmv2DGH0wNCOVwrWc=", + "lastModified": 1741865919, + "narHash": "sha256-4thdbnP6dlbdq+qZWTsm4ffAwoS8Tiq1YResB+RP6WE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b62d2a95c72fb068aecd374a7262b37ed92df82b", + "rev": "573c650e8a14b2faa0041645ab18aed7e60f0c9a", "type": "github" }, "original": { From 9520344f1f788c49591df03de2e25fe48364e0bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 17 Mar 2025 11:00:34 +0100 Subject: [PATCH 2/2] use nixpkgs-unstable for home-manager/darwin-nix/treefmt-nix --- dev/private.narHash | 2 +- dev/private/flake.lock | 49 +++++++++++++++++++++++++++++------------- dev/private/flake.nix | 11 ++++++---- 3 files changed, 42 insertions(+), 20 deletions(-) diff --git a/dev/private.narHash b/dev/private.narHash index 3e0b014..ea90a41 100644 --- a/dev/private.narHash +++ b/dev/private.narHash @@ -1 +1 @@ -sha256-PqGJ0GyDAKVBqjtjSHZIyXUvohBSv6Z1MzR7T3oTzls= \ No newline at end of file +sha256-Ey39RN/OvBLXzBigyeJymasD6q3YQzEBgh4/TAD0/FE= \ No newline at end of file diff --git a/dev/private/flake.lock b/dev/private/flake.lock index d796423..76aa53e 100644 --- a/dev/private/flake.lock +++ b/dev/private/flake.lock @@ -3,7 +3,7 @@ "home-manager": { "inputs": { "nixpkgs": [ - "nixpkgs-stable" + "nixpkgs-unstable" ] }, "locked": { @@ -23,15 +23,15 @@ "nix-darwin": { "inputs": { "nixpkgs": [ - "nixpkgs-stable" + "nixpkgs-unstable" ] }, "locked": { - "lastModified": 1742013980, - "narHash": "sha256-34YbfwABU5nb0F5eaaJE3ujldaNDhmyxw7CWqhXJV08=", + "lastModified": 1742165923, + "narHash": "sha256-WKzuVsHXjuxYjS9KxKdpoPWpT37LofyS5llSssEw058=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "9175b4bb5f127fb7b5784b14f7e01abff24c378f", + "rev": "95eac71bf52b271523d0ca81dbbeb3182990fc24", "type": "github" }, "original": { @@ -42,18 +42,36 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1741862977, - "narHash": "sha256-prZ0M8vE/ghRGGZcflvxCu40ObKaB+ikn74/xQoNrGQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "cdd2ef009676ac92b715ff26630164bb88fec4e0", - "type": "github" + "lastModified": 1742136038, + "narHash": "sha256-DDe16FJk18sadknQKKG/9FbwEro7A57tg9vB5kxZ8kY=", + "ref": "nixos-24.11", + "rev": "a1185f4064c18a5db37c5c84e5638c78b46e3341", + "shallow": true, + "type": "git", + "url": "https://github.com/NixOS/nixpkgs" }, "original": { - "owner": "NixOS", "ref": "nixos-24.11", - "repo": "nixpkgs", - "type": "github" + "shallow": true, + "type": "git", + "url": "https://github.com/NixOS/nixpkgs" + } + }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1741865919, + "narHash": "sha256-4thdbnP6dlbdq+qZWTsm4ffAwoS8Tiq1YResB+RP6WE=", + "ref": "nixpkgs-unstable", + "rev": "573c650e8a14b2faa0041645ab18aed7e60f0c9a", + "shallow": true, + "type": "git", + "url": "https://github.com/NixOS/nixpkgs" + }, + "original": { + "ref": "nixpkgs-unstable", + "shallow": true, + "type": "git", + "url": "https://github.com/NixOS/nixpkgs" } }, "root": { @@ -61,13 +79,14 @@ "home-manager": "home-manager", "nix-darwin": "nix-darwin", "nixpkgs-stable": "nixpkgs-stable", + "nixpkgs-unstable": "nixpkgs-unstable", "treefmt-nix": "treefmt-nix" } }, "treefmt-nix": { "inputs": { "nixpkgs": [ - "nixpkgs-stable" + "nixpkgs-unstable" ] }, "locked": { diff --git a/dev/private/flake.nix b/dev/private/flake.nix index bc845a3..7bc7663 100644 --- a/dev/private/flake.nix +++ b/dev/private/flake.nix @@ -1,15 +1,18 @@ { description = "private inputs"; - inputs.nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.11"; + + inputs.nixpkgs-stable.url = "git+https://github.com/NixOS/nixpkgs?shallow=1&ref=nixos-24.11"; + + inputs.nixpkgs-unstable.url = "git+https://github.com/NixOS/nixpkgs?shallow=1&ref=nixpkgs-unstable"; inputs.treefmt-nix.url = "github:numtide/treefmt-nix"; - inputs.treefmt-nix.inputs.nixpkgs.follows = "nixpkgs-stable"; + inputs.treefmt-nix.inputs.nixpkgs.follows = "nixpkgs-unstable"; inputs.nix-darwin.url = "github:LnL7/nix-darwin"; - inputs.nix-darwin.inputs.nixpkgs.follows = "nixpkgs-stable"; + inputs.nix-darwin.inputs.nixpkgs.follows = "nixpkgs-unstable"; inputs.home-manager.url = "github:nix-community/home-manager"; - inputs.home-manager.inputs.nixpkgs.follows = "nixpkgs-stable"; + inputs.home-manager.inputs.nixpkgs.follows = "nixpkgs-unstable"; outputs = _: { }; }