flake: update devshell inputs, bump flake.lock

This commit is contained in:
teutat3s 2023-07-21 11:49:31 +02:00
parent b965b25546
commit 873783ca77
Signed by: teutat3s
GPG key ID: 4FA1D3FA524F22C1
2 changed files with 52 additions and 22 deletions

View file

@ -2,19 +2,17 @@
"nodes": { "nodes": {
"devshell": { "devshell": {
"inputs": { "inputs": {
"flake-utils": [
"flake-utils"
],
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ],
"systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1667210711, "lastModified": 1683635384,
"narHash": "sha256-IoErjXZAkzYWHEpQqwu/DeRNJGFdR7X2OGbkhMqMrpw=", "narHash": "sha256-9goJTd05yOyD/McaMqZ4BUB8JW+mZMnZQJZ7VQ6C/Lw=",
"owner": "numtide", "owner": "numtide",
"repo": "devshell", "repo": "devshell",
"rev": "96a9dd12b8a447840cc246e17a47b81a4268bba7", "rev": "5143ea68647c4cf5227e4ad2100db6671fc4c369",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -24,12 +22,15 @@
} }
}, },
"flake-utils": { "flake-utils": {
"inputs": {
"systems": "systems_2"
},
"locked": { "locked": {
"lastModified": 1667395993, "lastModified": 1681202837,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -40,11 +41,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1669542132, "lastModified": 1684935479,
"narHash": "sha256-DRlg++NJAwPh8io3ExBJdNW7Djs3plVI5jgYQ+iXAZQ=", "narHash": "sha256-6QMMsXMr2nhmOPHdti2j3KRHt+bai2zw+LJfdCl97Mk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a115bb9bd56831941be3776c8a94005867f316a7", "rev": "f91ee3065de91a3531329a674a45ddcb3467a650",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -56,11 +57,11 @@
}, },
"nixpkgs-2205": { "nixpkgs-2205": {
"locked": { "locked": {
"lastModified": 1672580127, "lastModified": 1682600000,
"narHash": "sha256-3lW3xZslREhJogoOkjeZtlBtvFMyxHku7I/9IVehhT8=", "narHash": "sha256-ha4BehR1dh8EnXSoE1m/wyyYVvHI9txjW4w5/oxsW5Y=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0874168639713f547c05947c76124f78441ea46c", "rev": "50fc86b75d2744e1ab3837ef74b53f103a9b55a0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -79,6 +80,36 @@
"tritonshell-module": "tritonshell-module" "tritonshell-module": "tritonshell-module"
} }
}, },
"systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"tritonshell-module": { "tritonshell-module": {
"inputs": { "inputs": {
"devshell": [ "devshell": [
@ -92,11 +123,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1669581047, "lastModified": 1684242426,
"narHash": "sha256-qs2VUUCCkWlc+5KvP/Vh2ToLKMkCjAws47bVT6rilG8=", "narHash": "sha256-kvFD6WP6I1fK9DMCPpuRDZxsAGKpzXMMd2G5MYP42kU=",
"ref": "main", "ref": "main",
"rev": "341aa68b667a8fb9b77f8af319b7439e82c78793", "rev": "d227038987158fa894872868f25bbf911c9cb8d1",
"revCount": 53, "revCount": 61,
"type": "git", "type": "git",
"url": "https://git.greenbaum.cloud/dev/tritonshell" "url": "https://git.greenbaum.cloud/dev/tritonshell"
}, },

View file

@ -8,7 +8,6 @@
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
devshell.url = "github:numtide/devshell"; devshell.url = "github:numtide/devshell";
devshell.inputs.flake-utils.follows = "flake-utils";
devshell.inputs.nixpkgs.follows = "nixpkgs"; devshell.inputs.nixpkgs.follows = "nixpkgs";
tritonshell-module.url = "git+https://git.greenbaum.cloud/dev/tritonshell?ref=main"; tritonshell-module.url = "git+https://git.greenbaum.cloud/dev/tritonshell?ref=main";
@ -21,7 +20,7 @@
flake-utils.lib.simpleFlake { flake-utils.lib.simpleFlake {
inherit self nixpkgs; inherit self nixpkgs;
name = "infra-project"; name = "infra-project";
preOverlays = [ devshell.overlay ]; preOverlays = [ devshell.overlays.default ];
shell = { pkgs }: shell = { pkgs }:
pkgs.devshell.mkShell { pkgs.devshell.mkShell {
imports = [ tritonshell-module.devshellModules.x86_64-linux.tritonshell ]; imports = [ tritonshell-module.devshellModules.x86_64-linux.tritonshell ];