fuuko/torrent: Use AriaNg’s nixpkgs version
Otherwise node 10 will have to be built from source since it no longer gets built by Hydra.
This commit is contained in:
parent
a52cb95d44
commit
20b861a994
30
flake.lock
30
flake.lock
|
@ -5,9 +5,7 @@
|
||||||
"flake-utils": [
|
"flake-utils": [
|
||||||
"flake-utils"
|
"flake-utils"
|
||||||
],
|
],
|
||||||
"nixpkgs": [
|
"nixpkgs": "nixpkgs"
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1641157028,
|
"lastModified": 1641157028,
|
||||||
|
@ -187,16 +185,16 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1642798845,
|
"lastModified": 1619464443,
|
||||||
"narHash": "sha256-1g1X3wKmroGix68OXwb4gR1yXKPQ36apI1dssd/YbuM=",
|
"narHash": "sha256-R7WAb8EnkIJxxaF6GTHUPytjonhB4Zm0iatyWoW169A=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "e84444b14cc75a4be17b58fd2c344f47dddf084e",
|
"rev": "8e4fe32876ca15e3d5eb3ecd3ca0b224417f5f17",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"ref": "nixos-21.11",
|
"ref": "nixos-unstable",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
@ -243,6 +241,22 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"nixpkgs_2": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1642798845,
|
||||||
|
"narHash": "sha256-1g1X3wKmroGix68OXwb4gR1yXKPQ36apI1dssd/YbuM=",
|
||||||
|
"owner": "nixos",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "e84444b14cc75a4be17b58fd2c344f47dddf084e",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nixos",
|
||||||
|
"ref": "nixos-21.11",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"AriaNg": "AriaNg",
|
"AriaNg": "AriaNg",
|
||||||
|
@ -254,7 +268,7 @@
|
||||||
"krops": "krops",
|
"krops": "krops",
|
||||||
"nix-pre-commit-hooks": "nix-pre-commit-hooks",
|
"nix-pre-commit-hooks": "nix-pre-commit-hooks",
|
||||||
"nixos-hardware": "nixos-hardware",
|
"nixos-hardware": "nixos-hardware",
|
||||||
"nixpkgs": "nixpkgs",
|
"nixpkgs": "nixpkgs_2",
|
||||||
"nixpkgs-overlay": "nixpkgs-overlay",
|
"nixpkgs-overlay": "nixpkgs-overlay",
|
||||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
"nixpkgs-unstable": "nixpkgs-unstable",
|
||||||
"sops-nix": "sops-nix"
|
"sops-nix": "sops-nix"
|
||||||
|
|
|
@ -41,7 +41,6 @@
|
||||||
|
|
||||||
AriaNg.url = "git+https://git.sbruder.de/simon/AriaNg";
|
AriaNg.url = "git+https://git.sbruder.de/simon/AriaNg";
|
||||||
AriaNg.inputs.flake-utils.follows = "flake-utils";
|
AriaNg.inputs.flake-utils.follows = "flake-utils";
|
||||||
AriaNg.inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs =
|
outputs =
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ config, lib, pkgs, ... }:
|
{ config, inputs, lib, pkgs, ... }:
|
||||||
let
|
let
|
||||||
homeDir = "/var/lib/aria2";
|
homeDir = "/var/lib/aria2";
|
||||||
downloadDir = "/data/torrent";
|
downloadDir = "/data/torrent";
|
||||||
|
@ -163,7 +163,7 @@ in
|
||||||
|
|
||||||
locations = {
|
locations = {
|
||||||
"/" = {
|
"/" = {
|
||||||
root = pkgs.AriaNg;
|
root = inputs.AriaNg.packages.${config.nixpkgs.system}.AriaNg;
|
||||||
};
|
};
|
||||||
"/jsonrpc" = {
|
"/jsonrpc" = {
|
||||||
proxyPass = "http://unix:${homeDir}/rpc.sock";
|
proxyPass = "http://unix:${homeDir}/rpc.sock";
|
||||||
|
|
|
@ -81,8 +81,6 @@ in
|
||||||
system;
|
system;
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
|
|
||||||
AriaNg.overlay
|
|
||||||
];
|
];
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
|
|
Loading…
Reference in a new issue