From 1a7138d0938b98531138e2881a583d5577134299 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= Date: Wed, 13 Sep 2023 14:00:21 +0200 Subject: [PATCH] chore(flake): switch some inputs to FlakeHub --- flake.lock | 180 ++++++++++++++++++++++++++++++++++++++++------------- flake.nix | 9 +-- 2 files changed, 143 insertions(+), 46 deletions(-) diff --git a/flake.lock b/flake.lock index 64040bb..8cfb84e 100644 --- a/flake.lock +++ b/flake.lock @@ -214,6 +214,45 @@ "type": "github" } }, + "fenix_2": { + "inputs": { + "nixpkgs": [ + "fh", + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src_2" + }, + "locked": { + "narHash": "sha256-BMN2Sf1yuv5pw2koZZdMCCaghUYyo0hOtxY/v2zmiL8=", + "rev": "76e468cd74a08edcbabb14ce1698ebd2f5fad9d2", + "revCount": 1581, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/nix-community/fenix/0.1.1581%2Brev-76e468cd74a08edcbabb14ce1698ebd2f5fad9d2/018a425b-5c00-7475-80f5-a86f7ba6808e/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://api.flakehub.com/f/nix-community/fenix/0.1.1565.tar.gz" + } + }, + "fh": { + "inputs": { + "fenix": "fenix_2", + "flake-compat": "flake-compat_4", + "naersk": "naersk", + "nixpkgs": "nixpkgs" + }, + "locked": { + "narHash": "sha256-9dWd0syDzoyjnhVoOCazRVA4pAAXud+cxggVlxXzJFg=", + "path": "/nix/store/rg7l0383cxb616879vd42f3fcspcxiwl-source", + "rev": "674317344239e9ec768bcfe5254a16cd907c15d1", + "revCount": 119, + "type": "path" + }, + "original": { + "id": "fh", + "type": "indirect" + } + }, "flake-compat": { "flake": false, "locked": { @@ -263,6 +302,22 @@ } }, "flake-compat_4": { + "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-compat_5": { "flake": false, "locked": { "lastModified": 1641205782, @@ -278,7 +333,7 @@ "type": "github" } }, - "flake-compat_5": { + "flake-compat_6": { "flake": false, "locked": { "lastModified": 1673956053, @@ -319,17 +374,15 @@ "systems": "systems" }, "locked": { - "lastModified": 1694529238, "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", - "owner": "numtide", - "repo": "flake-utils", "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", - "type": "github" + "revCount": 87, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/numtide/flake-utils/0.1.87+rev-ff7b65b44d01cf9ba6a71320833626af21126384/018a8a74-649b-792e-a959-2f97793b1129/source.tar.gz" }, "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" + "type": "tarball", + "url": "https://flakehub.com/f/numtide/flake-utils/0.1.tar.gz" } }, "gitignore": { @@ -377,7 +430,7 @@ "matrix-appservices": { "inputs": { "devshell": "devshell", - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_5", "nixlib": "nixlib", "nixpkgs": [ "nixpkgs" @@ -397,6 +450,27 @@ "type": "gitlab" } }, + "naersk": { + "inputs": { + "nixpkgs": [ + "fh", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1692351612, + "narHash": "sha256-KTGonidcdaLadRnv9KFgwSMh1ZbXoR/OBmPjeNMhFwU=", + "owner": "nix-community", + "repo": "naersk", + "rev": "78789c30d64dea2396c9da516bbcc8db3a475207", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "naersk", + "type": "github" + } + }, "nixlib": { "locked": { "lastModified": 1643502816, @@ -414,59 +488,63 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1694591211, - "narHash": "sha256-NPP7XGZH+Q5ey7nE2zGLrBrzKmLYPhj8YgsTSdhH0D4=", - "owner": "NixOS", - "repo": "nixos-hardware", - "rev": "3ccd87fcdae4732fe33773cefa4375c641a057e7", - "type": "github" + "narHash": "sha256-bo3Gv6Cp40vAXDBPi2XiDejzp/kyz65wZg4AnEWxAcY=", + "rev": "ca41b8a227dd235b1b308217f116c7e6e84ad779", + "revCount": 1356, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/NixOS/nixos-hardware/0.1.1356+rev-ca41b8a227dd235b1b308217f116c7e6e84ad779/018a854e-1cd3-7daf-aed4-e4ebc8e451e3/source.tar.gz" }, "original": { - "owner": "NixOS", - "ref": "master", - "repo": "nixos-hardware", - "type": "github" + "type": "tarball", + "url": "https://flakehub.com/f/NixOS/nixos-hardware/0.1.tar.gz" } }, "nixpkgs": { "locked": { - "lastModified": 1694499547, - "narHash": "sha256-R7xMz1Iia6JthWRHDn36s/E248WB1/je62ovC/dUVKI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "e5f018cf150e29aac26c61dac0790ea023c46b24", - "type": "github" + "narHash": "sha256-aRTTXkYvhXosGx535iAFUaoFboUrZSYb1Ooih/auGp0=", + "rev": "a999c1cc0c9eb2095729d5aa03e0d8f7ed256780", + "revCount": 519597, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.519597%2Brev-a999c1cc0c9eb2095729d5aa03e0d8f7ed256780/018a3d35-4db5-76c3-aca2-de1920cf506f/source.tar.gz" }, "original": { - "owner": "NixOS", - "ref": "nixos-23.05", - "repo": "nixpkgs", - "type": "github" + "type": "tarball", + "url": "https://api.flakehub.com/f/NixOS/nixpkgs/0.1.514192.tar.gz" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1694422566, "narHash": "sha256-lHJ+A9esOz9vln/3CJG23FV6Wd2OoOFbDeEs4cMGMqc=", - "owner": "NixOS", - "repo": "nixpkgs", "rev": "3a2786eea085f040a66ecde1bc3ddc7099f6dbeb", - "type": "github" + "revCount": 524605, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.524605+rev-3a2786eea085f040a66ecde1bc3ddc7099f6dbeb/018a8a74-d581-7cf7-8c15-39bf84015e30/source.tar.gz" }, "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" + "type": "tarball", + "url": "https://flakehub.com/f/NixOS/nixpkgs/0.1.tar.gz" + } + }, + "nixpkgs_2": { + "locked": { + "narHash": "sha256-R7xMz1Iia6JthWRHDn36s/E248WB1/je62ovC/dUVKI=", + "rev": "e5f018cf150e29aac26c61dac0790ea023c46b24", + "revCount": 490791, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2305.490791+rev-e5f018cf150e29aac26c61dac0790ea023c46b24/018a8d07-c9a0-7f15-a8ce-f5c7d95cc2c9/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/NixOS/nixpkgs/0.2305.tar.gz" } }, "nur": { "locked": { - "lastModified": 1694589145, - "narHash": "sha256-zmmWfCQvs3cltM3a18GV39ur0fanjknNJCI8zlAiby8=", + "lastModified": 1694601892, + "narHash": "sha256-rGK2Y9vQJQ+v729LfpvTuxDfTE7ns2g34XAPSr9+Z0E=", "owner": "nix-community", "repo": "NUR", - "rev": "f939facb676b8552d11db25a70dd89d48cd8409f", + "rev": "71a739d93f1e95967e9d641623cbb97d0c8b801a", "type": "github" }, "original": { @@ -494,7 +572,7 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat_5", + "flake-compat": "flake-compat_6", "flake-utils": [ "flake-utils" ], @@ -525,12 +603,13 @@ "agenix": "agenix", "conduit": "conduit", "deploy-rs": "deploy-rs", + "fh": "fh", "flake-parts": "flake-parts", "flake-utils": "flake-utils", "home-manager": "home-manager", "matrix-appservices": "matrix-appservices", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nixpkgs-unstable": "nixpkgs-unstable", "nur": "nur", "nvim-kitty-navigator": "nvim-kitty-navigator", @@ -554,6 +633,23 @@ "type": "github" } }, + "rust-analyzer-src_2": { + "flake": false, + "locked": { + "lastModified": 1693248848, + "narHash": "sha256-TIroiasNKgsVHEjO4y8fBPHgFON1t91DMmOaXNLixXM=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "62268e474e9165de0cdb08d3794eec4b6ef1c6cd", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, "rust-overlay": { "inputs": { "flake-utils": [ diff --git a/flake.nix b/flake.nix index c923964..f9f473e 100644 --- a/flake.nix +++ b/flake.nix @@ -1,17 +1,18 @@ { inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05"; + nixpkgs.url = "https://flakehub.com/f/NixOS/nixpkgs/0.2305.tar.gz"; - nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs-unstable.url = "https://flakehub.com/f/NixOS/nixpkgs/0.1.tar.gz"; - nixos-hardware.url = "github:NixOS/nixos-hardware/master"; + nixos-hardware.url = + "https://flakehub.com/f/NixOS/nixos-hardware/0.1.tar.gz"; flake-parts = { url = "github:hercules-ci/flake-parts"; inputs.nixpkgs-lib.follows = "nixpkgs"; }; - flake-utils.url = "github:numtide/flake-utils"; + flake-utils.url = "https://flakehub.com/f/numtide/flake-utils/0.1.tar.gz"; home-manager = { url = "github:nix-community/home-manager/release-23.05";