mirror of
https://github.com/gytis-ivaskevicius/flake-utils-plus.git
synced 2024-10-26 17:16:28 +03:00
fix: failing channel-patching test
This commit is contained in:
parent
2bf0f91643
commit
d01cae97e1
@ -1,5 +1,6 @@
|
|||||||
{
|
{
|
||||||
inputs.utils.url = path:../../;
|
inputs.utils.url = path:../../;
|
||||||
|
inputs.nixpkgs.url = github:NixOS/nixpkgs/3c4a65f323dd;
|
||||||
|
|
||||||
outputs = inputs@{ self, nixpkgs, utils }:
|
outputs = inputs@{ self, nixpkgs, utils }:
|
||||||
utils.lib.mkFlake {
|
utils.lib.mkFlake {
|
||||||
|
@ -1,23 +1,23 @@
|
|||||||
diff --git a/lib/default.nix b/lib/default.nix
|
diff --git a/lib/default.nix b/lib/default.nix
|
||||||
index 5a85c542117..0ed00136d1d 100644
|
index 169f013191b8..05e91f1cd27b 100644
|
||||||
--- a/lib/default.nix
|
--- a/lib/default.nix
|
||||||
+++ b/lib/default.nix
|
+++ b/lib/default.nix
|
||||||
@@ -146,5 +146,7 @@ let
|
@@ -10,6 +10,7 @@ let
|
||||||
nixType imap;
|
lib = makeExtensible (self: let
|
||||||
inherit (self.versions)
|
callLibs = file: import file { lib = self; };
|
||||||
splitVersion;
|
in {
|
||||||
+
|
|
||||||
+ patchedFunction = x: x;
|
+ patchedFunction = x: x;
|
||||||
});
|
|
||||||
in lib
|
# often used, or depending on very little
|
||||||
|
trivial = callLibs ./trivial.nix;
|
||||||
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
|
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
|
||||||
index c951db5822a..53226de942e 100644
|
index ec6f410a48f6..3c6669988d2f 100644
|
||||||
--- a/nixos/modules/module-list.nix
|
--- a/nixos/modules/module-list.nix
|
||||||
+++ b/nixos/modules/module-list.nix
|
+++ b/nixos/modules/module-list.nix
|
||||||
@@ -1191,4 +1191,10 @@
|
@@ -1505,4 +1505,10 @@
|
||||||
./virtualisation/vmware-guest.nix
|
|
||||||
./virtualisation/xen-dom0.nix
|
|
||||||
./virtualisation/xe-guest-utilities.nix
|
./virtualisation/xe-guest-utilities.nix
|
||||||
|
./virtualisation/xen-dom0.nix
|
||||||
|
{ documentation.nixos.extraModules = [ ./virtualisation/qemu-vm.nix ]; }
|
||||||
+ ({ lib, config, ... }: {
|
+ ({ lib, config, ... }: {
|
||||||
+ options.patchedModule.test = lib.mkOption {
|
+ options.patchedModule.test = lib.mkOption {
|
||||||
+ default = null;
|
+ default = null;
|
||||||
@ -26,15 +26,13 @@ index c951db5822a..53226de942e 100644
|
|||||||
+ })
|
+ })
|
||||||
]
|
]
|
||||||
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
|
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
|
||||||
index c904707b7cf..9f0cab1875d 100644
|
index 0c2a44d531df..299ff71619b6 100644
|
||||||
--- a/pkgs/top-level/all-packages.nix
|
--- a/pkgs/top-level/all-packages.nix
|
||||||
+++ b/pkgs/top-level/all-packages.nix
|
+++ b/pkgs/top-level/all-packages.nix
|
||||||
@@ -12,6 +12,8 @@ with pkgs;
|
@@ -42286,4 +42286,6 @@ with pkgs;
|
||||||
|
ssl-proxy = callPackage ../tools/networking/ssl-proxy { };
|
||||||
|
|
||||||
{
|
code-maat = callPackage ../development/tools/code-maat {};
|
||||||
|
|
||||||
+ flake-utils-plus-test = callPackage ../applications/misc/hello { };
|
|
||||||
+
|
+
|
||||||
# A stdenv capable of building 32-bit binaries. On x86_64-linux,
|
+ flake-utils-plus-test = callPackage ../tools/misc/coreutils { };
|
||||||
# it uses GCC compiled with multilib support; on i686-linux, it's
|
}
|
||||||
# just the plain stdenv.
|
|
||||||
|
Loading…
Reference in New Issue
Block a user