chore: nix 2.24 -> 2.25
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
131299587c
commit
9aca532b78
10 changed files with 35 additions and 7 deletions
|
@ -1,6 +1,7 @@
|
|||
{
|
||||
config,
|
||||
mainUser,
|
||||
nix-eval-jobs,
|
||||
nix-fast-build,
|
||||
pkgs,
|
||||
...
|
||||
|
@ -9,7 +10,7 @@
|
|||
|
||||
nix-fast-build-pkg = nix-fast-build.packages.${pkgs.system}.nix-fast-build.override {
|
||||
nix-eval-jobs =
|
||||
pkgs.nix-eval-jobs.override {
|
||||
nix-eval-jobs.packages.${pkgs.system}.default.override {
|
||||
nix = config.nix.package;
|
||||
}
|
||||
// {
|
||||
|
@ -46,6 +47,7 @@
|
|||
in {
|
||||
services.nix-serve = {
|
||||
enable = true;
|
||||
package = pkgs.nix-serve-ng;
|
||||
secretKeyFile = secrets.binary-cache-key.path;
|
||||
};
|
||||
|
||||
|
|
BIN
flake.lock
BIN
flake.lock
Binary file not shown.
BIN
flake.nix
BIN
flake.nix
Binary file not shown.
|
@ -9,6 +9,11 @@ let
|
|||
repo = "nix-fast-build";
|
||||
};
|
||||
|
||||
nix-eval-jobs = mkDep {
|
||||
owner = "nix-community";
|
||||
repo = "nix-eval-jobs";
|
||||
};
|
||||
|
||||
nix-index-db = mkDep {
|
||||
owner = "Mic92";
|
||||
repo = "nix-index-database";
|
||||
|
@ -55,9 +60,6 @@ let
|
|||
nixd = mkDep {
|
||||
owner = "nix-community";
|
||||
repo = "nixd";
|
||||
|
||||
# FIXME: stay on nix 2.24 for now
|
||||
rev = "5507bb141efc11cf548e87e39b61da66dfbca9e5";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
@ -38,6 +38,7 @@ in rec {
|
|||
(mkOverride "flake-parts")
|
||||
(mkOverride "treefmt-nix")
|
||||
(mkOverride "lib-aggregate")
|
||||
(mkOverride "nix-eval-jobs")
|
||||
];
|
||||
|
||||
mkDep = info: mkInput (recursiveUpdate info {inputs.nixpkgs.follows = "nixpkgs";});
|
||||
|
|
|
@ -4,11 +4,17 @@ inputs: rec {
|
|||
system,
|
||||
nixpkgs,
|
||||
cfg ? {},
|
||||
nix ? null,
|
||||
cudaSupport ? false,
|
||||
}:
|
||||
import nixpkgs {
|
||||
inherit system;
|
||||
overlays = [inputs.self.overlays.build-failures] ++ (cfg.overlays or []);
|
||||
overlays =
|
||||
[
|
||||
(inputs.self.overlays.nix-version {inherit nix;})
|
||||
inputs.self.overlays.build-failures
|
||||
]
|
||||
++ (cfg.overlays or []);
|
||||
config =
|
||||
{
|
||||
inherit cudaSupport;
|
||||
|
@ -24,6 +30,7 @@ inputs: rec {
|
|||
}: ({config, ...}: let
|
||||
pkgs = mkPkgs {
|
||||
cfg = config.nixpkgs;
|
||||
nix = config.nix.package;
|
||||
inherit system cudaSupport;
|
||||
inherit (inputs) nixpkgs;
|
||||
};
|
||||
|
|
|
@ -100,7 +100,7 @@ in {
|
|||
;
|
||||
})
|
||||
++ [
|
||||
# This could help as well: nix derivation show -r /run/current-system
|
||||
# TODO: `depOf` program that looks through `nix derivation show -r /run/current-system`
|
||||
(pkgs.writeShellApplication {
|
||||
name = "listDerivs";
|
||||
text = ''
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
{...}: {
|
||||
build-failures = import ./build-failures;
|
||||
nix-version = import ./nix-version;
|
||||
xdg-desktop-portal-kde = import ./xdg-desktop-portal-kde;
|
||||
}
|
||||
|
|
15
overlays/nix-version/default.nix
Normal file
15
overlays/nix-version/default.nix
Normal file
|
@ -0,0 +1,15 @@
|
|||
{nix ? null}: (
|
||||
final: prev:
|
||||
builtins.mapAttrs
|
||||
(n: v:
|
||||
if nix == null
|
||||
then prev.${n}
|
||||
else v)
|
||||
{
|
||||
inherit nix;
|
||||
|
||||
nix-serve-ng = prev.nix-serve-ng.override {
|
||||
inherit nix;
|
||||
};
|
||||
}
|
||||
)
|
|
@ -1,4 +1,3 @@
|
|||
# FIXME: the source appears to be deprecated https://github.com/dspearson/librespot-auth
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
|
@ -12,6 +11,7 @@ rustPlatform.buildRustPackage rec {
|
|||
pname = "librespot-auth";
|
||||
version = "0.1.1";
|
||||
|
||||
# deprecated https://github.com/dspearson/librespot-auth
|
||||
src = fetchFromGitHub {
|
||||
owner = "dspearson";
|
||||
repo = pname;
|
||||
|
|
Loading…
Reference in a new issue