diff options
| author | Alyssa Ross <hi@alyssa.is> | 2020-01-26 22:39:25 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-01-26 22:39:25 +0000 |
| commit | bd2ad77e38991af0d7a3a5d82bd3f41a077ce401 (patch) | |
| tree | d1e26d039eb5004eb7c836aafff259cc198626d4 /pkgs/tools/misc/ipxe/default.nix | |
| parent | e5d8381542a8d084371d26013fab199f52474be7 (diff) | |
| parent | ad3f0d9829119b611350a9be1c226fb625f1f310 (diff) | |
| download | nixpkgs-bd2ad77e38991af0d7a3a5d82bd3f41a077ce401.tar nixpkgs-bd2ad77e38991af0d7a3a5d82bd3f41a077ce401.tar.gz nixpkgs-bd2ad77e38991af0d7a3a5d82bd3f41a077ce401.tar.bz2 nixpkgs-bd2ad77e38991af0d7a3a5d82bd3f41a077ce401.tar.lz nixpkgs-bd2ad77e38991af0d7a3a5d82bd3f41a077ce401.tar.xz nixpkgs-bd2ad77e38991af0d7a3a5d82bd3f41a077ce401.tar.zst nixpkgs-bd2ad77e38991af0d7a3a5d82bd3f41a077ce401.zip | |
Merge remote-tracking branch 'nixpkgs/master' into master
Diffstat (limited to 'pkgs/tools/misc/ipxe/default.nix')
| -rw-r--r-- | pkgs/tools/misc/ipxe/default.nix | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/tools/misc/ipxe/default.nix b/pkgs/tools/misc/ipxe/default.nix index 219c03f263c..1826bed216d 100644 --- a/pkgs/tools/misc/ipxe/default.nix +++ b/pkgs/tools/misc/ipxe/default.nix @@ -1,11 +1,9 @@ -{ stdenv, lib, fetchgit, perl, cdrkit, syslinux, xz, openssl, gnu-efi, mtools +{ stdenv, lib, fetchFromGitHub, perl, cdrkit, syslinux, xz, openssl, gnu-efi, mtools , embedScript ? null , additionalTargets ? {} }: let - date = "20190318"; - rev = "ebf2eaf515e46abd43bc798e7e4ba77bfe529218"; targets = additionalTargets // lib.optionalAttrs stdenv.isx86_64 { "bin-x86_64-efi/ipxe.efi" = null; "bin-x86_64-efi/ipxe.efirom" = null; @@ -19,15 +17,17 @@ let }; in -stdenv.mkDerivation { - name = "ipxe-${date}-${builtins.substring 0 7 rev}"; +stdenv.mkDerivation rec { + pname = "ipxe"; + version = "1.20.1"; nativeBuildInputs = [ perl cdrkit syslinux xz openssl gnu-efi mtools ]; - src = fetchgit { - url = https://git.ipxe.org/ipxe.git; - sha256 = "0if3m8h1nfxy4n37cwlfbc5kand52290v80m4zvjppc81im3nr5g"; - inherit rev; + src = fetchFromGitHub { + owner = "ipxe"; + repo = "ipxe"; + rev = "v${version}"; + sha256 = "0w7h7y97gj9nqvbmsg1zp6zj5mpbbpckqbbx7bpp6k3ahy5fk8zp"; }; # not possible due to assembler code |