git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #80252 from NixOS/staging-next

Staging next

commitc65707bc25b252bc7474cb443f4fda1a93a1b12c authorFrederik Rietdijk <freddyrietdijk@fridh.nl> dateWed 19 Feb 2020, 09:18 (7 years ago) parent7b9d9fe9d88ee0
25 files changed+148−153
pkgs/applications/editors/vim/common.nix+2−2 pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix+2−2 pkgs/development/compilers/go-jsonnet/default.nix+2−2 pkgs/development/compilers/go/1.12.nix+3−3 pkgs/development/compilers/go/1.13.nix+3−3 pkgs/development/libraries/glibc/common.nix+2−2 pkgs/development/libraries/http-parser/default.nix+2−2 pkgs/development/libraries/libarchive/default.nix+2−2 pkgs/development/libraries/libgee/default.nix+2−2 pkgs/development/libraries/libinput/default.nix+2−2 pkgs/development/libraries/libmicrohttpd/default.nix+2−2 pkgs/development/libraries/libuninameslist/default.nix+28 pkgs/development/libraries/openssl/default.nix+1−3 pkgs/development/libraries/qt-5/modules/qttools.nix+1−1 pkgs/development/libraries/science/math/openblas/default.nix+2−2 pkgs/development/libraries/wayland/default.nix+40−17 pkgs/development/libraries/wayland/fix-wayland-cross-compilation.patch+14 pkgs/development/libraries/wayland/protocols.nix+10−3 pkgs/development/tools/build-managers/cmake/default.nix+2−2 pkgs/os-specific/linux/kernel-headers/default.nix+16−21 pkgs/os-specific/linux/kernel-headers/no-dynamic-cc-version-check.patch−32 pkgs/os-specific/linux/kernel-headers/no-relocs.patch+1−7 pkgs/tools/misc/fontforge/default.nix+7−10 pkgs/tools/misc/fontforge/fontforge-20140813-use-system-uthash.patch−31 pkgs/top-level/all-packages.nix+2
pkgs/applications/editors/vim/common.nix+2−2
@@ -1,12 +1,12 @@
11{ lib, fetchFromGitHub }:
22rec {
3− version = "8.2.0013";
3+ version = "8.2.0227";
44
55 src = fetchFromGitHub {
66 owner = "vim";
77 repo = "vim";
88 rev = "v${version}";
9− sha256 = "00sc9zdjdww6f3svwf0nxpx8q2zp1n1r978h7ijapgvn2ysx2z1f";
9+ sha256 = "1yi7l2yd214iv6i8pr52m272mlzps5v3h6xdgr1770xfz4y1yc0h";
1010 };
1111
1212 enableParallelBuilding = true;
pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix+2−2
@@ -5,14 +5,14 @@
55
66stdenv.mkDerivation rec {
77 pname = "git-remote-gcrypt";
8− version = "1.2";
8+ version = "1.3";
99 rev = version;
1010
1111 src = fetchFromGitHub {
1212 inherit rev;
1313 owner = "spwhitton";
1414 repo = "git-remote-gcrypt";
15− sha256 = "0isfg0vlmcphxzj4jm32dycprhym26ina1b28jgc4j57kiqqrdcy";
15+ sha256 = "0n8fzvr6y0pxrbvkywlky2bd8jvi0ayp4n9hwi84l1ldmv4a40dh";
1616 };
1717
1818 outputs = [ "out" "man" ];
pkgs/development/compilers/go-jsonnet/default.nix+2−2
@@ -2,13 +2,13 @@
22
33buildGoModule rec {
44 pname = "go-jsonnet";
5− version = "0.14.0";
5+ version = "0.15.0";
66
77 src = fetchFromGitHub {
88 owner = "google";
99 repo = "go-jsonnet";
1010 rev = "v${version}";
11− sha256 = "1q0mpydh8h0zrml605q9r259y8584kbwcr9g4sqcb1n13b4d1sgp";
11+ sha256 = "0l6cwky2xl7m8nnc9abp76bhkdcf2ldbbv3r8p30xv2yr5wd1j8i";
1212 };
1313
1414 modSha256 = "1b6hz5a66hhlzpcv1badxr1b4nmk4lw0507d5jks7lqzvvwd0sxq";
pkgs/development/compilers/go/1.12.nix+3−3
@@ -30,11 +30,11 @@ in
3030
3131stdenv.mkDerivation rec {
3232 pname = "go";
33− version = "1.12.16";
33+ version = "1.12.17";
3434
3535 src = fetchurl {
3636 url = "https://dl.google.com/go/go${version}.src.tar.gz";
37− sha256 = "1y0x10fsvgpc1x24b9q9y6kv9b0kwf7879am3p0gym2abgc5wvnf";
37+ sha256 = "09cbl90maxry713wd18jdqrms3ivbvcm472csnxc78rsqhc851yy";
3838 };
3939
4040 # perl is used for testing go vet
@@ -242,7 +242,7 @@ stdenv.mkDerivation rec {
242242 homepage = http://golang.org/;
243243 description = "The Go Programming language";
244244 license = licenses.bsd3;
245− maintainers = with maintainers; [ cstrahan orivej velovix mic92 rvolosatovs ];
245+ maintainers = with maintainers; [ cstrahan orivej velovix mic92 rvolosatovs Frostman ];
246246 platforms = platforms.linux ++ platforms.darwin;
247247 };
248248}
pkgs/development/compilers/go/1.13.nix+3−3
@@ -30,11 +30,11 @@ in
3030
3131stdenv.mkDerivation rec {
3232 pname = "go";
33− version = "1.13.7";
33+ version = "1.13.8";
3434
3535 src = fetchurl {
3636 url = "https://dl.google.com/go/go${version}.src.tar.gz";
37− sha256 = "1x21kfpzfkvmqd42pan6nl862m7jjl4niqxxpcgm46awbz645bg4";
37+ sha256 = "0d7cxffk72568h46srzswrxd0bsdip7amgkf499wzn6l6d3g0fxi";
3838 };
3939
4040 # perl is used for testing go vet
@@ -239,7 +239,7 @@ stdenv.mkDerivation rec {
239239 homepage = http://golang.org/;
240240 description = "The Go Programming language";
241241 license = licenses.bsd3;
242− maintainers = with maintainers; [ cstrahan orivej velovix mic92 rvolosatovs kalbasit ];
242+ maintainers = with maintainers; [ cstrahan orivej velovix mic92 rvolosatovs kalbasit Frostman ];
243243 platforms = platforms.linux ++ platforms.darwin;
244244 };
245245}
pkgs/development/libraries/glibc/common.nix+2−2
@@ -24,7 +24,7 @@
2424, gd ? null, libpng ? null
2525, libidn2
2626, bison
27−, python3
27+, python3Minimal
2828}:
2929
3030{ name
@@ -155,7 +155,7 @@ stdenv.mkDerivation ({
155155 outputs = [ "out" "bin" "dev" "static" ];
156156
157157 depsBuildBuild = [ buildPackages.stdenv.cc ];
158− nativeBuildInputs = [ bison python3 ];
158+ nativeBuildInputs = [ bison python3Minimal ];
159159 buildInputs = [ linuxHeaders ] ++ lib.optionals withGd [ gd libpng ];
160160
161161 # Needed to install share/zoneinfo/zone.tab. Set to impure /bin/sh to
pkgs/development/libraries/http-parser/default.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv, fetchFromGitHub }:
22
33let
4− version = "2.9.2";
4+ version = "2.9.3";
55in stdenv.mkDerivation {
66 pname = "http-parser";
77 inherit version;
@@ -10,7 +10,7 @@ in stdenv.mkDerivation {
1010 owner = "nodejs";
1111 repo = "http-parser";
1212 rev = "v${version}";
13− sha256 = "1qs6x3n2nrcj1wiik5pg5i16inykf7rcfdfdy7rwyzf40pvdl3c2";
13+ sha256 = "189zi61vczqgmqjd2myjcjbbi5icrk7ccs0kn6nj8hxqiv5j3811";
1414 };
1515
1616 NIX_CFLAGS_COMPILE = "-Wno-error";
pkgs/development/libraries/libarchive/default.nix+2−2
@@ -10,13 +10,13 @@ assert xarSupport -> libxml2 != null;
1010
1111stdenv.mkDerivation rec {
1212 pname = "libarchive";
13− version = "3.4.1";
13+ version = "3.4.2";
1414
1515 src = fetchFromGitHub {
1616 owner = "libarchive";
1717 repo = "libarchive";
1818 rev = "v${version}";
19− sha256 = "0g0kzfl01zy1aabr5jcrh8480mb16vh3pacdhg6mm2bdv2f5w8z1";
19+ sha256 = "0mjm77wbqs8sbn9j44lj39nwbg6anmgz6pkyfxsww54a4rs0p3iz";
2020 };
2121
2222 outputs = [ "out" "lib" "dev" ];
pkgs/development/libraries/libgee/default.nix+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 pname = "libgee";
5− version = "0.20.2";
5+ version = "0.20.3";
66
77 outputs = [ "out" "dev" ];
88
99 src = fetchurl {
1010 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
11− sha256 = "0g1mhl7nidg82v4cikkk8dakzc18hg7wv0dsf2pbyijzfm5mq0wy";
11+ sha256 = "1pm525wm11dhwz24m8bpcln9547lmrigl6cxf3qsbg4cr3pyvdfh";
1212 };
1313
1414 doCheck = true;
pkgs/development/libraries/libinput/default.nix+2−2
@@ -27,11 +27,11 @@ in
2727with stdenv.lib;
2828stdenv.mkDerivation rec {
2929 pname = "libinput";
30− version = "1.15.0";
30+ version = "1.15.1";
3131
3232 src = fetchurl {
3333 url = "https://www.freedesktop.org/software/libinput/${pname}-${version}.tar.xz";
34− sha256 = "1qa3b2fd4pv8ysf0mgwnyhqv9v48zgy3sy0q3a3vxcmwcvpizgxz";
34+ sha256 = "05hcjlsrc38yn1g1n7kia9m93nc703hx66gf977kw5vgbi4mfbvb";
3535 };
3636
3737 outputs = [ "bin" "out" "dev" ];
pkgs/development/libraries/libmicrohttpd/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "libmicrohttpd";
5− version = "0.9.69";
5+ version = "0.9.70";
66
77 src = fetchurl {
88 url = "mirror://gnu/libmicrohttpd/${pname}-${version}.tar.gz";
9− sha256 = "0zp34zgcahym5kp2r83gfb5wnr8yf643a26k6zk96x3qica6p6zv";
9+ sha256 = "01vkjy89b1ylmh22dy5yza2r414nfwcfixxh3v29nvzrjv9s7l4h";
1010 };
1111
1212 outputs = [ "out" "dev" "devdoc" "info" ];
pkgs/development/libraries/libuninameslist/default.nixnew file+28
@@ -0,0 +1,28 @@
1+{ stdenv
2+, fetchFromGitHub
3+, autoreconfHook
4+}:
5+
6+stdenv.mkDerivation rec {
7+ pname = "libuninameslist";
8+ version = "20190701";
9+
10+ src = fetchFromGitHub {
11+ owner = "fontforge";
12+ repo = pname;
13+ rev = version;
14+ sha256 = "sha256:034c8clnskvqbwyiq7si4dad1kbngi3jmnrj064i39msqixmpdzb";
15+ };
16+
17+ nativeBuildInputs = [
18+ autoreconfHook
19+ ];
20+
21+ meta = with stdenv.lib; {
22+ homepage = https://github.com/fontforge/libuninameslist/;
23+ description = "A Library of Unicode names and annotation data";
24+ license = licenses.bsd3;
25+ maintainers = with maintainers; [ erictapen ];
26+ platforms = platforms.all;
27+ };
28+}
pkgs/development/libraries/openssl/default.nix+1−3
@@ -36,9 +36,7 @@ let
3636
3737 outputs = [ "bin" "dev" "out" "man" ] ++ optional withDocs "doc";
3838 setOutputFlags = false;
39− separateDebugInfo = !(stdenv.hostPlatform.useLLVM or false)
40− && stdenv.hostPlatform == stdenv.buildPlatform # unable to fix infinite recursion on stdenv.cc
41− && stdenv.cc.isGNU;
39+ separateDebugInfo = !(stdenv.hostPlatform.useLLVM or false) && stdenv.cc.isGNU;
4240
4341 nativeBuildInputs = [ perl ];
4442 buildInputs = stdenv.lib.optional withCryptodev cryptodev;
pkgs/development/libraries/qt-5/modules/qttools.nix+1−1
@@ -4,7 +4,7 @@ with lib;
44
55qtModule {
66 name = "qttools";
7− qtInputs = [ qtbase ];
7+ qtInputs = [ qtbase qtdeclarative ];
88 outputs = [ "out" "dev" "bin" ];
99
1010 # fixQtBuiltinPaths overwrites a builtin path we should keep
pkgs/development/libraries/science/math/openblas/default.nix+2−2
@@ -88,12 +88,12 @@ let
8888in
8989stdenv.mkDerivation rec {
9090 pname = "openblas";
91− version = "0.3.7";
91+ version = "0.3.8";
9292 src = fetchFromGitHub {
9393 owner = "xianyi";
9494 repo = "OpenBLAS";
9595 rev = "v${version}";
96− sha256 = "0vs1dlzyla02wajpkfzz8x3lfpgmwiaaizq2nmdjbkzkb7jnxhhz";
96+ sha256 = "0s017qqi4n6jzrxl9cyx625wj26smnyn5g8s699s7h8v1srlrw6p";
9797 };
9898
9999 inherit blas64;
pkgs/development/libraries/wayland/default.nix+40−17
@@ -1,43 +1,66 @@
1−{ lib, stdenv, fetchurl, pkgconfig
1+{ lib, stdenv, fetchurl, meson, pkgconfig, ninja
22, libffi, libxml2, wayland
33, expat ? null # Build wayland-scanner (currently cannot be disabled as of 1.7.0)
4+, withDocumentation ? false, graphviz-nox, doxygen, libxslt, xmlto, python3
5+, docbook_xsl, docbook_xml_dtd_45, docbook_xml_dtd_42
46}:
57
68# Require the optional to be enabled until upstream fixes or removes the configure flag
79assert expat != null;
810
9−stdenv.mkDerivation rec {
11+let
12+ isCross = stdenv.buildPlatform != stdenv.hostPlatform;
13+in stdenv.mkDerivation rec {
1014 pname = "wayland";
11− version = "1.17.0";
15+ version = "1.18.0";
1216
1317 src = fetchurl {
1418 url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz";
15− sha256 = "194ibzwpdcn6fvk4xngr4bf5axpciwg2bj82fdvz88kfmjw13akj";
19+ sha256 = "0k995rn96xkplrapz5k648j651wc43kq817xk1x8280h16gsfxa6";
1620 };
1721
1822 separateDebugInfo = true;
1923
20− configureFlags = [
21− "--disable-documentation"
22− ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
23− "--with-host-scanner"
24− ];
24+ mesonFlags = [ "-Ddocumentation=${lib.boolToString withDocumentation}" ];
25+
26+ patches = lib.optional isCross ./fix-wayland-cross-compilation.patch;
27+
28+ postPatch = lib.optionalString withDocumentation ''
29+ patchShebangs doc/doxygen/gen-doxygen.py
30+ '' + lib.optionalString isCross ''
31+ substituteInPlace egl/meson.build --replace \
32+ "find_program('nm').path()" \
33+ "find_program('${stdenv.cc.targetPrefix}nm').path()"
34+ '';
2535
2636 nativeBuildInputs = [
27− pkgconfig
28− ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
29− # for wayland-scanner during build
30− wayland
37+ meson pkgconfig ninja
38+ ] ++ lib.optionals isCross [
39+ wayland # For wayland-scanner during the build
40+ ] ++ lib.optionals withDocumentation [
41+ (graphviz-nox.override { pango = null; }) # To avoid an infinite recursion
42+ doxygen libxslt xmlto python3 docbook_xml_dtd_45
3143 ];
3244
33− buildInputs = [ libffi /* docbook_xsl doxygen graphviz libxslt xmlto */ expat libxml2 ];
45+ buildInputs = [ libffi expat libxml2
46+ ] ++ lib.optionals withDocumentation [
47+ docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42
48+ ];
3449
3550 meta = {
36− description = "Reference implementation of the wayland protocol";
51+ description = "Core Wayland window system code and protocol";
52+ longDescription = ''
53+ Wayland is a project to define a protocol for a compositor to talk to its
54+ clients as well as a library implementation of the protocol.
55+ The wayland protocol is essentially only about input handling and buffer
56+ management, but also handles drag and drop, selections, window management
57+ and other interactions that must go through the compositor (but not
58+ rendering).
59+ '';
3760 homepage = https://wayland.freedesktop.org/;
38− license = lib.licenses.mit;
61+ license = lib.licenses.mit; # Expat version
3962 platforms = lib.platforms.linux;
40− maintainers = with lib.maintainers; [ codyopel ];
63+ maintainers = with lib.maintainers; [ primeos codyopel ];
4164 };
4265
4366 passthru.version = version;
pkgs/development/libraries/wayland/fix-wayland-cross-compilation.patchnew file+14
@@ -0,0 +1,14 @@
1+diff --git a/src/meson.build b/src/meson.build
2+index 3e8c9bf..75241cb 100644
3+--- a/src/meson.build
4++++ b/src/meson.build
5+@@ -55,8 +55,7 @@ pkgconfig.generate(
6+ )
7+
8+ if meson.is_cross_build()
9+- scanner_dep = dependency('wayland-scanner', native: true, version: '>=1.14.0')
10+- wayland_scanner_for_build = find_program(scanner_dep.get_pkgconfig_variable('wayland_scanner'))
11++ wayland_scanner_for_build = find_program('wayland-scanner', native: true, version: '>=1.14.0')
12+ else
13+ wayland_scanner_for_build = wayland_scanner
14+ endif
pkgs/development/libraries/wayland/protocols.nix+10−3
@@ -17,10 +17,17 @@ stdenv.mkDerivation rec {
1717
1818 meta = {
1919 description = "Wayland protocol extensions";
20− homepage = https://wayland.freedesktop.org/;
21− license = lib.licenses.mit;
20+ longDescription = ''
21+ wayland-protocols contains Wayland protocols that add functionality not
22+ available in the Wayland core protocol. Such protocols either add
23+ completely new functionality, or extend the functionality of some other
24+ protocol either in Wayland core, or some other protocol in
25+ wayland-protocols.
26+ '';
27+ homepage = https://gitlab.freedesktop.org/wayland/wayland-protocols;
28+ license = lib.licenses.mit; # Expat version
2229 platforms = lib.platforms.linux;
23− maintainers = with lib.maintainers; [ ];
30+ maintainers = with lib.maintainers; [ primeos ];
2431 };
2532
2633 passthru.version = version;
pkgs/development/tools/build-managers/cmake/default.nix+2−2
@@ -19,12 +19,12 @@ stdenv.mkDerivation rec {
1919 + lib.optionalString useNcurses "-cursesUI"
2020 + lib.optionalString withQt5 "-qt5UI"
2121 + lib.optionalString useQt4 "-qt4UI";
22− version = "3.16.3";
22+ version = "3.16.4";
2323
2424 src = fetchurl {
2525 url = "${meta.homepage}files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz";
2626 # compare with https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}-SHA-256.txt
27− sha256 = "0s06wrp0jnw2l4yq94skj53hwnz7lqrmhh96sq7w7njkkggickz5";
27+ sha256 = "0b5c77lqzfk5l7mnnih5c78i36d3skbkw20jjnph79lx9l8qrk4v";
2828 };
2929
3030 patches = [
pkgs/os-specific/linux/kernel-headers/default.nix+16−21
@@ -1,7 +1,4 @@
1−{ stdenvNoCC, lib, buildPackages
2−, fetchurl, perl
3−, elf-header
4−}:
1+{ stdenvNoCC, lib, buildPackages, fetchurl, perl, elf-header }:
52
63let
74 makeLinuxHeaders = { src, version, patches ? [] }: stdenvNoCC.mkDerivation {
@@ -39,29 +36,28 @@ let
3936 # Skip clean on darwin, case-sensitivity issues.
4037 buildPhase = lib.optionalString (!stdenvNoCC.buildPlatform.isDarwin) ''
4138 make mrproper $makeFlags
42− ''
43− # For some reason, doing `make install_headers` twice, first without
44− # INSTALL_HDR_PATH=$out then with, is neccessary to get this to work
45− # for darwin cross. @Ericson2314 has no idea why.
46− + ''
47− make headers_install $makeFlags
39+ '' + ''
40+ make headers $makeFlags
4841 '';
4942
5043 checkPhase = ''
5144 make headers_check $makeFlags
5245 '';
5346
47+ # The following command requires rsync:
48+ # make headers_install INSTALL_HDR_PATH=$out $makeFlags
49+ # but rsync depends on popt which does not compile on aarch64 without
50+ # updateAutotoolsGnuConfigScriptsHook which is not enabled in stage2,
51+ # so we replicate it with cp. This also reduces bootstrap closure size.
5452 installPhase = ''
55− make headers_install INSTALL_HDR_PATH=$out $makeFlags
53+ mkdir -p $out
54+ cp -r usr/include $out
55+ find $out -type f ! -name '*.h' -delete
5656 ''
5757 # Some builds (e.g. KVM) want a kernel.release.
58− + '' mkdir -p $out/include/config
59− echo "${version}-default" > $out/include/config/kernel.release
60− ''
61− # These oddly named file records the `SHELL` passed, which causes bootstrap
62− # tools run-time dependency.
6358 + ''
64− find "$out" -name '..install.cmd' -print0 | xargs -0 rm
59+ mkdir -p $out/include/config
60+ echo "${version}-default" > $out/include/config/kernel.release
6561 '';
6662
6763 meta = with lib; {
@@ -73,16 +69,15 @@ let
7369in {
7470 inherit makeLinuxHeaders;
7571
76− linuxHeaders = let version = "4.19.16"; in
72+ linuxHeaders = let version = "5.5"; in
7773 makeLinuxHeaders {
7874 inherit version;
7975 src = fetchurl {
80− url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
81− sha256 = "1pqvn6dsh0xhdpawz4ag27vkw1abvb6sn3869i4fbrz33ww8i86q";
76+ url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
77+ sha256 = "0c131fi6s7vgvka1c0597vnvcmwn1pp968rci5kq64iwj3pd9yx6";
8278 };
8379 patches = [
8480 ./no-relocs.patch # for building x86 kernel headers on non-ELF platforms
85− ./no-dynamic-cc-version-check.patch # so we can use `stdenvNoCC`, see `makeFlags` above
8681 ];
8782 };
8883}
pkgs/os-specific/linux/kernel-headers/no-dynamic-cc-version-check.patchdeleted−32
@@ -1,32 +0,0 @@
1−diff --git a/Makefile b/Makefile
2−index 863f58503bee..b778d5023208 100644
3−--- a/Makefile
4−+++ b/Makefile
5−@@ -501,11 +501,9 @@ KBUILD_CFLAGS += $(call cc-option,-fno-PIE)
6− KBUILD_AFLAGS += $(call cc-option,-fno-PIE)
7−
8− # check for 'asm goto'
9−-ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC) $(KBUILD_CFLAGS)), y)
10− CC_HAVE_ASM_GOTO := 1
11− KBUILD_CFLAGS += -DCC_HAVE_ASM_GOTO
12− KBUILD_AFLAGS += -DCC_HAVE_ASM_GOTO
13−-endif
14−
15− # The expansion should be delayed until arch/$(SRCARCH)/Makefile is included.
16− # Some architectures define CROSS_COMPILE in arch/$(SRCARCH)/Makefile.
17−diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include
18−index 065324a8046f..d09c67194549 100644
19−--- a/scripts/Kbuild.include
20−+++ b/scripts/Kbuild.include
21−@@ -216,11 +216,8 @@ cc-disable-warning = $(call try-run-cached,\
22− cc-name = $(call shell-cached,$(CC) -v 2>&1 | grep -q "clang version" && echo clang || echo gcc)
23−
24− # cc-version
25−-cc-version = $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-version.sh $(CC))
26−
27− # cc-fullversion
28−-cc-fullversion = $(shell $(CONFIG_SHELL) \
29−- $(srctree)/scripts/gcc-version.sh -p $(CC))
30−
31− # cc-ifversion
32− # Usage: EXTRA_CFLAGS += $(call cc-ifversion, -lt, 0402, -O1)
pkgs/os-specific/linux/kernel-headers/no-relocs.patch+1−7
@@ -1,13 +1,7 @@
1−diff --git a/arch/x86/Makefile b/arch/x86/Makefile
2−index fad55160dcb9..a48c8331cbb2 100644
31--- a/arch/x86/Makefile
42+++ b/arch/x86/Makefile
5−@@ -239,7 +239,7 @@ ifdef CONFIG_RETPOLINE
6− endif
7−
3+@@ -231,3 +231,3 @@ endif
84 archscripts: scripts_basic
95- $(Q)$(MAKE) $(build)=arch/x86/tools relocs
106+ $(Q)$(MAKE) $(build)=arch/x86/tools
117
12− ###
13− # Syscall table generation
pkgs/tools/misc/fontforge/default.nix+7−10
@@ -1,7 +1,7 @@
11{ stdenv, fetchurl, lib
2−, autoconf, automake, gnum4, libtool, perl, gnulib, uthash, pkgconfig, gettext
2+, autoconf, automake, gnum4, libtool, perl, uthash, pkgconfig, gettext
33, python, freetype, zlib, glib, libungif, libpng, libjpeg, libtiff, libxml2, cairo, pango
4−, readline, woff2, zeromq
4+, readline, woff2, zeromq, libuninameslist
55, withSpiro ? false, libspiro
66, withGTK ? false, gtk2
77, withPython ? true
@@ -11,15 +11,13 @@
1111
1212stdenv.mkDerivation rec {
1313 pname = "fontforge";
14− version = "20190413";
14+ version = "20190801";
1515
1616 src = fetchurl {
1717 url = "https://github.com/${pname}/${pname}/releases/download/${version}/${pname}-${version}.tar.gz";
18− sha256 = "05v640mnk4fy4jzmxb6c4n4qm800x7hy4sl5gcdgzmm3md2s0qk7";
18+ sha256 = "0lh8yx01asbzxm6car5cfi64njh5p4lxc7iv8dldr5rwg357a86r";
1919 };
2020
21− patches = [ ./fontforge-20140813-use-system-uthash.patch ];
22−
2321 # use $SOURCE_DATE_EPOCH instead of non-deterministic timestamps
2422 postPatch = ''
2523 find . -type f -name '*.c' -exec sed -r -i 's#\btime\(&(.+)\)#if (getenv("SOURCE_DATE_EPOCH")) \1=atol(getenv("SOURCE_DATE_EPOCH")); else &#g' {} \;
@@ -34,7 +32,7 @@ stdenv.mkDerivation rec {
3432
3533 nativeBuildInputs = [ pkgconfig autoconf automake gnum4 libtool perl gettext ];
3634 buildInputs = [
37− readline uthash woff2 zeromq
35+ readline uthash woff2 zeromq libuninameslist
3836 python freetype zlib glib libungif libpng libjpeg libtiff libxml2
3937 ]
4038 ++ lib.optionals withSpiro [libspiro]
@@ -53,9 +51,7 @@ stdenv.mkDerivation rec {
5351 export SOURCE_DATE_EPOCH=$(date -d ${version} +%s)
5452
5553 export GIT="$(type -P true)"
56− cp -r "${gnulib}" ./gnulib
57− chmod +w -R ./gnulib
58− ./bootstrap --skip-git --gnulib-srcdir=./gnulib --force
54+ ./bootstrap --skip-git --force
5955 '';
6056
6157 doCheck = false; # tries to wget some fonts
@@ -74,5 +70,6 @@ stdenv.mkDerivation rec {
7470 homepage = http://fontforge.github.io;
7571 platforms = stdenv.lib.platforms.all;
7672 license = stdenv.lib.licenses.bsd3;
73+ maintainers = [ stdenv.lib.maintainers.erictapen ];
7774 };
7875}
pkgs/tools/misc/fontforge/fontforge-20140813-use-system-uthash.patchdeleted−31
@@ -1,31 +0,0 @@
1−--- a/Makefile.am.old 2014-08-12 10:07:32.000000000 +0530
2−+++ b/Makefile.am 2014-09-08 16:23:56.046996941 +0530
3−@@ -43,7 +43,6 @@
4− AM_CPPFLAGS =
5− AM_LDFLAGS =
6−
7−-BUILT_SOURCES = uthash/src
8− EXTRA_DIST =
9− CLEANFILES =
10− MOSTLYCLEANFILES =
11−@@ -113,8 +112,7 @@
12− Packaging/FontForge-doc.spec \
13− Packaging/FontForge.spec \
14− Packaging/FontForge.static.spec \
15− README \
16−- uthash/src \
17− $(NULL)
18−
19− #--------------------------------------------------------------------------
20−@@ -129,11 +127,6 @@
21−
22−
23− #--------------------------------------------------------------------------
24−-uthash/src:
25−- if [ ! -e uthash/src ]; then \
26−- if [ -e uthash ] ; then rm -r uthash ; fi ; \
27−- git clone https://github.com/troydhanson/uthash ; \
28−- fi ;
29−
30− # We import a selection of targets from Frank's standard packaging Makefile.
31−
pkgs/top-level/all-packages.nix+2
@@ -13109,6 +13109,8 @@ in
1310913109
1311013110 libunibreak = callPackage ../development/libraries/libunibreak { };
1311113111
13112+ libuninameslist = callPackage ../development/libraries/libuninameslist { };
13113+
1311213114 libunique = callPackage ../development/libraries/libunique { };
1311313115 libunique3 = callPackage ../development/libraries/libunique/3.x.nix { };
1311413116