Author: shlevy
Date: Fri Mar 16 11:53:50 2012
New Revision: 33149
URL: https://nixos.org/websvn/nix/?rev=33149&sc=1
Log:
Move NixosBootPkg into NixOS
Added:
nixos/trunk/modules/installer/efi-boot-stub/nixos-boot-pkg.nix
- copied unchanged from r33148,
nixpkgs/trunk/pkgs/tools/misc/NixosBootPkg/default.nix
Deleted:
nixpkgs/trunk/pkgs/tools/misc/NixosBootPkg/
Modified:
nixos/trunk/modules/installer/cd-dvd/iso-image.nix
nixos/trunk/modules/installer/efi-boot-stub/efi-boot-stub.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixos/trunk/modules/installer/cd-dvd/iso-image.nix
==============================================================================
--- nixos/trunk/modules/installer/cd-dvd/iso-image.nix Fri Mar 16 11:31:33
2012 (r33148)
+++ nixos/trunk/modules/installer/cd-dvd/iso-image.nix Fri Mar 16 11:53:50
2012 (r33149)
@@ -246,7 +246,9 @@
{ source = bootParams;
target = "/efi/nixos/boot-params";
}
- { source = "${pkgs.NixosBootPkg}/*/NixosBoot.efi";
+ { source = ''${import ../efi-boot-stub/nixos-boot-pkg.nix {
+ inherit (pkgs) edk2 stdenv fetchhg;
+ }}/*/NixosBoot.efi'';
target = "/efi/boot/boot${targetArch}.efi";
}
];
Modified: nixos/trunk/modules/installer/efi-boot-stub/efi-boot-stub.nix
==============================================================================
--- nixos/trunk/modules/installer/efi-boot-stub/efi-boot-stub.nix Fri Mar
16 11:31:33 2012 (r33148)
+++ nixos/trunk/modules/installer/efi-boot-stub/efi-boot-stub.nix Fri Mar
16 11:53:50 2012 (r33149)
@@ -88,7 +88,9 @@
inherit (config.boot.loader.efiBootStub) efiSysMountPoint runEfibootmgr
installStartupNsh efiDisk efiPartition installRemovableMediaImage;
kernelFile = platform.kernelTarget;
} // pkgs.stdenv.lib.optionalAttrs
config.boot.loader.efiBootStub.installRemovableMediaImage rec {
- removableMediaImage = "${pkgs.NixosBootPkg}/${targetArch}/NixosBoot.efi";
+ removableMediaImage = ''${import ./nixos-boot-pkg.nix {
+ inherit (pkgs) edk2 stdenv fetchhg;
+ }}/${targetArch}/NixosBoot.efi'';
targetArch = if pkgs.stdenv.isi686 then
"IA32"
else if pkgs.stdenv.isx86_64 then
Copied: nixos/trunk/modules/installer/efi-boot-stub/nixos-boot-pkg.nix (from
r33148, nixpkgs/trunk/pkgs/tools/misc/NixosBootPkg/default.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixos/trunk/modules/installer/efi-boot-stub/nixos-boot-pkg.nix Fri Mar
16 11:53:50 2012 (r33149, copy of r33148,
nixpkgs/trunk/pkgs/tools/misc/NixosBootPkg/default.nix)
@@ -0,0 +1,29 @@
+{ stdenv, edk2, fetchhg }:
+
+let
+
+ src = fetchhg {
+ url = https://bitbucket.org/shlevy/nixosbootpkg;
+ tag = "1ff4c2891c8c1eb03677a6f8b04b8d05807ec198";
+ sha256 = "06zwy0g9a7g2sny7phvn2z76pb3wnw4vm9vsrjjaj7f7nzcsn13k";
+ };
+
+in
+
+stdenv.mkDerivation (edk2.setup "NixosBootPkg/NixosBootPkg.dsc" {
+ name = "NixosBootPkg-2012-03-15";
+
+ unpackPhase = ''
+ ln -sv ${src} NixosBootPkg
+ ln -sv ${edk2.src}/MdePkg .
+ '';
+
+ meta = {
+ description =
+ "Simple EFI app to load the kernel with NixOS-specific arguments";
+ homepage = http://www.shealevy.com;
+ license = "MIT";
+ maintainers = [ stdenv.lib.maintainers.shlevy ];
+ platforms = ["x86_64-linux" "i686-linux"];
+ };
+})
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Mar 16 11:31:33
2012 (r33148)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Mar 16 11:53:50
2012 (r33149)
@@ -927,8 +927,6 @@
ninka = callPackage ../development/tools/misc/ninka { };
- NixosBootPkg = callPackage ../tools/misc/NixosBootPkg { };
-
nodejs = callPackage ../development/web/nodejs {};
ldns = callPackage ../development/libraries/ldns { };
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
