From 371bcad6504ca11a674605835b30efd17779d6f3 Mon Sep 17 00:00:00 2001 From: colin Date: Sat, 14 Jan 2023 23:28:12 +0000 Subject: [PATCH] flake.nix: use conventional URIs, no custom shit --- flake.lock | 58 ++++++++++++++++++++++++++++-------------------------- flake.nix | 10 +++++----- 2 files changed, 35 insertions(+), 33 deletions(-) diff --git a/flake.lock b/flake.lock index f355a73f..d7488457 100644 --- a/flake.lock +++ b/flake.lock @@ -24,16 +24,16 @@ "locked": { "lastModified": 1667907331, "narHash": "sha256-bHkAwkYlBjkupPUFcQjimNS8gxWSWjOTevEuwdnp5m0=", - "owner": "nix-community", - "repo": "home-manager", + "ref": "release-22.05", "rev": "6639e3a837fc5deb6f99554072789724997bc8e5", - "type": "github" + "revCount": 2151, + "type": "git", + "url": "https://github.com/nix-community/home-manager" }, "original": { - "owner": "nix-community", "ref": "release-22.05", - "repo": "home-manager", - "type": "github" + "type": "git", + "url": "https://github.com/nix-community/home-manager" } }, "mobile-nixos": { @@ -41,15 +41,15 @@ "locked": { "lastModified": 1670131242, "narHash": "sha256-T/o1/3gffr010fsqgNshs1NJJjsnUYvQnUZgm6hilsY=", - "owner": "nixos", - "repo": "mobile-nixos", + "ref": "refs/heads/master", "rev": "5ee45cc1f8e43f4af14ee17ccef9156b0db8cd77", - "type": "github" + "revCount": 2454, + "type": "git", + "url": "https://github.com/nixos/mobile-nixos" }, "original": { - "owner": "nixos", - "repo": "mobile-nixos", - "type": "github" + "type": "git", + "url": "https://github.com/nixos/mobile-nixos" } }, "nixpkgs": { @@ -73,15 +73,16 @@ "locked": { "lastModified": 1673612960, "narHash": "sha256-DWR7hrbecJKmUJCswk9MXZta710mq+3jZwTvHU/UfyY=", - "owner": "NixOS", - "repo": "nixpkgs", + "ref": "nixos-22.11", "rev": "e285dd0ca97c264003867c7329f0d1f4f028739c", - "type": "github" + "revCount": 430213, + "type": "git", + "url": "https://github.com/nixos/nixpkgs" }, "original": { - "id": "nixpkgs", "ref": "nixos-22.11", - "type": "indirect" + "type": "git", + "url": "https://github.com/nixos/nixpkgs" } }, "nixpkgs-stable_2": { @@ -104,15 +105,16 @@ "locked": { "lastModified": 1673540789, "narHash": "sha256-xqnxBOK3qctIeUVxecydrEDbEXjsvHCPGPbvsl63M/U=", - "owner": "NixOS", - "repo": "nixpkgs", + "ref": "nixos-unstable", "rev": "0f213d0fee84280d8c3a97f7469b988d6fe5fcdf", - "type": "github" + "revCount": 441903, + "type": "git", + "url": "https://github.com/nixos/nixpkgs" }, "original": { - "id": "nixpkgs", "ref": "nixos-unstable", - "type": "indirect" + "type": "git", + "url": "https://github.com/nixos/nixpkgs" } }, "root": { @@ -136,15 +138,15 @@ "locked": { "lastModified": 1673481602, "narHash": "sha256-P80X38fOM2MtoYdgkyuksGOQPDhIhNJW2W2jMeMIZzE=", - "owner": "Mic92", - "repo": "sops-nix", + "ref": "refs/heads/master", "rev": "32187b33ac6ec9b628dcd08dd941a715e6241dda", - "type": "github" + "revCount": 452, + "type": "git", + "url": "https://github.com/Mic92/sops-nix" }, "original": { - "owner": "Mic92", - "repo": "sops-nix", - "type": "github" + "type": "git", + "url": "https://github.com/Mic92/sops-nix" } }, "uninsane-dot-org": { diff --git a/flake.nix b/flake.nix index 630ef672..d74314cb 100644 --- a/flake.nix +++ b/flake.nix @@ -13,22 +13,22 @@ { inputs = { - nixpkgs-stable.url = "nixpkgs/nixos-22.11"; - nixpkgs-unpatched.url = "nixpkgs/nixos-unstable"; + nixpkgs-stable.url = "git+https://github.com/nixos/nixpkgs?ref=nixos-22.11"; + nixpkgs-unpatched.url = "git+https://github.com/nixos/nixpkgs?ref=nixos-unstable"; nixpkgs = { url = "path:nixpatches"; inputs.nixpkgs.follows = "nixpkgs-unpatched"; }; mobile-nixos = { - url = "github:nixos/mobile-nixos"; + url = "git+https://github.com/nixos/mobile-nixos"; flake = false; }; home-manager = { - url = "github:nix-community/home-manager/release-22.05"; + url = "git+https://github.com/nix-community/home-manager?ref=release-22.05"; inputs.nixpkgs.follows = "nixpkgs"; }; sops-nix = { - url = "github:Mic92/sops-nix"; + url = "git+https://github.com/Mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; uninsane-dot-org = {