From 093cb612282f48d15ba295f109660e47a22f8e39 Mon Sep 17 00:00:00 2001 From: Quentin Aristote Date: Sat, 18 Feb 2023 14:31:33 +0100 Subject: factor out common configuration options --- flake.lock | 59 +++++++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 43 insertions(+), 16 deletions(-) (limited to 'flake.lock') diff --git a/flake.lock b/flake.lock index d5d6fa0..543792b 100644 --- a/flake.lock +++ b/flake.lock @@ -12,11 +12,11 @@ ] }, "locked": { - "lastModified": 1671297777, - "narHash": "sha256-kvCzzOupvgGyO3Q/0cpGPgDYEdj8g6MVCH4Mlt/e56k=", + "lastModified": 1676498599, + "narHash": "sha256-eLqhEoQZhCcpQvBE2TZe0VVyfV+DnWJKUDoZEMTHN4g=", "owner": "qaristote", "repo": "info", - "rev": "c91a58357700a466aee5135767535136c878e009", + "rev": "4f91bd86bbe9bc3e7fdc04916f244ace13a92a15", "type": "github" }, "original": { @@ -27,11 +27,11 @@ }, "flake-utils": { "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1676283394, + "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", "type": "github" }, "original": { @@ -39,13 +39,28 @@ "type": "indirect" } }, + "my-nixpkgs": { + "inputs": { + "nur": "nur" + }, + "locked": { + "lastModified": 1676671024, + "narHash": "sha256-hziJ8MYh4f27DAaVjWqqZd0gC9LFIMx5ADnXik5+1HI=", + "type": "git", + "url": "file:///home/qaristote/code/nix/my-nixpkgs" + }, + "original": { + "type": "git", + "url": "file:///home/qaristote/code/nix/my-nixpkgs" + } + }, "nixpkgs": { "locked": { - "lastModified": 1671249438, - "narHash": "sha256-5e+CcnbZA3/i2BRXbnzRS52Ly67MUNdZR+Zpbb2C65k=", + "lastModified": 1676549890, + "narHash": "sha256-sq/WcOEAl7gWrrfGkWdnyYazRyTf+enEim/o6LOQzI8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "067bfc6c90a301572cec7da48f09c447a9a8eae0", + "rev": "8c66bd1b68f4708c90dcc97c6f7052a5a7b33257", "type": "github" }, "original": { @@ -53,23 +68,35 @@ "type": "indirect" } }, + "nur": { + "locked": { + "lastModified": 1676725308, + "narHash": "sha256-vzS7PJCDD7fCA9ybuiNcQgOAploV++zF//j6WL2e7zA=", + "owner": "nix-community", + "repo": "NUR", + "rev": "ec4bf914ab48fef81ad0ff0cbc70c84895454e0e", + "type": "github" + }, + "original": { + "id": "nur", + "type": "indirect" + } + }, "personal-webpage": { "inputs": { "data": "data", - "flake-utils": [ - "flake-utils" - ], + "flake-utils": "flake-utils", "nixpkgs": [ "nixpkgs" ], "uncss": "uncss" }, "locked": { - "lastModified": 1671298845, - "narHash": "sha256-lFVBXth57Pn6QIN+vPvFR87UxWJ1HFXarHalDvjWrR4=", + "lastModified": 1676669690, + "narHash": "sha256-JOQhAYEd5/kvUGBuaMY8cpWDE9jAMKLON9/E5S9ve0o=", "owner": "qaristote", "repo": "webpage", - "rev": "334d3318b16d765dc10a537be841240986aeea04", + "rev": "2fa3778f333a59c3e8af26205b921ad0a7d1168e", "type": "github" }, "original": { @@ -80,7 +107,7 @@ }, "root": { "inputs": { - "flake-utils": "flake-utils", + "my-nixpkgs": "my-nixpkgs", "nixpkgs": "nixpkgs", "personal-webpage": "personal-webpage" } -- cgit v1.2.3 From 7532f335a3ed8a898e2df95f06faa38bad2b8e5d Mon Sep 17 00:00:00 2001 From: Quentin Aristote Date: Sun, 19 Feb 2023 16:44:12 +0100 Subject: rollback to nixos-stable (fix ihatemoney and searx) --- flake.lock | 37 ++++++++++++++++++++++++++++--------- 1 file changed, 28 insertions(+), 9 deletions(-) (limited to 'flake.lock') diff --git a/flake.lock b/flake.lock index 543792b..ead2bbd 100644 --- a/flake.lock +++ b/flake.lock @@ -45,7 +45,7 @@ }, "locked": { "lastModified": 1676671024, - "narHash": "sha256-hziJ8MYh4f27DAaVjWqqZd0gC9LFIMx5ADnXik5+1HI=", + "narHash": "sha256-Duxvn4bUTG0n03KO3cxvqThtEk1e6FfLdGXJLKrOV8c=", "type": "git", "url": "file:///home/qaristote/code/nix/my-nixpkgs" }, @@ -56,25 +56,43 @@ }, "nixpkgs": { "locked": { - "lastModified": 1676549890, - "narHash": "sha256-sq/WcOEAl7gWrrfGkWdnyYazRyTf+enEim/o6LOQzI8=", + "lastModified": 1676771332, + "narHash": "sha256-YYn2K0AwyIyCzvP7C+xzEt64rlCRPyrllRPGNNu+50M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8c66bd1b68f4708c90dcc97c6f7052a5a7b33257", + "rev": "f27a4e2f6a3a23b843ca1c736e6043fb8b99acc1", "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "NixOS", + "ref": "nixos-22.11-small", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1676795730, + "narHash": "sha256-X69A9BdcPTySJJ7DqS4wc8b6eqGKi32jCSyaBsz4WB0=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "efc59894b1ba73cb745676616c56c780383d6788", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable-small", + "repo": "nixpkgs", + "type": "github" } }, "nur": { "locked": { - "lastModified": 1676725308, - "narHash": "sha256-vzS7PJCDD7fCA9ybuiNcQgOAploV++zF//j6WL2e7zA=", + "lastModified": 1676817898, + "narHash": "sha256-1yrNakg2qtOI9v/IFk+cYPEYtuoOQTsRvjG88tlhAVo=", "owner": "nix-community", "repo": "NUR", - "rev": "ec4bf914ab48fef81ad0ff0cbc70c84895454e0e", + "rev": "241b6ab4dccc162906a265e421a537847b74e8e9", "type": "github" }, "original": { @@ -109,6 +127,7 @@ "inputs": { "my-nixpkgs": "my-nixpkgs", "nixpkgs": "nixpkgs", + "nixpkgs-unstable": "nixpkgs-unstable", "personal-webpage": "personal-webpage" } }, -- cgit v1.2.3