various: address lint-short-path-literals
This commit is contained in:
+18
-18
@@ -111,7 +111,7 @@ let
|
||||
with import ./.. { inherit system; };
|
||||
|
||||
hydraJob (
|
||||
(import lib/eval-config.nix {
|
||||
(import ./lib/eval-config.nix {
|
||||
inherit system;
|
||||
modules = makeModules module { };
|
||||
}).config.system.build.isoImage
|
||||
@@ -123,7 +123,7 @@ let
|
||||
with import ./.. { inherit system; };
|
||||
|
||||
hydraJob (
|
||||
(import lib/eval-config.nix {
|
||||
(import ./lib/eval-config.nix {
|
||||
inherit system;
|
||||
modules = makeModules module { };
|
||||
}).config.system.build.sdImage
|
||||
@@ -141,7 +141,7 @@ let
|
||||
let
|
||||
|
||||
config =
|
||||
(import lib/eval-config.nix {
|
||||
(import ./lib/eval-config.nix {
|
||||
inherit system;
|
||||
modules = makeModules module { };
|
||||
}).config;
|
||||
@@ -183,7 +183,7 @@ let
|
||||
makeNetboot =
|
||||
{ module, system, ... }:
|
||||
let
|
||||
configEvaled = import lib/eval-config.nix {
|
||||
configEvaled = import ./lib/eval-config.nix {
|
||||
inherit system;
|
||||
modules = makeModules module { };
|
||||
};
|
||||
@@ -209,7 +209,7 @@ let
|
||||
in
|
||||
rec {
|
||||
|
||||
channel = import lib/make-channel.nix {
|
||||
channel = import ./lib/make-channel.nix {
|
||||
inherit
|
||||
pkgs
|
||||
nixpkgs
|
||||
@@ -232,7 +232,7 @@ rec {
|
||||
|
||||
kexec = forMatchingSystems supportedSystems (
|
||||
system:
|
||||
(import lib/eval-config.nix {
|
||||
(import ./lib/eval-config.nix {
|
||||
inherit system;
|
||||
modules = [
|
||||
./modules/installer/netboot/netboot-minimal.nix
|
||||
@@ -312,7 +312,7 @@ rec {
|
||||
with import ./.. { inherit system; };
|
||||
|
||||
hydraJob (
|
||||
(import lib/eval-config.nix {
|
||||
(import ./lib/eval-config.nix {
|
||||
inherit system;
|
||||
modules = [
|
||||
./modules/virtualisation/proxmox-image.nix
|
||||
@@ -331,7 +331,7 @@ rec {
|
||||
with import ./.. { inherit system; };
|
||||
|
||||
hydraJob (
|
||||
(import lib/eval-config.nix {
|
||||
(import ./lib/eval-config.nix {
|
||||
inherit system;
|
||||
modules = [
|
||||
./modules/virtualisation/proxmox-image.nix
|
||||
@@ -346,7 +346,7 @@ rec {
|
||||
with import ./.. { inherit system; };
|
||||
|
||||
hydraJob (
|
||||
(import lib/eval-config.nix {
|
||||
(import ./lib/eval-config.nix {
|
||||
inherit system;
|
||||
modules = [
|
||||
./modules/virtualisation/proxmox-lxc.nix
|
||||
@@ -362,7 +362,7 @@ rec {
|
||||
with import ./.. { inherit system; };
|
||||
|
||||
hydraJob (
|
||||
(import lib/eval-config.nix {
|
||||
(import ./lib/eval-config.nix {
|
||||
inherit system;
|
||||
modules = [
|
||||
configuration
|
||||
@@ -379,7 +379,7 @@ rec {
|
||||
with import ./.. { inherit system; };
|
||||
|
||||
hydraJob (
|
||||
(import lib/eval-config.nix {
|
||||
(import ./lib/eval-config.nix {
|
||||
inherit system;
|
||||
modules = [
|
||||
configuration
|
||||
@@ -403,7 +403,7 @@ rec {
|
||||
with import ./.. { inherit system; };
|
||||
|
||||
hydraJob (
|
||||
(import lib/eval-config.nix {
|
||||
(import ./lib/eval-config.nix {
|
||||
inherit system;
|
||||
modules = [
|
||||
configuration
|
||||
@@ -427,7 +427,7 @@ rec {
|
||||
with import ./.. { inherit system; };
|
||||
|
||||
hydraJob (
|
||||
(import lib/eval-config.nix {
|
||||
(import ./lib/eval-config.nix {
|
||||
inherit system;
|
||||
modules = [
|
||||
configuration
|
||||
@@ -451,7 +451,7 @@ rec {
|
||||
with import ./.. { inherit system; };
|
||||
|
||||
hydraJob (
|
||||
(import lib/eval-config.nix {
|
||||
(import ./lib/eval-config.nix {
|
||||
inherit system;
|
||||
modules = [
|
||||
configuration
|
||||
@@ -475,7 +475,7 @@ rec {
|
||||
with import ./.. { inherit system; };
|
||||
|
||||
hydraJob (
|
||||
(import lib/eval-config.nix {
|
||||
(import ./lib/eval-config.nix {
|
||||
inherit system;
|
||||
modules = [
|
||||
configuration
|
||||
@@ -491,7 +491,7 @@ rec {
|
||||
system:
|
||||
pkgs.runCommand "dummy" {
|
||||
toplevel =
|
||||
(import lib/eval-config.nix {
|
||||
(import ./lib/eval-config.nix {
|
||||
inherit system;
|
||||
modules = singleton (
|
||||
{ ... }:
|
||||
@@ -539,14 +539,14 @@ rec {
|
||||
{ ... }:
|
||||
{
|
||||
boot.isContainer = true;
|
||||
imports = [ modules/profiles/minimal.nix ];
|
||||
imports = [ ./modules/profiles/minimal.nix ];
|
||||
}
|
||||
);
|
||||
|
||||
ec2 = makeClosure (
|
||||
{ ... }:
|
||||
{
|
||||
imports = [ modules/virtualisation/amazon-image.nix ];
|
||||
imports = [ ./modules/virtualisation/amazon-image.nix ];
|
||||
}
|
||||
);
|
||||
|
||||
|
||||
@@ -873,7 +873,7 @@ let
|
||||
;;
|
||||
esac
|
||||
'') packagesLists}
|
||||
perl -w ${rpm/rpm-closure.pl} \
|
||||
perl -w ${./rpm/rpm-closure.pl} \
|
||||
${
|
||||
lib.concatImapStrings (i: pl: "./packages_${toString i}.xml ${pl.snd} ") (
|
||||
lib.zipLists packagesLists urlPrefixes
|
||||
@@ -973,7 +973,7 @@ let
|
||||
esac
|
||||
done
|
||||
|
||||
perl -w ${deb/deb-closure.pl} \
|
||||
perl -w ${./deb/deb-closure.pl} \
|
||||
./Packages ${urlPrefix} ${toString packages} > $out
|
||||
nixfmt $out
|
||||
'';
|
||||
|
||||
@@ -11,11 +11,9 @@
|
||||
pkgsBuildBuild,
|
||||
callPackage,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
microhs-boot,
|
||||
stdenv,
|
||||
versionCheckHook,
|
||||
writeShellScript,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -30,10 +28,10 @@ let
|
||||
};
|
||||
|
||||
patches = [
|
||||
patches/hugs.patch
|
||||
patches/hugs-viewpatterns.patch
|
||||
./patches/hugs.patch
|
||||
./patches/hugs-viewpatterns.patch
|
||||
]
|
||||
++ lib.optional stdenv.hostPlatform.isGnu patches/link-math.patch;
|
||||
++ lib.optional stdenv.hostPlatform.isGnu ./patches/link-math.patch;
|
||||
|
||||
# The source contains pre-compiled files
|
||||
# We delete them to be certain we are building from source
|
||||
|
||||
Reference in New Issue
Block a user