git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #88099 from zowoq/fwupdate
commit0f5ce2fac0c726036ca69a5524c59a49e2973dd4 authorJan Tojnar <jtojnar@gmail.com> dateTue 19 May 2020, 01:31 (6 years ago) parent69711a2a5cbd4f
4 files changed+2−79
pkgs/os-specific/linux/firmware/fwupdate/default.nix−66 pkgs/os-specific/linux/firmware/fwupdate/do-not-create-sharedstatedir.patch−10 pkgs/top-level/aliases.nix+1 pkgs/top-level/all-packages.nix+1−3
pkgs/os-specific/linux/firmware/fwupdate/default.nixdeleted−66
@@ -1,66 +0,0 @@
1−{ efivar, fetchurl, gettext, gnu-efi, libsmbios, pkgconfig, popt, stdenv }:
2−
3−let
4− version = "12";
5−
6− arch =
7− if stdenv.hostPlatform.isx86_32
8− then "ia32"
9− else stdenv.hostPlatform.parsed.cpu.name;
10−
11−in stdenv.mkDerivation {
12− pname = "fwupdate";
13− inherit version;
14− src = fetchurl {
15− url = "https://github.com/rhinstaller/fwupdate/releases/download/${version}/fwupdate-${version}.tar.bz2";
16− sha256 = "00w7jsg7wrlq4cpfz26m9rbv2jwyf0sansf343vfq02fy5lxars1";
17− };
18−
19− patches = [
20− ./do-not-create-sharedstatedir.patch
21− ];
22−
23− NIX_CFLAGS_COMPILE = builtins.toString [
24− "-I${gnu-efi}/include/efi"
25− "-I${gnu-efi}/include/efi/${arch}"
26− "-Wno-error=address-of-packed-member"
27− ];
28−
29− # TODO: Just apply the disable to the efi subdir
30− hardeningDisable = [ "stackprotector" ];
31−
32− makeFlags = [
33− "EFIDIR=nixos"
34− "prefix=$(out)"
35− "LIBDIR=$(out)/lib"
36− "GNUEFIDIR=${gnu-efi}/lib"
37− "ESPMOUNTPOINT=$(out)/boot"
38− ];
39−
40− nativeBuildInputs = [
41− pkgconfig
42− gettext
43− ];
44−
45− buildInputs = [
46− gnu-efi
47− libsmbios
48− popt
49− ];
50−
51− propagatedBuildInputs = [
52− efivar
53− ];
54−
55− postInstall = ''
56− rm -rf $out/src
57− rm -rf $out/lib/debug
58− '';
59−
60− meta = with stdenv.lib; {
61− description = "Tools for using the ESRT and UpdateCapsule() to apply firmware updates";
62− maintainers = with maintainers; [ ];
63− license = licenses.gpl2;
64− platforms = platforms.linux;
65− };
66−}
pkgs/os-specific/linux/firmware/fwupdate/do-not-create-sharedstatedir.patchdeleted−10
@@ -1,10 +0,0 @@
1−--- a/linux/Makefile
2−+++ b/linux/Makefile
3−@@ -131,7 +131,6 @@
4− ln -fs $(x) $(patsubst %.so.1.$(VERSION),%.so.1,$(DESTDIR)$(libdir)/$(x)) ;\
5− ln -fs $(x) $(patsubst %.so.1.$(VERSION),%.so,$(DESTDIR)$(libdir)/$(x)) ;\
6− )
7−- $(INSTALL) -d -m 755 $(DESTDIR)$(sharedstatedir)/fwupdate/
8− $(INSTALL) -d -m 755 $(DESTDIR)$(libexecdir)/fwupdate/
9− $(INSTALL) -m 755 cleanup $(DESTDIR)$(libexecdir)/fwupdate/cleanup
10− $(INSTALL) -d -m 755 $(DESTDIR)$(libdatadir)/systemd/system
pkgs/top-level/aliases.nix+1
@@ -149,6 +149,7 @@ mapAliases ({
149149 fuse_exfat = exfat; # 2015-09-11
150150 fuseki = apache-jena-fuseki; # added 2018-04-25
151151 fusesmb = throw "fusesmb is abandoned by upstream"; # added 2019-10-15
152+ fwupdate = throw "fwupdate was merged into fwupd"; # added 2020-05-19
152153 gccApple = throw "gccApple is no longer supported"; # added 2018-04-25
153154 gdb-multitarget = gdb; # added 2017-11-13
154155 gdk_pixbuf = gdk-pixbuf; # added 2019-05-22
pkgs/top-level/all-packages.nix+1−3
@@ -1863,7 +1863,7 @@ in
18631863 gixy = callPackage ../tools/admin/gixy { };
18641864
18651865 glpaper = callPackage ../development/tools/glpaper { };
1866−
1866+
18671867 gllvm = callPackage ../development/tools/gllvm { };
18681868
18691869 glide = callPackage ../development/tools/glide { };
@@ -16523,8 +16523,6 @@ in
1652316523
1652416524 fwupd = callPackage ../os-specific/linux/firmware/fwupd { };
1652516525
16526− fwupdate = callPackage ../os-specific/linux/firmware/fwupdate { };
16527−
1652816526 fwts = callPackage ../os-specific/linux/fwts { };
1652916527
1653016528 libossp_uuid = callPackage ../development/libraries/libossp-uuid { };