feat(flake): reduce duplicated inputs in flake.lock
All checks were successful
Discord / discord commits (push) Has been skipped
All checks were successful
Discord / discord commits (push) Has been skipped
This commit is contained in:
parent
22d186472e
commit
bd445b3809
4 changed files with 79 additions and 102 deletions
128
flake.lock
generated
128
flake.lock
generated
|
|
@ -242,13 +242,12 @@
|
|||
}
|
||||
},
|
||||
"flake-compat": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1696426674,
|
||||
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
|
||||
"lastModified": 1733328505,
|
||||
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
|
||||
"rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -257,35 +256,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-compat_2": {
|
||||
"locked": {
|
||||
"lastModified": 1696426674,
|
||||
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
|
||||
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
|
||||
"revCount": 57,
|
||||
"type": "tarball",
|
||||
"url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
"url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
|
||||
}
|
||||
},
|
||||
"flake-compat_3": {
|
||||
"locked": {
|
||||
"lastModified": 1717312683,
|
||||
"narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=",
|
||||
"owner": "nix-community",
|
||||
"repo": "flake-compat",
|
||||
"rev": "38fd3954cf65ce6faf3d0d45cd26059e059f07ea",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "flake-compat",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-parts": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": [
|
||||
|
|
@ -380,7 +350,6 @@
|
|||
"gitignore": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"hyprland",
|
||||
"pre-commit-hooks",
|
||||
"nixpkgs"
|
||||
]
|
||||
|
|
@ -568,35 +537,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"hyprgraphics_2": {
|
||||
"inputs": {
|
||||
"hyprutils": [
|
||||
"hyprpaper",
|
||||
"hyprutils"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"hyprpaper",
|
||||
"nixpkgs"
|
||||
],
|
||||
"systems": [
|
||||
"hyprpaper",
|
||||
"systems"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1734906236,
|
||||
"narHash": "sha256-vH/ysV2ONGQgYZPtcJKwc8jJivzyVxru2aaOxC20ZOE=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprgraphics",
|
||||
"rev": "6dea3fba08fd704dd624b6d4b261638fb4003c9c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprgraphics",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"hyprgrass": {
|
||||
"inputs": {
|
||||
"hyprland": [
|
||||
|
|
@ -632,7 +572,9 @@
|
|||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"pre-commit-hooks": "pre-commit-hooks",
|
||||
"pre-commit-hooks": [
|
||||
"pre-commit-hooks"
|
||||
],
|
||||
"systems": [
|
||||
"systems"
|
||||
],
|
||||
|
|
@ -765,7 +707,10 @@
|
|||
},
|
||||
"hyprpaper": {
|
||||
"inputs": {
|
||||
"hyprgraphics": "hyprgraphics_2",
|
||||
"hyprgraphics": [
|
||||
"hyprland",
|
||||
"hyprgraphics"
|
||||
],
|
||||
"hyprlang": [
|
||||
"hyprland",
|
||||
"hyprlang"
|
||||
|
|
@ -869,7 +814,9 @@
|
|||
},
|
||||
"jovian": {
|
||||
"inputs": {
|
||||
"nix-github-actions": "nix-github-actions",
|
||||
"nix-github-actions": [
|
||||
"nix-github-actions"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
|
|
@ -1147,7 +1094,9 @@
|
|||
"flake-parts": [
|
||||
"flake-parts"
|
||||
],
|
||||
"nix-github-actions": "nix-github-actions_2",
|
||||
"nix-github-actions": [
|
||||
"nix-github-actions"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
|
|
@ -1248,29 +1197,6 @@
|
|||
"nix-github-actions": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"jovian",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1729697500,
|
||||
"narHash": "sha256-VFTWrbzDlZyFHHb1AlKRiD/qqCJIripXKiCSFS8fAOY=",
|
||||
"owner": "zhaofengli",
|
||||
"repo": "nix-github-actions",
|
||||
"rev": "e418aeb728b6aa5ca8c5c71974e7159c2df1d8cf",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "zhaofengli",
|
||||
"ref": "matrix-name",
|
||||
"repo": "nix-github-actions",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nix-github-actions_2": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nix-eval-jobs",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
|
|
@ -1337,7 +1263,9 @@
|
|||
},
|
||||
"nixcord": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_2",
|
||||
"flake-compat": [
|
||||
"flake-compat"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
|
|
@ -1455,7 +1383,9 @@
|
|||
},
|
||||
"nixpkgs-wayland": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_3",
|
||||
"flake-compat": [
|
||||
"flake-compat"
|
||||
],
|
||||
"lib-aggregate": [
|
||||
"lib-aggregate"
|
||||
],
|
||||
|
|
@ -1644,19 +1574,20 @@
|
|||
},
|
||||
"pre-commit-hooks": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat",
|
||||
"flake-compat": [
|
||||
"flake-compat"
|
||||
],
|
||||
"gitignore": "gitignore",
|
||||
"nixpkgs": [
|
||||
"hyprland",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1735882644,
|
||||
"narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=",
|
||||
"lastModified": 1737043064,
|
||||
"narHash": "sha256-I/OuxGwXwRi5gnFPsyCvVR+IfFstA+QXEpHu1hvsgD8=",
|
||||
"owner": "cachix",
|
||||
"repo": "git-hooks.nix",
|
||||
"rev": "a5a961387e75ae44cc20f0a57ae463da5e959656",
|
||||
"rev": "94ee657f6032d913fe0ef49adaa743804635b0bb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1694,6 +1625,7 @@
|
|||
"eisa-scripts-src": "eisa-scripts-src",
|
||||
"extended-ollama-conversation-src": "extended-ollama-conversation-src",
|
||||
"firefox-gx-src": "firefox-gx-src",
|
||||
"flake-compat": "flake-compat",
|
||||
"flake-parts": "flake-parts",
|
||||
"flake-utils": "flake-utils",
|
||||
"flakegen": "flakegen",
|
||||
|
|
@ -1728,6 +1660,7 @@
|
|||
"nix-eval-jobs": "nix-eval-jobs",
|
||||
"nix-fast-build": "nix-fast-build",
|
||||
"nix-gaming": "nix-gaming",
|
||||
"nix-github-actions": "nix-github-actions",
|
||||
"nix-index-db": "nix-index-db",
|
||||
"nix-on-droid": "nix-on-droid",
|
||||
"nixcord": "nixcord",
|
||||
|
|
@ -1741,6 +1674,7 @@
|
|||
"piper-src": "piper-src",
|
||||
"pokemon-colorscripts-src": "pokemon-colorscripts-src",
|
||||
"pr-tracker": "pr-tracker",
|
||||
"pre-commit-hooks": "pre-commit-hooks",
|
||||
"protonhax-src": "protonhax-src",
|
||||
"secrets": "secrets",
|
||||
"sioyek-theme-src": "sioyek-theme-src",
|
||||
|
|
|
|||
30
flake.nix
30
flake.nix
|
|
@ -71,6 +71,11 @@
|
|||
repo = "firefox-gx";
|
||||
type = "github";
|
||||
};
|
||||
flake-compat = {
|
||||
owner = "edolstra";
|
||||
repo = "flake-compat";
|
||||
type = "github";
|
||||
};
|
||||
flake-parts = {
|
||||
inputs.nixpkgs-lib.follows = "nixpkgs";
|
||||
owner = "hercules-ci";
|
||||
|
|
@ -141,6 +146,7 @@
|
|||
inputs = {
|
||||
hyprutils.follows = "hyprutils";
|
||||
nixpkgs.follows = "nixpkgs";
|
||||
pre-commit-hooks.follows = "pre-commit-hooks";
|
||||
systems.follows = "systems";
|
||||
};
|
||||
owner = "hyprwm";
|
||||
|
|
@ -158,6 +164,7 @@
|
|||
};
|
||||
hyprpaper = {
|
||||
inputs = {
|
||||
hyprgraphics.follows = "hyprland/hyprgraphics";
|
||||
hyprlang.follows = "hyprland/hyprlang";
|
||||
hyprutils.follows = "hyprland/hyprutils";
|
||||
hyprwayland-scanner.follows = "hyprland/hyprwayland-scanner";
|
||||
|
|
@ -184,7 +191,10 @@
|
|||
type = "github";
|
||||
};
|
||||
jovian = {
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
inputs = {
|
||||
nix-github-actions.follows = "nix-github-actions";
|
||||
nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
owner = "Jovian-Experiments";
|
||||
repo = "Jovian-NixOS";
|
||||
type = "github";
|
||||
|
|
@ -279,6 +289,7 @@
|
|||
nix-eval-jobs = {
|
||||
inputs = {
|
||||
flake-parts.follows = "flake-parts";
|
||||
nix-github-actions.follows = "nix-github-actions";
|
||||
nixpkgs.follows = "nixpkgs";
|
||||
treefmt-nix.follows = "treefmt-nix";
|
||||
};
|
||||
|
|
@ -305,6 +316,12 @@
|
|||
repo = "nix-gaming";
|
||||
type = "github";
|
||||
};
|
||||
nix-github-actions = {
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
owner = "nix-community";
|
||||
repo = "nix-github-actions";
|
||||
type = "github";
|
||||
};
|
||||
nix-index-db = {
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
owner = "Mic92";
|
||||
|
|
@ -322,6 +339,7 @@
|
|||
};
|
||||
nixcord = {
|
||||
inputs = {
|
||||
flake-compat.follows = "flake-compat";
|
||||
nixpkgs.follows = "nixpkgs";
|
||||
systems.follows = "systems";
|
||||
treefmt-nix.follows = "treefmt-nix";
|
||||
|
|
@ -349,6 +367,7 @@
|
|||
};
|
||||
nixpkgs-wayland = {
|
||||
inputs = {
|
||||
flake-compat.follows = "flake-compat";
|
||||
lib-aggregate.follows = "lib-aggregate";
|
||||
nix-eval-jobs.follows = "nix-eval-jobs";
|
||||
nixpkgs.follows = "nixpkgs";
|
||||
|
|
@ -399,6 +418,15 @@
|
|||
repo = "pr-tracker";
|
||||
type = "github";
|
||||
};
|
||||
pre-commit-hooks = {
|
||||
inputs = {
|
||||
flake-compat.follows = "flake-compat";
|
||||
nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
owner = "cachix";
|
||||
repo = "git-hooks.nix";
|
||||
type = "github";
|
||||
};
|
||||
protonhax-src = {
|
||||
flake = false;
|
||||
owner = "jcnils";
|
||||
|
|
|
|||
|
|
@ -29,7 +29,11 @@ let
|
|||
repo = "nurl";
|
||||
};
|
||||
|
||||
# These are here to make sure all 'systems' are the same
|
||||
# These are here to make sure all 'systems' and popular inputs are the same
|
||||
flake-compat = mkInput {
|
||||
owner = "edolstra";
|
||||
repo = "flake-compat";
|
||||
};
|
||||
flake-utils = mkInput {
|
||||
owner = "numtide";
|
||||
repo = "flake-utils";
|
||||
|
|
@ -47,6 +51,15 @@ let
|
|||
owner = "nix-community";
|
||||
repo = "lib-aggregate";
|
||||
};
|
||||
nix-github-actions = mkDep {
|
||||
owner = "nix-community";
|
||||
repo = "nix-github-actions";
|
||||
};
|
||||
pre-commit-hooks = mkDep {
|
||||
owner = "cachix";
|
||||
repo = "git-hooks.nix";
|
||||
inputs.flake-compat.follows = "flake-compat";
|
||||
};
|
||||
};
|
||||
|
||||
overlays = {
|
||||
|
|
@ -133,11 +146,10 @@ let
|
|||
repo = "hyprpaper";
|
||||
|
||||
inputs = {
|
||||
hyprgraphics.follows = "hyprland/hyprgraphics";
|
||||
hyprlang.follows = "hyprland/hyprlang";
|
||||
hyprutils.follows = "hyprland/hyprutils";
|
||||
hyprwayland-scanner.follows = "hyprland/hyprwayland-scanner";
|
||||
nixpkgs.follows = "hyprland/nixpkgs";
|
||||
systems.follows = "hyprland/systems";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -34,11 +34,14 @@ in rec {
|
|||
info
|
||||
{inherit type;}
|
||||
(mkOverride "systems")
|
||||
(mkOverride "flake-compat")
|
||||
(mkOverride "flake-utils")
|
||||
(mkOverride "flake-parts")
|
||||
(mkOverride "treefmt-nix")
|
||||
(mkOverride "lib-aggregate")
|
||||
(mkOverride "nix-eval-jobs")
|
||||
(mkOverride "nix-github-actions")
|
||||
(mkOverride "pre-commit-hooks")
|
||||
(mkOverride "treefmt-nix")
|
||||
];
|
||||
|
||||
mkDep = info: mkInput (recursiveUpdate info {inputs.nixpkgs.follows = "nixpkgs";});
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue