feat: support https://niks3-cache.tami.moe and add niks3 binary
All checks were successful
Build and Push docker image / buildAndPush (push) Successful in 2m2s
All checks were successful
Build and Push docker image / buildAndPush (push) Successful in 2m2s
This commit is contained in:
parent
c5f67c568c
commit
d9f918f37f
2 changed files with 61 additions and 5 deletions
43
flake.lock
generated
43
flake.lock
generated
|
|
@ -64,6 +64,27 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"niks3": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixpkgs"
|
||||||
|
],
|
||||||
|
"treefmt-nix": "treefmt-nix"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1783583669,
|
||||||
|
"narHash": "sha256-fiAFsNCgzMmaeoEFQiibMIYO3MyUqvKlwNT3F+N94MI=",
|
||||||
|
"owner": "Mic92",
|
||||||
|
"repo": "niks3",
|
||||||
|
"rev": "fbcded5420a3f2357fda14b6cf0f0453d1ed3266",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "Mic92",
|
||||||
|
"repo": "niks3",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"nix": {
|
"nix": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-compat": "flake-compat",
|
"flake-compat": "flake-compat",
|
||||||
|
|
@ -150,9 +171,31 @@
|
||||||
},
|
},
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
|
"niks3": "niks3",
|
||||||
"nix": "nix",
|
"nix": "nix",
|
||||||
"nixpkgs": "nixpkgs_2"
|
"nixpkgs": "nixpkgs_2"
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"treefmt-nix": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"niks3",
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1780220602,
|
||||||
|
"narHash": "sha256-eynAfOmbmxJnkp7YewvCEbShNnnYJ9gLLqkzsYtBPeM=",
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "treefmt-nix",
|
||||||
|
"rev": "db947814a175b7ca6ded66e21383d938df01c227",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "treefmt-nix",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"root": "root",
|
"root": "root",
|
||||||
|
|
|
||||||
23
flake.nix
23
flake.nix
|
|
@ -3,10 +3,18 @@
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
|
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
|
||||||
nix.url = "github:nixos/nix";
|
nix.url = "github:nixos/nix";
|
||||||
|
niks3 = {
|
||||||
|
url = "github:Mic92/niks3";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
outputs = { nixpkgs, nix, self }:
|
outputs = { nixpkgs, nix, self, ... }@inputs:
|
||||||
let pkgs = import nixpkgs { system = "x86_64-linux"; }; in {
|
let
|
||||||
packages.x86_64-linux = rec {
|
system = "x86_64-linux";
|
||||||
|
pkgs = import nixpkgs { inherit system; };
|
||||||
|
in
|
||||||
|
{
|
||||||
|
packages.${system} = rec {
|
||||||
default = nix-with-tools;
|
default = nix-with-tools;
|
||||||
|
|
||||||
minimal-nix = import (nix + "/docker.nix") {
|
minimal-nix = import (nix + "/docker.nix") {
|
||||||
|
|
@ -23,12 +31,17 @@
|
||||||
};
|
};
|
||||||
nix-with-tools = import (nix + "/docker.nix") {
|
nix-with-tools = import (nix + "/docker.nix") {
|
||||||
inherit pkgs;
|
inherit pkgs;
|
||||||
extraPkgs = [ pkgs.nodejs pkgs.skopeo ];
|
extraPkgs = [
|
||||||
|
pkgs.nodejs
|
||||||
|
pkgs.skopeo
|
||||||
|
inputs.niks3.packages.${system}.default
|
||||||
|
];
|
||||||
nixConf = {
|
nixConf = {
|
||||||
extra-substituters = [ "https://nix-cache.tami.moe" ];
|
extra-substituters = [ "https://nix-cache.tami.moe" "https://niks3-cache.tami.moe" ];
|
||||||
trusted-public-keys = [
|
trusted-public-keys = [
|
||||||
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
|
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
|
||||||
"nix-cache.tami.moe:3jrWZ412K0YTFfKMJC6ftc4lsugeMVWDBiudFCAdDb8="
|
"nix-cache.tami.moe:3jrWZ412K0YTFfKMJC6ftc4lsugeMVWDBiudFCAdDb8="
|
||||||
|
"niks3-garage:l7ZLnM6i0mqqHbMEpHg+UAeqG53u8m/Mhep487dOOOE="
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue