Merge master into staging-next
This commit is contained in:
commit
7338a5dec5
@ -233,7 +233,9 @@ in
|
|||||||
symlinks because modprobe only supports one directory.
|
symlinks because modprobe only supports one directory.
|
||||||
'';
|
'';
|
||||||
# Convert the list of path to only one path.
|
# Convert the list of path to only one path.
|
||||||
apply = pkgs.aggregateModules;
|
apply = let
|
||||||
|
kernel-name = config.boot.kernelPackages.kernel.name or "kernel";
|
||||||
|
in modules: (pkgs.aggregateModules modules).override { name = kernel-name + "-modules"; };
|
||||||
};
|
};
|
||||||
|
|
||||||
system.requiredKernelConfig = mkOption {
|
system.requiredKernelConfig = mkOption {
|
||||||
|
@ -13,15 +13,11 @@ let
|
|||||||
|
|
||||||
kernel-name = config.boot.kernelPackages.kernel.name or "kernel";
|
kernel-name = config.boot.kernelPackages.kernel.name or "kernel";
|
||||||
|
|
||||||
modulesTree = config.system.modulesTree.override { name = kernel-name + "-modules"; };
|
|
||||||
firmware = config.hardware.firmware;
|
|
||||||
|
|
||||||
|
|
||||||
# Determine the set of modules that we need to mount the root FS.
|
# Determine the set of modules that we need to mount the root FS.
|
||||||
modulesClosure = pkgs.makeModulesClosure {
|
modulesClosure = pkgs.makeModulesClosure {
|
||||||
rootModules = config.boot.initrd.availableKernelModules ++ config.boot.initrd.kernelModules;
|
rootModules = config.boot.initrd.availableKernelModules ++ config.boot.initrd.kernelModules;
|
||||||
kernel = modulesTree;
|
kernel = config.system.modulesTree;
|
||||||
firmware = firmware;
|
firmware = config.hardware.firmware;
|
||||||
allowMissing = false;
|
allowMissing = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -91,13 +91,11 @@ let
|
|||||||
};
|
};
|
||||||
|
|
||||||
kernel-name = config.boot.kernelPackages.kernel.name or "kernel";
|
kernel-name = config.boot.kernelPackages.kernel.name or "kernel";
|
||||||
modulesTree = config.system.modulesTree.override { name = kernel-name + "-modules"; };
|
|
||||||
firmware = config.hardware.firmware;
|
|
||||||
# Determine the set of modules that we need to mount the root FS.
|
# Determine the set of modules that we need to mount the root FS.
|
||||||
modulesClosure = pkgs.makeModulesClosure {
|
modulesClosure = pkgs.makeModulesClosure {
|
||||||
rootModules = config.boot.initrd.availableKernelModules ++ config.boot.initrd.kernelModules;
|
rootModules = config.boot.initrd.availableKernelModules ++ config.boot.initrd.kernelModules;
|
||||||
kernel = modulesTree;
|
kernel = config.system.modulesTree;
|
||||||
firmware = firmware;
|
firmware = config.hardware.firmware;
|
||||||
allowMissing = false;
|
allowMissing = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
733
pkgs/applications/blockchains/polkadot/Cargo.lock
generated
733
pkgs/applications/blockchains/polkadot/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -11,13 +11,13 @@
|
|||||||
}:
|
}:
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "polkadot";
|
pname = "polkadot";
|
||||||
version = "1.8.0";
|
version = "1.9.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "paritytech";
|
owner = "paritytech";
|
||||||
repo = "polkadot-sdk";
|
repo = "polkadot-sdk";
|
||||||
rev = "polkadot-v${version}";
|
rev = "polkadot-v${version}";
|
||||||
hash = "sha256-GyiipeXe4Ny7UAwKMEelTqiaWZH1r/VhmbdMaUH6fjQ=";
|
hash = "sha256-YLd1XKluL8QBbZPTb1FCvBDVD0YWjZfZTvl4p9jx28Y=";
|
||||||
|
|
||||||
# the build process of polkadot requires a .git folder in order to determine
|
# the build process of polkadot requires a .git folder in order to determine
|
||||||
# the git commit hash that is being built and add it to the version string.
|
# the git commit hash that is being built and add it to the version string.
|
||||||
|
@ -24,5 +24,6 @@ buildGoModule rec {
|
|||||||
homepage = "https://github.com/Code-Hex/Neo-cowsay";
|
homepage = "https://github.com/Code-Hex/Neo-cowsay";
|
||||||
license = with licenses; [ artistic1 /* or */ gpl3 ];
|
license = with licenses; [ artistic1 /* or */ gpl3 ];
|
||||||
maintainers = with maintainers; [ Br1ght0ne ];
|
maintainers = with maintainers; [ Br1ght0ne ];
|
||||||
|
mainProgram = "cowsay";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -1,12 +1,12 @@
|
|||||||
{ buildPackages, fetchurl, lib, stdenv, libgcrypt, readline, libgpg-error }:
|
{ buildPackages, fetchurl, lib, stdenv, libgcrypt, readline, libgpg-error }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
version = "1.6.11";
|
version = "1.6.14";
|
||||||
pname = "freeipmi";
|
pname = "freeipmi";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://gnu/freeipmi/${pname}-${version}.tar.gz";
|
url = "mirror://gnu/freeipmi/${pname}-${version}.tar.gz";
|
||||||
sha256 = "sha256-ZfvWkQ/AEEV3SGlUFPJ8V1W06NdXNCISIfOFjGIwqJc=";
|
sha256 = "sha256-Gj2sXHa3zMTU+GqhK475shK673SJvwXombiau34U7bU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||||
|
Loading…
Reference in New Issue
Block a user