From b20ddd6aefcb5ad7c9c78f012399848e6f887854 Mon Sep 17 00:00:00 2001 From: sajenim Date: Tue, 23 May 2023 23:01:21 +0800 Subject: [PATCH] update flake --- flake.lock | 339 +++-------------------------------------------------- flake.nix | 1 - 2 files changed, 17 insertions(+), 323 deletions(-) diff --git a/flake.lock b/flake.lock index fd76813..460f614 100644 --- a/flake.lock +++ b/flake.lock @@ -1,87 +1,5 @@ { "nodes": { - "crane": { - "inputs": { - "flake-compat": "flake-compat", - "flake-utils": "flake-utils", - "nixpkgs": [ - "nixpkgs-f2k", - "nixpkgs" - ], - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1683134812, - "narHash": "sha256-yUiArtneEBCTYt7rOg/tLr1iv4AmjFu5tdGa0OVpjbo=", - "owner": "ipetkov", - "repo": "crane", - "rev": "8708b19627b2dfc2d1ac332b74383b8abdd429f0", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, - "emacs": { - "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1683221311, - "narHash": "sha256-UuiPrML5Acp1lyH88IQUnNSKLfTLDQ3KxciTuQXGWmM=", - "owner": "nix-community", - "repo": "emacs-overlay", - "rev": "e0902043a891c61adcca88b7697ce322022a2663", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "emacs-overlay", - "type": "github" - } - }, - "fenix": { - "inputs": { - "nixpkgs": [ - "nixpkgs-f2k", - "nixpkgs-fmt", - "nixpkgs" - ], - "rust-analyzer-src": "rust-analyzer-src" - }, - "locked": { - "lastModified": 1637475807, - "narHash": "sha256-E3nzOvlzZXwyo8Stp5upKsTCDcqUTYAFj4EC060A31c=", - "owner": "nix-community", - "repo": "fenix", - "rev": "960e7fef45692a4fffc6df6d6b613b0399bbdfd5", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "fenix", - "type": "github" - } - }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" @@ -118,54 +36,6 @@ "type": "github" } }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "locked": { - "lastModified": 1637014545, - "narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "haskell-flake": { "locked": { "lastModified": 1684069239, @@ -203,11 +73,11 @@ ] }, "locked": { - "lastModified": 1683276742, - "narHash": "sha256-QURv/m81hd6TN5RMjlSHhE1zLpXHsvDEm66qv3MRBsM=", + "lastModified": 1684788503, + "narHash": "sha256-ewr/8U0/iCs8K+MP5Fw9Q1IQ1Pt57ZgC2k/dg1c+CMk=", "owner": "nix-community", "repo": "home-manager", - "rev": "38271ead8e7b291beb9d3b8312e66c3268796c0a", + "rev": "d9995d94f194955d1f1af0e1ad5866a904196c20", "type": "github" }, "original": { @@ -219,11 +89,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1683928319, - "narHash": "sha256-maz0DRKixJVcNRMiAMWlJniiF8IuQ+WbfmlJJ8D+jfM=", + "lastModified": 1684580438, + "narHash": "sha256-LUPswmDn6fXP3lEBJFA2Id8PkcYDgzUilevWackYVvQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9656e85a15a0fe67847ee8cdb99a20d8df499962", + "rev": "7dc71aef32e8faf065cb171700792cf8a65c152d", "type": "github" }, "original": { @@ -233,52 +103,6 @@ "type": "github" } }, - "nixpkgs-f2k": { - "inputs": { - "crane": "crane", - "emacs": "emacs", - "nixpkgs": "nixpkgs_3", - "nixpkgs-fmt": "nixpkgs-fmt", - "river-src": "river-src", - "wezterm-src": "wezterm-src" - }, - "locked": { - "lastModified": 1683254075, - "narHash": "sha256-C8kxG8HO38UijYPDpuk0FLhZCytGqqu6vHabYyiBeSE=", - "owner": "fortuneteller2k", - "repo": "nixpkgs-f2k", - "rev": "34d87bf99e312795f73185a1b3198ae4241b1dac", - "type": "github" - }, - "original": { - "owner": "fortuneteller2k", - "repo": "nixpkgs-f2k", - "type": "github" - } - }, - "nixpkgs-fmt": { - "inputs": { - "fenix": "fenix", - "flake-utils": "flake-utils_3", - "nixpkgs": [ - "nixpkgs-f2k", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1678089153, - "narHash": "sha256-Kr6EDc4RZuUHUu4rP+gh4CQSMH35RDJJ9600vAPZVzo=", - "owner": "nix-community", - "repo": "nixpkgs-fmt", - "rev": "398c5226d3402ec075d36c504a4575c40d01cf0c", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs-fmt", - "type": "github" - } - }, "nixpkgs-lib": { "locked": { "dir": "lib", @@ -317,11 +141,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1684049129, - "narHash": "sha256-7WB9LpnPNAS8oI7hMoHeKLNhRX7k3CI9uWBRSfmOCCE=", + "lastModified": 1684754342, + "narHash": "sha256-plGnjnbnPLoZCTdQX21oT7xliQhFtgcWlkuDHgtEb1o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0470f36b02ef01d4f43c641bbf07020bcab71bf1", + "rev": "7084250df3d7f9735087d3234407f3c1fc2400e3", "type": "github" }, "original": { @@ -333,37 +157,21 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1673540789, - "narHash": "sha256-xqnxBOK3qctIeUVxecydrEDbEXjsvHCPGPbvsl63M/U=", - "owner": "NixOS", + "lastModified": 1684120848, + "narHash": "sha256-gIwJ5ac1FwZEkCRwjY+gLwgD4G1Bw3Xtr2jr2XihMPo=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "0f213d0fee84280d8c3a97f7469b988d6fe5fcdf", + "rev": "0cb867999eec4085e1c9ca61c09b72261fa63bb4", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-unstable", + "owner": "nixos", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_3": { - "locked": { - "lastModified": 1683250446, - "narHash": "sha256-poBkMQ0q7X2xH5hAqLYmsly0NGbC6zDCUnrwOXIxo50=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "fed0618057e5714b2eb0b88bedbe671ce057a41a", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "master", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { "locked": { "lastModified": 1684120848, "narHash": "sha256-gIwJ5ac1FwZEkCRwjY+gLwgD4G1Bw3Xtr2jr2XihMPo=", @@ -379,133 +187,20 @@ "type": "github" } }, - "nixpkgs_5": { - "locked": { - "lastModified": 1684120848, - "narHash": "sha256-gIwJ5ac1FwZEkCRwjY+gLwgD4G1Bw3Xtr2jr2XihMPo=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "0cb867999eec4085e1c9ca61c09b72261fa63bb4", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "river-src": { - "flake": false, - "locked": { - "lastModified": 1683034657, - "narHash": "sha256-WAn6zVY7mq3EUZcdyeY1wQxbLJ+3SBMHBWQWWQy/1M4=", - "ref": "refs/heads/master", - "rev": "5de9bf846b27af2c001a780a0d524e8fba7637a2", - "revCount": 1031, - "submodules": true, - "type": "git", - "url": "https://github.com/riverwm/river.git" - }, - "original": { - "submodules": true, - "type": "git", - "url": "https://github.com/riverwm/river.git" - } - }, "root": { "inputs": { "home-manager": "home-manager", "nixpkgs": "nixpkgs", - "nixpkgs-f2k": "nixpkgs-f2k", "nixpkgs-unstable": "nixpkgs-unstable", "xmobar-config": "xmobar-config", "xmonad-config": "xmonad-config" } }, - "rust-analyzer-src": { - "flake": false, - "locked": { - "lastModified": 1637439871, - "narHash": "sha256-2awQ/obzl7zqYgLwbQL0zT58gN8Xq7n+81GcMiS595I=", - "owner": "rust-analyzer", - "repo": "rust-analyzer", - "rev": "4566414789310acb2617543f4b50beab4bb48e06", - "type": "github" - }, - "original": { - "owner": "rust-analyzer", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" - } - }, - "rust-overlay": { - "inputs": { - "flake-utils": [ - "nixpkgs-f2k", - "crane", - "flake-utils" - ], - "nixpkgs": [ - "nixpkgs-f2k", - "crane", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1683080331, - "narHash": "sha256-nGDvJ1DAxZIwdn6ww8IFwzoHb2rqBP4wv/65Wt5vflk=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "d59c3fa0cba8336e115b376c2d9e91053aa59e56", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "wezterm-src": { - "flake": false, - "locked": { - "lastModified": 1682955979, - "narHash": "sha256-s9JcwJ08GQ8CxDWDUwUtRs6A6Jp2SnbTQ9pnXzC586o=", - "ref": "main", - "rev": "d0e9a034406f25af035ecd93f771cc723a2bd704", - "revCount": 7201, - "submodules": true, - "type": "git", - "url": "https://github.com/wez/wezterm.git" - }, - "original": { - "ref": "main", - "submodules": true, - "type": "git", - "url": "https://github.com/wez/wezterm.git" - } - }, "xmobar-config": { "inputs": { "flake-parts": "flake-parts", "haskell-flake": "haskell-flake", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1, @@ -522,7 +217,7 @@ "inputs": { "flake-parts": "flake-parts_2", "haskell-flake": "haskell-flake_2", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1, diff --git a/flake.nix b/flake.nix index c8c5fbb..206911c 100644 --- a/flake.nix +++ b/flake.nix @@ -14,7 +14,6 @@ home-manager.inputs.nixpkgs.follows = "nixpkgs"; # Add any other flake you might need - nixpkgs-f2k.url = "github:fortuneteller2k/nixpkgs-f2k"; # Developer environments xmonad-config.url = "path:home-manager/common/jade/xmonad/xmonad-config";