From d7687d14995a2c13df007cfaef4a823f422090c6 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Thu, 3 Jun 2021 01:19:48 +0800 Subject: [PATCH 001/113] usbmuxd: 1.1.1 -> unstable-2021-05-08 --- pkgs/tools/misc/usbmuxd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/usbmuxd/default.nix b/pkgs/tools/misc/usbmuxd/default.nix index d001db4d3cb..96b82a8a20a 100644 --- a/pkgs/tools/misc/usbmuxd/default.nix +++ b/pkgs/tools/misc/usbmuxd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "usbmuxd"; - version = "1.1.1"; + version = "unstable-2021-05-08"; src = fetchFromGitHub { owner = "libimobiledevice"; repo = pname; - rev = version; - sha256 = "0a2xgrb4b3ndam448z74wh1267nmrz1wcbpx4xz86pwbdc93snab"; + rev = "5e484e18f1383b5a0bd6c353ab1d668b03e4ffab"; + sha256 = "sha256-hhbfRmLEhVVuJNnw65PakPnvjSCrN3oSMK6D7Zwnw60="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; From 752be7c65c3f9d6d1eb7906113754b2659d7d2c3 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Thu, 3 Jun 2021 02:25:29 +0800 Subject: [PATCH 002/113] libusbmuxd: 2.0.2 -> unstable-2021-02-06 --- pkgs/development/libraries/libusbmuxd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libusbmuxd/default.nix b/pkgs/development/libraries/libusbmuxd/default.nix index 66198a6ec33..7bba6e8b404 100644 --- a/pkgs/development/libraries/libusbmuxd/default.nix +++ b/pkgs/development/libraries/libusbmuxd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libusbmuxd"; - version = "2.0.2"; + version = "unstable-2021-02-06"; src = fetchFromGitHub { owner = "libimobiledevice"; repo = pname; - rev = version; - sha256 = "139pzsnixkck6ly1q6p0diqr0hgd0mx0pr4xx1jamm3f3656kpf9"; + rev = "3eb50a07bad4c2222e76df93b23a0161922150d1"; + sha256 = "sha256-pBPBgE6s8JYKJYEV8CcumNki+6jD5r7HzQ0nZ8yQLdM="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; From e7dfc3b4c8b0d051a3c01f9e53cf035259058830 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 6 Jun 2021 12:24:09 +0200 Subject: [PATCH 003/113] python3Packages.pyads: 3.2.2 -> 3.3.7 --- .../python-modules/pyads/default.nix | 26 ++++++++++++++----- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pyads/default.nix b/pkgs/development/python-modules/pyads/default.nix index 37d3b31a365..5b710b0da15 100644 --- a/pkgs/development/python-modules/pyads/default.nix +++ b/pkgs/development/python-modules/pyads/default.nix @@ -1,25 +1,37 @@ -{ adslib, buildPythonPackage, fetchFromGitHub, lib, pytestCheckHook, pytest -, pytestcov, pythonOlder }: +{ lib +, adslib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { pname = "pyads"; - version = "3.2.2"; - + version = "3.3.7"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "stlehmann"; repo = pname; rev = version; - sha256 = "1jd727pw0z73y4xhrykqkfcz1acrpy3rks58lr1y4yilfv11p6jb"; + sha256 = "sha256-h3c6z+dmrOc1Q7E8YVJZJD2FsxoxqQX5J92SEweIpto="; }; - buildInputs = [ adslib ]; + buildInputs = [ + adslib + ]; + patchPhase = '' substituteInPlace pyads/pyads_ex.py \ --replace "ctypes.CDLL(adslib)" "ctypes.CDLL(\"${adslib}/lib/adslib.so\")" ''; - checkInputs = [ pytestCheckHook pytest pytestcov ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "pyads" ]; meta = with lib; { description = "Python wrapper for TwinCAT ADS library"; From c878a8a47fdc73302a8539c892446bae8ab05fb4 Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Tue, 8 Jun 2021 22:57:13 +0300 Subject: [PATCH 004/113] teams: add an argument for enabling rect-overlay MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The rect-overlay doesn’t work on non-composited window managers such as i3 but it’s not a problem for others. Make the choice available via an argument to the derivation. The setting defaults to `false` so that it works for a broader set of users. See also: #99279. --- .../networking/instant-messengers/teams/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/teams/default.nix b/pkgs/applications/networking/instant-messengers/teams/default.nix index cd7efb7ad89..6941322ad88 100644 --- a/pkgs/applications/networking/instant-messengers/teams/default.nix +++ b/pkgs/applications/networking/instant-messengers/teams/default.nix @@ -12,7 +12,8 @@ , coreutils , gawk , xdg-utils -, systemd }: +, systemd +, enableRectOverlay ? false }: stdenv.mkDerivation rec { pname = "teams"; @@ -57,9 +58,11 @@ stdenv.mkDerivation rec { ln -s $out/opt/teams/teams $out/bin/ + ${lib.optionalString (!enableRectOverlay) '' # Work-around screen sharing bug # https://docs.microsoft.com/en-us/answers/questions/42095/sharing-screen-not-working-anymore-bug.html rm $out/opt/teams/resources/app.asar.unpacked/node_modules/slimcore/bin/rect-overlay + ''} runHook postInstall ''; From 8826285592e2c2f7b0c62277e30e3063cfbef45a Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Tue, 8 Jun 2021 23:59:20 +0200 Subject: [PATCH 005/113] fancy-motd: unstable-2021-05-15 -> unstable-2021-05-20 --- pkgs/tools/system/fancy-motd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/fancy-motd/default.nix b/pkgs/tools/system/fancy-motd/default.nix index 982dbcd2f5b..ebfab8aac6f 100644 --- a/pkgs/tools/system/fancy-motd/default.nix +++ b/pkgs/tools/system/fancy-motd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fancy-motd"; - version = "unstable-2021-05-15"; + version = "unstable-2021-05-20"; src = fetchFromGitHub { owner = "bcyran"; repo = pname; - rev = "b25c1e7d76927d7f947a048d844dad4400de3598"; - sha256 = "05jazmijk3im1wl4nprkwmrq6bxhb3ah8syyqym109blajy72841"; + rev = "57978bdfa31179783c51c6f33e47063ec8641205"; + sha256 = "0bkgd86721jw81jvliw3rv4p52qpjynsxb6hn81divd068l56prg"; }; buildInputs = [ bc curl figlet fortune gawk iproute2 ]; From a87aa4a2769b8675d9750d7e3b61ca6a515b1656 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 9 Jun 2021 10:35:53 +0200 Subject: [PATCH 006/113] python3Packages.aiotractive: init at 0.5.1 --- .../python-modules/aiotractive/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/aiotractive/default.nix diff --git a/pkgs/development/python-modules/aiotractive/default.nix b/pkgs/development/python-modules/aiotractive/default.nix new file mode 100644 index 00000000000..78d9ef43501 --- /dev/null +++ b/pkgs/development/python-modules/aiotractive/default.nix @@ -0,0 +1,37 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, yarl +}: + +buildPythonPackage rec { + pname = "aiotractive"; + version = "0.5.1"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "zhulik"; + repo = pname; + rev = "v${version}"; + sha256 = "09zbca84dn1sprwqpfanmxxnmaknbzjz98xa87agpgy8xb3wpw7j"; + }; + + propagatedBuildInputs = [ + aiohttp + yarl + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "aiotractive" ]; + + meta = with lib; { + description = "Python client for the Tractive REST API"; + homepage = "https://github.com/zhulik/aiotractive"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c6d4128719f..a22762ab6a6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -353,6 +353,8 @@ in { aiosyncthing = callPackage ../development/python-modules/aiosyncthing { }; + aiotractive = callPackage ../development/python-modules/aiotractive { }; + aiounifi = callPackage ../development/python-modules/aiounifi { }; aiounittest = callPackage ../development/python-modules/aiounittest { }; From a0c4e9863bdb907e8487ba22aa70040fb0aa59d7 Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Wed, 9 Jun 2021 15:13:56 +0200 Subject: [PATCH 007/113] generate-exprs-from-tarballs.pl: clearly broadcast auto-generation --- pkgs/servers/x11/xorg/default.nix | 6475 +++++++++-------- .../x11/xorg/generate-expr-from-tarballs.pl | 1 + 2 files changed, 3570 insertions(+), 2906 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 441d8834e08..bd3e7df12b8 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -5,2911 +5,3574 @@ lib.makeScope newScope (self: with self; { inherit pixman; - appres = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, libXt }: stdenv.mkDerivation { - name = "appres-1.0.5"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/appres-1.0.5.tar.bz2"; - sha256 = "0a2r4sxky3k7b3kdb5pbv709q9b5zi3gxjz336wl66f828vqkbgz"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 xorgproto libXt ]; - meta.platforms = lib.platforms.unix; - }) {}; - - bdftopcf = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { - name = "bdftopcf-1.1"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/bdftopcf-1.1.tar.bz2"; - sha256 = "18hiscgljrz10zjcws25bis32nyrg3hzgmiq6scrh7izqmgz0kab"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ]; - meta.platforms = lib.platforms.unix; - }) {}; - - bitmap = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, xbitmaps, libXmu, xorgproto, libXt }: stdenv.mkDerivation { - name = "bitmap-1.0.9"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/bitmap-1.0.9.tar.gz"; - sha256 = "0kzbv5wh02798l77y9y8d8sjkmzm9cvsn3rjh8a86v5waj50apsb"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 libXaw xbitmaps libXmu xorgproto libXt ]; - meta.platforms = lib.platforms.unix; - }) {}; - - editres = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt }: stdenv.mkDerivation { - name = "editres-1.0.7"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/editres-1.0.7.tar.bz2"; - sha256 = "04awfwmy3f9f0bchidc4ssbgrbicn5gzasg3jydpfnp5513d76h8"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 libXaw libXmu xorgproto libXt ]; - meta.platforms = lib.platforms.unix; - }) {}; - - encodings = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { - name = "encodings-1.0.5"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/font/encodings-1.0.5.tar.bz2"; - sha256 = "0caafx0yqqnqyvbalxhh3mb0r9v36xmcy5zjhygb2i508dhy35mx"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ]; - meta.platforms = lib.platforms.unix; - }) {}; - - fontadobe100dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { - name = "font-adobe-100dpi-1.0.3"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/font/font-adobe-100dpi-1.0.3.tar.bz2"; - sha256 = "0m60f5bd0caambrk8ksknb5dks7wzsg7g7xaf0j21jxmx8rq9h5j"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; - buildInputs = [ ]; - configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - meta.platforms = lib.platforms.unix; - }) {}; - - fontadobe75dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { - name = "font-adobe-75dpi-1.0.3"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/font/font-adobe-75dpi-1.0.3.tar.bz2"; - sha256 = "02advcv9lyxpvrjv8bjh1b797lzg6jvhipclz49z8r8y98g4l0n6"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; - buildInputs = [ ]; - configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - meta.platforms = lib.platforms.unix; - }) {}; - - fontadobeutopia100dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { - name = "font-adobe-utopia-100dpi-1.0.4"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/font/font-adobe-utopia-100dpi-1.0.4.tar.bz2"; - sha256 = "19dd9znam1ah72jmdh7i6ny2ss2r6m21z9v0l43xvikw48zmwvyi"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; - buildInputs = [ ]; - configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - meta.platforms = lib.platforms.unix; - }) {}; - - fontadobeutopia75dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { - name = "font-adobe-utopia-75dpi-1.0.4"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/font/font-adobe-utopia-75dpi-1.0.4.tar.bz2"; - sha256 = "152wigpph5wvl4k9m3l4mchxxisgsnzlx033mn5iqrpkc6f72cl7"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; - buildInputs = [ ]; - configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - meta.platforms = lib.platforms.unix; - }) {}; - - fontadobeutopiatype1 = callPackage ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { - name = "font-adobe-utopia-type1-1.0.4"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/font/font-adobe-utopia-type1-1.0.4.tar.bz2"; - sha256 = "0xw0pdnzj5jljsbbhakc6q9ha2qnca1jr81zk7w70yl9bw83b54p"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config mkfontscale ]; - buildInputs = [ ]; - configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - meta.platforms = lib.platforms.unix; - }) {}; - - fontalias = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { - name = "font-alias-1.0.3"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/font/font-alias-1.0.3.tar.bz2"; - sha256 = "16ic8wfwwr3jicaml7b5a0sk6plcgc1kg84w02881yhwmqm3nicb"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ]; - meta.platforms = lib.platforms.unix; - }) {}; - - fontarabicmisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { - name = "font-arabic-misc-1.0.3"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/font/font-arabic-misc-1.0.3.tar.bz2"; - sha256 = "1x246dfnxnmflzf0qzy62k8jdpkb6jkgspcjgbk8jcq9lw99npah"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; - buildInputs = [ ]; - configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - meta.platforms = lib.platforms.unix; - }) {}; - - fontbh100dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { - name = "font-bh-100dpi-1.0.3"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/font/font-bh-100dpi-1.0.3.tar.bz2"; - sha256 = "10cl4gm38dw68jzln99ijix730y7cbx8np096gmpjjwff1i73h13"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; - buildInputs = [ ]; - configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - meta.platforms = lib.platforms.unix; - }) {}; - - fontbh75dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { - name = "font-bh-75dpi-1.0.3"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/font/font-bh-75dpi-1.0.3.tar.bz2"; - sha256 = "073jmhf0sr2j1l8da97pzsqj805f7mf9r2gy92j4diljmi8sm1il"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; - buildInputs = [ ]; - configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - meta.platforms = lib.platforms.unix; - }) {}; - - fontbhlucidatypewriter100dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { - name = "font-bh-lucidatypewriter-100dpi-1.0.3"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/font/font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2"; - sha256 = "1fqzckxdzjv4802iad2fdrkpaxl4w0hhs9lxlkyraq2kq9ik7a32"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; - buildInputs = [ ]; - configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - meta.platforms = lib.platforms.unix; - }) {}; - - fontbhlucidatypewriter75dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { - name = "font-bh-lucidatypewriter-75dpi-1.0.3"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/font/font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2"; - sha256 = "0cfbxdp5m12cm7jsh3my0lym9328cgm7fa9faz2hqj05wbxnmhaa"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; - buildInputs = [ ]; - configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - meta.platforms = lib.platforms.unix; - }) {}; - - fontbhttf = callPackage ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { - name = "font-bh-ttf-1.0.3"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/font/font-bh-ttf-1.0.3.tar.bz2"; - sha256 = "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config mkfontscale ]; - buildInputs = [ ]; - configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - meta.platforms = lib.platforms.unix; - }) {}; - - fontbhtype1 = callPackage ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { - name = "font-bh-type1-1.0.3"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/font/font-bh-type1-1.0.3.tar.bz2"; - sha256 = "1hb3iav089albp4sdgnlh50k47cdjif9p4axm0kkjvs8jyi5a53n"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config mkfontscale ]; - buildInputs = [ ]; - configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - meta.platforms = lib.platforms.unix; - }) {}; - - fontbitstream100dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { - name = "font-bitstream-100dpi-1.0.3"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/font/font-bitstream-100dpi-1.0.3.tar.bz2"; - sha256 = "1kmn9jbck3vghz6rj3bhc3h0w6gh0qiaqm90cjkqsz1x9r2dgq7b"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; - buildInputs = [ ]; - configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - meta.platforms = lib.platforms.unix; - }) {}; - - fontbitstream75dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { - name = "font-bitstream-75dpi-1.0.3"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/font/font-bitstream-75dpi-1.0.3.tar.bz2"; - sha256 = "13plbifkvfvdfym6gjbgy9wx2xbdxi9hfrl1k22xayy02135wgxs"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; - buildInputs = [ ]; - configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - meta.platforms = lib.platforms.unix; - }) {}; - - fontbitstreamtype1 = callPackage ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { - name = "font-bitstream-type1-1.0.3"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/font/font-bitstream-type1-1.0.3.tar.bz2"; - sha256 = "1256z0jhcf5gbh1d03593qdwnag708rxqa032izmfb5dmmlhbsn6"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config mkfontscale ]; - buildInputs = [ ]; - configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - meta.platforms = lib.platforms.unix; - }) {}; - - fontcronyxcyrillic = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { - name = "font-cronyx-cyrillic-1.0.3"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/font/font-cronyx-cyrillic-1.0.3.tar.bz2"; - sha256 = "0ai1v4n61k8j9x2a1knvfbl2xjxk3xxmqaq3p9vpqrspc69k31kf"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; - buildInputs = [ ]; - configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - meta.platforms = lib.platforms.unix; - }) {}; - - fontcursormisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { - name = "font-cursor-misc-1.0.3"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/font/font-cursor-misc-1.0.3.tar.bz2"; - sha256 = "0dd6vfiagjc4zmvlskrbjz85jfqhf060cpys8j0y1qpcbsrkwdhp"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; - buildInputs = [ ]; - configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - meta.platforms = lib.platforms.unix; - }) {}; - - fontdaewoomisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { - name = "font-daewoo-misc-1.0.3"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/font/font-daewoo-misc-1.0.3.tar.bz2"; - sha256 = "1s2bbhizzgbbbn5wqs3vw53n619cclxksljvm759h9p1prqdwrdw"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; - buildInputs = [ ]; - configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - meta.platforms = lib.platforms.unix; - }) {}; - - fontdecmisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { - name = "font-dec-misc-1.0.3"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/font/font-dec-misc-1.0.3.tar.bz2"; - sha256 = "0yzza0l4zwyy7accr1s8ab7fjqkpwggqydbm2vc19scdby5xz7g1"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; - buildInputs = [ ]; - configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - meta.platforms = lib.platforms.unix; - }) {}; - - fontibmtype1 = callPackage ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { - name = "font-ibm-type1-1.0.3"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/font/font-ibm-type1-1.0.3.tar.bz2"; - sha256 = "1pyjll4adch3z5cg663s6vhi02k8m6488f0mrasg81ssvg9jinzx"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config mkfontscale ]; - buildInputs = [ ]; - configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - meta.platforms = lib.platforms.unix; - }) {}; - - fontisasmisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { - name = "font-isas-misc-1.0.3"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/font/font-isas-misc-1.0.3.tar.bz2"; - sha256 = "0rx8q02rkx673a7skkpnvfkg28i8gmqzgf25s9yi0lar915sn92q"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; - buildInputs = [ ]; - configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - meta.platforms = lib.platforms.unix; - }) {}; - - fontjismisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { - name = "font-jis-misc-1.0.3"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/font/font-jis-misc-1.0.3.tar.bz2"; - sha256 = "0rdc3xdz12pnv951538q6wilx8mrdndpkphpbblszsv7nc8cw61b"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; - buildInputs = [ ]; - configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - meta.platforms = lib.platforms.unix; - }) {}; - - fontmicromisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { - name = "font-micro-misc-1.0.3"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/font/font-micro-misc-1.0.3.tar.bz2"; - sha256 = "1dldxlh54zq1yzfnrh83j5vm0k4ijprrs5yl18gm3n9j1z0q2cws"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; - buildInputs = [ ]; - configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - meta.platforms = lib.platforms.unix; - }) {}; - - fontmisccyrillic = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { - name = "font-misc-cyrillic-1.0.3"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/font/font-misc-cyrillic-1.0.3.tar.bz2"; - sha256 = "0q2ybxs8wvylvw95j6x9i800rismsmx4b587alwbfqiw6biy63z4"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; - buildInputs = [ ]; - configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - meta.platforms = lib.platforms.unix; - }) {}; - - fontmiscethiopic = callPackage ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { - name = "font-misc-ethiopic-1.0.3"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/font/font-misc-ethiopic-1.0.3.tar.bz2"; - sha256 = "19cq7iq0pfad0nc2v28n681fdq3fcw1l1hzaq0wpkgpx7bc1zjsk"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config mkfontscale ]; - buildInputs = [ ]; - configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - meta.platforms = lib.platforms.unix; - }) {}; - - fontmiscmeltho = callPackage ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { - name = "font-misc-meltho-1.0.3"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/font/font-misc-meltho-1.0.3.tar.bz2"; - sha256 = "148793fqwzrc3bmh2vlw5fdiwjc2n7vs25cic35gfp452czk489p"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config mkfontscale ]; - buildInputs = [ ]; - configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - meta.platforms = lib.platforms.unix; - }) {}; - - fontmiscmisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { - name = "font-misc-misc-1.1.2"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/font/font-misc-misc-1.1.2.tar.bz2"; - sha256 = "150pq6n8n984fah34n3k133kggn9v0c5k07igv29sxp1wi07krxq"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; - buildInputs = [ ]; - configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - meta.platforms = lib.platforms.unix; - }) {}; - - fontmuttmisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { - name = "font-mutt-misc-1.0.3"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/font/font-mutt-misc-1.0.3.tar.bz2"; - sha256 = "13qghgr1zzpv64m0p42195k1kc77pksiv059fdvijz1n6kdplpxx"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; - buildInputs = [ ]; - configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - meta.platforms = lib.platforms.unix; - }) {}; - - fontschumachermisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { - name = "font-schumacher-misc-1.1.2"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/font/font-schumacher-misc-1.1.2.tar.bz2"; - sha256 = "0nkym3n48b4v36y4s927bbkjnsmicajarnf6vlp7wxp0as304i74"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; - buildInputs = [ ]; - configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - meta.platforms = lib.platforms.unix; - }) {}; - - fontscreencyrillic = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { - name = "font-screen-cyrillic-1.0.4"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/font/font-screen-cyrillic-1.0.4.tar.bz2"; - sha256 = "0yayf1qlv7irf58nngddz2f1q04qkpr5jwp4aja2j5gyvzl32hl2"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; - buildInputs = [ ]; - configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - meta.platforms = lib.platforms.unix; - }) {}; - - fontsonymisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { - name = "font-sony-misc-1.0.3"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/font/font-sony-misc-1.0.3.tar.bz2"; - sha256 = "1xfgcx4gsgik5mkgkca31fj3w72jw9iw76qyrajrsz1lp8ka6hr0"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; - buildInputs = [ ]; - configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - meta.platforms = lib.platforms.unix; - }) {}; - - fontsunmisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { - name = "font-sun-misc-1.0.3"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/font/font-sun-misc-1.0.3.tar.bz2"; - sha256 = "1q6jcqrffg9q5f5raivzwx9ffvf7r11g6g0b125na1bhpz5ly7s8"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; - buildInputs = [ ]; - configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - meta.platforms = lib.platforms.unix; - }) {}; - - fonttosfnt = callPackage ({ stdenv, pkg-config, fetchurl, libfontenc, freetype, xorgproto }: stdenv.mkDerivation { - name = "fonttosfnt-1.2.1"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/fonttosfnt-1.2.1.tar.bz2"; - sha256 = "16r51h5wfy85wnbq3q8v8a184hb25c3ksjgix0mlcywdz7qkbj07"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libfontenc freetype xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; - - fontutil = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { - name = "font-util-1.3.1"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/font/font-util-1.3.1.tar.bz2"; - sha256 = "08drjb6cf84pf5ysghjpb4i7xkd2p86k3wl2a0jxs1jif6qbszma"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ]; - meta.platforms = lib.platforms.unix; - }) {}; - - fontwinitzkicyrillic = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { - name = "font-winitzki-cyrillic-1.0.3"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/font/font-winitzki-cyrillic-1.0.3.tar.bz2"; - sha256 = "181n1bgq8vxfxqicmy1jpm1hnr6gwn1kdhl6hr4frjigs1ikpldb"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; - buildInputs = [ ]; - configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - meta.platforms = lib.platforms.unix; - }) {}; - - fontxfree86type1 = callPackage ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { - name = "font-xfree86-type1-1.0.4"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/font/font-xfree86-type1-1.0.4.tar.bz2"; - sha256 = "0jp3zc0qfdaqfkgzrb44vi9vi0a8ygb35wp082yz7rvvxhmg9sya"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config mkfontscale ]; - buildInputs = [ ]; - configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - meta.platforms = lib.platforms.unix; - }) {}; - - gccmakedep = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { - name = "gccmakedep-1.0.3"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/util/gccmakedep-1.0.3.tar.bz2"; - sha256 = "1r1fpy5ni8chbgx7j5sz0008fpb6vbazpy1nifgdhgijyzqxqxdj"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ]; - meta.platforms = lib.platforms.unix; - }) {}; - - iceauth = callPackage ({ stdenv, pkg-config, fetchurl, libICE, xorgproto }: stdenv.mkDerivation { - name = "iceauth-1.0.8"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/iceauth-1.0.8.tar.bz2"; - sha256 = "1ik0mdidmyvy48hn8p2hwvf3535rf3m96hhf0mvcqrbj44x23vp6"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libICE xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; - - ico = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { - name = "ico-1.0.5"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/ico-1.0.5.tar.bz2"; - sha256 = "0gvpwfk9kvlfn631dgizc45qc2qqjn9pavdp2q7qb3drkvr64fyp"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; - - imake = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto }: stdenv.mkDerivation { - name = "imake-1.0.8"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/util/imake-1.0.8.tar.bz2"; - sha256 = "00m7l90ws72k1qm101sd2rx92ckd50cszyng5d4dd77jncbf9lmq"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; - - libAppleWM = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { - name = "libAppleWM-1.4.1"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/lib/libAppleWM-1.4.1.tar.bz2"; - sha256 = "0r8x28n45q89x91mz8mv0zkkcxi8wazkac886fyvflhiv2y8ap2y"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto libX11 libXext ]; - meta.platforms = lib.platforms.unix; - }) {}; - - libFS = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xtrans }: stdenv.mkDerivation { - name = "libFS-1.0.8"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/lib/libFS-1.0.8.tar.bz2"; - sha256 = "03xxyvpfa3rhqcld4p2chkil482jn9cp80hj17jdybcv2hkkgqf8"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto xtrans ]; - meta.platforms = lib.platforms.unix; - }) {}; - - libICE = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xtrans }: stdenv.mkDerivation { - name = "libICE-1.0.10"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/lib/libICE-1.0.10.tar.bz2"; - sha256 = "0j638yvmyna2k4mz465jywgdybgdchdqppfx6xfazg7l5khxr1kg"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto xtrans ]; - meta.platforms = lib.platforms.unix; - }) {}; - - libSM = callPackage ({ stdenv, pkg-config, fetchurl, libICE, libuuid, xorgproto, xtrans }: stdenv.mkDerivation { - name = "libSM-1.2.3"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/lib/libSM-1.2.3.tar.bz2"; - sha256 = "1fwwfq9v3sqmpzpscymswxn76xhxnysa24pfim1mcpxhvjcl89id"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libICE libuuid xorgproto xtrans ]; - meta.platforms = lib.platforms.unix; - }) {}; - - libWindowsWM = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { - name = "libWindowsWM-1.0.1"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2"; - sha256 = "1p0flwb67xawyv6yhri9w17m1i4lji5qnd0gq8v1vsfb8zw7rw15"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto libX11 libXext ]; - meta.platforms = lib.platforms.unix; - }) {}; - - libX11 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libxcb, xtrans }: stdenv.mkDerivation { - name = "libX11-1.7.0"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/lib/libX11-1.7.0.tar.bz2"; - sha256 = "0m6bfwllr3pq2c00l51y62yiq15kphc8dw69zf67qhwmclxzkj1n"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto libxcb xtrans ]; - meta.platforms = lib.platforms.unix; - }) {}; - - libXScrnSaver = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { - name = "libXScrnSaver-1.2.3"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/lib/libXScrnSaver-1.2.3.tar.bz2"; - sha256 = "1y4vx1vabg7j9hamp0vrfrax5b0lmgm3h0lbgbb3hnkv3dd0f5zr"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto libX11 libXext ]; - meta.platforms = lib.platforms.unix; - }) {}; - - libXTrap = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, libXt }: stdenv.mkDerivation { - name = "libXTrap-1.0.1"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/lib/libXTrap-1.0.1.tar.bz2"; - sha256 = "0bi5wxj6avim61yidh9fd3j4n8czxias5m8vss9vhxjnk1aksdwg"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto libX11 libXext libXt ]; - meta.platforms = lib.platforms.unix; - }) {}; - - libXau = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto }: stdenv.mkDerivation { - name = "libXau-1.0.9"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/lib/libXau-1.0.9.tar.bz2"; - sha256 = "1v3krc6x0zliaa66qq1bf9j60x5nqfy68v8axaiglxpnvgqcpy6c"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; - - libXaw = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto, libXmu, libXpm, libXt }: stdenv.mkDerivation { - name = "libXaw-1.0.14"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/lib/libXaw-1.0.14.tar.bz2"; - sha256 = "13kg59r3086383g1dyhnwxanhp2frssh9062mrgn34nzlf7gkbkn"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 libXext xorgproto libXmu libXpm libXt ]; - meta.platforms = lib.platforms.unix; - }) {}; - - libXaw3d = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, libXmu, libXpm, xorgproto, libXt }: stdenv.mkDerivation { - name = "libXaw3d-1.6.3"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/lib/libXaw3d-1.6.3.tar.bz2"; - sha256 = "0i653s8g25cc0mimkwid9366bqkbyhdyjhckx7bw77j20hzrkfid"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 libXext libXmu libXpm xorgproto libXt ]; - meta.platforms = lib.platforms.unix; - }) {}; - - libXcomposite = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXfixes }: stdenv.mkDerivation { - name = "libXcomposite-0.4.5"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/lib/libXcomposite-0.4.5.tar.bz2"; - sha256 = "13sfcglvz87vl58hd9rszwr73z0z4nwga3c12rfh7f5s2ln8l8dk"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto libX11 libXfixes ]; - meta.platforms = lib.platforms.unix; - }) {}; - - libXcursor = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXfixes, libXrender }: stdenv.mkDerivation { - name = "libXcursor-1.2.0"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/lib/libXcursor-1.2.0.tar.bz2"; - sha256 = "10l7c9fm0jmpkm9ab9dz8r6m1pr87vvgqjnbx1psz50h4pwfklrs"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto libX11 libXfixes libXrender ]; - meta.platforms = lib.platforms.unix; - }) {}; - - libXdamage = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXfixes }: stdenv.mkDerivation { - name = "libXdamage-1.1.5"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/lib/libXdamage-1.1.5.tar.bz2"; - sha256 = "0igaw2akjf712y3rv7lx473jigxmcv9rs9y8sbrvbhya8f30cd5p"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto libX11 libXfixes ]; - meta.platforms = lib.platforms.unix; - }) {}; - - libXdmcp = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto }: stdenv.mkDerivation { - name = "libXdmcp-1.1.3"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/lib/libXdmcp-1.1.3.tar.bz2"; - sha256 = "0ab53h0rkq721ihk5hi469x500f3pgbkm1wy01yf24x5m923nli0"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; - - libXext = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { - name = "libXext-1.3.4"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/lib/libXext-1.3.4.tar.bz2"; - sha256 = "0azqxllcsfxc3ilhz6kwc6x7m8wc477p59ir9p0yrsldx766zbar"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; - - libXfixes = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11 }: stdenv.mkDerivation { - name = "libXfixes-5.0.3"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/lib/libXfixes-5.0.3.tar.bz2"; - sha256 = "1miana3y4hwdqdparsccmygqr3ic3hs5jrqfzp70hvi2zwxd676y"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto libX11 ]; - meta.platforms = lib.platforms.unix; - }) {}; - - libXfont = callPackage ({ stdenv, pkg-config, fetchurl, libfontenc, xorgproto, freetype, xtrans, zlib }: stdenv.mkDerivation { - name = "libXfont-1.5.4"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/lib/libXfont-1.5.4.tar.bz2"; - sha256 = "0hiji1bvpl78aj3a3141hkk353aich71wv8l5l2z51scfy878zqs"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libfontenc xorgproto freetype xtrans zlib ]; - meta.platforms = lib.platforms.unix; - }) {}; - - libXfont2 = callPackage ({ stdenv, pkg-config, fetchurl, libfontenc, xorgproto, freetype, xtrans, zlib }: stdenv.mkDerivation { - name = "libXfont2-2.0.4"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/lib/libXfont2-2.0.4.tar.bz2"; - sha256 = "1rk9pjxcm01lbr1dxhnvk4f2qrn6zp068qjbvvz5w0z5d0rin5bd"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libfontenc xorgproto freetype xtrans zlib ]; - meta.platforms = lib.platforms.unix; - }) {}; - - libXft = callPackage ({ stdenv, pkg-config, fetchurl, fontconfig, freetype, libX11, xorgproto, libXrender }: stdenv.mkDerivation { - name = "libXft-2.3.3"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/lib/libXft-2.3.3.tar.bz2"; - sha256 = "05lja9s54090xwh31r0bqms4v3pimng5xr09g2rdnafx2vk6hp12"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ fontconfig freetype libX11 xorgproto libXrender ]; - meta.platforms = lib.platforms.unix; - }) {}; - - libXi = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, libXfixes }: stdenv.mkDerivation { - name = "libXi-1.7.10"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/lib/libXi-1.7.10.tar.bz2"; - sha256 = "0q8hz3slga3w3ch8wp0k7ay9ilhz315qnab0w1y2x9w3cf7hv8rn"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto libX11 libXext libXfixes ]; - meta.platforms = lib.platforms.unix; - }) {}; - - libXinerama = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto }: stdenv.mkDerivation { - name = "libXinerama-1.1.4"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/lib/libXinerama-1.1.4.tar.bz2"; - sha256 = "086p0axqj57nvkaqa6r00dnr9kyrn1m8blgf0zjy25zpxkbxn200"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 libXext xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; - - libXmu = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto, libXt }: stdenv.mkDerivation { - name = "libXmu-1.1.3"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/lib/libXmu-1.1.3.tar.bz2"; - sha256 = "0cdpqnx6258i4l6qhphvkdiyspysg0i5caqjy820kp63wwjk4d4w"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 libXext xorgproto libXt ]; - meta.platforms = lib.platforms.unix; - }) {}; - - libXp = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXau, libXext }: stdenv.mkDerivation { - name = "libXp-1.0.3"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/lib/libXp-1.0.3.tar.bz2"; - sha256 = "0mwc2jwmq03b1m9ihax5c6gw2ln8rc70zz4fsj3kb7440nchqdkz"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto libX11 libXau libXext ]; - meta.platforms = lib.platforms.unix; - }) {}; - - libXpm = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto, libXt, gettext }: stdenv.mkDerivation { - name = "libXpm-3.5.13"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/lib/libXpm-3.5.13.tar.bz2"; - sha256 = "09dc6nwlb2122h02vl64k9x56mxnyqz2gwpga0abfv4bb1bxmlcw"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config gettext ]; - buildInputs = [ libX11 libXext xorgproto libXt ]; - meta.platforms = lib.platforms.unix; - }) {}; - - libXpresent = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11 }: stdenv.mkDerivation { - name = "libXpresent-1.0.0"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/lib/libXpresent-1.0.0.tar.bz2"; - sha256 = "12kvvar3ihf6sw49h6ywfdiwmb8i1gh8wasg1zhzp6hs2hay06n1"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto libX11 ]; - meta.platforms = lib.platforms.unix; - }) {}; - - libXrandr = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, libXrender }: stdenv.mkDerivation { - name = "libXrandr-1.5.2"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/lib/libXrandr-1.5.2.tar.bz2"; - sha256 = "08z0mqywrm7ij8bxlfrx0d2wy6kladdmkva1nw5k6qix82z0xsla"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto libX11 libXext libXrender ]; - meta.platforms = lib.platforms.unix; - }) {}; - - libXrender = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11 }: stdenv.mkDerivation { - name = "libXrender-0.9.10"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/lib/libXrender-0.9.10.tar.bz2"; - sha256 = "0j89cnb06g8x79wmmnwzykgkkfdhin9j7hjpvsxwlr3fz1wmjvf0"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto libX11 ]; - meta.platforms = lib.platforms.unix; - }) {}; - - libXres = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { - name = "libXres-1.2.1"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/lib/libXres-1.2.1.tar.bz2"; - sha256 = "049b7dk6hx47161hg47ryjrm6pwsp27r5pby05b0wqb1pcggprmn"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto libX11 libXext ]; - meta.platforms = lib.platforms.unix; - }) {}; - - libXt = callPackage ({ stdenv, pkg-config, fetchurl, libICE, xorgproto, libSM, libX11 }: stdenv.mkDerivation { - name = "libXt-1.2.1"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/lib/libXt-1.2.1.tar.bz2"; - sha256 = "0q1x7842r8rcn2m0q4q9f69h4qa097fyizs8brzx5ns62s7w1737"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libICE xorgproto libSM libX11 ]; - meta.platforms = lib.platforms.unix; - }) {}; - - libXtst = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, libXi }: stdenv.mkDerivation { - name = "libXtst-1.2.3"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/lib/libXtst-1.2.3.tar.bz2"; - sha256 = "012jpyj7xfm653a9jcfqbzxyywdmwb2b5wr1dwylx14f3f54jma6"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto libX11 libXext libXi ]; - meta.platforms = lib.platforms.unix; - }) {}; - - libXv = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { - name = "libXv-1.0.11"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/lib/libXv-1.0.11.tar.bz2"; - sha256 = "125hn06bd3d8y97hm2pbf5j55gg4r2hpd3ifad651i4sr7m16v6j"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto libX11 libXext ]; - meta.platforms = lib.platforms.unix; - }) {}; - - libXvMC = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, libXv }: stdenv.mkDerivation { - name = "libXvMC-1.0.12"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/lib/libXvMC-1.0.12.tar.bz2"; - sha256 = "1kbdjsvkm5l7axv7g477qj18sab2wnqhliy6197syzizgfbsfgbb"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto libX11 libXext libXv ]; - meta.platforms = lib.platforms.unix; - }) {}; - - libXxf86dga = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto }: stdenv.mkDerivation { - name = "libXxf86dga-1.1.5"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/lib/libXxf86dga-1.1.5.tar.bz2"; - sha256 = "00vjvcdlc1sga251jkxn6gkxmx9h5n290ffxxpa40qbca1gvr61b"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 libXext xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; - - libXxf86misc = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto }: stdenv.mkDerivation { - name = "libXxf86misc-1.0.4"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/lib/libXxf86misc-1.0.4.tar.bz2"; - sha256 = "107k593sx27vjz3v7gbb223add9i7w0bjc90gbb3jqpin3i07758"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 libXext xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; - - libXxf86vm = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto }: stdenv.mkDerivation { - name = "libXxf86vm-1.1.4"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/lib/libXxf86vm-1.1.4.tar.bz2"; - sha256 = "0mydhlyn72i7brjwypsqrpkls3nm6vxw0li8b2nw0caz7kwjgvmg"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 libXext xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; - - libdmx = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { - name = "libdmx-1.1.4"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/lib/libdmx-1.1.4.tar.bz2"; - sha256 = "0hvjfhrcym770cr0zpqajdy3cda30aiwbjzv16iafkqkbl090gr5"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto libX11 libXext ]; - meta.platforms = lib.platforms.unix; - }) {}; - - libfontenc = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, zlib }: stdenv.mkDerivation { - name = "libfontenc-1.1.4"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/lib/libfontenc-1.1.4.tar.bz2"; - sha256 = "0y90170dp8wsidr1dzza0grxr1lfh30ji3b5vkjz4j6x1n0wxz1c"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto zlib ]; - meta.platforms = lib.platforms.unix; - }) {}; - - libpciaccess = callPackage ({ stdenv, pkg-config, fetchurl, zlib }: stdenv.mkDerivation { - name = "libpciaccess-0.16"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/lib/libpciaccess-0.16.tar.bz2"; - sha256 = "12glp4w1kgvmqn89lk19cgr6jccd3awxra4dxisp7pagi06rsk11"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ zlib ]; - meta.platforms = lib.platforms.unix; - }) {}; - - libpthreadstubs = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { - name = "libpthread-stubs-0.4"; - builder = ./builder.sh; - src = fetchurl { - url = "https://xcb.freedesktop.org/dist/libpthread-stubs-0.4.tar.bz2"; - sha256 = "0cz7s9w8lqgzinicd4g36rjg08zhsbyngh0w68c3np8nlc8mkl74"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ]; - meta.platforms = lib.platforms.unix; - }) {}; - - libxcb = callPackage ({ stdenv, pkg-config, fetchurl, libxslt, libpthreadstubs, libXau, xcbproto, libXdmcp, python3 }: stdenv.mkDerivation { - name = "libxcb-1.14"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/lib/libxcb-1.14.tar.xz"; - sha256 = "0d2chjgyn5lr9sfhacfvqgnj9l9faz11vn322a06jd6lk3dxcpm5"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config python3 ]; - buildInputs = [ libxslt libpthreadstubs libXau xcbproto libXdmcp ]; - meta.platforms = lib.platforms.unix; - }) {}; - - libxkbfile = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11 }: stdenv.mkDerivation { - name = "libxkbfile-1.1.0"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/lib/libxkbfile-1.1.0.tar.bz2"; - sha256 = "1irq9crvscd3yb8sr802dhvvfr35jdy1n2yz094xplmd42mbv3bm"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto libX11 ]; - meta.platforms = lib.platforms.unix; - }) {}; - - libxshmfence = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto }: stdenv.mkDerivation { - name = "libxshmfence-1.3"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/lib/libxshmfence-1.3.tar.bz2"; - sha256 = "1ir0j92mnd1nk37mrv9bz5swnccqldicgszvfsh62jd14q6k115q"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; - - listres = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, libXmu, xorgproto, libXt }: stdenv.mkDerivation { - name = "listres-1.0.4"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/listres-1.0.4.tar.bz2"; - sha256 = "041bxkvv6f92sm3hhm977c4gdqdv5r1jyxjqcqfi8vkrg3s2j4ka"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libXaw libXmu xorgproto libXt ]; - meta.platforms = lib.platforms.unix; - }) {}; - - lndir = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto }: stdenv.mkDerivation { - name = "lndir-1.0.3"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/util/lndir-1.0.3.tar.bz2"; - sha256 = "0pdngiy8zdhsiqx2am75yfcl36l7kd7d7nl0rss8shcdvsqgmx29"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; - - luit = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { - name = "luit-20190106"; - builder = ./builder.sh; - src = fetchurl { - url = "https://invisible-mirror.net/archives/luit/luit-20190106.tgz"; - sha256 = "081rrajj5hpgx3pvm43grqzscnq5kl320q0wq6zzhf6wrijhz41b"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ]; - meta.platforms = lib.platforms.unix; - }) {}; - - makedepend = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto }: stdenv.mkDerivation { - name = "makedepend-1.0.6"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/util/makedepend-1.0.6.tar.bz2"; - sha256 = "072h9nzh8s5vqfz35dli4fba36fnr219asjrb7p89n8ph0paan6m"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; - - mkfontscale = callPackage ({ stdenv, pkg-config, fetchurl, libfontenc, freetype, xorgproto, zlib }: stdenv.mkDerivation { - name = "mkfontscale-1.2.1"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/mkfontscale-1.2.1.tar.bz2"; - sha256 = "1ixsnsm2mn0zy9ksdid0lj6irnhvasfik9mz8bbrs5sajzmra16a"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libfontenc freetype xorgproto zlib ]; - meta.platforms = lib.platforms.unix; - }) {}; - - oclock = callPackage ({ stdenv, pkg-config, fetchurl, libxkbfile, libX11, libXext, libXmu, libXt }: stdenv.mkDerivation { - name = "oclock-1.0.4"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/oclock-1.0.4.tar.bz2"; - sha256 = "1zmfzfmdp42nvapf0qz1bc3i3waq5sjrpkgfw64qs4nmq30wy86c"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libxkbfile libX11 libXext libXmu libXt ]; - meta.platforms = lib.platforms.unix; - }) {}; - - sessreg = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto }: stdenv.mkDerivation { - name = "sessreg-1.1.2"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/sessreg-1.1.2.tar.bz2"; - sha256 = "0crczl25zynkrslmm8sjaxszhrh4i33m7h5fg4wfdb3k8aarxjyz"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; - - setxkbmap = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libxkbfile }: stdenv.mkDerivation { - name = "setxkbmap-1.3.2"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/setxkbmap-1.3.2.tar.bz2"; - sha256 = "1xdrxs65v7d0rw1yaz0vsz55w4hxym99216p085ya9978j379wlg"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 libxkbfile ]; - meta.platforms = lib.platforms.unix; - }) {}; - - smproxy = callPackage ({ stdenv, pkg-config, fetchurl, libICE, libSM, libXmu, libXt }: stdenv.mkDerivation { - name = "smproxy-1.0.6"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/smproxy-1.0.6.tar.bz2"; - sha256 = "0rkjyzmsdqmlrkx8gy2j4q6iksk58hcc92xzdprkf8kml9ar3wbc"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libICE libSM libXmu libXt ]; - meta.platforms = lib.platforms.unix; - }) {}; - - transset = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { - name = "transset-1.0.2"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/transset-1.0.2.tar.bz2"; - sha256 = "088v8p0yfn4r3azabp6662hqikfs2gjb9xmjjd45gnngwwp19b2b"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; - - twm = callPackage ({ stdenv, pkg-config, fetchurl, libICE, libSM, libX11, libXext, libXmu, xorgproto, libXt }: stdenv.mkDerivation { - name = "twm-1.0.10"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/twm-1.0.10.tar.bz2"; - sha256 = "1ms5cj1w3g26zg6bxdv1j9hl0pxr4300qnv003cz1q3cl7ffljb4"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libICE libSM libX11 libXext libXmu xorgproto libXt ]; - meta.platforms = lib.platforms.unix; - }) {}; - - utilmacros = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { - name = "util-macros-1.19.3"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/util/util-macros-1.19.3.tar.bz2"; - sha256 = "0w8ryfqylprz37zj9grl4jzdsqq67ibfwq5raj7vm1i7kmp2x08g"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ]; - meta.platforms = lib.platforms.unix; - }) {}; - - viewres = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, libXmu, libXt }: stdenv.mkDerivation { - name = "viewres-1.0.5"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/viewres-1.0.5.tar.bz2"; - sha256 = "1mz319kfmvcrdpi22dmdr91mif1j0j3ck1f8mmnz5g1r9kl1in2y"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libXaw libXmu libXt ]; - meta.platforms = lib.platforms.unix; - }) {}; - - x11perf = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, libXft, libXmu, xorgproto, libXrender }: stdenv.mkDerivation { - name = "x11perf-1.6.1"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/x11perf-1.6.1.tar.bz2"; - sha256 = "0d3wh6z6znwhfdiv0zaggfj0xgish98xa10yy76b9517zj7hnzhw"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 libXext libXft libXmu xorgproto libXrender ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xauth = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXau, libXext, libXmu, xorgproto }: stdenv.mkDerivation { - name = "xauth-1.1"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xauth-1.1.tar.bz2"; - sha256 = "032klzzw8r09z36x1272ssd79bcisz8j5p8gbdy111fiknvx27bd"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 libXau libXext libXmu xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xbacklight = callPackage ({ stdenv, pkg-config, fetchurl, libxcb, xcbutil }: stdenv.mkDerivation { - name = "xbacklight-1.2.3"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xbacklight-1.2.3.tar.bz2"; - sha256 = "1plssg0s3pbslg6rfzxp9sx8ryvn8l32zyvc8zp9zsbsfwjg69rs"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libxcb xcbutil ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xbitmaps = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { - name = "xbitmaps-1.1.2"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/data/xbitmaps-1.1.2.tar.bz2"; - sha256 = "1vh73sc13s7w5r6gnc6irca56s7998bja7wgdivkfn8jccawgw5r"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xcalc = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, xorgproto, libXt }: stdenv.mkDerivation { - name = "xcalc-1.1.0"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xcalc-1.1.0.tar.bz2"; - sha256 = "1sxmlcb0sb3h4z05kl5l0kxnhrc0h8c74p9m3zdc7bv58jaldmym"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 libXaw xorgproto libXt ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xcbproto = callPackage ({ stdenv, pkg-config, fetchurl, python3 }: stdenv.mkDerivation { - name = "xcb-proto-1.14.1"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/proto/xcb-proto-1.14.1.tar.xz"; - sha256 = "1hzwazgyywd9mz4mjj1yv8ski27qqx7ypmyr27m39hrajyddsjph"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config python3 ]; - buildInputs = [ ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xcbutil = callPackage ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xorgproto, m4 }: stdenv.mkDerivation { - name = "xcb-util-0.4.0"; - builder = ./builder.sh; - src = fetchurl { - url = "https://xcb.freedesktop.org/dist/xcb-util-0.4.0.tar.bz2"; - sha256 = "1sahmrgbpyki4bb72hxym0zvxwnycmswsxiisgqlln9vrdlr9r26"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config m4 ]; - buildInputs = [ gperf libxcb xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xcbutilcursor = callPackage ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xcbutilimage, xcbutilrenderutil, xorgproto, m4 }: stdenv.mkDerivation { - name = "xcb-util-cursor-0.1.3"; - builder = ./builder.sh; - src = fetchurl { - url = "https://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.3.tar.bz2"; - sha256 = "0krr4rcw6r42cncinzvzzdqnmxk3nrgpnadyg2h8k9x10q3hm885"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config m4 ]; - buildInputs = [ gperf libxcb xcbutilimage xcbutilrenderutil xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xcbutilerrors = callPackage ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xcbproto, xorgproto, m4 }: stdenv.mkDerivation { - name = "xcb-util-errors-1.0"; - builder = ./builder.sh; - src = fetchurl { - url = "https://xcb.freedesktop.org/dist/xcb-util-errors-1.0.tar.bz2"; - sha256 = "158rm913dg3hxrrhyvvxr8bcm0pjy5jws70dhy2s12w1krv829k8"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config m4 ]; - buildInputs = [ gperf libxcb xcbproto xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xcbutilimage = callPackage ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xcbutil, xorgproto, m4 }: stdenv.mkDerivation { - name = "xcb-util-image-0.4.0"; - builder = ./builder.sh; - src = fetchurl { - url = "https://xcb.freedesktop.org/dist/xcb-util-image-0.4.0.tar.bz2"; - sha256 = "1z1gxacg7q4cw6jrd26gvi5y04npsyavblcdad1xccc8swvnmf9d"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config m4 ]; - buildInputs = [ gperf libxcb xcbutil xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xcbutilkeysyms = callPackage ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xorgproto, m4 }: stdenv.mkDerivation { - name = "xcb-util-keysyms-0.4.0"; - builder = ./builder.sh; - src = fetchurl { - url = "https://xcb.freedesktop.org/dist/xcb-util-keysyms-0.4.0.tar.bz2"; - sha256 = "1nbd45pzc1wm6v5drr5338j4nicbgxa5hcakvsvm5pnyy47lky0f"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config m4 ]; - buildInputs = [ gperf libxcb xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xcbutilrenderutil = callPackage ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xorgproto, m4 }: stdenv.mkDerivation { - name = "xcb-util-renderutil-0.3.9"; - builder = ./builder.sh; - src = fetchurl { - url = "https://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2"; - sha256 = "0nza1csdvvxbmk8vgv8vpmq7q8h05xrw3cfx9lwxd1hjzd47xsf6"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config m4 ]; - buildInputs = [ gperf libxcb xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xcbutilwm = callPackage ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xorgproto, m4 }: stdenv.mkDerivation { - name = "xcb-util-wm-0.4.1"; - builder = ./builder.sh; - src = fetchurl { - url = "https://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2"; - sha256 = "0gra7hfyxajic4mjd63cpqvd20si53j1q3rbdlkqkahfciwq3gr8"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config m4 ]; - buildInputs = [ gperf libxcb xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xclock = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXft, libxkbfile, libXmu, xorgproto, libXrender, libXt }: stdenv.mkDerivation { - name = "xclock-1.0.9"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xclock-1.0.9.tar.bz2"; - sha256 = "1fr3q4rszgx7x2zxy2ip592a3fgx20hfwac49p2l5b7jqsr1ying"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 libXaw libXft libxkbfile libXmu xorgproto libXrender libXt ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xcmsdb = callPackage ({ stdenv, pkg-config, fetchurl, libX11 }: stdenv.mkDerivation { - name = "xcmsdb-1.0.5"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xcmsdb-1.0.5.tar.bz2"; - sha256 = "1ik7gzlp2igz183x70883000ygp99r20x3aah6xhaslbpdhm6n75"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xcompmgr = callPackage ({ stdenv, pkg-config, fetchurl, libXcomposite, libXdamage, libXext, libXfixes, libXrender }: stdenv.mkDerivation { - name = "xcompmgr-1.1.8"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xcompmgr-1.1.8.tar.bz2"; - sha256 = "0hvjkanrdlvk3ln5a1jx3c9ggziism2jr1na7jl3zyk0y3sdm28b"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libXcomposite libXdamage libXext libXfixes libXrender ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xconsole = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt }: stdenv.mkDerivation { - name = "xconsole-1.0.7"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xconsole-1.0.7.tar.bz2"; - sha256 = "1q2ib1626i5da0nda09sp3vzppjrcn82fff83cw7hwr0vy14h56i"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 libXaw libXmu xorgproto libXt ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xcursorgen = callPackage ({ stdenv, pkg-config, fetchurl, libpng, libX11, libXcursor }: stdenv.mkDerivation { - name = "xcursorgen-1.0.7"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xcursorgen-1.0.7.tar.bz2"; - sha256 = "0ggbv084cavp52hjgcz3vdj0g018axs0m23c03lpc5sgn92gidim"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libpng libX11 libXcursor ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xcursorthemes = callPackage ({ stdenv, pkg-config, fetchurl, libXcursor }: stdenv.mkDerivation { - name = "xcursor-themes-1.0.6"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/data/xcursor-themes-1.0.6.tar.bz2"; - sha256 = "16a96li0s0ggg60v7f6ywxmsrmxdfizcw55ccv7sp4qjfisca7pf"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libXcursor ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xdm = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXau, libXaw, libXdmcp, libXext, libXft, libXinerama, libXmu, libXpm, xorgproto, libXrender, libXt }: stdenv.mkDerivation { - name = "xdm-1.1.12"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xdm-1.1.12.tar.bz2"; - sha256 = "1x17hdymf6rd8jmh4n1sd4g5a8ayr5w94nwjw84qs2fs5pvq7lhd"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm xorgproto libXrender libXt ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xdpyinfo = callPackage ({ stdenv, pkg-config, fetchurl, libdmx, libX11, libxcb, libXcomposite, libXext, libXi, libXinerama, xorgproto, libXrender, libXtst, libXxf86dga, libXxf86misc, libXxf86vm }: stdenv.mkDerivation { - name = "xdpyinfo-1.3.2"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xdpyinfo-1.3.2.tar.bz2"; - sha256 = "0ldgrj4w2fa8jng4b3f3biaj0wyn8zvya88pnk70d7k12pcqw8rh"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libdmx libX11 libxcb libXcomposite libXext libXi libXinerama xorgproto libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xdriinfo = callPackage ({ stdenv, pkg-config, fetchurl, libGL, xorgproto, libX11 }: stdenv.mkDerivation { - name = "xdriinfo-1.0.6"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xdriinfo-1.0.6.tar.bz2"; - sha256 = "0lcx8h3zd11m4w8wf7dyp89826d437iz78cyrix436bqx31x5k6r"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libGL xorgproto libX11 ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xev = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, libXrandr }: stdenv.mkDerivation { - name = "xev-1.2.3"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xev-1.2.3.tar.bz2"; - sha256 = "02ddsdx138g7szhwklpbzi0cxr34871iay3k28kdcihrz8f4zg36"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 xorgproto libXrandr ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xeyes = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, libXmu, xorgproto, libXrender, libXt }: stdenv.mkDerivation { - name = "xeyes-1.1.2"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xeyes-1.1.2.tar.bz2"; - sha256 = "0lq5j7fryx1wn998jq6h3icz1h6pqrsbs3adskjzjyhn5l6yrg2p"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 libXext libXmu xorgproto libXrender libXt ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xf86inputevdev = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libevdev, udev, mtdev, xorgserver }: stdenv.mkDerivation { - name = "xf86-input-evdev-2.10.6"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-input-evdev-2.10.6.tar.bz2"; - sha256 = "1h1y0fwnawlp4yc5llr1l7hwfcxxpln2fxhy6arcf6w6h4z0f9l7"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto libevdev udev mtdev xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xf86inputjoystick = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { - name = "xf86-input-joystick-1.6.3"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2"; - sha256 = "1awfq496d082brgjbr60lhm6jvr9537rflwxqdfqwfzjy3n6jxly"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xf86inputkeyboard = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { - name = "xf86-input-keyboard-1.9.0"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2"; - sha256 = "12032yg412kyvnmc5fha1in7mpi651d8sa1bk4138s2j2zr01jgp"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xf86inputlibinput = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libinput, xorgserver }: stdenv.mkDerivation { - name = "xf86-input-libinput-1.0.1"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-input-libinput-1.0.1.tar.bz2"; - sha256 = "0nr4r9x8c7y1l0ipivjch5zps093mxmg2nqmfn2934am26fc9ppx"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto libinput xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xf86inputmouse = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { - name = "xf86-input-mouse-1.9.3"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-input-mouse-1.9.3.tar.bz2"; - sha256 = "1iawr1wyl2qch1mqszcs0s84i92mh4xxprflnycbw1adc18b7v4k"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xf86inputsynaptics = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libevdev, libX11, libXi, xorgserver, libXtst }: stdenv.mkDerivation { - name = "xf86-input-synaptics-1.9.1"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-input-synaptics-1.9.1.tar.bz2"; - sha256 = "0xhm03qywwfgkpfl904d08lx00y28m1b6lqmks5nxizixwk3by3s"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto libevdev libX11 libXi xorgserver libXtst ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xf86inputvmmouse = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, udev, xorgserver }: stdenv.mkDerivation { - name = "xf86-input-vmmouse-13.1.0"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2"; - sha256 = "06ckn4hlkpig5vnivl0zj8a7ykcgvrsj8b3iccl1pgn1gaamix8a"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto udev xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xf86inputvoid = callPackage ({ stdenv, pkg-config, fetchurl, xorgserver, xorgproto }: stdenv.mkDerivation { - name = "xf86-input-void-1.4.1"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2"; - sha256 = "171k8b8s42s3w73l7ln9jqwk88w4l7r1km2blx1vy898c854yvpr"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgserver xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xf86videoamdgpu = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, mesa, libGL, libdrm, udev, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-amdgpu-19.1.0"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-amdgpu-19.1.0.tar.bz2"; - sha256 = "0pgy4ihnja0vm8504qw7qxh3pdpa3p9k6967nz15m6b1mvha83jg"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto mesa libGL libdrm udev xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xf86videoapm = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-apm-1.3.0"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-apm-1.3.0.tar.bz2"; - sha256 = "0znwqfc8abkiha98an8hxsngnz96z6cd976bc4bsvz1km6wqk0c0"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto libpciaccess xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xf86videoark = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-ark-0.7.5"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2"; - sha256 = "07p5vdsj2ckxb6wh02s61akcv4qfg6s1d5ld3jn3lfaayd3f1466"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto libpciaccess xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xf86videoast = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-ast-1.1.5"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2"; - sha256 = "1pm2cy81ma7ldsw0yfk28b33h9z2hcj5rccrxhfxfgvxsiavrnqy"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto libpciaccess xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xf86videoati = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, mesa, libGL, libdrm, udev, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-ati-19.1.0"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-ati-19.1.0.tar.bz2"; - sha256 = "0j9w4axsqlycv4v14g53xyhkm9h7d27b2fcv9lrzb9gf54b5m7v5"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto mesa libGL libdrm udev libpciaccess xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xf86videochips = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-chips-1.4.0"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-chips-1.4.0.tar.bz2"; - sha256 = "1gqzy7q9v824m7hqkbbmncxg082zm0d4mafgc97c4skyiwgf9wq7"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto libpciaccess xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xf86videocirrus = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-cirrus-1.5.3"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2"; - sha256 = "1asifc6ld2g9kap15vfhvsvyl69lj7pw3d9ra9mi4najllh7pj7d"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto libpciaccess xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xf86videodummy = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-dummy-0.3.8"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-dummy-0.3.8.tar.bz2"; - sha256 = "1fcm9vwgv8wnffbvkzddk4yxrh3kc0np6w65wj8k88q7jf3bn4ip"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xf86videofbdev = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-fbdev-0.5.0"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-fbdev-0.5.0.tar.bz2"; - sha256 = "16a66zr0l1lmssa07i3rzy07djxnb45c17ks8c71h8l06xgxihyw"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto libpciaccess xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xf86videogeode = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-geode-2.11.19"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-geode-2.11.19.tar.bz2"; - sha256 = "0zn9gb49grds5mcs1dlrx241k2w1sgqmx4i5x7v6159xxqhlqsf6"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto libpciaccess xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xf86videoglide = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-glide-1.2.2"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-glide-1.2.2.tar.bz2"; - sha256 = "1vaav6kx4n00q4fawgqnjmbdkppl0dir2dkrj4ad372mxrvl9c4y"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xf86videoglint = callPackage ({ stdenv, pkg-config, fetchurl, libpciaccess, xorgproto, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-glint-1.2.9"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-glint-1.2.9.tar.bz2"; - sha256 = "1lkpspvrvrp9s539bhfdjfh4andaqyk63l6zjn8m3km95smk6a45"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libpciaccess xorgproto xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xf86videoi128 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-i128-1.4.0"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-i128-1.4.0.tar.bz2"; - sha256 = "1snhpv1igrhifcls3r498kjd14ml6x2xvih7zk9xlsd1ymmhlb4g"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto libpciaccess xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xf86videoi740 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-i740-1.4.0"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-i740-1.4.0.tar.bz2"; - sha256 = "0l3s1m95bdsg4gki943qipq8agswbb84dzcflpxa3vlckwhh3r26"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto libpciaccess xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xf86videointel = callPackage ({ stdenv, pkg-config, fetchurl, cairo, xorgproto, libdrm, libpng, udev, libpciaccess, libX11, xcbutil, libxcb, libXcursor, libXdamage, libXext, libXfixes, xorgserver, libXrandr, libXrender, libxshmfence, libXtst, libXvMC }: stdenv.mkDerivation { - name = "xf86-video-intel-2.99.917"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2"; - sha256 = "1jb7jspmzidfixbc0gghyjmnmpqv85i7pi13l4h2hn2ml3p83dq0"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ cairo xorgproto libdrm libpng udev libpciaccess libX11 xcbutil libxcb libXcursor libXdamage libXext libXfixes xorgserver libXrandr libXrender libxshmfence libXtst libXvMC ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xf86videomach64 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-mach64-6.9.6"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-mach64-6.9.6.tar.bz2"; - sha256 = "171wg8r6py1l138s58rlapin3rlpwsg9spmvhc7l68mm3g3hf1vs"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xf86videomga = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-mga-2.0.0"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-mga-2.0.0.tar.bz2"; - sha256 = "0yaxpgyyj9398nzzr5vnsfxcis76z46p9814yzj8179yl7hld296"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xf86videoneomagic = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-neomagic-1.3.0"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-neomagic-1.3.0.tar.bz2"; - sha256 = "0r4h673kw8fl7afc30anwbjlbhp82mg15fvaxf470xg7z983k0wk"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto libpciaccess xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xf86videonewport = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-newport-0.2.4"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-newport-0.2.4.tar.bz2"; - sha256 = "1yafmp23jrfdmc094i6a4dsizapsc9v0pl65cpc8w1kvn7343k4i"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xf86videonouveau = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, udev, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-nouveau-1.0.17"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-nouveau-1.0.17.tar.bz2"; - sha256 = "0sqm1jwjg15sp8v7039y2hsbhph8gpjd2bdzcqqiij2mgbi254s9"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto libdrm udev libpciaccess xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xf86videonv = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-nv-2.1.21"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-nv-2.1.21.tar.bz2"; - sha256 = "0bdk3pc5y0n7p53q4gc2ff7bw16hy5hwdjjxkm5j3s7hdyg6960z"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto libpciaccess xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xf86videoomap = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-omap-0.4.5"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-omap-0.4.5.tar.bz2"; - sha256 = "0nmbrx6913dc724y8wj2p6vqfbj5zdjfmsl037v627jj0whx9rwk"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto libdrm xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xf86videoopenchrome = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, udev, libpciaccess, libX11, libXext, xorgserver, libXvMC }: stdenv.mkDerivation { - name = "xf86-video-openchrome-0.6.0"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-openchrome-0.6.0.tar.bz2"; - sha256 = "0x9gq3hw6k661k82ikd1y2kkk4dmgv310xr5q59dwn4k6z37aafs"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto libdrm udev libpciaccess libX11 libXext xorgserver libXvMC ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xf86videoqxl = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, udev, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-qxl-0.1.5"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-qxl-0.1.5.tar.bz2"; - sha256 = "14jc24znnahhmz4kqalafmllsg8awlz0y6gpgdpk5ih38ph851mi"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto libdrm udev libpciaccess xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xf86videor128 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-r128-6.11.0"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-r128-6.11.0.tar.bz2"; - sha256 = "0snvwmrh8dqyyaq7ggicym6yrsg4brygkx9156r0m095m7fp3rav"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xf86videorendition = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-rendition-4.2.7"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-rendition-4.2.7.tar.bz2"; - sha256 = "0yzqcdfrnnyaaaa76d4hpwycpq4x2j8qvg9m4q19lj4xbicwc4cm"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto libpciaccess xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xf86videos3virge = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-s3virge-1.11.0"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-s3virge-1.11.0.tar.bz2"; - sha256 = "06d1v5s7xf00y18x12cz11sk00rgn0yq95w66kmgzy465pzxvj84"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto libpciaccess xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xf86videosavage = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-savage-2.3.9"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-savage-2.3.9.tar.bz2"; - sha256 = "11pcrsdpdrwk0mrgv83s5nsx8a9i4lhmivnal3fjbrvi3zdw94rc"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xf86videosiliconmotion = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-siliconmotion-1.7.9"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.9.tar.bz2"; - sha256 = "1g2r6gxqrmjdff95d42msxdw6vmkg2zn5sqv0rxd420iwy8wdwyh"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto libpciaccess xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xf86videosis = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-sis-0.11.0"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-sis-0.11.0.tar.bz2"; - sha256 = "0srvrhydjnynfb7b1s145rgmsk4f71iz0ag4icpmb05944d90xr1"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xf86videosisusb = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-sisusb-0.9.7"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-sisusb-0.9.7.tar.bz2"; - sha256 = "090lfs3hjz3cjd016v5dybmcsigj6ffvjdhdsqv13k90p4b08h7l"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto libpciaccess xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xf86videosuncg6 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-suncg6-1.1.2"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-suncg6-1.1.2.tar.bz2"; - sha256 = "04fgwgk02m4nimlv67rrg1wnyahgymrn6rb2cjj1l8bmzkii4glr"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xf86videosunffb = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-sunffb-1.2.2"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-sunffb-1.2.2.tar.bz2"; - sha256 = "07z3ngifwg2d4jgq8pms47n5lr2yn0ai72g86xxjnb3k20n5ym7s"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xf86videosunleo = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-sunleo-1.2.2"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-sunleo-1.2.2.tar.bz2"; - sha256 = "1gacm0s6rii4x5sx9py5bhvs50jd4vs3nnbwjdjymyf31kpdirl3"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xf86videotdfx = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-tdfx-1.5.0"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-tdfx-1.5.0.tar.bz2"; - sha256 = "0qc5wzwf1n65si9rc37bh224pzahh7gp67vfimbxs0b9yvhq0i9g"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xf86videotga = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-tga-1.2.2"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2"; - sha256 = "0cb161lvdgi6qnf1sfz722qn38q7kgakcvj7b45ba3i0020828r0"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto libpciaccess xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xf86videotrident = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-trident-1.3.8"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-trident-1.3.8.tar.bz2"; - sha256 = "0gxcar434kx813fxdpb93126lhmkl3ikabaljhcj5qn3fkcijlcy"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto libpciaccess xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xf86videov4l = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-v4l-0.3.0"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-v4l-0.3.0.tar.bz2"; - sha256 = "084x4p4avy72mgm2vnnvkicw3419i6pp3wxik8zqh7gmq4xv5z75"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xf86videovboxvideo = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-vboxvideo-1.0.0"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-vboxvideo-1.0.0.tar.bz2"; - sha256 = "195z1js3i51qgxvhfw4bxb4dw3jcrrx2ynpm2y3475dypjzs7dkz"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto libpciaccess xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xf86videovesa = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-vesa-2.5.0"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-vesa-2.5.0.tar.bz2"; - sha256 = "0nf6ai74c60xk96kgr8q9mx6lrxm5id3765ws4d801irqzrj85hz"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto libpciaccess xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xf86videovmware = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, udev, libpciaccess, libX11, libXext, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-vmware-13.3.0"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-vmware-13.3.0.tar.bz2"; - sha256 = "0v06qhm059klq40m2yx4wypzb7h53aaassbjfmm6clcyclj1k5s7"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto libdrm udev libpciaccess libX11 libXext xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xf86videovoodoo = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-voodoo-1.2.5"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-voodoo-1.2.5.tar.bz2"; - sha256 = "1s6p7yxmi12q4y05va53rljwyzd6ry492r1pgi7wwq6cznivhgly"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto libpciaccess xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xf86videowsfb = callPackage ({ stdenv, pkg-config, fetchurl, xorgserver, xorgproto }: stdenv.mkDerivation { - name = "xf86-video-wsfb-0.4.0"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-wsfb-0.4.0.tar.bz2"; - sha256 = "0hr8397wpd0by1hc47fqqrnaw3qdqd8aqgwgzv38w5k3l3jy6p4p"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgserver xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xf86videoxgi = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-xgi-1.6.1"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-xgi-1.6.1.tar.bz2"; - sha256 = "10xd2vah0pnpw5spn40n4p95mpmgvdkly4i1cz51imnlfsw7g8si"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xfd = callPackage ({ stdenv, pkg-config, fetchurl, libxkbfile, fontconfig, libXaw, libXft, libXmu, xorgproto, libXrender, libXt, gettext }: stdenv.mkDerivation { - name = "xfd-1.1.3"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xfd-1.1.3.tar.bz2"; - sha256 = "0n6r1v8sm0z0ycqch035xpm46nv5v4mav3kxh36883l3ln5r6bqr"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config gettext ]; - buildInputs = [ libxkbfile fontconfig libXaw libXft libXmu xorgproto libXrender libXt ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xfontsel = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, libXt }: stdenv.mkDerivation { - name = "xfontsel-1.0.6"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xfontsel-1.0.6.tar.bz2"; - sha256 = "0700lf6hx7dg88wq1yll7zjvf9gbwh06xff20yffkxb289y0pai5"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 libXaw libXmu libXt ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xfs = callPackage ({ stdenv, pkg-config, fetchurl, libXfont2, xorgproto, xtrans }: stdenv.mkDerivation { - name = "xfs-1.2.0"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xfs-1.2.0.tar.bz2"; - sha256 = "0q4q4rbzx159sfn2n52y039fki6nc6a39qdfxa78yjc3aw8i48nv"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libXfont2 xorgproto xtrans ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xfsinfo = callPackage ({ stdenv, pkg-config, fetchurl, libFS, xorgproto }: stdenv.mkDerivation { - name = "xfsinfo-1.0.6"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xfsinfo-1.0.6.tar.bz2"; - sha256 = "1mmir5i7gm71xc0ba8vnizi4744vsd31hknhi4cmgvg6kadqngla"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libFS xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xgamma = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, libXxf86vm }: stdenv.mkDerivation { - name = "xgamma-1.0.6"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xgamma-1.0.6.tar.bz2"; - sha256 = "1lr2nb1fhg5fk2fchqxdxyl739602ggwhmgl2wiv5c8qbidw7w8f"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 xorgproto libXxf86vm ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xgc = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, libXt }: stdenv.mkDerivation { - name = "xgc-1.0.5"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xgc-1.0.5.tar.bz2"; - sha256 = "0pigvjd3i9fchmj1inqy151aafz3dr0vq1h2zizdb2imvadqv0hl"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libXaw libXt ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xhost = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXau, libXmu, xorgproto }: stdenv.mkDerivation { - name = "xhost-1.0.8"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xhost-1.0.8.tar.bz2"; - sha256 = "15n3mnd4i5kh4z32qv11580qjgvnng0wry2y753ljrqkkrbkrp52"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 libXau libXmu xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xinit = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { - name = "xinit-1.4.1"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xinit-1.4.1.tar.bz2"; - sha256 = "1fdbakx59vyh474skjydj1bbglpby3y03nl7mxn0z9v8gdhqz6yy"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xinput = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, libXi, libXinerama, libXrandr }: stdenv.mkDerivation { - name = "xinput-1.6.3"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xinput-1.6.3.tar.bz2"; - sha256 = "1vb6xdd1xmk5f7pwc5zcbxfray5sf1vbnscqwf2yl8lv7gfq38im"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto libX11 libXext libXi libXinerama libXrandr ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xkbcomp = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libxkbfile, xorgproto }: stdenv.mkDerivation { - name = "xkbcomp-1.4.5"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xkbcomp-1.4.5.tar.bz2"; - sha256 = "0pmhshqinwqh5rip670l3szjpywky67hv232ql6gvdj489n0hlb8"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 libxkbfile xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xkbevd = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libxkbfile }: stdenv.mkDerivation { - name = "xkbevd-1.1.4"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xkbevd-1.1.4.tar.bz2"; - sha256 = "0sprjx8i86ljk0l7ldzbz2xlk8916z5zh78cafjv8k1a63js4c14"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 libxkbfile ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xkbprint = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libxkbfile, xorgproto }: stdenv.mkDerivation { - name = "xkbprint-1.0.4"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xkbprint-1.0.4.tar.bz2"; - sha256 = "04iyv5z8aqhabv7wcpvbvq0ji0jrz1666vw6gvxkvl7szswalgqb"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 libxkbfile xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xkbutils = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXaw, libXt }: stdenv.mkDerivation { - name = "xkbutils-1.0.4"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2"; - sha256 = "0c412isxl65wplhl7nsk12vxlri29lk48g3p52hbrs3m0awqm8fj"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto libX11 libXaw libXt ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xkeyboardconfig = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, python3 }: stdenv.mkDerivation { - name = "xkeyboard-config-2.31"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.31.tar.bz2"; - sha256 = "18xddaxh83zm698syh50w983jg6b7b8zgv0dfaf7ha485hgihi6s"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config python3 ]; - buildInputs = [ libX11 xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xkill = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation { - name = "xkill-1.0.5"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xkill-1.0.5.tar.bz2"; - sha256 = "0szzd9nzn0ybkhnfyizb876irwnjsnb78rcaxx6prb71jmmbpw65"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 libXmu xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xload = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt, gettext }: stdenv.mkDerivation { - name = "xload-1.1.3"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xload-1.1.3.tar.bz2"; - sha256 = "01sr6yd6yhyyfgn88l867w6h9dn5ikcynaz5rwji6xqxhw1lhkpk"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config gettext ]; - buildInputs = [ libX11 libXaw libXmu xorgproto libXt ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xlsatoms = callPackage ({ stdenv, pkg-config, fetchurl, libxcb }: stdenv.mkDerivation { - name = "xlsatoms-1.1.3"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xlsatoms-1.1.3.tar.bz2"; - sha256 = "10m3a046jvaw5ywx4y65kl84lsxqan70gww1g1r7cf96ijaqz1jp"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libxcb ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xlsclients = callPackage ({ stdenv, pkg-config, fetchurl, libxcb }: stdenv.mkDerivation { - name = "xlsclients-1.1.4"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xlsclients-1.1.4.tar.bz2"; - sha256 = "1h8931sn34mcip6vpi4v7hdmr1r58gkbw4s2p97w98kykks2lgvp"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libxcb ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xlsfonts = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { - name = "xlsfonts-1.0.6"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xlsfonts-1.0.6.tar.bz2"; - sha256 = "0s6kxgv78chkwsqmhw929f4pf91gq63f4yvixxnan1h00cx0pf49"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xmag = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, libXt }: stdenv.mkDerivation { - name = "xmag-1.0.6"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xmag-1.0.6.tar.bz2"; - sha256 = "0qg12ifbbk9n8fh4jmyb625cknn8ssj86chd6zwdiqjin8ivr8l7"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 libXaw libXmu libXt ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xmessage = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, libXt }: stdenv.mkDerivation { - name = "xmessage-1.0.5"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xmessage-1.0.5.tar.bz2"; - sha256 = "0a90kfm0qz8cn2pbpqfyqrc5s9bfvvy14nj848ynvw56wy0zng9p"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libXaw libXt ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xmodmap = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { - name = "xmodmap-1.0.10"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xmodmap-1.0.10.tar.bz2"; - sha256 = "0z28331i2pm16x671fa9qwsfqdmr6a43bzwmp0dm17a3sx0hjgs7"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xmore = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, libXt }: stdenv.mkDerivation { - name = "xmore-1.0.3"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xmore-1.0.3.tar.bz2"; - sha256 = "06r514p30v87vx00ddlck9mwazaqk9bx08ip866p1mw2a46iwjk4"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libXaw libXt ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xorgcffiles = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { - name = "xorg-cf-files-1.0.6"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2"; - sha256 = "0kckng0zs1viz0nr84rdl6dswgip7ndn4pnh5nfwnviwpsfmmksd"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xorgdocs = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { - name = "xorg-docs-1.7.1"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/doc/xorg-docs-1.7.1.tar.bz2"; - sha256 = "0jrc4jmb4raqawx0j9jmhgasr0k6sxv0bm2hrxjh9hb26iy6gf14"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xorgproto = callPackage ({ stdenv, pkg-config, fetchurl, libXt }: stdenv.mkDerivation { - name = "xorgproto-2021.3"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/proto/xorgproto-2021.3.tar.bz2"; - sha256 = "0dypp7cvjf0rvwa7cn1zp7djw5ynhs1rwk9p0r1vczbwzha2nwsc"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libXt ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xorgserver = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, openssl, libX11, libXau, libXaw, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, libXmu, libXpm, libXrender, libXres, libXt }: stdenv.mkDerivation { - name = "xorg-server-1.20.11"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/xserver/xorg-server-1.20.11.tar.bz2"; - sha256 = "0jacqgin8kcyy8fyv0lhgb4if8g9hp60rm3ih3s1mgps7xp7jk4i"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xorgsgmldoctools = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { - name = "xorg-sgml-doctools-1.11"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/doc/xorg-sgml-doctools-1.11.tar.bz2"; - sha256 = "0k5pffyi5bx8dmfn033cyhgd3gf6viqj3x769fqixifwhbgy2777"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xpr = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation { - name = "xpr-1.0.5"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xpr-1.0.5.tar.bz2"; - sha256 = "07qy9lwjvxighcmg6qvjkgagad3wwvidrfx0jz85lgynz3qy0dmr"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 libXmu xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xprop = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { - name = "xprop-1.2.5"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xprop-1.2.5.tar.bz2"; - sha256 = "18ckr8g1z50zkc01hprkpm1npwbq32yqib4b3l98c95z2q1yv4lv"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xrandr = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, libXrandr, libXrender }: stdenv.mkDerivation { - name = "xrandr-1.5.1"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xrandr-1.5.1.tar.xz"; - sha256 = "0ql75s1n3dm2m3g1ilb9l6hqh15r0v709bgghpwazy3jknpnvivv"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 xorgproto libXrandr libXrender ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xrdb = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation { - name = "xrdb-1.2.0"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xrdb-1.2.0.tar.bz2"; - sha256 = "0ik9gh6363c47pr0dp7q22nfs8vmavjg2v4bsr0604ppl77nafpj"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 libXmu xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xrefresh = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { - name = "xrefresh-1.0.6"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xrefresh-1.0.6.tar.bz2"; - sha256 = "0lv3rlshh7s0z3aqx5ahnnf8cl082m934bk7gv881mz8nydznz98"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xset = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, libXmu, xorgproto, libXxf86misc }: stdenv.mkDerivation { - name = "xset-1.2.4"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xset-1.2.4.tar.bz2"; - sha256 = "0my987wjvra7l92ry6q44ky383yg3phzxhdbn3lqhapm1ll9bzg4"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 libXext libXmu xorgproto libXxf86misc ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xsetroot = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xbitmaps, libXcursor, libXmu, xorgproto }: stdenv.mkDerivation { - name = "xsetroot-1.1.2"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xsetroot-1.1.2.tar.bz2"; - sha256 = "0z21mqvmdl6rl63q77479wgkfygnll57liza1i3va7sr4fx45i0h"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 xbitmaps libXcursor libXmu xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xsm = callPackage ({ stdenv, pkg-config, fetchurl, libICE, libSM, libX11, libXaw, libXt }: stdenv.mkDerivation { - name = "xsm-1.0.4"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xsm-1.0.4.tar.bz2"; - sha256 = "09a4ss1fnrh1sgm21r4n5pivawf34paci3rn6mscyljf7a4vcd4r"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libICE libSM libX11 libXaw libXt ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xstdcmap = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation { - name = "xstdcmap-1.0.4"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xstdcmap-1.0.4.tar.bz2"; - sha256 = "12vgzsxv4rw25frkgjyli6w6hy10lgpvsx9wzw2v5l5a3qzqp286"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 libXmu xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xtrans = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { - name = "xtrans-1.4.0"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/lib/xtrans-1.4.0.tar.bz2"; - sha256 = "0wyp0yc6gi72hwc3kjmvm3vkj9p6s407cb6dxx37jh9wb68l8z1p"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xtrap = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXt, libXTrap }: stdenv.mkDerivation { - name = "xtrap-1.0.3"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xtrap-1.0.3.tar.bz2"; - sha256 = "0sqm4j1zflk1s94iq4waa70hna1xcys88v9a70w0vdw66czhvj2j"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 libXt libXTrap ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xvinfo = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, libXv }: stdenv.mkDerivation { - name = "xvinfo-1.1.4"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xvinfo-1.1.4.tar.bz2"; - sha256 = "0gz7fvxavqlrqynpfbrm2nc9yx8h0ksnbnv34fj7n1q6cq6j4lq3"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 xorgproto libXv ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xwd = callPackage ({ stdenv, pkg-config, fetchurl, libxkbfile, libX11, xorgproto }: stdenv.mkDerivation { - name = "xwd-1.0.7"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xwd-1.0.7.tar.bz2"; - sha256 = "1537i8q8pgf0sjklakzfvjwrq5b246qjywrx9ll8xfg0p6w1as6d"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libxkbfile libX11 xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xwininfo = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libxcb, xorgproto }: stdenv.mkDerivation { - name = "xwininfo-1.1.4"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xwininfo-1.1.4.tar.bz2"; - sha256 = "00avrpw4h5mr1klp41lv2j4dmq465v6l5kb5bhm4k5ml8sm9i543"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 libxcb xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; - - xwud = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { - name = "xwud-1.0.5"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xwud-1.0.5.tar.bz2"; - sha256 = "1a8hdgy40smvblnh3s9f0vkqckl68nmivx7d48zk34m8z18p16cr"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; + # THIS IS A GENERATED FILE. DO NOT EDIT! + appres = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, libXt }: stdenv.mkDerivation { + name = "appres-1.0.5"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/appres-1.0.5.tar.bz2"; + sha256 = "0a2r4sxky3k7b3kdb5pbv709q9b5zi3gxjz336wl66f828vqkbgz"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 xorgproto libXt ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + bdftopcf = callPackage + ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { + name = "bdftopcf-1.1"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/bdftopcf-1.1.tar.bz2"; + sha256 = "18hiscgljrz10zjcws25bis32nyrg3hzgmiq6scrh7izqmgz0kab"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + bitmap = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, libXaw, xbitmaps, libXmu, xorgproto, libXt }: stdenv.mkDerivation { + name = "bitmap-1.0.9"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/bitmap-1.0.9.tar.gz"; + sha256 = "0kzbv5wh02798l77y9y8d8sjkmzm9cvsn3rjh8a86v5waj50apsb"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 libXaw xbitmaps libXmu xorgproto libXt ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + editres = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt }: stdenv.mkDerivation { + name = "editres-1.0.7"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/editres-1.0.7.tar.bz2"; + sha256 = "04awfwmy3f9f0bchidc4ssbgrbicn5gzasg3jydpfnp5513d76h8"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 libXaw libXmu xorgproto libXt ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + encodings = callPackage + ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { + name = "encodings-1.0.5"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/encodings-1.0.5.tar.bz2"; + sha256 = "0caafx0yqqnqyvbalxhh3mb0r9v36xmcy5zjhygb2i508dhy35mx"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontadobe100dpi = callPackage + ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { + name = "font-adobe-100dpi-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-adobe-100dpi-1.0.3.tar.bz2"; + sha256 = "0m60f5bd0caambrk8ksknb5dks7wzsg7g7xaf0j21jxmx8rq9h5j"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; + buildInputs = [ ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontadobe75dpi = callPackage + ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { + name = "font-adobe-75dpi-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-adobe-75dpi-1.0.3.tar.bz2"; + sha256 = "02advcv9lyxpvrjv8bjh1b797lzg6jvhipclz49z8r8y98g4l0n6"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; + buildInputs = [ ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontadobeutopia100dpi = callPackage + ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { + name = "font-adobe-utopia-100dpi-1.0.4"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-adobe-utopia-100dpi-1.0.4.tar.bz2"; + sha256 = "19dd9znam1ah72jmdh7i6ny2ss2r6m21z9v0l43xvikw48zmwvyi"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; + buildInputs = [ ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontadobeutopia75dpi = callPackage + ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { + name = "font-adobe-utopia-75dpi-1.0.4"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-adobe-utopia-75dpi-1.0.4.tar.bz2"; + sha256 = "152wigpph5wvl4k9m3l4mchxxisgsnzlx033mn5iqrpkc6f72cl7"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; + buildInputs = [ ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontadobeutopiatype1 = callPackage + ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { + name = "font-adobe-utopia-type1-1.0.4"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-adobe-utopia-type1-1.0.4.tar.bz2"; + sha256 = "0xw0pdnzj5jljsbbhakc6q9ha2qnca1jr81zk7w70yl9bw83b54p"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config mkfontscale ]; + buildInputs = [ ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontalias = callPackage + ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { + name = "font-alias-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-alias-1.0.3.tar.bz2"; + sha256 = "16ic8wfwwr3jicaml7b5a0sk6plcgc1kg84w02881yhwmqm3nicb"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontarabicmisc = callPackage + ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + name = "font-arabic-misc-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-arabic-misc-1.0.3.tar.bz2"; + sha256 = "1x246dfnxnmflzf0qzy62k8jdpkb6jkgspcjgbk8jcq9lw99npah"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; + buildInputs = [ ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontbh100dpi = callPackage + ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { + name = "font-bh-100dpi-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-bh-100dpi-1.0.3.tar.bz2"; + sha256 = "10cl4gm38dw68jzln99ijix730y7cbx8np096gmpjjwff1i73h13"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; + buildInputs = [ ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontbh75dpi = callPackage + ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { + name = "font-bh-75dpi-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-bh-75dpi-1.0.3.tar.bz2"; + sha256 = "073jmhf0sr2j1l8da97pzsqj805f7mf9r2gy92j4diljmi8sm1il"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; + buildInputs = [ ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontbhlucidatypewriter100dpi = callPackage + ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { + name = "font-bh-lucidatypewriter-100dpi-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2"; + sha256 = "1fqzckxdzjv4802iad2fdrkpaxl4w0hhs9lxlkyraq2kq9ik7a32"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; + buildInputs = [ ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontbhlucidatypewriter75dpi = callPackage + ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { + name = "font-bh-lucidatypewriter-75dpi-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2"; + sha256 = "0cfbxdp5m12cm7jsh3my0lym9328cgm7fa9faz2hqj05wbxnmhaa"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; + buildInputs = [ ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontbhttf = callPackage + ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { + name = "font-bh-ttf-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-bh-ttf-1.0.3.tar.bz2"; + sha256 = "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config mkfontscale ]; + buildInputs = [ ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontbhtype1 = callPackage + ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { + name = "font-bh-type1-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-bh-type1-1.0.3.tar.bz2"; + sha256 = "1hb3iav089albp4sdgnlh50k47cdjif9p4axm0kkjvs8jyi5a53n"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config mkfontscale ]; + buildInputs = [ ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontbitstream100dpi = callPackage + ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + name = "font-bitstream-100dpi-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-bitstream-100dpi-1.0.3.tar.bz2"; + sha256 = "1kmn9jbck3vghz6rj3bhc3h0w6gh0qiaqm90cjkqsz1x9r2dgq7b"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; + buildInputs = [ ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontbitstream75dpi = callPackage + ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + name = "font-bitstream-75dpi-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-bitstream-75dpi-1.0.3.tar.bz2"; + sha256 = "13plbifkvfvdfym6gjbgy9wx2xbdxi9hfrl1k22xayy02135wgxs"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; + buildInputs = [ ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontbitstreamtype1 = callPackage + ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { + name = "font-bitstream-type1-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-bitstream-type1-1.0.3.tar.bz2"; + sha256 = "1256z0jhcf5gbh1d03593qdwnag708rxqa032izmfb5dmmlhbsn6"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config mkfontscale ]; + buildInputs = [ ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontcronyxcyrillic = callPackage + ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + name = "font-cronyx-cyrillic-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-cronyx-cyrillic-1.0.3.tar.bz2"; + sha256 = "0ai1v4n61k8j9x2a1knvfbl2xjxk3xxmqaq3p9vpqrspc69k31kf"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; + buildInputs = [ ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontcursormisc = callPackage + ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + name = "font-cursor-misc-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-cursor-misc-1.0.3.tar.bz2"; + sha256 = "0dd6vfiagjc4zmvlskrbjz85jfqhf060cpys8j0y1qpcbsrkwdhp"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; + buildInputs = [ ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontdaewoomisc = callPackage + ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + name = "font-daewoo-misc-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-daewoo-misc-1.0.3.tar.bz2"; + sha256 = "1s2bbhizzgbbbn5wqs3vw53n619cclxksljvm759h9p1prqdwrdw"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; + buildInputs = [ ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontdecmisc = callPackage + ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + name = "font-dec-misc-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-dec-misc-1.0.3.tar.bz2"; + sha256 = "0yzza0l4zwyy7accr1s8ab7fjqkpwggqydbm2vc19scdby5xz7g1"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; + buildInputs = [ ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontibmtype1 = callPackage + ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { + name = "font-ibm-type1-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-ibm-type1-1.0.3.tar.bz2"; + sha256 = "1pyjll4adch3z5cg663s6vhi02k8m6488f0mrasg81ssvg9jinzx"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config mkfontscale ]; + buildInputs = [ ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontisasmisc = callPackage + ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + name = "font-isas-misc-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-isas-misc-1.0.3.tar.bz2"; + sha256 = "0rx8q02rkx673a7skkpnvfkg28i8gmqzgf25s9yi0lar915sn92q"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; + buildInputs = [ ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontjismisc = callPackage + ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + name = "font-jis-misc-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-jis-misc-1.0.3.tar.bz2"; + sha256 = "0rdc3xdz12pnv951538q6wilx8mrdndpkphpbblszsv7nc8cw61b"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; + buildInputs = [ ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontmicromisc = callPackage + ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + name = "font-micro-misc-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-micro-misc-1.0.3.tar.bz2"; + sha256 = "1dldxlh54zq1yzfnrh83j5vm0k4ijprrs5yl18gm3n9j1z0q2cws"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; + buildInputs = [ ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontmisccyrillic = callPackage + ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + name = "font-misc-cyrillic-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-misc-cyrillic-1.0.3.tar.bz2"; + sha256 = "0q2ybxs8wvylvw95j6x9i800rismsmx4b587alwbfqiw6biy63z4"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; + buildInputs = [ ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontmiscethiopic = callPackage + ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { + name = "font-misc-ethiopic-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-misc-ethiopic-1.0.3.tar.bz2"; + sha256 = "19cq7iq0pfad0nc2v28n681fdq3fcw1l1hzaq0wpkgpx7bc1zjsk"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config mkfontscale ]; + buildInputs = [ ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontmiscmeltho = callPackage + ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { + name = "font-misc-meltho-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-misc-meltho-1.0.3.tar.bz2"; + sha256 = "148793fqwzrc3bmh2vlw5fdiwjc2n7vs25cic35gfp452czk489p"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config mkfontscale ]; + buildInputs = [ ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontmiscmisc = callPackage + ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { + name = "font-misc-misc-1.1.2"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-misc-misc-1.1.2.tar.bz2"; + sha256 = "150pq6n8n984fah34n3k133kggn9v0c5k07igv29sxp1wi07krxq"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; + buildInputs = [ ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontmuttmisc = callPackage + ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + name = "font-mutt-misc-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-mutt-misc-1.0.3.tar.bz2"; + sha256 = "13qghgr1zzpv64m0p42195k1kc77pksiv059fdvijz1n6kdplpxx"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; + buildInputs = [ ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontschumachermisc = callPackage + ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { + name = "font-schumacher-misc-1.1.2"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-schumacher-misc-1.1.2.tar.bz2"; + sha256 = "0nkym3n48b4v36y4s927bbkjnsmicajarnf6vlp7wxp0as304i74"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; + buildInputs = [ ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontscreencyrillic = callPackage + ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + name = "font-screen-cyrillic-1.0.4"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-screen-cyrillic-1.0.4.tar.bz2"; + sha256 = "0yayf1qlv7irf58nngddz2f1q04qkpr5jwp4aja2j5gyvzl32hl2"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; + buildInputs = [ ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontsonymisc = callPackage + ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + name = "font-sony-misc-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-sony-misc-1.0.3.tar.bz2"; + sha256 = "1xfgcx4gsgik5mkgkca31fj3w72jw9iw76qyrajrsz1lp8ka6hr0"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; + buildInputs = [ ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontsunmisc = callPackage + ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + name = "font-sun-misc-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-sun-misc-1.0.3.tar.bz2"; + sha256 = "1q6jcqrffg9q5f5raivzwx9ffvf7r11g6g0b125na1bhpz5ly7s8"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; + buildInputs = [ ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fonttosfnt = callPackage + ({ stdenv, pkg-config, fetchurl, libfontenc, freetype, xorgproto }: stdenv.mkDerivation { + name = "fonttosfnt-1.2.1"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/fonttosfnt-1.2.1.tar.bz2"; + sha256 = "16r51h5wfy85wnbq3q8v8a184hb25c3ksjgix0mlcywdz7qkbj07"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libfontenc freetype xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontutil = callPackage + ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { + name = "font-util-1.3.1"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-util-1.3.1.tar.bz2"; + sha256 = "08drjb6cf84pf5ysghjpb4i7xkd2p86k3wl2a0jxs1jif6qbszma"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontwinitzkicyrillic = callPackage + ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + name = "font-winitzki-cyrillic-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-winitzki-cyrillic-1.0.3.tar.bz2"; + sha256 = "181n1bgq8vxfxqicmy1jpm1hnr6gwn1kdhl6hr4frjigs1ikpldb"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; + buildInputs = [ ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontxfree86type1 = callPackage + ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { + name = "font-xfree86-type1-1.0.4"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-xfree86-type1-1.0.4.tar.bz2"; + sha256 = "0jp3zc0qfdaqfkgzrb44vi9vi0a8ygb35wp082yz7rvvxhmg9sya"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config mkfontscale ]; + buildInputs = [ ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + gccmakedep = callPackage + ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { + name = "gccmakedep-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/util/gccmakedep-1.0.3.tar.bz2"; + sha256 = "1r1fpy5ni8chbgx7j5sz0008fpb6vbazpy1nifgdhgijyzqxqxdj"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + iceauth = callPackage + ({ stdenv, pkg-config, fetchurl, libICE, xorgproto }: stdenv.mkDerivation { + name = "iceauth-1.0.8"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/iceauth-1.0.8.tar.bz2"; + sha256 = "1ik0mdidmyvy48hn8p2hwvf3535rf3m96hhf0mvcqrbj44x23vp6"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libICE xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + ico = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { + name = "ico-1.0.5"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/ico-1.0.5.tar.bz2"; + sha256 = "0gvpwfk9kvlfn631dgizc45qc2qqjn9pavdp2q7qb3drkvr64fyp"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + imake = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto }: stdenv.mkDerivation { + name = "imake-1.0.8"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/util/imake-1.0.8.tar.bz2"; + sha256 = "00m7l90ws72k1qm101sd2rx92ckd50cszyng5d4dd77jncbf9lmq"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libAppleWM = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { + name = "libAppleWM-1.4.1"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libAppleWM-1.4.1.tar.bz2"; + sha256 = "0r8x28n45q89x91mz8mv0zkkcxi8wazkac886fyvflhiv2y8ap2y"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libX11 libXext ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libFS = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, xtrans }: stdenv.mkDerivation { + name = "libFS-1.0.8"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libFS-1.0.8.tar.bz2"; + sha256 = "03xxyvpfa3rhqcld4p2chkil482jn9cp80hj17jdybcv2hkkgqf8"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto xtrans ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libICE = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, xtrans }: stdenv.mkDerivation { + name = "libICE-1.0.10"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libICE-1.0.10.tar.bz2"; + sha256 = "0j638yvmyna2k4mz465jywgdybgdchdqppfx6xfazg7l5khxr1kg"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto xtrans ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libSM = callPackage + ({ stdenv, pkg-config, fetchurl, libICE, libuuid, xorgproto, xtrans }: stdenv.mkDerivation { + name = "libSM-1.2.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libSM-1.2.3.tar.bz2"; + sha256 = "1fwwfq9v3sqmpzpscymswxn76xhxnysa24pfim1mcpxhvjcl89id"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libICE libuuid xorgproto xtrans ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libWindowsWM = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { + name = "libWindowsWM-1.0.1"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2"; + sha256 = "1p0flwb67xawyv6yhri9w17m1i4lji5qnd0gq8v1vsfb8zw7rw15"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libX11 libXext ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libX11 = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libxcb, xtrans }: stdenv.mkDerivation { + name = "libX11-1.7.0"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libX11-1.7.0.tar.bz2"; + sha256 = "0m6bfwllr3pq2c00l51y62yiq15kphc8dw69zf67qhwmclxzkj1n"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libxcb xtrans ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libXScrnSaver = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { + name = "libXScrnSaver-1.2.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libXScrnSaver-1.2.3.tar.bz2"; + sha256 = "1y4vx1vabg7j9hamp0vrfrax5b0lmgm3h0lbgbb3hnkv3dd0f5zr"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libX11 libXext ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libXTrap = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, libXt }: stdenv.mkDerivation { + name = "libXTrap-1.0.1"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libXTrap-1.0.1.tar.bz2"; + sha256 = "0bi5wxj6avim61yidh9fd3j4n8czxias5m8vss9vhxjnk1aksdwg"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libX11 libXext libXt ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libXau = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto }: stdenv.mkDerivation { + name = "libXau-1.0.9"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libXau-1.0.9.tar.bz2"; + sha256 = "1v3krc6x0zliaa66qq1bf9j60x5nqfy68v8axaiglxpnvgqcpy6c"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libXaw = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto, libXmu, libXpm, libXt }: stdenv.mkDerivation { + name = "libXaw-1.0.14"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libXaw-1.0.14.tar.bz2"; + sha256 = "13kg59r3086383g1dyhnwxanhp2frssh9062mrgn34nzlf7gkbkn"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 libXext xorgproto libXmu libXpm libXt ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libXaw3d = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, libXext, libXmu, libXpm, xorgproto, libXt }: stdenv.mkDerivation { + name = "libXaw3d-1.6.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libXaw3d-1.6.3.tar.bz2"; + sha256 = "0i653s8g25cc0mimkwid9366bqkbyhdyjhckx7bw77j20hzrkfid"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 libXext libXmu libXpm xorgproto libXt ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libXcomposite = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXfixes }: stdenv.mkDerivation { + name = "libXcomposite-0.4.5"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libXcomposite-0.4.5.tar.bz2"; + sha256 = "13sfcglvz87vl58hd9rszwr73z0z4nwga3c12rfh7f5s2ln8l8dk"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libX11 libXfixes ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libXcursor = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXfixes, libXrender }: stdenv.mkDerivation { + name = "libXcursor-1.2.0"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libXcursor-1.2.0.tar.bz2"; + sha256 = "10l7c9fm0jmpkm9ab9dz8r6m1pr87vvgqjnbx1psz50h4pwfklrs"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libX11 libXfixes libXrender ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libXdamage = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXfixes }: stdenv.mkDerivation { + name = "libXdamage-1.1.5"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libXdamage-1.1.5.tar.bz2"; + sha256 = "0igaw2akjf712y3rv7lx473jigxmcv9rs9y8sbrvbhya8f30cd5p"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libX11 libXfixes ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libXdmcp = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto }: stdenv.mkDerivation { + name = "libXdmcp-1.1.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libXdmcp-1.1.3.tar.bz2"; + sha256 = "0ab53h0rkq721ihk5hi469x500f3pgbkm1wy01yf24x5m923nli0"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libXext = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { + name = "libXext-1.3.4"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libXext-1.3.4.tar.bz2"; + sha256 = "0azqxllcsfxc3ilhz6kwc6x7m8wc477p59ir9p0yrsldx766zbar"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libXfixes = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libX11 }: stdenv.mkDerivation { + name = "libXfixes-5.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libXfixes-5.0.3.tar.bz2"; + sha256 = "1miana3y4hwdqdparsccmygqr3ic3hs5jrqfzp70hvi2zwxd676y"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libX11 ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libXfont = callPackage + ({ stdenv, pkg-config, fetchurl, libfontenc, xorgproto, freetype, xtrans, zlib }: stdenv.mkDerivation { + name = "libXfont-1.5.4"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libXfont-1.5.4.tar.bz2"; + sha256 = "0hiji1bvpl78aj3a3141hkk353aich71wv8l5l2z51scfy878zqs"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libfontenc xorgproto freetype xtrans zlib ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libXfont2 = callPackage + ({ stdenv, pkg-config, fetchurl, libfontenc, xorgproto, freetype, xtrans, zlib }: stdenv.mkDerivation { + name = "libXfont2-2.0.4"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libXfont2-2.0.4.tar.bz2"; + sha256 = "1rk9pjxcm01lbr1dxhnvk4f2qrn6zp068qjbvvz5w0z5d0rin5bd"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libfontenc xorgproto freetype xtrans zlib ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libXft = callPackage + ({ stdenv, pkg-config, fetchurl, fontconfig, freetype, libX11, xorgproto, libXrender }: stdenv.mkDerivation { + name = "libXft-2.3.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libXft-2.3.3.tar.bz2"; + sha256 = "05lja9s54090xwh31r0bqms4v3pimng5xr09g2rdnafx2vk6hp12"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ fontconfig freetype libX11 xorgproto libXrender ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libXi = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, libXfixes }: stdenv.mkDerivation { + name = "libXi-1.7.10"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libXi-1.7.10.tar.bz2"; + sha256 = "0q8hz3slga3w3ch8wp0k7ay9ilhz315qnab0w1y2x9w3cf7hv8rn"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libX11 libXext libXfixes ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libXinerama = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto }: stdenv.mkDerivation { + name = "libXinerama-1.1.4"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libXinerama-1.1.4.tar.bz2"; + sha256 = "086p0axqj57nvkaqa6r00dnr9kyrn1m8blgf0zjy25zpxkbxn200"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 libXext xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libXmu = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto, libXt }: stdenv.mkDerivation { + name = "libXmu-1.1.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libXmu-1.1.3.tar.bz2"; + sha256 = "0cdpqnx6258i4l6qhphvkdiyspysg0i5caqjy820kp63wwjk4d4w"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 libXext xorgproto libXt ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libXp = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXau, libXext }: stdenv.mkDerivation { + name = "libXp-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libXp-1.0.3.tar.bz2"; + sha256 = "0mwc2jwmq03b1m9ihax5c6gw2ln8rc70zz4fsj3kb7440nchqdkz"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libX11 libXau libXext ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libXpm = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto, libXt, gettext }: stdenv.mkDerivation { + name = "libXpm-3.5.13"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libXpm-3.5.13.tar.bz2"; + sha256 = "09dc6nwlb2122h02vl64k9x56mxnyqz2gwpga0abfv4bb1bxmlcw"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config gettext ]; + buildInputs = [ libX11 libXext xorgproto libXt ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libXpresent = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libX11 }: stdenv.mkDerivation { + name = "libXpresent-1.0.0"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libXpresent-1.0.0.tar.bz2"; + sha256 = "12kvvar3ihf6sw49h6ywfdiwmb8i1gh8wasg1zhzp6hs2hay06n1"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libX11 ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libXrandr = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, libXrender }: stdenv.mkDerivation { + name = "libXrandr-1.5.2"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libXrandr-1.5.2.tar.bz2"; + sha256 = "08z0mqywrm7ij8bxlfrx0d2wy6kladdmkva1nw5k6qix82z0xsla"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libX11 libXext libXrender ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libXrender = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libX11 }: stdenv.mkDerivation { + name = "libXrender-0.9.10"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libXrender-0.9.10.tar.bz2"; + sha256 = "0j89cnb06g8x79wmmnwzykgkkfdhin9j7hjpvsxwlr3fz1wmjvf0"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libX11 ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libXres = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { + name = "libXres-1.2.1"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libXres-1.2.1.tar.bz2"; + sha256 = "049b7dk6hx47161hg47ryjrm6pwsp27r5pby05b0wqb1pcggprmn"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libX11 libXext ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libXt = callPackage + ({ stdenv, pkg-config, fetchurl, libICE, xorgproto, libSM, libX11 }: stdenv.mkDerivation { + name = "libXt-1.2.1"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libXt-1.2.1.tar.bz2"; + sha256 = "0q1x7842r8rcn2m0q4q9f69h4qa097fyizs8brzx5ns62s7w1737"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libICE xorgproto libSM libX11 ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libXtst = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, libXi }: stdenv.mkDerivation { + name = "libXtst-1.2.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libXtst-1.2.3.tar.bz2"; + sha256 = "012jpyj7xfm653a9jcfqbzxyywdmwb2b5wr1dwylx14f3f54jma6"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libX11 libXext libXi ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libXv = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { + name = "libXv-1.0.11"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libXv-1.0.11.tar.bz2"; + sha256 = "125hn06bd3d8y97hm2pbf5j55gg4r2hpd3ifad651i4sr7m16v6j"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libX11 libXext ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libXvMC = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, libXv }: stdenv.mkDerivation { + name = "libXvMC-1.0.12"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libXvMC-1.0.12.tar.bz2"; + sha256 = "1kbdjsvkm5l7axv7g477qj18sab2wnqhliy6197syzizgfbsfgbb"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libX11 libXext libXv ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libXxf86dga = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto }: stdenv.mkDerivation { + name = "libXxf86dga-1.1.5"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libXxf86dga-1.1.5.tar.bz2"; + sha256 = "00vjvcdlc1sga251jkxn6gkxmx9h5n290ffxxpa40qbca1gvr61b"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 libXext xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libXxf86misc = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto }: stdenv.mkDerivation { + name = "libXxf86misc-1.0.4"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libXxf86misc-1.0.4.tar.bz2"; + sha256 = "107k593sx27vjz3v7gbb223add9i7w0bjc90gbb3jqpin3i07758"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 libXext xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libXxf86vm = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto }: stdenv.mkDerivation { + name = "libXxf86vm-1.1.4"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libXxf86vm-1.1.4.tar.bz2"; + sha256 = "0mydhlyn72i7brjwypsqrpkls3nm6vxw0li8b2nw0caz7kwjgvmg"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 libXext xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libdmx = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { + name = "libdmx-1.1.4"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libdmx-1.1.4.tar.bz2"; + sha256 = "0hvjfhrcym770cr0zpqajdy3cda30aiwbjzv16iafkqkbl090gr5"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libX11 libXext ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libfontenc = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, zlib }: stdenv.mkDerivation { + name = "libfontenc-1.1.4"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libfontenc-1.1.4.tar.bz2"; + sha256 = "0y90170dp8wsidr1dzza0grxr1lfh30ji3b5vkjz4j6x1n0wxz1c"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto zlib ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libpciaccess = callPackage + ({ stdenv, pkg-config, fetchurl, zlib }: stdenv.mkDerivation { + name = "libpciaccess-0.16"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libpciaccess-0.16.tar.bz2"; + sha256 = "12glp4w1kgvmqn89lk19cgr6jccd3awxra4dxisp7pagi06rsk11"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ zlib ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libpthreadstubs = callPackage + ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { + name = "libpthread-stubs-0.4"; + builder = ./builder.sh; + src = fetchurl { + url = "https://xcb.freedesktop.org/dist/libpthread-stubs-0.4.tar.bz2"; + sha256 = "0cz7s9w8lqgzinicd4g36rjg08zhsbyngh0w68c3np8nlc8mkl74"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libxcb = callPackage + ({ stdenv, pkg-config, fetchurl, libxslt, libpthreadstubs, libXau, xcbproto, libXdmcp, python3 }: stdenv.mkDerivation { + name = "libxcb-1.14"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libxcb-1.14.tar.xz"; + sha256 = "0d2chjgyn5lr9sfhacfvqgnj9l9faz11vn322a06jd6lk3dxcpm5"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config python3 ]; + buildInputs = [ libxslt libpthreadstubs libXau xcbproto libXdmcp ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libxkbfile = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libX11 }: stdenv.mkDerivation { + name = "libxkbfile-1.1.0"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libxkbfile-1.1.0.tar.bz2"; + sha256 = "1irq9crvscd3yb8sr802dhvvfr35jdy1n2yz094xplmd42mbv3bm"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libX11 ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libxshmfence = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto }: stdenv.mkDerivation { + name = "libxshmfence-1.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libxshmfence-1.3.tar.bz2"; + sha256 = "1ir0j92mnd1nk37mrv9bz5swnccqldicgszvfsh62jd14q6k115q"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + listres = callPackage + ({ stdenv, pkg-config, fetchurl, libXaw, libXmu, xorgproto, libXt }: stdenv.mkDerivation { + name = "listres-1.0.4"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/listres-1.0.4.tar.bz2"; + sha256 = "041bxkvv6f92sm3hhm977c4gdqdv5r1jyxjqcqfi8vkrg3s2j4ka"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libXaw libXmu xorgproto libXt ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + lndir = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto }: stdenv.mkDerivation { + name = "lndir-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/util/lndir-1.0.3.tar.bz2"; + sha256 = "0pdngiy8zdhsiqx2am75yfcl36l7kd7d7nl0rss8shcdvsqgmx29"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + luit = callPackage + ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { + name = "luit-20190106"; + builder = ./builder.sh; + src = fetchurl { + url = "https://invisible-mirror.net/archives/luit/luit-20190106.tgz"; + sha256 = "081rrajj5hpgx3pvm43grqzscnq5kl320q0wq6zzhf6wrijhz41b"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + makedepend = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto }: stdenv.mkDerivation { + name = "makedepend-1.0.6"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/util/makedepend-1.0.6.tar.bz2"; + sha256 = "072h9nzh8s5vqfz35dli4fba36fnr219asjrb7p89n8ph0paan6m"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + mkfontscale = callPackage + ({ stdenv, pkg-config, fetchurl, libfontenc, freetype, xorgproto, zlib }: stdenv.mkDerivation { + name = "mkfontscale-1.2.1"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/mkfontscale-1.2.1.tar.bz2"; + sha256 = "1ixsnsm2mn0zy9ksdid0lj6irnhvasfik9mz8bbrs5sajzmra16a"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libfontenc freetype xorgproto zlib ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + oclock = callPackage + ({ stdenv, pkg-config, fetchurl, libxkbfile, libX11, libXext, libXmu, libXt }: stdenv.mkDerivation { + name = "oclock-1.0.4"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/oclock-1.0.4.tar.bz2"; + sha256 = "1zmfzfmdp42nvapf0qz1bc3i3waq5sjrpkgfw64qs4nmq30wy86c"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libxkbfile libX11 libXext libXmu libXt ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + sessreg = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto }: stdenv.mkDerivation { + name = "sessreg-1.1.2"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/sessreg-1.1.2.tar.bz2"; + sha256 = "0crczl25zynkrslmm8sjaxszhrh4i33m7h5fg4wfdb3k8aarxjyz"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + setxkbmap = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, libxkbfile }: stdenv.mkDerivation { + name = "setxkbmap-1.3.2"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/setxkbmap-1.3.2.tar.bz2"; + sha256 = "1xdrxs65v7d0rw1yaz0vsz55w4hxym99216p085ya9978j379wlg"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 libxkbfile ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + smproxy = callPackage + ({ stdenv, pkg-config, fetchurl, libICE, libSM, libXmu, libXt }: stdenv.mkDerivation { + name = "smproxy-1.0.6"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/smproxy-1.0.6.tar.bz2"; + sha256 = "0rkjyzmsdqmlrkx8gy2j4q6iksk58hcc92xzdprkf8kml9ar3wbc"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libICE libSM libXmu libXt ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + transset = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { + name = "transset-1.0.2"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/transset-1.0.2.tar.bz2"; + sha256 = "088v8p0yfn4r3azabp6662hqikfs2gjb9xmjjd45gnngwwp19b2b"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + twm = callPackage + ({ stdenv, pkg-config, fetchurl, libICE, libSM, libX11, libXext, libXmu, xorgproto, libXt }: stdenv.mkDerivation { + name = "twm-1.0.10"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/twm-1.0.10.tar.bz2"; + sha256 = "1ms5cj1w3g26zg6bxdv1j9hl0pxr4300qnv003cz1q3cl7ffljb4"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libICE libSM libX11 libXext libXmu xorgproto libXt ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + utilmacros = callPackage + ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { + name = "util-macros-1.19.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/util/util-macros-1.19.3.tar.bz2"; + sha256 = "0w8ryfqylprz37zj9grl4jzdsqq67ibfwq5raj7vm1i7kmp2x08g"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + viewres = callPackage + ({ stdenv, pkg-config, fetchurl, libXaw, libXmu, libXt }: stdenv.mkDerivation { + name = "viewres-1.0.5"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/viewres-1.0.5.tar.bz2"; + sha256 = "1mz319kfmvcrdpi22dmdr91mif1j0j3ck1f8mmnz5g1r9kl1in2y"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libXaw libXmu libXt ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + x11perf = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, libXext, libXft, libXmu, xorgproto, libXrender }: stdenv.mkDerivation { + name = "x11perf-1.6.1"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/x11perf-1.6.1.tar.bz2"; + sha256 = "0d3wh6z6znwhfdiv0zaggfj0xgish98xa10yy76b9517zj7hnzhw"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 libXext libXft libXmu xorgproto libXrender ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xauth = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, libXau, libXext, libXmu, xorgproto }: stdenv.mkDerivation { + name = "xauth-1.1"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xauth-1.1.tar.bz2"; + sha256 = "032klzzw8r09z36x1272ssd79bcisz8j5p8gbdy111fiknvx27bd"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 libXau libXext libXmu xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xbacklight = callPackage + ({ stdenv, pkg-config, fetchurl, libxcb, xcbutil }: stdenv.mkDerivation { + name = "xbacklight-1.2.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xbacklight-1.2.3.tar.bz2"; + sha256 = "1plssg0s3pbslg6rfzxp9sx8ryvn8l32zyvc8zp9zsbsfwjg69rs"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libxcb xcbutil ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xbitmaps = callPackage + ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { + name = "xbitmaps-1.1.2"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/data/xbitmaps-1.1.2.tar.bz2"; + sha256 = "1vh73sc13s7w5r6gnc6irca56s7998bja7wgdivkfn8jccawgw5r"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xcalc = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, libXaw, xorgproto, libXt }: stdenv.mkDerivation { + name = "xcalc-1.1.0"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xcalc-1.1.0.tar.bz2"; + sha256 = "1sxmlcb0sb3h4z05kl5l0kxnhrc0h8c74p9m3zdc7bv58jaldmym"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 libXaw xorgproto libXt ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xcbproto = callPackage + ({ stdenv, pkg-config, fetchurl, python3 }: stdenv.mkDerivation { + name = "xcb-proto-1.14.1"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/proto/xcb-proto-1.14.1.tar.xz"; + sha256 = "1hzwazgyywd9mz4mjj1yv8ski27qqx7ypmyr27m39hrajyddsjph"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config python3 ]; + buildInputs = [ ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xcbutil = callPackage + ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xorgproto, m4 }: stdenv.mkDerivation { + name = "xcb-util-0.4.0"; + builder = ./builder.sh; + src = fetchurl { + url = "https://xcb.freedesktop.org/dist/xcb-util-0.4.0.tar.bz2"; + sha256 = "1sahmrgbpyki4bb72hxym0zvxwnycmswsxiisgqlln9vrdlr9r26"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config m4 ]; + buildInputs = [ gperf libxcb xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xcbutilcursor = callPackage + ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xcbutilimage, xcbutilrenderutil, xorgproto, m4 }: stdenv.mkDerivation { + name = "xcb-util-cursor-0.1.3"; + builder = ./builder.sh; + src = fetchurl { + url = "https://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.3.tar.bz2"; + sha256 = "0krr4rcw6r42cncinzvzzdqnmxk3nrgpnadyg2h8k9x10q3hm885"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config m4 ]; + buildInputs = [ gperf libxcb xcbutilimage xcbutilrenderutil xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xcbutilerrors = callPackage + ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xcbproto, xorgproto, m4 }: stdenv.mkDerivation { + name = "xcb-util-errors-1.0"; + builder = ./builder.sh; + src = fetchurl { + url = "https://xcb.freedesktop.org/dist/xcb-util-errors-1.0.tar.bz2"; + sha256 = "158rm913dg3hxrrhyvvxr8bcm0pjy5jws70dhy2s12w1krv829k8"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config m4 ]; + buildInputs = [ gperf libxcb xcbproto xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xcbutilimage = callPackage + ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xcbutil, xorgproto, m4 }: stdenv.mkDerivation { + name = "xcb-util-image-0.4.0"; + builder = ./builder.sh; + src = fetchurl { + url = "https://xcb.freedesktop.org/dist/xcb-util-image-0.4.0.tar.bz2"; + sha256 = "1z1gxacg7q4cw6jrd26gvi5y04npsyavblcdad1xccc8swvnmf9d"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config m4 ]; + buildInputs = [ gperf libxcb xcbutil xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xcbutilkeysyms = callPackage + ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xorgproto, m4 }: stdenv.mkDerivation { + name = "xcb-util-keysyms-0.4.0"; + builder = ./builder.sh; + src = fetchurl { + url = "https://xcb.freedesktop.org/dist/xcb-util-keysyms-0.4.0.tar.bz2"; + sha256 = "1nbd45pzc1wm6v5drr5338j4nicbgxa5hcakvsvm5pnyy47lky0f"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config m4 ]; + buildInputs = [ gperf libxcb xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xcbutilrenderutil = callPackage + ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xorgproto, m4 }: stdenv.mkDerivation { + name = "xcb-util-renderutil-0.3.9"; + builder = ./builder.sh; + src = fetchurl { + url = "https://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2"; + sha256 = "0nza1csdvvxbmk8vgv8vpmq7q8h05xrw3cfx9lwxd1hjzd47xsf6"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config m4 ]; + buildInputs = [ gperf libxcb xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xcbutilwm = callPackage + ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xorgproto, m4 }: stdenv.mkDerivation { + name = "xcb-util-wm-0.4.1"; + builder = ./builder.sh; + src = fetchurl { + url = "https://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2"; + sha256 = "0gra7hfyxajic4mjd63cpqvd20si53j1q3rbdlkqkahfciwq3gr8"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config m4 ]; + buildInputs = [ gperf libxcb xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xclock = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXft, libxkbfile, libXmu, xorgproto, libXrender, libXt }: stdenv.mkDerivation { + name = "xclock-1.0.9"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xclock-1.0.9.tar.bz2"; + sha256 = "1fr3q4rszgx7x2zxy2ip592a3fgx20hfwac49p2l5b7jqsr1ying"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 libXaw libXft libxkbfile libXmu xorgproto libXrender libXt ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xcmsdb = callPackage + ({ stdenv, pkg-config, fetchurl, libX11 }: stdenv.mkDerivation { + name = "xcmsdb-1.0.5"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xcmsdb-1.0.5.tar.bz2"; + sha256 = "1ik7gzlp2igz183x70883000ygp99r20x3aah6xhaslbpdhm6n75"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xcompmgr = callPackage + ({ stdenv, pkg-config, fetchurl, libXcomposite, libXdamage, libXext, libXfixes, libXrender }: stdenv.mkDerivation { + name = "xcompmgr-1.1.8"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xcompmgr-1.1.8.tar.bz2"; + sha256 = "0hvjkanrdlvk3ln5a1jx3c9ggziism2jr1na7jl3zyk0y3sdm28b"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libXcomposite libXdamage libXext libXfixes libXrender ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xconsole = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt }: stdenv.mkDerivation { + name = "xconsole-1.0.7"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xconsole-1.0.7.tar.bz2"; + sha256 = "1q2ib1626i5da0nda09sp3vzppjrcn82fff83cw7hwr0vy14h56i"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 libXaw libXmu xorgproto libXt ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xcursorgen = callPackage + ({ stdenv, pkg-config, fetchurl, libpng, libX11, libXcursor }: stdenv.mkDerivation { + name = "xcursorgen-1.0.7"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xcursorgen-1.0.7.tar.bz2"; + sha256 = "0ggbv084cavp52hjgcz3vdj0g018axs0m23c03lpc5sgn92gidim"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libpng libX11 libXcursor ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xcursorthemes = callPackage + ({ stdenv, pkg-config, fetchurl, libXcursor }: stdenv.mkDerivation { + name = "xcursor-themes-1.0.6"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/data/xcursor-themes-1.0.6.tar.bz2"; + sha256 = "16a96li0s0ggg60v7f6ywxmsrmxdfizcw55ccv7sp4qjfisca7pf"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libXcursor ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xdm = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, libXau, libXaw, libXdmcp, libXext, libXft, libXinerama, libXmu, libXpm, xorgproto, libXrender, libXt }: stdenv.mkDerivation { + name = "xdm-1.1.12"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xdm-1.1.12.tar.bz2"; + sha256 = "1x17hdymf6rd8jmh4n1sd4g5a8ayr5w94nwjw84qs2fs5pvq7lhd"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm xorgproto libXrender libXt ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xdpyinfo = callPackage + ({ stdenv, pkg-config, fetchurl, libdmx, libX11, libxcb, libXcomposite, libXext, libXi, libXinerama, xorgproto, libXrender, libXtst, libXxf86dga, libXxf86misc, libXxf86vm }: stdenv.mkDerivation { + name = "xdpyinfo-1.3.2"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xdpyinfo-1.3.2.tar.bz2"; + sha256 = "0ldgrj4w2fa8jng4b3f3biaj0wyn8zvya88pnk70d7k12pcqw8rh"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libdmx libX11 libxcb libXcomposite libXext libXi libXinerama xorgproto libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xdriinfo = callPackage + ({ stdenv, pkg-config, fetchurl, libGL, xorgproto, libX11 }: stdenv.mkDerivation { + name = "xdriinfo-1.0.6"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xdriinfo-1.0.6.tar.bz2"; + sha256 = "0lcx8h3zd11m4w8wf7dyp89826d437iz78cyrix436bqx31x5k6r"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libGL xorgproto libX11 ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xev = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, libXrandr }: stdenv.mkDerivation { + name = "xev-1.2.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xev-1.2.3.tar.bz2"; + sha256 = "02ddsdx138g7szhwklpbzi0cxr34871iay3k28kdcihrz8f4zg36"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 xorgproto libXrandr ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xeyes = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, libXext, libXmu, xorgproto, libXrender, libXt }: stdenv.mkDerivation { + name = "xeyes-1.1.2"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xeyes-1.1.2.tar.bz2"; + sha256 = "0lq5j7fryx1wn998jq6h3icz1h6pqrsbs3adskjzjyhn5l6yrg2p"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 libXext libXmu xorgproto libXrender libXt ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86inputevdev = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libevdev, udev, mtdev, xorgserver }: stdenv.mkDerivation { + name = "xf86-input-evdev-2.10.6"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-input-evdev-2.10.6.tar.bz2"; + sha256 = "1h1y0fwnawlp4yc5llr1l7hwfcxxpln2fxhy6arcf6w6h4z0f9l7"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libevdev udev mtdev xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86inputjoystick = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { + name = "xf86-input-joystick-1.6.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2"; + sha256 = "1awfq496d082brgjbr60lhm6jvr9537rflwxqdfqwfzjy3n6jxly"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86inputkeyboard = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { + name = "xf86-input-keyboard-1.9.0"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2"; + sha256 = "12032yg412kyvnmc5fha1in7mpi651d8sa1bk4138s2j2zr01jgp"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86inputlibinput = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libinput, xorgserver }: stdenv.mkDerivation { + name = "xf86-input-libinput-1.0.1"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-input-libinput-1.0.1.tar.bz2"; + sha256 = "0nr4r9x8c7y1l0ipivjch5zps093mxmg2nqmfn2934am26fc9ppx"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libinput xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86inputmouse = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { + name = "xf86-input-mouse-1.9.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-input-mouse-1.9.3.tar.bz2"; + sha256 = "1iawr1wyl2qch1mqszcs0s84i92mh4xxprflnycbw1adc18b7v4k"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86inputsynaptics = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libevdev, libX11, libXi, xorgserver, libXtst }: stdenv.mkDerivation { + name = "xf86-input-synaptics-1.9.1"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-input-synaptics-1.9.1.tar.bz2"; + sha256 = "0xhm03qywwfgkpfl904d08lx00y28m1b6lqmks5nxizixwk3by3s"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libevdev libX11 libXi xorgserver libXtst ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86inputvmmouse = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, udev, xorgserver }: stdenv.mkDerivation { + name = "xf86-input-vmmouse-13.1.0"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2"; + sha256 = "06ckn4hlkpig5vnivl0zj8a7ykcgvrsj8b3iccl1pgn1gaamix8a"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto udev xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86inputvoid = callPackage + ({ stdenv, pkg-config, fetchurl, xorgserver, xorgproto }: stdenv.mkDerivation { + name = "xf86-input-void-1.4.1"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2"; + sha256 = "171k8b8s42s3w73l7ln9jqwk88w4l7r1km2blx1vy898c854yvpr"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgserver xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videoamdgpu = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, mesa, libGL, libdrm, udev, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-amdgpu-19.1.0"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-amdgpu-19.1.0.tar.bz2"; + sha256 = "0pgy4ihnja0vm8504qw7qxh3pdpa3p9k6967nz15m6b1mvha83jg"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto mesa libGL libdrm udev xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videoapm = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-apm-1.3.0"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-apm-1.3.0.tar.bz2"; + sha256 = "0znwqfc8abkiha98an8hxsngnz96z6cd976bc4bsvz1km6wqk0c0"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libpciaccess xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videoark = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-ark-0.7.5"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2"; + sha256 = "07p5vdsj2ckxb6wh02s61akcv4qfg6s1d5ld3jn3lfaayd3f1466"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libpciaccess xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videoast = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-ast-1.1.5"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2"; + sha256 = "1pm2cy81ma7ldsw0yfk28b33h9z2hcj5rccrxhfxfgvxsiavrnqy"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libpciaccess xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videoati = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, mesa, libGL, libdrm, udev, libpciaccess, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-ati-19.1.0"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-ati-19.1.0.tar.bz2"; + sha256 = "0j9w4axsqlycv4v14g53xyhkm9h7d27b2fcv9lrzb9gf54b5m7v5"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto mesa libGL libdrm udev libpciaccess xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videochips = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-chips-1.4.0"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-chips-1.4.0.tar.bz2"; + sha256 = "1gqzy7q9v824m7hqkbbmncxg082zm0d4mafgc97c4skyiwgf9wq7"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libpciaccess xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videocirrus = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-cirrus-1.5.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2"; + sha256 = "1asifc6ld2g9kap15vfhvsvyl69lj7pw3d9ra9mi4najllh7pj7d"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libpciaccess xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videodummy = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-dummy-0.3.8"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-dummy-0.3.8.tar.bz2"; + sha256 = "1fcm9vwgv8wnffbvkzddk4yxrh3kc0np6w65wj8k88q7jf3bn4ip"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videofbdev = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-fbdev-0.5.0"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-fbdev-0.5.0.tar.bz2"; + sha256 = "16a66zr0l1lmssa07i3rzy07djxnb45c17ks8c71h8l06xgxihyw"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libpciaccess xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videogeode = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-geode-2.11.19"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-geode-2.11.19.tar.bz2"; + sha256 = "0zn9gb49grds5mcs1dlrx241k2w1sgqmx4i5x7v6159xxqhlqsf6"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libpciaccess xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videoglide = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-glide-1.2.2"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-glide-1.2.2.tar.bz2"; + sha256 = "1vaav6kx4n00q4fawgqnjmbdkppl0dir2dkrj4ad372mxrvl9c4y"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videoglint = callPackage + ({ stdenv, pkg-config, fetchurl, libpciaccess, xorgproto, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-glint-1.2.9"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-glint-1.2.9.tar.bz2"; + sha256 = "1lkpspvrvrp9s539bhfdjfh4andaqyk63l6zjn8m3km95smk6a45"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libpciaccess xorgproto xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videoi128 = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-i128-1.4.0"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-i128-1.4.0.tar.bz2"; + sha256 = "1snhpv1igrhifcls3r498kjd14ml6x2xvih7zk9xlsd1ymmhlb4g"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libpciaccess xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videoi740 = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-i740-1.4.0"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-i740-1.4.0.tar.bz2"; + sha256 = "0l3s1m95bdsg4gki943qipq8agswbb84dzcflpxa3vlckwhh3r26"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libpciaccess xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videointel = callPackage + ({ stdenv, pkg-config, fetchurl, cairo, xorgproto, libdrm, libpng, udev, libpciaccess, libX11, xcbutil, libxcb, libXcursor, libXdamage, libXext, libXfixes, xorgserver, libXrandr, libXrender, libxshmfence, libXtst, libXvMC }: stdenv.mkDerivation { + name = "xf86-video-intel-2.99.917"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2"; + sha256 = "1jb7jspmzidfixbc0gghyjmnmpqv85i7pi13l4h2hn2ml3p83dq0"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ cairo xorgproto libdrm libpng udev libpciaccess libX11 xcbutil libxcb libXcursor libXdamage libXext libXfixes xorgserver libXrandr libXrender libxshmfence libXtst libXvMC ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videomach64 = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-mach64-6.9.6"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-mach64-6.9.6.tar.bz2"; + sha256 = "171wg8r6py1l138s58rlapin3rlpwsg9spmvhc7l68mm3g3hf1vs"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videomga = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-mga-2.0.0"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-mga-2.0.0.tar.bz2"; + sha256 = "0yaxpgyyj9398nzzr5vnsfxcis76z46p9814yzj8179yl7hld296"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videoneomagic = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-neomagic-1.3.0"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-neomagic-1.3.0.tar.bz2"; + sha256 = "0r4h673kw8fl7afc30anwbjlbhp82mg15fvaxf470xg7z983k0wk"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libpciaccess xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videonewport = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-newport-0.2.4"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-newport-0.2.4.tar.bz2"; + sha256 = "1yafmp23jrfdmc094i6a4dsizapsc9v0pl65cpc8w1kvn7343k4i"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videonouveau = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, udev, libpciaccess, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-nouveau-1.0.17"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-nouveau-1.0.17.tar.bz2"; + sha256 = "0sqm1jwjg15sp8v7039y2hsbhph8gpjd2bdzcqqiij2mgbi254s9"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libdrm udev libpciaccess xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videonv = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-nv-2.1.21"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-nv-2.1.21.tar.bz2"; + sha256 = "0bdk3pc5y0n7p53q4gc2ff7bw16hy5hwdjjxkm5j3s7hdyg6960z"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libpciaccess xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videoomap = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-omap-0.4.5"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-omap-0.4.5.tar.bz2"; + sha256 = "0nmbrx6913dc724y8wj2p6vqfbj5zdjfmsl037v627jj0whx9rwk"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libdrm xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videoopenchrome = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, udev, libpciaccess, libX11, libXext, xorgserver, libXvMC }: stdenv.mkDerivation { + name = "xf86-video-openchrome-0.6.0"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-openchrome-0.6.0.tar.bz2"; + sha256 = "0x9gq3hw6k661k82ikd1y2kkk4dmgv310xr5q59dwn4k6z37aafs"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libdrm udev libpciaccess libX11 libXext xorgserver libXvMC ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videoqxl = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, udev, libpciaccess, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-qxl-0.1.5"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-qxl-0.1.5.tar.bz2"; + sha256 = "14jc24znnahhmz4kqalafmllsg8awlz0y6gpgdpk5ih38ph851mi"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libdrm udev libpciaccess xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videor128 = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-r128-6.11.0"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-r128-6.11.0.tar.bz2"; + sha256 = "0snvwmrh8dqyyaq7ggicym6yrsg4brygkx9156r0m095m7fp3rav"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videorendition = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-rendition-4.2.7"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-rendition-4.2.7.tar.bz2"; + sha256 = "0yzqcdfrnnyaaaa76d4hpwycpq4x2j8qvg9m4q19lj4xbicwc4cm"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libpciaccess xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videos3virge = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-s3virge-1.11.0"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-s3virge-1.11.0.tar.bz2"; + sha256 = "06d1v5s7xf00y18x12cz11sk00rgn0yq95w66kmgzy465pzxvj84"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libpciaccess xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videosavage = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-savage-2.3.9"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-savage-2.3.9.tar.bz2"; + sha256 = "11pcrsdpdrwk0mrgv83s5nsx8a9i4lhmivnal3fjbrvi3zdw94rc"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videosiliconmotion = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-siliconmotion-1.7.9"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.9.tar.bz2"; + sha256 = "1g2r6gxqrmjdff95d42msxdw6vmkg2zn5sqv0rxd420iwy8wdwyh"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libpciaccess xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videosis = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-sis-0.11.0"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-sis-0.11.0.tar.bz2"; + sha256 = "0srvrhydjnynfb7b1s145rgmsk4f71iz0ag4icpmb05944d90xr1"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videosisusb = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-sisusb-0.9.7"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-sisusb-0.9.7.tar.bz2"; + sha256 = "090lfs3hjz3cjd016v5dybmcsigj6ffvjdhdsqv13k90p4b08h7l"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libpciaccess xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videosuncg6 = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-suncg6-1.1.2"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-suncg6-1.1.2.tar.bz2"; + sha256 = "04fgwgk02m4nimlv67rrg1wnyahgymrn6rb2cjj1l8bmzkii4glr"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videosunffb = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-sunffb-1.2.2"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-sunffb-1.2.2.tar.bz2"; + sha256 = "07z3ngifwg2d4jgq8pms47n5lr2yn0ai72g86xxjnb3k20n5ym7s"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videosunleo = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-sunleo-1.2.2"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-sunleo-1.2.2.tar.bz2"; + sha256 = "1gacm0s6rii4x5sx9py5bhvs50jd4vs3nnbwjdjymyf31kpdirl3"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videotdfx = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-tdfx-1.5.0"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-tdfx-1.5.0.tar.bz2"; + sha256 = "0qc5wzwf1n65si9rc37bh224pzahh7gp67vfimbxs0b9yvhq0i9g"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videotga = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-tga-1.2.2"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2"; + sha256 = "0cb161lvdgi6qnf1sfz722qn38q7kgakcvj7b45ba3i0020828r0"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libpciaccess xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videotrident = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-trident-1.3.8"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-trident-1.3.8.tar.bz2"; + sha256 = "0gxcar434kx813fxdpb93126lhmkl3ikabaljhcj5qn3fkcijlcy"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libpciaccess xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videov4l = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-v4l-0.3.0"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-v4l-0.3.0.tar.bz2"; + sha256 = "084x4p4avy72mgm2vnnvkicw3419i6pp3wxik8zqh7gmq4xv5z75"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videovboxvideo = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-vboxvideo-1.0.0"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-vboxvideo-1.0.0.tar.bz2"; + sha256 = "195z1js3i51qgxvhfw4bxb4dw3jcrrx2ynpm2y3475dypjzs7dkz"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libpciaccess xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videovesa = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-vesa-2.5.0"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-vesa-2.5.0.tar.bz2"; + sha256 = "0nf6ai74c60xk96kgr8q9mx6lrxm5id3765ws4d801irqzrj85hz"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libpciaccess xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videovmware = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, udev, libpciaccess, libX11, libXext, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-vmware-13.3.0"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-vmware-13.3.0.tar.bz2"; + sha256 = "0v06qhm059klq40m2yx4wypzb7h53aaassbjfmm6clcyclj1k5s7"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libdrm udev libpciaccess libX11 libXext xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videovoodoo = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-voodoo-1.2.5"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-voodoo-1.2.5.tar.bz2"; + sha256 = "1s6p7yxmi12q4y05va53rljwyzd6ry492r1pgi7wwq6cznivhgly"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libpciaccess xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videowsfb = callPackage + ({ stdenv, pkg-config, fetchurl, xorgserver, xorgproto }: stdenv.mkDerivation { + name = "xf86-video-wsfb-0.4.0"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-wsfb-0.4.0.tar.bz2"; + sha256 = "0hr8397wpd0by1hc47fqqrnaw3qdqd8aqgwgzv38w5k3l3jy6p4p"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgserver xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videoxgi = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-xgi-1.6.1"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-xgi-1.6.1.tar.bz2"; + sha256 = "10xd2vah0pnpw5spn40n4p95mpmgvdkly4i1cz51imnlfsw7g8si"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xfd = callPackage + ({ stdenv, pkg-config, fetchurl, libxkbfile, fontconfig, libXaw, libXft, libXmu, xorgproto, libXrender, libXt, gettext }: stdenv.mkDerivation { + name = "xfd-1.1.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xfd-1.1.3.tar.bz2"; + sha256 = "0n6r1v8sm0z0ycqch035xpm46nv5v4mav3kxh36883l3ln5r6bqr"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config gettext ]; + buildInputs = [ libxkbfile fontconfig libXaw libXft libXmu xorgproto libXrender libXt ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xfontsel = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, libXt }: stdenv.mkDerivation { + name = "xfontsel-1.0.6"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xfontsel-1.0.6.tar.bz2"; + sha256 = "0700lf6hx7dg88wq1yll7zjvf9gbwh06xff20yffkxb289y0pai5"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 libXaw libXmu libXt ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xfs = callPackage + ({ stdenv, pkg-config, fetchurl, libXfont2, xorgproto, xtrans }: stdenv.mkDerivation { + name = "xfs-1.2.0"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xfs-1.2.0.tar.bz2"; + sha256 = "0q4q4rbzx159sfn2n52y039fki6nc6a39qdfxa78yjc3aw8i48nv"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libXfont2 xorgproto xtrans ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xfsinfo = callPackage + ({ stdenv, pkg-config, fetchurl, libFS, xorgproto }: stdenv.mkDerivation { + name = "xfsinfo-1.0.6"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xfsinfo-1.0.6.tar.bz2"; + sha256 = "1mmir5i7gm71xc0ba8vnizi4744vsd31hknhi4cmgvg6kadqngla"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libFS xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xgamma = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, libXxf86vm }: stdenv.mkDerivation { + name = "xgamma-1.0.6"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xgamma-1.0.6.tar.bz2"; + sha256 = "1lr2nb1fhg5fk2fchqxdxyl739602ggwhmgl2wiv5c8qbidw7w8f"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 xorgproto libXxf86vm ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xgc = callPackage + ({ stdenv, pkg-config, fetchurl, libXaw, libXt }: stdenv.mkDerivation { + name = "xgc-1.0.5"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xgc-1.0.5.tar.bz2"; + sha256 = "0pigvjd3i9fchmj1inqy151aafz3dr0vq1h2zizdb2imvadqv0hl"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libXaw libXt ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xhost = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, libXau, libXmu, xorgproto }: stdenv.mkDerivation { + name = "xhost-1.0.8"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xhost-1.0.8.tar.bz2"; + sha256 = "15n3mnd4i5kh4z32qv11580qjgvnng0wry2y753ljrqkkrbkrp52"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 libXau libXmu xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xinit = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { + name = "xinit-1.4.1"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xinit-1.4.1.tar.bz2"; + sha256 = "1fdbakx59vyh474skjydj1bbglpby3y03nl7mxn0z9v8gdhqz6yy"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xinput = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, libXi, libXinerama, libXrandr }: stdenv.mkDerivation { + name = "xinput-1.6.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xinput-1.6.3.tar.bz2"; + sha256 = "1vb6xdd1xmk5f7pwc5zcbxfray5sf1vbnscqwf2yl8lv7gfq38im"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libX11 libXext libXi libXinerama libXrandr ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xkbcomp = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, libxkbfile, xorgproto }: stdenv.mkDerivation { + name = "xkbcomp-1.4.5"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xkbcomp-1.4.5.tar.bz2"; + sha256 = "0pmhshqinwqh5rip670l3szjpywky67hv232ql6gvdj489n0hlb8"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 libxkbfile xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xkbevd = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, libxkbfile }: stdenv.mkDerivation { + name = "xkbevd-1.1.4"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xkbevd-1.1.4.tar.bz2"; + sha256 = "0sprjx8i86ljk0l7ldzbz2xlk8916z5zh78cafjv8k1a63js4c14"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 libxkbfile ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xkbprint = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, libxkbfile, xorgproto }: stdenv.mkDerivation { + name = "xkbprint-1.0.4"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xkbprint-1.0.4.tar.bz2"; + sha256 = "04iyv5z8aqhabv7wcpvbvq0ji0jrz1666vw6gvxkvl7szswalgqb"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 libxkbfile xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xkbutils = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXaw, libXt }: stdenv.mkDerivation { + name = "xkbutils-1.0.4"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2"; + sha256 = "0c412isxl65wplhl7nsk12vxlri29lk48g3p52hbrs3m0awqm8fj"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libX11 libXaw libXt ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xkeyboardconfig = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, python3 }: stdenv.mkDerivation { + name = "xkeyboard-config-2.31"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.31.tar.bz2"; + sha256 = "18xddaxh83zm698syh50w983jg6b7b8zgv0dfaf7ha485hgihi6s"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config python3 ]; + buildInputs = [ libX11 xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xkill = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation { + name = "xkill-1.0.5"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xkill-1.0.5.tar.bz2"; + sha256 = "0szzd9nzn0ybkhnfyizb876irwnjsnb78rcaxx6prb71jmmbpw65"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 libXmu xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xload = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt, gettext }: stdenv.mkDerivation { + name = "xload-1.1.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xload-1.1.3.tar.bz2"; + sha256 = "01sr6yd6yhyyfgn88l867w6h9dn5ikcynaz5rwji6xqxhw1lhkpk"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config gettext ]; + buildInputs = [ libX11 libXaw libXmu xorgproto libXt ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xlsatoms = callPackage + ({ stdenv, pkg-config, fetchurl, libxcb }: stdenv.mkDerivation { + name = "xlsatoms-1.1.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xlsatoms-1.1.3.tar.bz2"; + sha256 = "10m3a046jvaw5ywx4y65kl84lsxqan70gww1g1r7cf96ijaqz1jp"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libxcb ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xlsclients = callPackage + ({ stdenv, pkg-config, fetchurl, libxcb }: stdenv.mkDerivation { + name = "xlsclients-1.1.4"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xlsclients-1.1.4.tar.bz2"; + sha256 = "1h8931sn34mcip6vpi4v7hdmr1r58gkbw4s2p97w98kykks2lgvp"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libxcb ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xlsfonts = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { + name = "xlsfonts-1.0.6"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xlsfonts-1.0.6.tar.bz2"; + sha256 = "0s6kxgv78chkwsqmhw929f4pf91gq63f4yvixxnan1h00cx0pf49"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xmag = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, libXt }: stdenv.mkDerivation { + name = "xmag-1.0.6"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xmag-1.0.6.tar.bz2"; + sha256 = "0qg12ifbbk9n8fh4jmyb625cknn8ssj86chd6zwdiqjin8ivr8l7"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 libXaw libXmu libXt ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xmessage = callPackage + ({ stdenv, pkg-config, fetchurl, libXaw, libXt }: stdenv.mkDerivation { + name = "xmessage-1.0.5"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xmessage-1.0.5.tar.bz2"; + sha256 = "0a90kfm0qz8cn2pbpqfyqrc5s9bfvvy14nj848ynvw56wy0zng9p"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libXaw libXt ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xmodmap = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { + name = "xmodmap-1.0.10"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xmodmap-1.0.10.tar.bz2"; + sha256 = "0z28331i2pm16x671fa9qwsfqdmr6a43bzwmp0dm17a3sx0hjgs7"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xmore = callPackage + ({ stdenv, pkg-config, fetchurl, libXaw, libXt }: stdenv.mkDerivation { + name = "xmore-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xmore-1.0.3.tar.bz2"; + sha256 = "06r514p30v87vx00ddlck9mwazaqk9bx08ip866p1mw2a46iwjk4"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libXaw libXt ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xorgcffiles = callPackage + ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { + name = "xorg-cf-files-1.0.6"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2"; + sha256 = "0kckng0zs1viz0nr84rdl6dswgip7ndn4pnh5nfwnviwpsfmmksd"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xorgdocs = callPackage + ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { + name = "xorg-docs-1.7.1"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/doc/xorg-docs-1.7.1.tar.bz2"; + sha256 = "0jrc4jmb4raqawx0j9jmhgasr0k6sxv0bm2hrxjh9hb26iy6gf14"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xorgproto = callPackage + ({ stdenv, pkg-config, fetchurl, libXt }: stdenv.mkDerivation { + name = "xorgproto-2021.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/proto/xorgproto-2021.3.tar.bz2"; + sha256 = "0dypp7cvjf0rvwa7cn1zp7djw5ynhs1rwk9p0r1vczbwzha2nwsc"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libXt ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xorgserver = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, openssl, libX11, libXau, libXaw, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, libXmu, libXpm, libXrender, libXres, libXt }: stdenv.mkDerivation { + name = "xorg-server-1.20.11"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/xserver/xorg-server-1.20.11.tar.bz2"; + sha256 = "0jacqgin8kcyy8fyv0lhgb4if8g9hp60rm3ih3s1mgps7xp7jk4i"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xorgsgmldoctools = callPackage + ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { + name = "xorg-sgml-doctools-1.11"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/doc/xorg-sgml-doctools-1.11.tar.bz2"; + sha256 = "0k5pffyi5bx8dmfn033cyhgd3gf6viqj3x769fqixifwhbgy2777"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xpr = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation { + name = "xpr-1.0.5"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xpr-1.0.5.tar.bz2"; + sha256 = "07qy9lwjvxighcmg6qvjkgagad3wwvidrfx0jz85lgynz3qy0dmr"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 libXmu xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xprop = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { + name = "xprop-1.2.5"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xprop-1.2.5.tar.bz2"; + sha256 = "18ckr8g1z50zkc01hprkpm1npwbq32yqib4b3l98c95z2q1yv4lv"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xrandr = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, libXrandr, libXrender }: stdenv.mkDerivation { + name = "xrandr-1.5.1"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xrandr-1.5.1.tar.xz"; + sha256 = "0ql75s1n3dm2m3g1ilb9l6hqh15r0v709bgghpwazy3jknpnvivv"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 xorgproto libXrandr libXrender ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xrdb = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation { + name = "xrdb-1.2.0"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xrdb-1.2.0.tar.bz2"; + sha256 = "0ik9gh6363c47pr0dp7q22nfs8vmavjg2v4bsr0604ppl77nafpj"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 libXmu xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xrefresh = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { + name = "xrefresh-1.0.6"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xrefresh-1.0.6.tar.bz2"; + sha256 = "0lv3rlshh7s0z3aqx5ahnnf8cl082m934bk7gv881mz8nydznz98"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xset = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, libXext, libXmu, xorgproto, libXxf86misc }: stdenv.mkDerivation { + name = "xset-1.2.4"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xset-1.2.4.tar.bz2"; + sha256 = "0my987wjvra7l92ry6q44ky383yg3phzxhdbn3lqhapm1ll9bzg4"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 libXext libXmu xorgproto libXxf86misc ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xsetroot = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, xbitmaps, libXcursor, libXmu, xorgproto }: stdenv.mkDerivation { + name = "xsetroot-1.1.2"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xsetroot-1.1.2.tar.bz2"; + sha256 = "0z21mqvmdl6rl63q77479wgkfygnll57liza1i3va7sr4fx45i0h"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 xbitmaps libXcursor libXmu xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xsm = callPackage + ({ stdenv, pkg-config, fetchurl, libICE, libSM, libX11, libXaw, libXt }: stdenv.mkDerivation { + name = "xsm-1.0.4"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xsm-1.0.4.tar.bz2"; + sha256 = "09a4ss1fnrh1sgm21r4n5pivawf34paci3rn6mscyljf7a4vcd4r"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libICE libSM libX11 libXaw libXt ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xstdcmap = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation { + name = "xstdcmap-1.0.4"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xstdcmap-1.0.4.tar.bz2"; + sha256 = "12vgzsxv4rw25frkgjyli6w6hy10lgpvsx9wzw2v5l5a3qzqp286"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 libXmu xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xtrans = callPackage + ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { + name = "xtrans-1.4.0"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/xtrans-1.4.0.tar.bz2"; + sha256 = "0wyp0yc6gi72hwc3kjmvm3vkj9p6s407cb6dxx37jh9wb68l8z1p"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xtrap = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, libXt, libXTrap }: stdenv.mkDerivation { + name = "xtrap-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xtrap-1.0.3.tar.bz2"; + sha256 = "0sqm4j1zflk1s94iq4waa70hna1xcys88v9a70w0vdw66czhvj2j"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 libXt libXTrap ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xvinfo = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, libXv }: stdenv.mkDerivation { + name = "xvinfo-1.1.4"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xvinfo-1.1.4.tar.bz2"; + sha256 = "0gz7fvxavqlrqynpfbrm2nc9yx8h0ksnbnv34fj7n1q6cq6j4lq3"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 xorgproto libXv ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xwd = callPackage + ({ stdenv, pkg-config, fetchurl, libxkbfile, libX11, xorgproto }: stdenv.mkDerivation { + name = "xwd-1.0.7"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xwd-1.0.7.tar.bz2"; + sha256 = "1537i8q8pgf0sjklakzfvjwrq5b246qjywrx9ll8xfg0p6w1as6d"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libxkbfile libX11 xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xwininfo = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, libxcb, xorgproto }: stdenv.mkDerivation { + name = "xwininfo-1.1.4"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xwininfo-1.1.4.tar.bz2"; + sha256 = "00avrpw4h5mr1klp41lv2j4dmq465v6l5kb5bhm4k5ml8sm9i543"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 libxcb xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xwud = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { + name = "xwud-1.0.5"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xwud-1.0.5.tar.bz2"; + sha256 = "1a8hdgy40smvblnh3s9f0vkqckl68nmivx7d48zk34m8z18p16cr"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; }) diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index b50f3f33a31..6ec75517147 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -301,6 +301,7 @@ foreach my $pkg (sort (keys %pkgURLs)) { } print OUT < Date: Wed, 9 Jun 2021 06:27:09 +0800 Subject: [PATCH 008/113] flashrom: Build and install manpage It seems flashrom has two build systems at the moment. One based on meson/ninja and one based on Make. The latter can build and install the manpage but the former cannot. ArchLinux does the same, call make after finishing the meson build. --- pkgs/tools/misc/flashrom/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/flashrom/default.nix b/pkgs/tools/misc/flashrom/default.nix index 8fcfa9acb1f..66a8b213403 100644 --- a/pkgs/tools/misc/flashrom/default.nix +++ b/pkgs/tools/misc/flashrom/default.nix @@ -7,6 +7,7 @@ , libftdi1 , libusb1 , pciutils +, installShellFiles }: stdenv.mkDerivation rec { @@ -18,8 +19,15 @@ stdenv.mkDerivation rec { sha256 = "0ax4kqnh7kd3z120ypgp73qy1knz47l6qxsqzrfkd97mh5cdky71"; }; + # Meson build doesn't build and install manpage. Only Makefile can. + # Build manpage from source directory. Here we're inside the ./build subdirectory + postInstall = '' + make flashrom.8 -C .. + installManPage ../flashrom.8 + ''; + mesonFlags = lib.optionals stdenv.isAarch64 [ "-Dpciutils=false" ]; - nativeBuildInputs = [ meson pkg-config ninja ]; + nativeBuildInputs = [ meson pkg-config ninja installShellFiles ]; buildInputs = [ libftdi1 libusb1 pciutils ]; meta = with lib; { From ba65f9762022e499d0a2aa56c08cc31001b0a422 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Wed, 9 Jun 2021 20:56:10 +0200 Subject: [PATCH 009/113] zanshin: use `boost` instead of `boost160` --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8f19cd1a679..b4280a30d07 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27892,9 +27892,7 @@ in zam-plugins = callPackage ../applications/audio/zam-plugins { }; - zanshin = libsForQt5.callPackage ../applications/office/zanshin { - boost = boost160; - }; + zanshin = libsForQt5.callPackage ../applications/office/zanshin { }; zathura = callPackage ../applications/misc/zathura { }; From f2e402f9cd60d82a708a270ffa6ca67e5d3cb23c Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Wed, 9 Jun 2021 22:56:36 +0200 Subject: [PATCH 010/113] vowpal-wabbit: use boost17x --- .../science/machine-learning/vowpal-wabbit/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix b/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix index de6f9212983..d1523b571f4 100644 --- a/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix +++ b/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, boost169, flatbuffers, fmt, rapidjson, spdlog, zlib }: +{ lib, stdenv, fetchFromGitHub, cmake, boost, flatbuffers, fmt, rapidjson, spdlog, zlib }: stdenv.mkDerivation rec { pname = "vowpal-wabbit"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ - boost169 + boost flatbuffers fmt rapidjson diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 89e316fbcd0..b7b3bec2f2a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4359,7 +4359,9 @@ in vorta = libsForQt5.callPackage ../applications/backup/vorta { }; - vowpal-wabbit = callPackage ../applications/science/machine-learning/vowpal-wabbit { }; + vowpal-wabbit = callPackage ../applications/science/machine-learning/vowpal-wabbit { + boost = boost17x; + }; utahfs = callPackage ../applications/networking/utahfs { }; From 2bac6a445e191a6ab3f943036afefca272a916ae Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 12 Feb 2021 22:38:50 -0800 Subject: [PATCH 011/113] roon-bridge: init at 1.8-795 --- pkgs/servers/roon-bridge/default.nix | 66 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 68 insertions(+) create mode 100644 pkgs/servers/roon-bridge/default.nix diff --git a/pkgs/servers/roon-bridge/default.nix b/pkgs/servers/roon-bridge/default.nix new file mode 100644 index 00000000000..637d43737a1 --- /dev/null +++ b/pkgs/servers/roon-bridge/default.nix @@ -0,0 +1,66 @@ +{ alsaLib +, alsaUtils +, autoPatchelfHook +, fetchurl +, lib +, makeWrapper +, stdenv +, zlib +}: + +stdenv.mkDerivation rec { + pname = "roon-bridge"; + version = "100800753"; + + # N.B. The URL is unstable. I've asked for them to provide a stable URL but + # they have ignored me. If this package fails to build for you, you may need + # to update the version and sha256. + # c.f. https://community.roonlabs.com/t/latest-roon-server-is-not-available-for-download-on-nixos/118129 + src = fetchurl { + url = "https://web.archive.org/web/20201221152142/http://download.roonlabs.com/builds/RoonBridge_linuxx64.tar.bz2"; + sha256 = "sha256-ahdy0/TBOyMfCt4VTkcDTZGAFmwQJT2KvZuMtFcAY3w="; + }; + + buildInputs = [ + alsaLib + alsaUtils + zlib + ]; + + nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; + + installPhase = '' + runHook preInstall + mkdir -p $out + mv * $out + runHook postInstall + ''; + + postFixup = + let + linkFix = bin: '' + sed -i '/ulimit/d' ${bin} + sed -i '/ln -sf/d' ${bin} + ln -sf $out/RoonMono/bin/mono-sgen $out/RoonMono/bin/${builtins.baseNameOf bin} + ''; + wrapFix = bin: '' + wrapProgram ${bin} --prefix PATH : ${lib.makeBinPath [ alsaUtils ]} + ''; + in + '' + ${linkFix "$out/Bridge/RAATServer"} + ${linkFix "$out/Bridge/RoonBridge"} + ${linkFix "$out/Bridge/RoonBridgeHelper"} + + ${wrapFix "$out/check.sh"} + ${wrapFix "$out/start.sh"} + ''; + + meta = with lib; { + description = "The music player for music lovers"; + homepage = "https://roonlabs.com"; + license = licenses.unfree; + maintainers = with maintainers; [ lovesegfault ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ad5474958ba..1becc853070 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19845,6 +19845,8 @@ in boost = boost17x; }; + roon-bridge = callPackage ../servers/roon-bridge { }; + roon-server = callPackage ../servers/roon-server { }; s6 = skawarePackages.s6; From 38b5368b7edd1425064af98fde0b260ca5273117 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 10 Jun 2021 21:35:57 +0200 Subject: [PATCH 012/113] gitAndTools.gitstatus: 1.4.4 -> 1.5.1 --- .../version-management/git-and-tools/gitstatus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix index f4b74405eba..3817ce7fa4f 100644 --- a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gitstatus"; - version = "1.4.4"; + version = "1.5.1"; src = fetchFromGitHub { owner = "romkatv"; repo = "gitstatus"; rev = "v${version}"; - sha256 = "1w5kpca2v6iii912riywp1jscq7cpr5xv93mglr30pjnar1mk8gs"; + sha256 = "1ffgh5826985phc8amvzl9iydvsnij5brh4gczfh201vfmw9d4hh"; }; buildInputs = [ (callPackage ./romkatv_libgit2.nix {}) ]; From 1f3c5be76d66f987c19b4d4791e7d6fab942e866 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 10 Jun 2021 21:36:15 +0200 Subject: [PATCH 013/113] zsh-powerlevel10k: 1.14.6 -> 1.15.0 --- pkgs/shells/zsh/zsh-powerlevel10k/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix index c18a863c636..b3a1c191cd3 100644 --- a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix +++ b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix @@ -19,13 +19,13 @@ let in stdenv.mkDerivation rec { pname = "powerlevel10k"; - version = "1.14.6"; + version = "1.15.0"; src = fetchFromGitHub { owner = "romkatv"; repo = "powerlevel10k"; rev = "v${version}"; - sha256 = "1z6xipd7bgq7fc03x9j2dmg3yv59xyjf4ic5f1l6l6pw7w3q4sq7"; + sha256 = "1b3j2riainx3zz4irww72z0pb8l8ymnh1903zpsy5wmjgb0wkcwq"; }; patches = [ From 0e4ade244d0f1b01a378aa58c235a1576778c1fd Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Fri, 4 Jun 2021 03:19:54 +0800 Subject: [PATCH 014/113] linux_xanmod: 5.12.8 -> 5.12.10 --- pkgs/os-specific/linux/kernel/linux-xanmod.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-xanmod.nix b/pkgs/os-specific/linux/kernel/linux-xanmod.nix index aa8988fae8e..fafa0e53810 100644 --- a/pkgs/os-specific/linux/kernel/linux-xanmod.nix +++ b/pkgs/os-specific/linux/kernel/linux-xanmod.nix @@ -1,7 +1,7 @@ { lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args: let - version = "5.12.8"; + version = "5.12.10"; suffix = "xanmod1-cacule"; in buildLinux (args // rec { @@ -12,16 +12,13 @@ buildLinux (args // rec { owner = "xanmod"; repo = "linux"; rev = modDirVersion; - sha256 = "sha256-i3exBrEKyTHM2Iq8AJEIHwaw6KJarfcahlm/pPxAhmo="; - extraPostFetch = '' - rm $out/.config - ''; + sha256 = "sha256-DxWkknL8kgFmdI+jb5chVnWCz6oDKOw6iuT69zDaDNs="; }; extraMeta = { branch = "5.12-cacule"; maintainers = with lib.maintainers; [ fortuneteller2k ]; description = "Built with custom settings and new features built to provide a stable, responsive and smooth desktop experience"; - broken = stdenv.hostPlatform.isAarch64; + broken = stdenv.isAarch64; }; } // (args.argsOverride or { })) From 5d06ef0e1ece059302fe818a4a35398d805e4917 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Wed, 9 Jun 2021 21:23:43 +0200 Subject: [PATCH 015/113] apfsprogs: init at unstable-2021-05-07 --- pkgs/tools/filesystems/apfsprogs/default.nix | 38 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/tools/filesystems/apfsprogs/default.nix diff --git a/pkgs/tools/filesystems/apfsprogs/default.nix b/pkgs/tools/filesystems/apfsprogs/default.nix new file mode 100644 index 00000000000..b50eaf39636 --- /dev/null +++ b/pkgs/tools/filesystems/apfsprogs/default.nix @@ -0,0 +1,38 @@ +{ lib +, stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation { + pname = "apfsprogs"; + version = "unstable-2021-05-07"; + + src = fetchFromGitHub { + owner = "linux-apfs"; + repo = "apfsprogs"; + rev = "d360211a30608a907e3ee8ad4468d606c40ec2d7"; + sha256 = "sha256-SeFs/GQfIEvnxERyww+mnynjR7E02DdtBA6JsknEM+Q="; + }; + + buildPhase = '' + runHook preBuild + make -C apfsck $makeFlags + make -C mkapfs $makeFlags + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + make -C apfsck install BINDIR="$out/bin" MANDIR="$out/share/man8" $installFlags + make -C mkapfs install BINDIR="$out/bin" MANDIR="$out/share/man8" $installFlags + runHook postInstall + ''; + + meta = with lib; { + description = "Experimental APFS tools for linux"; + homepage = "https://github.com/linux-apfs/apfsprogs"; + license = licenses.gpl2Only; + platforms = platforms.linux; + maintainers = with maintainers; [ Luflosi ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3eef7577800..bceb15cf830 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1067,6 +1067,8 @@ in apfs-fuse = callPackage ../tools/filesystems/apfs-fuse { }; + apfsprogs = callPackage ../tools/filesystems/apfsprogs { }; + apk-tools = callPackage ../tools/package-management/apk-tools { lua = lua5_3; }; From 1fdddce7f270d627b33388b7ea0d481b1600dfbb Mon Sep 17 00:00:00 2001 From: Josh Hoffer Date: Wed, 9 Jun 2021 18:41:44 -0600 Subject: [PATCH 016/113] maintainers: add princemachiavelli --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 9e044942eab..7e31ef2a82c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11679,6 +11679,16 @@ github = "pulsation"; githubId = 1838397; }; + princemachiavelli = { + name = "Josh Hoffer"; + email = "jhoffer@sansorgan.es"; + github = "princemachiavelli"; + githubId = 2730968; + keys = [{ + longkeyid = "ed25519/0x83124F97A318EA18"; + fingerprint = "DD54 130B ABEC B65C 1F6B 2A38 8312 4F97 A318 EA18"; + }]; + }; ydlr = { name = "ydlr"; email = "ydlr@ydlr.io"; From 11ee0cb222350d9a2ebe0071d6e7628f7ba27866 Mon Sep 17 00:00:00 2001 From: Josh Hoffer Date: Wed, 9 Jun 2021 16:46:17 -0600 Subject: [PATCH 017/113] electron-mail: init at 4.12.2 --- .../mailreaders/electron-mail/default.nix | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/applications/networking/mailreaders/electron-mail/default.nix diff --git a/pkgs/applications/networking/mailreaders/electron-mail/default.nix b/pkgs/applications/networking/mailreaders/electron-mail/default.nix new file mode 100644 index 00000000000..1f7d663cf8e --- /dev/null +++ b/pkgs/applications/networking/mailreaders/electron-mail/default.nix @@ -0,0 +1,33 @@ +{ appimageTools, lib, fetchurl }: + +let + pname = "electron-mail"; + version = "4.12.2"; + name = "ElectronMail-${version}"; + + src = fetchurl { + url = "https://github.com/vladimiry/ElectronMail/releases/download/v${version}/electron-mail-${version}-linux-x86_64.AppImage"; + sha256 = "D+0qoIb0EwUVbgKOiKQpqoLDgm8l/UKDWm/BjhW4MYU="; + }; + + appimageContents = appimageTools.extract { inherit name src; }; +in appimageTools.wrapType2 { + inherit name src; + + extraInstallCommands = '' + mv $out/bin/${name} $out/bin/${pname} + + install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + cp -r ${appimageContents}/usr/share/icons $out/share + ''; + + meta = with lib; { + description = "ElectronMail is an Electron-based unofficial desktop client for ProtonMail"; + homepage = "https://github.com/vladimiry/ElectronMail"; + license = licenses.mit; + maintainers = [ maintainers.princemachiavelli ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 89e316fbcd0..7f8aa0e159d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2550,6 +2550,8 @@ in electronplayer = callPackage ../applications/video/electronplayer/electronplayer.nix { }; + electron-mail = callPackage ../applications/networking/mailreaders/electron-mail { }; + element-desktop = callPackage ../applications/networking/instant-messengers/element/element-desktop.nix { }; element-web = callPackage ../applications/networking/instant-messengers/element/element-web.nix { From cc4e1d5de95a20abcd792b3475de26294ad7fcf0 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Thu, 10 Jun 2021 11:35:57 -0700 Subject: [PATCH 018/113] llvmPackage: Use LLVM 11 for RISC-V --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3eef7577800..62f825d58ec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11489,7 +11489,7 @@ in /**/ if platform.isDarwin then (if platform.isAarch64 then 11 else 7) else if platform.isFreeBSD then 7 else if platform.isAndroid then 12 - else if platform.isLinux then (if platform.isRiscV then 9 else 7) + else if platform.isLinux then (if platform.isRiscV then 11 else 7) else if platform.isWasm then 8 else 11; # latest # We take the "max of the mins". Why? Since those are lower bounds of the From 9acd608f7748f475cad65d7543eb775633a8f7f8 Mon Sep 17 00:00:00 2001 From: natto1784 Date: Fri, 11 Jun 2021 10:46:02 +0530 Subject: [PATCH 019/113] anup: init at 0.4.0 --- pkgs/applications/misc/anup/default.nix | 27 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/applications/misc/anup/default.nix diff --git a/pkgs/applications/misc/anup/default.nix b/pkgs/applications/misc/anup/default.nix new file mode 100644 index 00000000000..9c99c84eabe --- /dev/null +++ b/pkgs/applications/misc/anup/default.nix @@ -0,0 +1,27 @@ +{ lib, rustPlatform, fetchFromGitHub, sqlite, xdg-utils}: + +rustPlatform.buildRustPackage rec { + pname = "anup"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "Acizza"; + repo = "anup"; + rev = version; + sha256 = "sha256-4pXF4p4K8+YihVB9NdgT6bOidmQEgWXUbcbvgXJ0IDA="; + }; + + buildInputs = [ + sqlite + xdg-utils + ]; + + cargoSha256 = "sha256-1TA2HDHKA3twFtlAWaC2zcRzS8TJwcbBt1OTQ3hC3qM="; + + meta = with lib; { + homepage = "https://github.com/Acizza/anup"; + description = "An anime tracker for AniList featuring a TUI"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ natto1784 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 19cbe826b9f..75e667d85ea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22610,6 +22610,8 @@ in antiword = callPackage ../applications/office/antiword {}; + anup = callPackage ../applications/misc/anup {}; + ao = libfive; apache-directory-studio = callPackage ../applications/networking/apache-directory-studio {}; From 5de8597c9bb337b4fb24dd7aaed59a3f230333d3 Mon Sep 17 00:00:00 2001 From: natto1784 Date: Fri, 11 Jun 2021 10:46:40 +0530 Subject: [PATCH 020/113] maintainers: add natto1784 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2448ad3f93d..538de4733c2 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7185,6 +7185,12 @@ githubId = 818502; name = "Nathan Yong"; }; + natto1784 = { + email = "natto@weirdnatto.in"; + github = "natto1784"; + githubId = 56316606; + name = "Amneesh Singh"; + }; nbren12 = { email = "nbren12@gmail.com"; github = "nbren12"; From 9c40b6f375f0ab2220b4c3717671fa5ebc023044 Mon Sep 17 00:00:00 2001 From: Zane van Iperen Date: Fri, 11 Jun 2021 14:19:10 +1000 Subject: [PATCH 021/113] tini: don't explicitly depend on glibc * Fixes pkgsStatic.tini build. * Use postPatch instead of patchPhase * Moves glibc dependency into docker.docker-tini --- pkgs/applications/virtualization/docker/default.nix | 6 ++++-- pkgs/applications/virtualization/tini/default.nix | 5 ++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index bec51af81ac..ee7c4d6bcfa 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -11,7 +11,7 @@ rec { , tiniRev, tiniSha256, buildxSupport ? false # package dependencies , stdenv, fetchFromGitHub, buildGoPackage - , makeWrapper, installShellFiles, pkg-config + , makeWrapper, installShellFiles, pkg-config, glibc , go-md2man, go, containerd, runc, docker-proxy, tini, libtool , sqlite, iproute2, lvm2, systemd, docker-buildx , btrfs-progs, iptables, e2fsprogs, xz, util-linux, xfsprogs, git @@ -56,7 +56,9 @@ rec { }; # Do not remove static from make files as we want a static binary - patchPhase = ""; + postPatch = ""; + + buildInputs = [ glibc glibc.static ]; NIX_CFLAGS_COMPILE = "-DMINIMAL=ON"; }); diff --git a/pkgs/applications/virtualization/tini/default.nix b/pkgs/applications/virtualization/tini/default.nix index dd7bcb19978..76668301c6b 100644 --- a/pkgs/applications/virtualization/tini/default.nix +++ b/pkgs/applications/virtualization/tini/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, glibc }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { version = "0.19.0"; @@ -11,12 +11,11 @@ stdenv.mkDerivation rec { sha256 ="1hnnvjydg7gi5gx6nibjjdnfipblh84qcpajc08nvr44rkzswck4"; }; - patchPhase = "sed -i /tini-static/d CMakeLists.txt"; + postPatch = "sed -i /tini-static/d CMakeLists.txt"; NIX_CFLAGS_COMPILE = "-DPR_SET_CHILD_SUBREAPER=36 -DPR_GET_CHILD_SUBREAPER=37"; nativeBuildInputs = [ cmake ]; - buildInputs = [ glibc glibc.static ]; meta = with lib; { description = "A tiny but valid init for containers"; From 838ff97b19d32163e292aa4d2845b82a57c8b78c Mon Sep 17 00:00:00 2001 From: Marius Bergmann Date: Fri, 11 Jun 2021 11:25:33 +0200 Subject: [PATCH 022/113] cups-kyocera-ecosys-m552x-p502x: init at 8.1602 --- .../kyocera-ecosys-m552x-p502x/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/misc/cups/drivers/kyocera-ecosys-m552x-p502x/default.nix diff --git a/pkgs/misc/cups/drivers/kyocera-ecosys-m552x-p502x/default.nix b/pkgs/misc/cups/drivers/kyocera-ecosys-m552x-p502x/default.nix new file mode 100644 index 00000000000..66e3d036bcc --- /dev/null +++ b/pkgs/misc/cups/drivers/kyocera-ecosys-m552x-p502x/default.nix @@ -0,0 +1,29 @@ +{ stdenv +, lib +, fetchzip + # can either be "EU" or "Global"; it's unclear what the difference is +, region ? "Global" +}: + +stdenv.mkDerivation rec { + pname = "cups-kyocera-ecosys-m552x-p502x"; + version = "8.1602"; + + src = fetchzip { + url = "https://www.kyoceradocumentsolutions.de/content/download-center/de/drivers/all/Linux_8_1602_ECOSYS_M5521_5526_P5021_5026_zip.download.zip"; + sha256 = "sha256-XDH5deZmWNghfoO7JaYYvnVq++mbQ8RwLY57L2CKYaY="; + }; + + installPhase = '' + mkdir -p $out/share/cups/model/Kyocera + cp ${region}/English/*.PPD $out/share/cups/model/Kyocera/ + ''; + + meta = with lib; { + description = "PPD files for Kyocera ECOSYS M5521cdn/M5521cdw/M5526cdn/M5526cdw/P5021cdn/P5021cdw/P5026cdn/P5026cdw"; + homepage = "https://www.kyoceradocumentsolutions.com"; + license = licenses.unfree; + maintainers = [ maintainers.mbrgm ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dfdcf9bfe78..b2d670de60e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30298,6 +30298,8 @@ in cups-kyocera = callPackage ../misc/cups/drivers/kyocera {}; + cups-kyocera-ecosys-m552x-p502x = callPackage ../misc/cups/drivers/kyocera-ecosys-m552x-p502x {}; + cups-kyodialog3 = callPackage ../misc/cups/drivers/kyodialog3 {}; cups-dymo = callPackage ../misc/cups/drivers/dymo {}; From 7c02bd1fae16824d208d81ba4461f5d5d0ea8537 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20B=C3=A4renz?= Date: Mon, 7 Jun 2021 17:35:50 +0200 Subject: [PATCH 023/113] pythonPackages.pyathena: init at 2.3.0 --- .../python-modules/pyathena/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/pyathena/default.nix diff --git a/pkgs/development/python-modules/pyathena/default.nix b/pkgs/development/python-modules/pyathena/default.nix new file mode 100644 index 00000000000..c7a8599a048 --- /dev/null +++ b/pkgs/development/python-modules/pyathena/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchPypi +, sqlalchemy +, boto3 +, botocore +, pandas +, tenacity +}: + +buildPythonPackage rec { + pname = "pyathena"; + version = "2.3.0"; + + src = fetchPypi { + pname = "PyAthena"; + inherit version; + sha256 = "08fl653yayvqi991zvcai5ifcxwy9ip6xh0cr3lbimggjnjgwsl5"; + }; + + # Nearly all tests depend on a working AWS Athena instance, + # therefore deactivating them. + # https://github.com/laughingman7743/PyAthena/#testing + doCheck = false; + + propagatedBuildInputs = [ + boto3 + botocore + pandas + tenacity + ]; + + meta = with lib; { + homepage = "https://github.com/laughingman7743/PyAthena/"; + license = licenses.mit; + description = "Python DB API 2.0 (PEP 249) client for Amazon Athena"; + maintainers = with maintainers; [ turion ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0e284963bef..69a09baaef5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5494,6 +5494,8 @@ in { pyasn1-modules = callPackage ../development/python-modules/pyasn1-modules { }; + pyathena = callPackage ../development/python-modules/pyathena { }; + pyatmo = callPackage ../development/python-modules/pyatmo { }; pyatspi = callPackage ../development/python-modules/pyatspi { }; From c78150c69e762af1bf3d908469d70d8a714e50a6 Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Sat, 12 Jun 2021 11:15:02 +0200 Subject: [PATCH 024/113] skytemple: add webkitgtk to buildInputs WebKit is used for rendering interactive statistics graph. --- pkgs/applications/misc/skytemple/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/skytemple/default.nix b/pkgs/applications/misc/skytemple/default.nix index a67d79f9bf9..0daaad2f265 100644 --- a/pkgs/applications/misc/skytemple/default.nix +++ b/pkgs/applications/misc/skytemple/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, gobject-introspection, gtk3, gtksourceview3, wrapGAppsHook, python3Packages }: +{ lib, fetchFromGitHub, gobject-introspection, gtk3, gtksourceview3, webkitgtk, wrapGAppsHook, python3Packages }: python3Packages.buildPythonApplication rec { pname = "skytemple"; @@ -11,7 +11,15 @@ python3Packages.buildPythonApplication rec { sha256 = "0l2c4qngv58j6zkp0va6m96zksx8gqn3mjc3isqybfnhjr6nd3v9"; }; - buildInputs = [ gobject-introspection gtk3 gtksourceview3 ]; + buildInputs = [ + gobject-introspection + gtk3 + gtksourceview3 + # webkitgkt is used for rendering interactive statistics graph which + # can be seen by opening a ROM, entering Pokemon section, selecting + # any Pokemon, and clicking Stats and Moves tab. + webkitgtk + ]; nativeBuildInputs = [ gobject-introspection wrapGAppsHook ]; propagatedBuildInputs = with python3Packages; [ natsort From 8a5035c134c1b968a222f2af5f1c881a6deb66f0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 3 Jun 2021 13:47:11 +0200 Subject: [PATCH 025/113] python3Packages.pykulersky: init at 0.5.2 --- .../python-modules/pykulersky/default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/python-modules/pykulersky/default.nix diff --git a/pkgs/development/python-modules/pykulersky/default.nix b/pkgs/development/python-modules/pykulersky/default.nix new file mode 100644 index 00000000000..1afa50c9be3 --- /dev/null +++ b/pkgs/development/python-modules/pykulersky/default.nix @@ -0,0 +1,43 @@ +{ lib +, bleak +, buildPythonPackage +, click +, fetchFromGitHub +, pytest-asyncio +, pytest-mock +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pykulersky"; + version = "0.5.2"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "emlove"; + repo = pname; + rev = version; + sha256 = "1fzfixnl28rny7c3wr6gcdpqhyrz7z2aqq6qfwkxnkq2kqdbpmmg"; + }; + + propagatedBuildInputs = [ + bleak + click + ]; + + checkInputs = [ + pytest-asyncio + pytest-mock + pytestCheckHook + ]; + + pythonImportsCheck = [ "pykulersky" ]; + + meta = with lib; { + description = "Python module to control Brightech Kuler Sky Bluetooth LED devices"; + homepage = "https://github.com/emlove/pykulersky"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e4e072dce93..f76553ed908 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5894,6 +5894,8 @@ in { pykoplenti = callPackage ../development/python-modules/pykoplenti { }; + pykulersky = callPackage ../development/python-modules/pykulersky { }; + pykwalify = callPackage ../development/python-modules/pykwalify { }; pylacrosse = callPackage ../development/python-modules/pylacrosse { }; From 0c5e7123cd36d9a9614b8cdea9b6250bb262d7e7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Jun 2021 11:30:35 +0200 Subject: [PATCH 026/113] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 06d4d195dd7..977a974a354 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -433,7 +433,7 @@ "konnected" = ps: with ps; [ aiohttp-cors ]; # missing inputs: konnected "kostal_plenticore" = ps: with ps; [ ]; # missing inputs: kostal_plenticore "kraken" = ps: with ps; [ ]; # missing inputs: krakenex pykrakenapi - "kulersky" = ps: with ps; [ ]; # missing inputs: pykulersky + "kulersky" = ps: with ps; [ pykulersky ]; "kwb" = ps: with ps; [ ]; # missing inputs: pykwb "lacrosse" = ps: with ps; [ pylacrosse ]; "lametric" = ps: with ps; [ ]; # missing inputs: lmnotify From a3deb659879f1bce05fc763c79177a028a577230 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Jun 2021 11:32:36 +0200 Subject: [PATCH 027/113] home-assistant: enable kulersky tests --- pkgs/servers/home-assistant/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 6f06ec0a823..e53ff16aa4d 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -446,6 +446,7 @@ in with py.pkgs; buildPythonApplication rec { "kmtronic" "knx" "kodi" + "kulersky" "lastfm" "lcn" "light" From bce8f178d86e0bc98730ae1db92c17d320f5c3dd Mon Sep 17 00:00:00 2001 From: Antoine Fontaine Date: Sat, 12 Jun 2021 07:31:06 +0200 Subject: [PATCH 028/113] unvanquished: workaround NVidia proprietary driver bug --- pkgs/games/unvanquished/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/games/unvanquished/default.nix b/pkgs/games/unvanquished/default.nix index 35db4625db9..6bbdc42d9f2 100644 --- a/pkgs/games/unvanquished/default.nix +++ b/pkgs/games/unvanquished/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv, fetchzip, fetchurl, fetchFromGitHub, buildFHSUserEnv -, runCommandNoCC, makeDesktopItem, copyDesktopItems, gcc, cmake, gmp -, libGL, zlib, ncurses, geoip, lua5, nettle, curl, SDL2, freetype, glew -, openal, libopus, opusfile, libogg, libvorbis, libjpeg, libwebp, libpng +{ lib, stdenv, fetchzip, fetchFromGitHub, buildFHSUserEnv, makeDesktopItem +, copyDesktopItems, gcc, cmake, gmp , libGL, zlib, ncurses, geoip, lua5 +, nettle, curl, SDL2, freetype, glew , openal, libopus, opusfile, libogg +, libvorbis, libjpeg, libwebp, libpng , cacert, aria2 # to download assets }: @@ -127,6 +127,7 @@ in stdenv.mkDerivation rec { "-DBUILD_SGAME=NO" "-DUSE_HARDENING=TRUE" "-DUSE_LTO=TRUE" + "-DOpenGL_GL_PREFERENCE=LEGACY" # https://github.com/DaemonEngine/Daemon/issues/474 ]; desktopItems = [ From 65693820a98d667874a14424a9ff8bb59fce5eb5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 3 Jun 2021 15:19:03 +0200 Subject: [PATCH 029/113] python3Packages.nettigo-air-monitor: init at 0.2.6 --- .../nettigo-air-monitor/default.nix | 50 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 52 insertions(+) create mode 100644 pkgs/development/python-modules/nettigo-air-monitor/default.nix diff --git a/pkgs/development/python-modules/nettigo-air-monitor/default.nix b/pkgs/development/python-modules/nettigo-air-monitor/default.nix new file mode 100644 index 00000000000..9cf8618bb30 --- /dev/null +++ b/pkgs/development/python-modules/nettigo-air-monitor/default.nix @@ -0,0 +1,50 @@ +{ lib +, aiohttp +, aioresponses +, buildPythonPackage +, fetchFromGitHub +, pytest-asyncio +, pytest-error-for-skips +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "nettigo-air-monitor"; + version = "0.2.6"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "bieniu"; + repo = pname; + rev = version; + sha256 = "0zs14g02m1ahyrhl2ihk74fp390g4672r1jjiaawmkxrvib07dvp"; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + checkInputs = [ + aioresponses + pytest-asyncio + pytest-error-for-skips + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace "pytest-runner" "" + substituteInPlace setup.cfg \ + --replace "--cov --cov-report term-missing " "" + ''; + + pythonImportsCheck = [ "nettigo_air_monitor" ]; + + meta = with lib; { + description = "Python module to get air quality data from Nettigo Air Monitor devices"; + homepage = "https://github.com/bieniu/nettigo-air-monitor"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e4e072dce93..9c153c5b246 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4596,6 +4596,8 @@ in { netifaces = callPackage ../development/python-modules/netifaces { }; + nettigo-air-monitor = callPackage ../development/python-modules/nettigo-air-monitor { }; + networkx = callPackage ../development/python-modules/networkx { }; neuron-mpi = pkgs.neuron-mpi.override { inherit python; }; From 76ccb3595e0ddba04d11a1d65bbc43b97475b135 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Jun 2021 11:57:19 +0200 Subject: [PATCH 030/113] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 06d4d195dd7..4954330b8a8 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -544,7 +544,7 @@ "mystrom" = ps: with ps; [ aiohttp-cors python-mystrom ]; "mythicbeastsdns" = ps: with ps; [ ]; # missing inputs: mbddns "nad" = ps: with ps; [ nad-receiver ]; - "nam" = ps: with ps; [ ]; # missing inputs: nettigo-air-monitor + "nam" = ps: with ps; [ nettigo-air-monitor ]; "namecheapdns" = ps: with ps; [ defusedxml ]; "nanoleaf" = ps: with ps; [ pynanoleaf ]; "neato" = ps: with ps; [ aiohttp-cors pybotvac ]; From 6ddaeab20872710c3c9669c9b110ccf8574cdfb8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Jun 2021 11:58:54 +0200 Subject: [PATCH 031/113] home-assistant: enable nam tests --- pkgs/servers/home-assistant/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 6f06ec0a823..84554e5e539 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -493,6 +493,7 @@ in with py.pkgs; buildPythonApplication rec { "my" "myq" "mysensors" + "nam" "namecheapdns" "neato" "netatmo" From 3bd196f27b3afbe719bead4ef864f4d1e7d2029f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Jun 2021 13:19:21 +0200 Subject: [PATCH 032/113] python3Packages.garminconnect-aio: init at 0.1.4 --- .../garminconnect-aio/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/garminconnect-aio/default.nix diff --git a/pkgs/development/python-modules/garminconnect-aio/default.nix b/pkgs/development/python-modules/garminconnect-aio/default.nix new file mode 100644 index 00000000000..bb754118e07 --- /dev/null +++ b/pkgs/development/python-modules/garminconnect-aio/default.nix @@ -0,0 +1,37 @@ +{ lib +, aiohttp +, brotlipy +, buildPythonPackage +, fetchFromGitHub +, yarl +}: + +buildPythonPackage rec { + pname = "garminconnect-aio"; + version = "0.1.4"; + + src = fetchFromGitHub { + owner = "cyberjunky"; + repo = "python-garminconnect-aio"; + rev = version; + sha256 = "0s2gpy5hciv9akqqhxy0d2ywp6jp9mmdngx34q7fq3xn668kcrhr"; + }; + + propagatedBuildInputs = [ + aiohttp + brotlipy + yarl + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "garminconnect_aio" ]; + + meta = with lib; { + description = "Python module to interact with Garmin Connect"; + homepage = "https://github.com/cyberjunky/python-garminconnect-aio"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e4e072dce93..20ab9697137 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2686,6 +2686,8 @@ in { pythonPackages = self; }); + garminconnect-aio = callPackage ../development/python-modules/garminconnect-aio { }; + gast = callPackage ../development/python-modules/gast { }; garages-amsterdam = callPackage ../development/python-modules/garages-amsterdam { }; From 13cddf14d274d635842c8d4e4cf8708dd71bd980 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Jun 2021 13:20:46 +0200 Subject: [PATCH 033/113] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index da1095743b5..43022e1d712 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -293,7 +293,7 @@ "futurenow" = ps: with ps; [ pyfnip ]; "garadget" = ps: with ps; [ ]; "garages_amsterdam" = ps: with ps; [ garages-amsterdam ]; - "garmin_connect" = ps: with ps; [ ]; # missing inputs: garminconnect_aio + "garmin_connect" = ps: with ps; [ garminconnect-aio ]; "gc100" = ps: with ps; [ ]; # missing inputs: python-gc100 "gdacs" = ps: with ps; [ aio-georss-gdacs ]; "generic" = ps: with ps; [ ]; From b74d567ff38dc93736133e1476597653eb89d753 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Jun 2021 13:22:18 +0200 Subject: [PATCH 034/113] home-assistant: enable garmin_connect tests --- pkgs/servers/home-assistant/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 6f06ec0a823..d184953bf8e 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -383,6 +383,7 @@ in with py.pkgs; buildPythonApplication rec { "fritzbox" "fritzbox_callmonitor" "frontend" + "garmin_connect" "generic" "generic_thermostat" "geo_json_events" From d54cf8100bef1efee5446d365c4276d7b150ed89 Mon Sep 17 00:00:00 2001 From: Jelle Besseling Date: Sat, 12 Jun 2021 14:35:52 +0200 Subject: [PATCH 035/113] python3Packages.wasmer: fix Darwin build --- pkgs/development/python-modules/wasmer/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/wasmer/default.nix b/pkgs/development/python-modules/wasmer/default.nix index 373e7a0a220..14cac499883 100644 --- a/pkgs/development/python-modules/wasmer/default.nix +++ b/pkgs/development/python-modules/wasmer/default.nix @@ -1,7 +1,9 @@ { lib +, stdenv , rustPlatform , fetchFromGitHub , buildPythonPackage +, libiconv }: let pname = "wasmer"; @@ -26,6 +28,8 @@ in buildPythonPackage rec { nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook ]; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildAndTestSubdir = "packages/api"; doCheck = false; From 96af64292ae353975851cb8fb2370c2ddea6e4a7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 9 Jun 2021 09:00:17 +0200 Subject: [PATCH 036/113] python3Packages.hass-nabucasa: allow later snitun releases --- .../python-modules/hass-nabucasa/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix index 1abd9648e95..f69f140017e 100644 --- a/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -24,10 +24,6 @@ buildPythonPackage rec { sha256 = "sha256-eQdbAQRKqnJGxnSTkk3gld9TX9MpP3J8LFNYH6peVIY="; }; - postPatch = '' - sed -i 's/"acme.*"/"acme"/' setup.py - ''; - propagatedBuildInputs = [ acme aiohttp @@ -44,11 +40,17 @@ buildPythonPackage rec { pytestCheckHook ]; + postPatch = '' + sed -i 's/"acme.*"/"acme"/' setup.py + substituteInPlace setup.py \ + --replace "snitun==" "snitun>=" + ''; + pythonImportsCheck = [ "hass_nabucasa" ]; meta = with lib; { homepage = "https://github.com/NabuCasa/hass-nabucasa"; - description = "Home Assistant cloud integration by Nabu Casa, inc."; + description = "Python module for the Home Assistant cloud integration"; license = licenses.gpl3Only; maintainers = with maintainers; [ Scriptkiddi ]; }; From 82d99d388a45969ec4f1a644cf16d7fe44118117 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Jun 2021 22:58:18 +0200 Subject: [PATCH 037/113] python3Packages.snitun: 0.21.0 -> 0.27.0 --- .../python-modules/snitun/default.nix | 31 ++++++++++++++----- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/snitun/default.nix b/pkgs/development/python-modules/snitun/default.nix index f93445a02b0..f09876eadb1 100644 --- a/pkgs/development/python-modules/snitun/default.nix +++ b/pkgs/development/python-modules/snitun/default.nix @@ -1,21 +1,35 @@ -{ lib, stdenv, buildPythonPackage, python, fetchFromGitHub -, attrs, cryptography, async-timeout, pytest-aiohttp, pytestCheckHook +{ lib +, stdenv +, async-timeout +, attrs +, buildPythonPackage +, cryptography +, fetchFromGitHub +, pytest-aiohttp +, pytestCheckHook }: buildPythonPackage rec { pname = "snitun"; - version = "0.21.0"; + version = "0.27.0"; src = fetchFromGitHub { owner = "NabuCasa"; repo = pname; rev = version; - sha256 = "sha256-oZHi/H9HOqGTFuhqPSZXntMzVJ3ZT4zNejezo0cDtqg="; + sha256 = "sha256-vx9F+Nat69Yadd+YpsnBCstnxCEICFJI14TdG6PvstI="; }; - propagatedBuildInputs = [ attrs cryptography async-timeout ]; + propagatedBuildInputs = [ + async-timeout + attrs + cryptography + ]; - checkInputs = [ pytestCheckHook pytest-aiohttp ]; + checkInputs = [ + pytest-aiohttp + pytestCheckHook + ]; disabledTests = lib.optionals stdenv.isDarwin [ "test_multiplexer_data_channel_abort_full" # https://github.com/NabuCasa/snitun/issues/61 @@ -26,10 +40,13 @@ buildPythonPackage rec { "test_peer_listener_timeout" ]; + pythonImportsCheck = [ "snitun" ]; + meta = with lib; { homepage = "https://github.com/nabucasa/snitun"; description = "SNI proxy with TCP multiplexer"; - license = licenses.gpl3; + license = licenses.gpl3Only; maintainers = with maintainers; [ Scriptkiddi ]; + platforms = platforms.linux; }; } From d710320b77f5b4102adaa486e735419f5e914a50 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 13 Jun 2021 00:30:37 +0200 Subject: [PATCH 038/113] python3Packages.configargparse: 1.4 -> 1.4.1 --- pkgs/development/python-modules/configargparse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/configargparse/default.nix b/pkgs/development/python-modules/configargparse/default.nix index 5646bca0473..45ec7364a59 100644 --- a/pkgs/development/python-modules/configargparse/default.nix +++ b/pkgs/development/python-modules/configargparse/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "configargparse"; - version = "1.4"; + version = "1.4.1"; src = fetchFromGitHub { owner = "bw2"; repo = "ConfigArgParse"; rev = "v${version}"; - sha256 = "0x6ar7d8qhr7gb1s8asbhqymg9jd635h7cyczqrbmvm8689zhj1d"; + sha256 = "sha256-hzhjrdrXxjksvbHlTnQVsT350g0yuG1F21fElv6bLSA="; }; checkInputs = [ From 2850d06833c3aa66d85e15021562ab0ae9f07dd4 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Sun, 13 Jun 2021 09:58:21 +0800 Subject: [PATCH 039/113] interception-tools-plugins.caps2esc: 0.1.3 -> 0.3.2 --- pkgs/tools/inputmethods/interception-tools/caps2esc.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/inputmethods/interception-tools/caps2esc.nix b/pkgs/tools/inputmethods/interception-tools/caps2esc.nix index ab4242295a0..933a731828f 100644 --- a/pkgs/tools/inputmethods/interception-tools/caps2esc.nix +++ b/pkgs/tools/inputmethods/interception-tools/caps2esc.nix @@ -2,13 +2,14 @@ stdenv.mkDerivation rec { pname = "caps2esc"; - version = "0.1.3"; + version = "0.3.2"; src = fetchFromGitLab { - owner = "interception/linux/plugins"; + group = "interception"; + owner = "linux/plugins"; repo = pname; rev = "v${version}"; - sha256 = "10xv56vh5h3lxyii3ni166ddv1sz2pylrjmdwxhb4gd2p5zgl1ji"; + sha256 = "sha256-gPFElAixiDTTwcl2XKM7MbTkpRrg8ToO5K7H8kz3DHk="; }; nativeBuildInputs = [ cmake ]; From 6cfd6f91af1dcf5e22e24503cbda5d2cb0f17074 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Sun, 13 Jun 2021 10:02:37 +0800 Subject: [PATCH 040/113] interception-tools-plugins.dual-function-keys: 1.1.0 -> 1.4.0 --- .../interception-tools/dual-function-keys.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/inputmethods/interception-tools/dual-function-keys.nix b/pkgs/tools/inputmethods/interception-tools/dual-function-keys.nix index 730135e4a7d..9824a46d43e 100644 --- a/pkgs/tools/inputmethods/interception-tools/dual-function-keys.nix +++ b/pkgs/tools/inputmethods/interception-tools/dual-function-keys.nix @@ -2,16 +2,18 @@ stdenv.mkDerivation rec { pname = "dual-function-keys"; - version = "1.1.0"; + version = "1.4.0"; src = fetchFromGitLab { - owner = "interception/linux/plugins"; + group = "interception"; + owner = "linux/plugins"; repo = pname; rev = version; - sha256 = "07hksca4g7v4zsvhmhc9j725j3n63fzrkx9sb4a0wrd7rwgr25rz"; + sha256 = "sha256-xlplbkeptXMBlRnSsc5NgGJfT8aoZxTRgTwTOd7aiWg="; }; nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libevdev libyamlcpp ]; prePatch = '' From 3f4b38eb0398995f662f0f88692bc1bc47a088f9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 13 Jun 2021 11:13:32 +0200 Subject: [PATCH 041/113] python3Packages.fastjsonschema: 2.14.5 -> 2.15.1 --- pkgs/development/python-modules/fastjsonschema/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/fastjsonschema/default.nix b/pkgs/development/python-modules/fastjsonschema/default.nix index 34eb0a158d9..6a6cc6ea804 100644 --- a/pkgs/development/python-modules/fastjsonschema/default.nix +++ b/pkgs/development/python-modules/fastjsonschema/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "fastjsonschema"; - version = "2.14.5"; + version = "2.15.1"; disabled = pythonOlder "3.3"; @@ -17,19 +17,20 @@ buildPythonPackage rec { repo = "python-fastjsonschema"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "1hgzafswdw5zqrd8qhdxa43crzfy7lrlifdn90133a0h3psr7qs1"; + sha256 = "sha256-ltxFJ3V5/bckusspQ5o0F4reMoB4KpYWPHF8ZNXGqVQ="; }; checkInputs = [ pytestCheckHook ]; dontUseSetuptoolsCheck = true; disabledTests = [ "benchmark" - # these tests require network access "remote ref" "definitions" ]; + pythonImportsCheck = [ "fastjsonschema" ]; + meta = with lib; { description = "Fast JSON schema validator for Python."; homepage = "https://horejsek.github.io/python-fastjsonschema/"; From f5b6846c21c343786ff502e68047a32f54d06eb2 Mon Sep 17 00:00:00 2001 From: marius david Date: Sat, 12 Jun 2021 17:03:08 +0200 Subject: [PATCH 042/113] armips: init at 0.11.0 --- pkgs/development/compilers/armips/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/compilers/armips/default.nix diff --git a/pkgs/development/compilers/armips/default.nix b/pkgs/development/compilers/armips/default.nix new file mode 100644 index 00000000000..b6fbb5ef34c --- /dev/null +++ b/pkgs/development/compilers/armips/default.nix @@ -0,0 +1,31 @@ +{ stdenv, lib, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "armips"; + version = "0.11.0"; + + src = fetchFromGitHub { + owner = "Kingcom"; + repo = "armips"; + rev = "v${version}"; + sha256 = "sha256-L+Uxww/WtvDJn1xZqoqA6Pkzq/98sy1qTxZbv6eEjbA="; + }; + + nativeBuildInputs = [ cmake ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp armips $out/bin + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/Kingcom/armips"; + description = "Assembler for various ARM and MIPS platforms."; + license = licenses.mit; + maintainers = with maintainers; [ marius851000 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e794f99b7e5..c22ea282f59 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10429,6 +10429,8 @@ in aliceml = callPackage ../development/compilers/aliceml { }; + armips = callPackage ../development/compilers/armips { }; + arachne-pnr = callPackage ../development/compilers/arachne-pnr { }; asciigraph = callPackage ../tools/text/asciigraph { }; From b826265c48645e54053baf0060976fe34877e04e Mon Sep 17 00:00:00 2001 From: marius david Date: Sat, 12 Jun 2021 17:10:08 +0200 Subject: [PATCH 043/113] python3Packages.skytemple-files: fix non-working patch --- .../skytemple-files/default.nix | 23 ++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/skytemple-files/default.nix b/pkgs/development/python-modules/skytemple-files/default.nix index cb03d73b427..0df6419b526 100644 --- a/pkgs/development/python-modules/skytemple-files/default.nix +++ b/pkgs/development/python-modules/skytemple-files/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, appdirs, explorerscript, ndspy, pillow, setuptools, skytemple-rust, tilequant }: +{ lib, buildPythonPackage, fetchFromGitHub, appdirs, explorerscript, ndspy, pillow, setuptools, skytemple-rust, tilequant, armips, fetchpatch }: buildPythonPackage rec { pname = "skytemple-files"; @@ -8,9 +8,26 @@ buildPythonPackage rec { owner = "SkyTemple"; repo = pname; rev = version; - sha256 = "1vklg4kcj3kb9ryrzrcmywn131b2bp3vy94cd4x4y4s7hkhgwg74"; + sha256 = "sha256-/S0otBujwO/IMiLKgA2o8wlD6xk1/DpwOAfemojV9NU="; + fetchSubmodules = true; }; + patches = [ + # fix patching https://github.com/SkyTemple/skytemple-files/pull/128 + # merged, remove for next update + (fetchpatch { + url = "http://github.com/SkyTemple/skytemple-files/commit/71dd71e6abb7435405e30225e8a37592b990d692.patch"; + sha256 = "sha256-CSBaT+LVP9J0C1FlUCduTJroq9z2EAJG6lruvlHlQLI="; + }) + ]; + + postPatch = '' + substituteInPlace skytemple_files/patch/arm_patcher.py \ + --replace "exec_name = os.getenv('SKYTEMPLE_ARMIPS_EXEC', f'{prefix}armips')" "exec_name = \"${armips}/bin/armips\"" + ''; + + buildInputs = [ armips ]; + propagatedBuildInputs = [ appdirs explorerscript ndspy pillow setuptools skytemple-rust tilequant ]; doCheck = false; # requires Pokémon Mystery Dungeon ROM @@ -20,6 +37,6 @@ buildPythonPackage rec { homepage = "https://github.com/SkyTemple/skytemple-files"; description = "Python library to edit the ROM of Pokémon Mystery Dungeon Explorers of Sky"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ xfix ]; + maintainers = with maintainers; [ xfix marius851000 ]; }; } From 6bec6a789a151e2deb9cd4c6ef575ff7c99865f8 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sun, 13 Jun 2021 11:33:46 +0200 Subject: [PATCH 044/113] radsecproxy: 1.8.2 -> 1.9.0 Fixes CVE-2021-32642. https://github.com/radsecproxy/radsecproxy/releases/tag/1.9.0 --- pkgs/tools/networking/radsecproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/radsecproxy/default.nix b/pkgs/tools/networking/radsecproxy/default.nix index 1a7d895f810..1c56d520b90 100644 --- a/pkgs/tools/networking/radsecproxy/default.nix +++ b/pkgs/tools/networking/radsecproxy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "radsecproxy"; - version = "1.8.2"; + version = "1.9.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "1g7q128cip1dac9jad58rd96afx4xz7x7vsiv0af8iyq2ivqvs2m"; + sha256 = "0ppgnvmzk5j42zvz74mwaz6767lzf9vpl8y57w612fvqpg65g4bv"; }; nativeBuildInputs = [ autoreconfHook ]; From 7f934c2827e901db279a79b72664101d307868d4 Mon Sep 17 00:00:00 2001 From: Samuel Noordhuis Date: Sun, 13 Jun 2021 20:15:47 +1000 Subject: [PATCH 045/113] tanka: 0.15.1 -> 0.16.0 --- pkgs/applications/networking/cluster/tanka/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/tanka/default.nix b/pkgs/applications/networking/cluster/tanka/default.nix index 715f75ddc8a..c792a38001a 100644 --- a/pkgs/applications/networking/cluster/tanka/default.nix +++ b/pkgs/applications/networking/cluster/tanka/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tanka"; - version = "0.15.1"; + version = "0.16.0"; src = fetchFromGitHub { owner = "grafana"; repo = pname; rev = "v${version}"; - sha256 = "sha256-aCgr56nXZCkG8k/ZGH2/cDOaqkznnyb6JLEcImqLH64="; + sha256 = "sha256-KvQIVJZD/VvLE5RocWLRVGbb8faLY2cBeFSE/6E7x50="; }; vendorSha256 = "sha256-vpm2y/CxRNWkz6+AOMmmZH5AjRQWAa6WD5Fnx5lqJYw="; From c8f95fd174a46078d1468f19a9192f0fee1b4cd6 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 12 Feb 2021 22:45:02 -0800 Subject: [PATCH 046/113] nixos.roon-bridge: init --- nixos/modules/services/audio/roon-bridge.nix | 74 ++++++++++++++++++++ pkgs/servers/roon-bridge/default.nix | 14 ++-- 2 files changed, 81 insertions(+), 7 deletions(-) create mode 100644 nixos/modules/services/audio/roon-bridge.nix diff --git a/nixos/modules/services/audio/roon-bridge.nix b/nixos/modules/services/audio/roon-bridge.nix new file mode 100644 index 00000000000..85273a2039c --- /dev/null +++ b/nixos/modules/services/audio/roon-bridge.nix @@ -0,0 +1,74 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + name = "roon-bridge"; + cfg = config.services.roon-bridge; +in { + options = { + services.roon-bridge = { + enable = mkEnableOption "Roon Bridge"; + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Open ports in the firewall for the bridge. + + UDP: 9003 + TCP: 9100 - 9200 + ''; + }; + user = mkOption { + type = types.str; + default = "roon-bridge"; + description = '' + User to run the Roon bridge as. + ''; + }; + group = mkOption { + type = types.str; + default = "roon-bridge"; + description = '' + Group to run the Roon Bridge as. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.roon-bridge = { + after = [ "network.target" ]; + description = "Roon Bridge"; + wantedBy = [ "multi-user.target" ]; + + environment.ROON_DATAROOT = "/var/lib/${name}"; + + serviceConfig = { + ExecStart = "${pkgs.roon-bridge}/start.sh"; + LimitNOFILE = 8192; + User = cfg.user; + Group = cfg.group; + StateDirectory = name; + }; + }; + + networking.firewall = mkIf cfg.openFirewall { + allowedTCPPortRanges = [ + { from = 9100; to = 9200; } + ]; + allowedUDPPorts = [ 9003 ]; + }; + + + users.groups.${cfg.group} = {}; + users.users.${cfg.user} = + if cfg.user == "roon-bridge" then { + isSystemUser = true; + description = "Roon Bridge user"; + group = cfg.group; + extraGroups = [ "audio" ]; + } + else {}; + }; +} diff --git a/pkgs/servers/roon-bridge/default.nix b/pkgs/servers/roon-bridge/default.nix index 637d43737a1..5b469c1cc9d 100644 --- a/pkgs/servers/roon-bridge/default.nix +++ b/pkgs/servers/roon-bridge/default.nix @@ -1,5 +1,5 @@ -{ alsaLib -, alsaUtils +{ alsa-lib +, alsa-utils , autoPatchelfHook , fetchurl , lib @@ -10,20 +10,20 @@ stdenv.mkDerivation rec { pname = "roon-bridge"; - version = "100800753"; + version = "1.8-795"; # N.B. The URL is unstable. I've asked for them to provide a stable URL but # they have ignored me. If this package fails to build for you, you may need # to update the version and sha256. # c.f. https://community.roonlabs.com/t/latest-roon-server-is-not-available-for-download-on-nixos/118129 src = fetchurl { - url = "https://web.archive.org/web/20201221152142/http://download.roonlabs.com/builds/RoonBridge_linuxx64.tar.bz2"; + url = "https://web.archive.org/web/20210610172810/http://download.roonlabs.com/builds/RoonBridge_linuxx64.tar.bz2"; sha256 = "sha256-ahdy0/TBOyMfCt4VTkcDTZGAFmwQJT2KvZuMtFcAY3w="; }; buildInputs = [ - alsaLib - alsaUtils + alsa-lib + alsa-utils zlib ]; @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { ln -sf $out/RoonMono/bin/mono-sgen $out/RoonMono/bin/${builtins.baseNameOf bin} ''; wrapFix = bin: '' - wrapProgram ${bin} --prefix PATH : ${lib.makeBinPath [ alsaUtils ]} + wrapProgram ${bin} --prefix PATH : ${lib.makeBinPath [ alsa-utils ]} ''; in '' From 96e9be097b4a21bf2f010c4a542bc699b4d8126b Mon Sep 17 00:00:00 2001 From: Axel Forsman Date: Sun, 13 Jun 2021 13:53:30 +0200 Subject: [PATCH 047/113] gbsplay: 2016-12-17 -> 0.0.94 Add the "nas" output plugin. Remove configure flags since those should get detected automatically. Install bash completions. Format through nixpkgs-fmt. --- pkgs/applications/audio/gbsplay/default.nix | 30 ++++++++++++--------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/audio/gbsplay/default.nix b/pkgs/applications/audio/gbsplay/default.nix index 7cee125f6e7..3d280ca72ab 100644 --- a/pkgs/applications/audio/gbsplay/default.nix +++ b/pkgs/applications/audio/gbsplay/default.nix @@ -1,28 +1,32 @@ -{ lib, stdenv, fetchFromGitHub, libpulseaudio }: +{ lib, stdenv, fetchFromGitHub, installShellFiles, libpulseaudio, nas }: -stdenv.mkDerivation { - name = "gbsplay-2016-12-17"; +stdenv.mkDerivation rec { + pname = "gbsplay"; + version = "0.0.94"; src = fetchFromGitHub { owner = "mmitch"; repo = "gbsplay"; - rev = "2c4486e17fd4f4cdea8c3fd79ae898c892616b70"; - sha256 = "1214j67sr87zfhvym41cw2g823fmqh4hr451r7y1s9ql3jpjqhpz"; + rev = version; + sha256 = "VpaXbjotmc/Ref1geiKkBX9UhbPxfAGkFAdKVxP8Uxo="; }; - buildInputs = [ libpulseaudio ]; + configureFlags = [ + "--without-test" # See mmitch/gbsplay#62 + "--without-contrib" + ]; - configureFlags = - [ "--without-test" "--without-contrib" "--disable-devdsp" - "--enable-pulse" "--disable-alsa" "--disable-midi" - "--disable-nas" "--disable-dsound" "--disable-i18n" ]; + nativeBuildInputs = [ installShellFiles ]; + buildInputs = [ libpulseaudio nas ]; - makeFlags = [ "tests=" ]; + postInstall = '' + installShellCompletion --bash --name gbsplay contrib/gbsplay.bashcompletion + ''; meta = with lib; { - description = "gameboy sound player"; + description = "Gameboy sound player"; license = licenses.gpl1; - platforms = ["i686-linux" "x86_64-linux"]; + platforms = [ "i686-linux" "x86_64-linux" ]; maintainers = with maintainers; [ dasuxullebt ]; }; } From 40ffedfb388d6099baf2227ef99c3066e8280d37 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sun, 13 Jun 2021 10:19:02 +0200 Subject: [PATCH 048/113] darwin: expose bootstrapLlvmVersion as argument in the stdenv This enables the bootstrap stdenv test to specify the actual llvm of the newly generated build instread of assuming it's the same version as the current stdenv. --- pkgs/stdenv/darwin/default.nix | 6 ++---- pkgs/stdenv/darwin/make-bootstrap-tools.nix | 4 +++- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 4ff512386e8..d6624a493aa 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -4,6 +4,7 @@ , config , overlays , crossOverlays ? [ ] +, bootstrapLlvmVersion ? if localSystem.isAarch64 then "11.1.0" else "7.1.0" # Allow passing in bootstrap files directly so we can test the stdenv bootstrap process when changing the bootstrap tools , bootstrapFiles ? if localSystem.isAarch64 then let @@ -40,14 +41,11 @@ assert crossSystem == localSystem; let inherit (localSystem) system; - # Bootstrap version needs to be known to reference headers included in the bootstrap tools - bootstrapLlvmVersion = if localSystem.isAarch64 then "11.1.0" else "7.1.0"; - useAppleSDKLibs = localSystem.isAarch64; haveKRB5 = localSystem.isx86_64; # final toolchain is injected into llvmPackages_${finalLlvmVersion} - finalLlvmVersion = if localSystem.isAarch64 then "11" else "7"; + finalLlvmVersion = lib.versions.major bootstrapLlvmVersion; finalLlvmPackages = "llvmPackages_${finalLlvmVersion}"; commonImpureHostDeps = [ diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix index 08b4372a0a1..c62e72f6047 100644 --- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -254,6 +254,8 @@ in rec { ''; }; + bootstrapLlvmVersion = llvmPackages.llvm.version; + bootstrapFiles = { sh = "${build}/on-server/sh"; bzip2 = "${build}/on-server/bzip2"; @@ -408,7 +410,7 @@ in rec { system = if crossSystem != null then crossSystem else system; stdenvStages = args: let - args' = args // { inherit bootstrapFiles; }; + args' = args // { inherit bootstrapLlvmVersion bootstrapFiles; }; in (import (test-pkgspath + "/pkgs/stdenv/darwin") args').stagesDarwin; }; } From d429c33e190a4a16df4ce8d3d55c9aaf9960565f Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sun, 13 Jun 2021 10:47:13 +0200 Subject: [PATCH 049/113] darwin: temporarily disable bootstrap stdenv test The update bootstrap tools requires changes from the upcoming llvm update in order to work. Fixes #126617 --- pkgs/top-level/release.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index e62c3ecc19b..e04b6e7e681 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -174,7 +174,8 @@ let # Lightweight distribution and test inherit (bootstrap) dist test; # Test a full stdenv bootstrap from the bootstrap tools definition - inherit (bootstrap.test-pkgs) stdenv; + # TODO re-enable with https://github.com/NixOS/nixpkgs/pull/126411 + # inherit (bootstrap.test-pkgs) stdenv; }; # Cross compiled bootstrap tools From 73953ec2ef627686bd1b1d3d8877c94f7d521264 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Sun, 13 Jun 2021 21:00:21 +0100 Subject: [PATCH 050/113] kube3d: 4.4.4 -> 4.4.5 --- pkgs/applications/networking/cluster/kube3d/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix index 88ba44b2e24..6070308bec6 100644 --- a/pkgs/applications/networking/cluster/kube3d/default.nix +++ b/pkgs/applications/networking/cluster/kube3d/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kube3d"; - version = "4.4.4"; + version = "4.4.5"; src = fetchFromGitHub { owner = "rancher"; repo = "k3d"; rev = "v${version}"; - sha256 = "sha256-pfyU25MASKQMwd49IbNyyEiz3gmSOBmLdWtIKhYU2wg="; + sha256 = "sha256-nT/17R1Gky9509U077tgwS7iQKRMJUk8rwQiHSHcP+s="; }; vendorSha256 = null; From 4d074658d005ff59ef1646fc854b166b682e65d3 Mon Sep 17 00:00:00 2001 From: IvarWithoutBones Date: Sun, 13 Jun 2021 23:10:23 +0200 Subject: [PATCH 051/113] cglm: init at 0.8.3 --- pkgs/development/libraries/cglm/default.nix | 27 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/libraries/cglm/default.nix diff --git a/pkgs/development/libraries/cglm/default.nix b/pkgs/development/libraries/cglm/default.nix new file mode 100644 index 00000000000..a1c90f6b463 --- /dev/null +++ b/pkgs/development/libraries/cglm/default.nix @@ -0,0 +1,27 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "cglm"; + version = "0.8.3"; + + src = fetchFromGitHub { + owner = "recp"; + repo = "cglm"; + rev = "v${version}"; + sha256 = "0crzkxan3kivyah225md5c65zglg5c1cgrsmwhvp51hmrpmxss5v"; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + homepage = "https://github.com/recp/cglm"; + description = "Highly Optimized Graphics Math (glm) for C"; + license = licenses.mit; + maintainers = [ maintainers.ivar ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 393e83fc151..5bff6312028 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3553,6 +3553,8 @@ in cfdg = callPackage ../tools/graphics/cfdg { }; + cglm = callPackage ../development/libraries/cglm { }; + cgreen = callPackage ../development/libraries/cgreen { }; checkinstall = callPackage ../tools/package-management/checkinstall { }; From 7bee527fcef8487f54a491e6e45dbe9741f267fe Mon Sep 17 00:00:00 2001 From: IvarWithoutBones Date: Mon, 14 Jun 2021 01:10:28 +0200 Subject: [PATCH 052/113] newlib: 3.3.0 -> 4.1.0 --- pkgs/development/misc/newlib/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/misc/newlib/default.nix b/pkgs/development/misc/newlib/default.nix index 193ec53d5ad..870aa068afe 100644 --- a/pkgs/development/misc/newlib/default.nix +++ b/pkgs/development/misc/newlib/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, buildPackages }: -let version = "3.3.0"; -in stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "newlib"; - inherit version; + version = "4.1.0"; + src = fetchurl { url = "ftp://sourceware.org/pub/newlib/newlib-${version}.tar.gz"; - sha256 = "0ricyx792ig2cb2x31b653yb7w7f7mf2111dv5h96lfzmqz9xpaq"; + sha256 = "0m01sjjyj0ib7bwlcrvmk1qkkgd66zf1dhbw716j490kymrf75pj"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; From c3218e1ff70242566acd4e08b992d6a26b823bd7 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 13 Jun 2021 22:47:06 -0400 Subject: [PATCH 053/113] stylua: init at 0.8.1 --- pkgs/development/tools/stylua/default.nix | 35 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/tools/stylua/default.nix diff --git a/pkgs/development/tools/stylua/default.nix b/pkgs/development/tools/stylua/default.nix new file mode 100644 index 00000000000..56c57483ddc --- /dev/null +++ b/pkgs/development/tools/stylua/default.nix @@ -0,0 +1,35 @@ +{ fetchFromGitHub +, lib +, rustPlatform +, stdenvNoCC +, lua52Support ? true +, luauSupport ? false +}: + +rustPlatform.buildRustPackage rec { + pname = "stylua"; + version = "0.8.1"; + + src = fetchFromGitHub { + owner = "johnnymorganz"; + repo = pname; + rev = "v${version}"; + sha256 = "0gjm9pvwfbwhd49pm5sw5plwhlhvbfkms44h67zgvy7xzqv8h3dw"; + }; + + cargoSha256 = "117m78naldp6yvwcccvsrbnx6x6287cvq0saa06pmiqv1rqm50m3"; + + cargoBuildFlags = lib.optionals lua52Support [ "--features" "lua52" ] + ++ lib.optionals luauSupport [ "--features" "luau" ]; + + # test_standard fails on darwin + doCheck = !stdenvNoCC.isDarwin; + + meta = with lib; { + description = "An opinionated Lua code formatter"; + homepage = "https://github.com/johnnymorganz/stylua"; + changelog = "https://github.com/johnnymorganz/stylua/blob/v${version}/CHANGELOG.md"; + license = licenses.mpl20; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 453c4758ae4..e0d49336a3e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14002,6 +14002,8 @@ in strace = callPackage ../development/tools/misc/strace { }; + stylua = callPackage ../development/tools/stylua { }; + summon = callPackage ../development/tools/summon { }; svlint = callPackage ../development/tools/analysis/svlint { }; From 0874136de6854112c7d8b3e3de979482e7252f28 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 14 Jun 2021 09:50:57 +0200 Subject: [PATCH 054/113] python3Packages.androidtv: 0.0.59 -> 0.0.60 --- pkgs/development/python-modules/androidtv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/androidtv/default.nix b/pkgs/development/python-modules/androidtv/default.nix index 02edcea42ef..e49f4ba53fe 100644 --- a/pkgs/development/python-modules/androidtv/default.nix +++ b/pkgs/development/python-modules/androidtv/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "androidtv"; - version = "0.0.59"; + version = "0.0.60"; # pypi does not contain tests, using github sources instead src = fetchFromGitHub { owner = "JeffLIrion"; repo = "python-androidtv"; rev = "v${version}"; - sha256 = "sha256-QuKWOo+QMBpVJglwvaSMbKKYMN/MW31E7BgIMchESG8="; + sha256 = "sha256-GWCiRxZ6pHrcVkOKNGxSK8lUD0RohtED8czXIWUoVaM="; }; propagatedBuildInputs = [ adb-shell pure-python-adb ] From ade0e5bd30a4ddf38f984312df7637be1d1d6dfd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 6 Jun 2021 00:06:34 +0200 Subject: [PATCH 055/113] python3Packages.aio-geojson-client: init at 0.14 --- .../aio-geojson-client/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/aio-geojson-client/default.nix diff --git a/pkgs/development/python-modules/aio-geojson-client/default.nix b/pkgs/development/python-modules/aio-geojson-client/default.nix new file mode 100644 index 00000000000..2c64230db26 --- /dev/null +++ b/pkgs/development/python-modules/aio-geojson-client/default.nix @@ -0,0 +1,45 @@ +{ lib +, aiohttp +, aresponses +, asynctest +, buildPythonPackage +, fetchFromGitHub +, geojson +, haversine +, pytest-asyncio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "aio-geojson-client"; + version = "0.14"; + + src = fetchFromGitHub { + owner = "exxamalte"; + repo = "python-aio-geojson-client"; + rev = "v${version}"; + sha256 = "1nk0mas71n1bn4wc7pcv279i1b5mxy9phyc8ppxlb16kbjnjj0h8"; + }; + + propagatedBuildInputs = [ + aiohttp + geojson + haversine + ]; + + checkInputs = [ + aresponses + asynctest + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "aio_geojson_client" ]; + + meta = with lib; { + description = "Python module for accessing GeoJSON feeds"; + homepage = "https://github.com/exxamalte/python-aio-geojson-client"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c76f3753ad5..e8a4e27578a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -225,6 +225,8 @@ in { agent-py = callPackage ../development/python-modules/agent-py { }; + aio-geojson-client = callPackage ../development/python-modules/aio-geojson-client { }; + aio-georss-client = callPackage ../development/python-modules/aio-georss-client { }; aio-georss-gdacs = callPackage ../development/python-modules/aio-georss-gdacs { }; From 1d948b071d03fc94f5faf22626af6938ff9532f3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 6 Jun 2021 00:14:12 +0200 Subject: [PATCH 056/113] python3Packages.aio-geojson-geonetnz-quakes: init at 0.12 --- .../aio-geojson-geonetnz-quakes/default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix diff --git a/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix b/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix new file mode 100644 index 00000000000..2def7919fa1 --- /dev/null +++ b/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix @@ -0,0 +1,43 @@ +{ lib +, aio-geojson-client +, aiohttp +, aresponses +, buildPythonPackage +, fetchFromGitHub +, pytest-asyncio +, pytestCheckHook +, pytz +}: + +buildPythonPackage rec { + pname = "aio-geojson-geonetnz-quakes"; + version = "0.12"; + + src = fetchFromGitHub { + owner = "exxamalte"; + repo = "python-aio-geojson-geonetnz-quakes"; + rev = "v${version}"; + sha256 = "166gvcc1rzigb822k1373y18k54x5aklikr8sc7hyml5vz937xr7"; + }; + + propagatedBuildInputs = [ + aio-geojson-client + aiohttp + pytz + ]; + + checkInputs = [ + aresponses + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "aio_geojson_geonetnz_quakes" ]; + + meta = with lib; { + description = "Python module for accessing the GeoNet NZ Quakes GeoJSON feeds"; + homepage = "https://github.com/exxamalte/pythonaio-geojson-geonetnz-quakes"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e8a4e27578a..10a9c4868ef 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -227,6 +227,8 @@ in { aio-geojson-client = callPackage ../development/python-modules/aio-geojson-client { }; + aio-geojson-geonetnz-quakes = callPackage ../development/python-modules/aio-geojson-geonetnz-quakes { }; + aio-georss-client = callPackage ../development/python-modules/aio-georss-client { }; aio-georss-gdacs = callPackage ../development/python-modules/aio-georss-gdacs { }; From 41e46438efcdd867c03f568448a13fc90ea245b3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 6 Jun 2021 00:18:02 +0200 Subject: [PATCH 057/113] python3Packages.aio-geojson-geonetnz-volcano: init at 0.5 --- .../aio-geojson-geonetnz-volcano/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix diff --git a/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix b/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix new file mode 100644 index 00000000000..97adb2f8fe0 --- /dev/null +++ b/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix @@ -0,0 +1,45 @@ +{ lib +, aio-geojson-client +, aiohttp +, aresponses +, asynctest +, buildPythonPackage +, fetchFromGitHub +, pytest-asyncio +, pytestCheckHook +, pytz +}: + +buildPythonPackage rec { + pname = "aio-geojson-geonetnz-volcano"; + version = "0.5"; + + src = fetchFromGitHub { + owner = "exxamalte"; + repo = "python-aio-geojson-geonetnz-volcano"; + rev = "v${version}"; + sha256 = "0x4i9gjwb2j788aw4j47bxin0d2ma3khssprq4ga3cjzx2qjwjvn"; + }; + + propagatedBuildInputs = [ + aio-geojson-client + aiohttp + pytz + ]; + + checkInputs = [ + aresponses + asynctest + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "aio_geojson_geonetnz_volcano" ]; + + meta = with lib; { + description = "Python module for accessing the GeoNet NZ Volcanic GeoJSON feeds"; + homepage = "https://github.com/exxamalte/pythonaio-geojson-geonetnz-volcano"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 10a9c4868ef..3644a8eef02 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -229,6 +229,8 @@ in { aio-geojson-geonetnz-quakes = callPackage ../development/python-modules/aio-geojson-geonetnz-quakes { }; + aio-geojson-geonetnz-volcano = callPackage ../development/python-modules/aio-geojson-geonetnz-volcano { }; + aio-georss-client = callPackage ../development/python-modules/aio-georss-client { }; aio-georss-gdacs = callPackage ../development/python-modules/aio-georss-gdacs { }; From 0f28f4e8a052426f86320e6da2936dca5038d9c1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 6 Jun 2021 00:22:47 +0200 Subject: [PATCH 058/113] python3Packages.aio-geojson-nsw-rfs-incidents: init at 0.3 --- .../aio-geojson-nsw-rfs-incidents/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/aio-geojson-nsw-rfs-incidents/default.nix diff --git a/pkgs/development/python-modules/aio-geojson-nsw-rfs-incidents/default.nix b/pkgs/development/python-modules/aio-geojson-nsw-rfs-incidents/default.nix new file mode 100644 index 00000000000..845f0fec8cd --- /dev/null +++ b/pkgs/development/python-modules/aio-geojson-nsw-rfs-incidents/default.nix @@ -0,0 +1,45 @@ +{ lib +, aio-geojson-client +, aiohttp +, aresponses +, asynctest +, buildPythonPackage +, fetchFromGitHub +, pytest-asyncio +, pytestCheckHook +, pytz +}: + +buildPythonPackage rec { + pname = "aio-geojson-nsw-rfs-incidents"; + version = "0.3"; + + src = fetchFromGitHub { + owner = "exxamalte"; + repo = "python-aio-geojson-nsw-rfs-incidents"; + rev = "v${version}"; + sha256 = "0g7a5sbp1y4shhsik924zssa2n7ima6p2zk1l890y66lyc168vws"; + }; + + propagatedBuildInputs = [ + aio-geojson-client + aiohttp + pytz + ]; + + checkInputs = [ + aresponses + asynctest + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "aio_geojson_nsw_rfs_incidents" ]; + + meta = with lib; { + description = "Python module for accessing the NSW Rural Fire Service incidents feeds"; + homepage = "https://github.com/exxamalte/python-aio-geojson-nsw-rfs-incidents"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3644a8eef02..a84a3adfb50 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -231,6 +231,8 @@ in { aio-geojson-geonetnz-volcano = callPackage ../development/python-modules/aio-geojson-geonetnz-volcano { }; + aio-geojson-nsw-rfs-incidents = callPackage ../development/python-modules/aio-geojson-nsw-rfs-incidents { }; + aio-georss-client = callPackage ../development/python-modules/aio-georss-client { }; aio-georss-gdacs = callPackage ../development/python-modules/aio-georss-gdacs { }; From ce1a051d13fcb6eb1d2cf35c084fdd77e41c0164 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 14 Jun 2021 12:14:18 +0200 Subject: [PATCH 059/113] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index f7f5f589f62..e62d3dbcf4b 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -303,8 +303,8 @@ "geo_location" = ps: with ps; [ ]; "geo_rss_events" = ps: with ps; [ georss-generic-client ]; "geofency" = ps: with ps; [ aiohttp-cors ]; - "geonetnz_quakes" = ps: with ps; [ ]; # missing inputs: aio_geojson_geonetnz_quakes - "geonetnz_volcano" = ps: with ps; [ ]; # missing inputs: aio_geojson_geonetnz_volcano + "geonetnz_quakes" = ps: with ps; [ aio-geojson-geonetnz-quakes ]; + "geonetnz_volcano" = ps: with ps; [ aio-geojson-geonetnz-volcano ]; "gios" = ps: with ps; [ gios ]; "github" = ps: with ps; [ PyGithub ]; "gitlab_ci" = ps: with ps; [ python-gitlab ]; @@ -576,7 +576,7 @@ "notify_events" = ps: with ps; [ ]; # missing inputs: notify-events "notion" = ps: with ps; [ aionotion ]; "nsw_fuel_station" = ps: with ps; [ ]; # missing inputs: nsw-fuel-api-client - "nsw_rural_fire_service_feed" = ps: with ps; [ ]; # missing inputs: aio_geojson_nsw_rfs_incidents + "nsw_rural_fire_service_feed" = ps: with ps; [ aio-geojson-nsw-rfs-incidents ]; "nuheat" = ps: with ps; [ ]; # missing inputs: nuheat "nuki" = ps: with ps; [ pynuki ]; "numato" = ps: with ps; [ ]; # missing inputs: numato-gpio From 2680c5c780c35fc8ceefa40e78a6c2fd9fb5dfce Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 14 Jun 2021 12:20:28 +0200 Subject: [PATCH 060/113] home-assistant: enable geo* tests --- pkgs/servers/home-assistant/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index da3e16b0a20..551ab4dedf6 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -391,7 +391,10 @@ in with py.pkgs; buildPythonApplication rec { "generic_thermostat" "geo_json_events" "geo_location" + "geo_rss_events" "geofency" + "geonetnz_quakes" + "geonetnz_volcano" "glances" "gios" "gogogate2" @@ -505,6 +508,7 @@ in with py.pkgs; buildPythonApplication rec { "no_ip" "notify" "notion" + "nsw_rural_fire_service_feed" "nuki" "number" "nws" From d97fa35f946476a13ed4d59f62c354baf73b3c88 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 14 Jun 2021 12:22:00 +0200 Subject: [PATCH 061/113] python3Packages.aio-geojson-nsw-rfs-incidents: 0.3 -> 0.4 --- .../python-modules/aio-geojson-nsw-rfs-incidents/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aio-geojson-nsw-rfs-incidents/default.nix b/pkgs/development/python-modules/aio-geojson-nsw-rfs-incidents/default.nix index 845f0fec8cd..792f91bc7f1 100644 --- a/pkgs/development/python-modules/aio-geojson-nsw-rfs-incidents/default.nix +++ b/pkgs/development/python-modules/aio-geojson-nsw-rfs-incidents/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "aio-geojson-nsw-rfs-incidents"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-aio-geojson-nsw-rfs-incidents"; rev = "v${version}"; - sha256 = "0g7a5sbp1y4shhsik924zssa2n7ima6p2zk1l890y66lyc168vws"; + sha256 = "sha256-o9tuoJ7VZ6bg0rYeRWClKxdbxxj6wPgkSF7ZdOfmJew="; }; propagatedBuildInputs = [ From 77a7b33804dffbdaa1d513351d865b0c6942abed Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Mon, 14 Jun 2021 11:50:23 +0100 Subject: [PATCH 062/113] google-fonts: unstable-2021-01-19 -> unstable-2021-06-12 Also move to `stdenvNoCC` to reduce rebuilds --- pkgs/data/fonts/google-fonts/default.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/data/fonts/google-fonts/default.nix b/pkgs/data/fonts/google-fonts/default.nix index 210902a0e71..9689fddd391 100644 --- a/pkgs/data/fonts/google-fonts/default.nix +++ b/pkgs/data/fonts/google-fonts/default.nix @@ -1,22 +1,18 @@ -{ lib -, stdenv -, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -stdenv.mkDerivation { +stdenvNoCC.mkDerivation { pname = "google-fonts"; - version = "unstable-2021-01-19"; + version = "unstable-2021-06-12"; outputs = [ "out" "adobeBlank" ]; src = fetchFromGitHub { owner = "google"; repo = "fonts"; - rev = "a3a831f0fe44cd58465c6937ea06873728f2ba0d"; - sha256 = "19abx2bj7mkysv2ihr43m3kpyf6kv6v2qjlm1skxc82rb72xqhix"; + rev = "370c795d7e5f9b02db9a793c2779e2c8f94c6adc"; + sha256 = "sha256-XKjxmupY2KuefCtKZMXWaba1TnNwdYM/P0xGXOtBGmM="; }; - phases = [ "unpackPhase" "patchPhase" "installPhase" ]; - patchPhase = '' # These directories need to be removed because they contain # older or duplicate versions of fonts also present in other @@ -33,6 +29,8 @@ stdenv.mkDerivation { fi ''; + dontBuild = true; + installPhase = '' adobeBlankDest=$adobeBlank/share/fonts/truetype install -m 444 -Dt $adobeBlankDest ofl/adobeblank/AdobeBlank-Regular.ttf From 9fb4d19c2ec8d86439457e4cc10bc12becdc7268 Mon Sep 17 00:00:00 2001 From: Serhii Zhuravel <1804871+dxops@users.noreply.github.com> Date: Wed, 2 Jun 2021 20:25:59 +0300 Subject: [PATCH 063/113] Allow to extend PHP_INI_SCAN_DIR Fixes #109383 --- pkgs/development/interpreters/php/generic.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix index 558fa45a1fd..d86ea48afe1 100644 --- a/pkgs/development/interpreters/php/generic.nix +++ b/pkgs/development/interpreters/php/generic.nix @@ -124,15 +124,15 @@ let ln -s ${extraInit} $out/lib/php.ini if test -e $out/bin/php; then - wrapProgram $out/bin/php --set PHP_INI_SCAN_DIR $out/lib + wrapProgram $out/bin/php --prefix PHP_INI_SCAN_DIR : $out/lib fi if test -e $out/bin/php-fpm; then - wrapProgram $out/bin/php-fpm --set PHP_INI_SCAN_DIR $out/lib + wrapProgram $out/bin/php-fpm --prefix PHP_INI_SCAN_DIR : $out/lib fi if test -e $out/bin/phpdbg; then - wrapProgram $out/bin/phpdbg --set PHP_INI_SCAN_DIR $out/lib + wrapProgram $out/bin/phpdbg --prefix PHP_INI_SCAN_DIR : $out/lib fi ''; }; From 2bbf6c86876ecf75fe0ed1d8e3dff413bf255024 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= Date: Mon, 14 Jun 2021 14:21:41 +0200 Subject: [PATCH 064/113] Move CompCert into coqPackages. (#126214) * compcert: preparation to move in coqPackages * compcert: move into coqPackages * compcert: remove version 3.7 As a consequence, also remove VST version 2.6 These were broken. --- .../compilers/compcert/default.nix | 125 ------------------ pkgs/development/coq-modules/VST/default.nix | 2 - .../coq-modules/compcert/default.nix | 109 +++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/coq-packages.nix | 14 +- 5 files changed, 117 insertions(+), 135 deletions(-) delete mode 100644 pkgs/development/compilers/compcert/default.nix create mode 100644 pkgs/development/coq-modules/compcert/default.nix diff --git a/pkgs/development/compilers/compcert/default.nix b/pkgs/development/compilers/compcert/default.nix deleted file mode 100644 index beafd6414f4..00000000000 --- a/pkgs/development/compilers/compcert/default.nix +++ /dev/null @@ -1,125 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper -, coqPackages, ocamlPackages, coq2html -, tools ? stdenv.cc -, version ? "3.9" -}: - -let - ocaml-pkgs = with ocamlPackages; [ ocaml findlib menhir menhirLib ]; - ccomp-platform = if stdenv.isDarwin then "x86_64-macosx" else "x86_64-linux"; - inherit (coqPackages) coq flocq; - inherit (lib) optional optionalString; -in - -let param = { - "3.7" = { - sha256 = "1h4zhk9rrqki193nxs9vjvya7nl9yxjcf07hfqb6g77riy1vd2jr"; - patches = [ - (fetchpatch { - url = "https://github.com/AbsInt/CompCert/commit/0a2db0269809539ccc66f8ec73637c37fbd23580.patch"; - sha256 = "0n8qrba70x8f422jdvq9ddgsx6avf2dkg892g4ldh3jiiidyhspy"; - }) - (fetchpatch { - url = "https://github.com/AbsInt/CompCert/commit/5e29f8b5ba9582ecf2a1d0baeaef195873640607.patch"; - sha256 = "184nfdgxrkci880lkaj5pgnify3plka7xfgqrgv16275sqppc5hc"; - }) - ]; - }; - "3.8" = { - sha256 = "1gzlyxvw64ca12qql3wnq3bidcx9ygsklv9grjma3ib4hvg7vnr7"; - patches = [ - # Support for Coq 8.12.2 - (fetchpatch { - url = "https://github.com/AbsInt/CompCert/commit/06956421b4307054af221c118c5f59593c0e67b9.patch"; - sha256 = "1f90q6j3xfvnf3z830bkd4d8526issvmdlrjlc95bfsqs78i1yrl"; - }) - # Support for Coq 8.13.0 - (fetchpatch { - url = "https://github.com/AbsInt/CompCert/commit/0895388e7ebf9c9f3176d225107e21968919fb97.patch"; - sha256 = "0qhkzgb2xl5kxys81pldp3mr39gd30lvr2l2wmplij319vp3xavd"; - }) - # Support for Coq 8.13.1 - (fetchpatch { - url = "https://github.com/AbsInt/CompCert/commit/6bf310dd678285dc193798e89fc2c441d8430892.patch"; - sha256 = "026ahhvpj5pksy90f8pnxgmhgwfqk4kwyvcf8x3dsanvz98d4pj5"; - }) - # Drop support for Coq < 8.9 - (fetchpatch { - url = "https://github.com/AbsInt/CompCert/commit/7563a5df926a4c6fb1489a7a4c847641c8a35095.patch"; - sha256 = "05vkslzy399r3dm6dmjs722rrajnyfa30xsyy3djl52isvn4gyfb"; - }) - # Support for Coq 8.13.2 - (fetchpatch { - url = "https://github.com/AbsInt/CompCert/commit/48bc183167c4ce01a5c9ea86e49d60530adf7290.patch"; - sha256 = "0j62lppfk26d1brdp3qwll2wi4gvpx1k70qivpvby5f7dpkrkax1"; - }) - ]; - useExternalFlocq = true; - }; - "3.9" = { - sha256 = "1srcz2dqrvmbvv5cl66r34zqkm0hsbryk7gd3i9xx4slahc9zvdb"; - useExternalFlocq = true; - }; -}."${version}"; in - -stdenv.mkDerivation rec { - pname = "compcert"; - inherit version; - - src = fetchFromGitHub { - owner = "AbsInt"; - repo = "CompCert"; - rev = "v${version}"; - inherit (param) sha256; - }; - - patches = param.patches or []; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = ocaml-pkgs ++ [ coq coq2html ]; - propagatedBuildInputs = optional (param.useExternalFlocq or false) flocq; - enableParallelBuilding = true; - - postPatch = '' - substituteInPlace ./configure \ - --replace \$\{toolprefix\}ar 'ar' \ - --replace '{toolprefix}gcc' '{toolprefix}cc' - ''; - - configurePhase = '' - ./configure -clightgen \ - -prefix $out \ - -coqdevdir $lib/lib/coq/${coq.coq-version}/user-contrib/compcert/ \ - -toolprefix ${tools}/bin/ \ - ${optionalString (param.useExternalFlocq or false) "-use-external-Flocq"} \ - ${ccomp-platform} - ''; - - installTargets = "documentation install"; - postInstall = '' - # move man into place - mkdir -p $man/share - mv $out/share/man/ $man/share/ - - # move docs into place - mkdir -p $doc/share/doc/compcert - mv doc/html $doc/share/doc/compcert/ - - # wrap ccomp to undefine _FORTIFY_SOURCE; ccomp invokes cc1 which sets - # _FORTIFY_SOURCE=2 by default, but undefines __GNUC__ (as it should), - # which causes a warning in libc. this suppresses it. - for x in ccomp clightgen; do - wrapProgram $out/bin/$x --add-flags "-U_FORTIFY_SOURCE" - done - ''; - - outputs = [ "out" "lib" "doc" "man" ]; - - meta = with lib; { - description = "Formally verified C compiler"; - homepage = "https://compcert.org"; - license = licenses.inria-compcert; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; - maintainers = with maintainers; [ thoughtpolice jwiegley vbgl ]; - }; -} diff --git a/pkgs/development/coq-modules/VST/default.nix b/pkgs/development/coq-modules/VST/default.nix index ad5caec9492..c3bd33ce4bf 100644 --- a/pkgs/development/coq-modules/VST/default.nix +++ b/pkgs/development/coq-modules/VST/default.nix @@ -9,10 +9,8 @@ with lib; mkCoqDerivation { inherit version; defaultVersion = with versions; switch coq.coq-version [ { case = range "8.12" "8.13"; out = "2.7.1"; } - { case = "8.11"; out = "2.6"; } ] null; release."2.7.1".sha256 = "1674j7bkvihiv19vizm99dp6gj3lryb00zx6a87jz214f3ydcvnj"; - release."2.6".sha256 = "00bf9hl4pvmsqa08lzjs1mrxyfgfxq4k6778pnldmc8ichm90jgk"; releaseRev = v: "v${v}"; propagatedBuildInputs = [ compcert ]; diff --git a/pkgs/development/coq-modules/compcert/default.nix b/pkgs/development/coq-modules/compcert/default.nix new file mode 100644 index 00000000000..978cea5b09e --- /dev/null +++ b/pkgs/development/coq-modules/compcert/default.nix @@ -0,0 +1,109 @@ +{ lib, fetchzip, mkCoqDerivation, coq, flocq, compcert +, ocamlPackages, fetchpatch, makeWrapper, coq2html +, stdenv, tools ? stdenv.cc +, version ? null +}: + +with lib; + +let compcert = mkCoqDerivation rec { + + pname = "compcert"; + owner = "AbsInt"; + + inherit version; + releaseRev = v: "v${v}"; + + defaultVersion = with versions; switch coq.version [ + { case = range "8.8" "8.13"; out = "3.8"; } + ] null; + + release = { + "3.8".sha256 = "1gzlyxvw64ca12qql3wnq3bidcx9ygsklv9grjma3ib4hvg7vnr7"; + "3.9".sha256 = "1srcz2dqrvmbvv5cl66r34zqkm0hsbryk7gd3i9xx4slahc9zvdb"; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = with ocamlPackages; [ ocaml findlib menhir menhirLib ] ++ [ coq coq2html ]; + propagatedBuildInputs = [ flocq ]; + + enableParallelBuilding = true; + + postPatch = '' + substituteInPlace ./configure \ + --replace \$\{toolprefix\}ar 'ar' \ + --replace '{toolprefix}gcc' '{toolprefix}cc' + ''; + + configurePhase = '' + ./configure -clightgen \ + -prefix $out \ + -coqdevdir $lib/lib/coq/${coq.coq-version}/user-contrib/compcert/ \ + -toolprefix ${tools}/bin/ \ + -use-external-Flocq \ + ${if stdenv.isDarwin then "x86_64-macosx" else "x86_64-linux"} + ''; + + installTargets = "documentation install"; + postInstall = '' + # move man into place + mkdir -p $man/share + mv $out/share/man/ $man/share/ + + # move docs into place + mkdir -p $doc/share/doc/compcert + mv doc/html $doc/share/doc/compcert/ + + # wrap ccomp to undefine _FORTIFY_SOURCE; ccomp invokes cc1 which sets + # _FORTIFY_SOURCE=2 by default, but undefines __GNUC__ (as it should), + # which causes a warning in libc. this suppresses it. + for x in ccomp clightgen; do + wrapProgram $out/bin/$x --add-flags "-U_FORTIFY_SOURCE" + done + ''; + + outputs = [ "out" "lib" "doc" "man" ]; + + meta = with lib; { + description = "Formally verified C compiler"; + homepage = "https://compcert.org"; + license = licenses.inria-compcert; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; + maintainers = with maintainers; [ thoughtpolice jwiegley vbgl ]; + }; +}; in +compcert.overrideAttrs (o: + { + patches = with versions; switch [ coq.version o.version ] [ + { cases = [ (range "8.12.2" "8.13.2") "3.8" ]; + out = [ + # Support for Coq 8.12.2 + (fetchpatch { + url = "https://github.com/AbsInt/CompCert/commit/06956421b4307054af221c118c5f59593c0e67b9.patch"; + sha256 = "1f90q6j3xfvnf3z830bkd4d8526issvmdlrjlc95bfsqs78i1yrl"; + }) + # Support for Coq 8.13.0 + (fetchpatch { + url = "https://github.com/AbsInt/CompCert/commit/0895388e7ebf9c9f3176d225107e21968919fb97.patch"; + sha256 = "0qhkzgb2xl5kxys81pldp3mr39gd30lvr2l2wmplij319vp3xavd"; + }) + # Support for Coq 8.13.1 + (fetchpatch { + url = "https://github.com/AbsInt/CompCert/commit/6bf310dd678285dc193798e89fc2c441d8430892.patch"; + sha256 = "026ahhvpj5pksy90f8pnxgmhgwfqk4kwyvcf8x3dsanvz98d4pj5"; + }) + # Drop support for Coq < 8.9 + (fetchpatch { + url = "https://github.com/AbsInt/CompCert/commit/7563a5df926a4c6fb1489a7a4c847641c8a35095.patch"; + sha256 = "05vkslzy399r3dm6dmjs722rrajnyfa30xsyy3djl52isvn4gyfb"; + }) + # Support for Coq 8.13.2 + (fetchpatch { + url = "https://github.com/AbsInt/CompCert/commit/48bc183167c4ce01a5c9ea86e49d60530adf7290.patch"; + sha256 = "0j62lppfk26d1brdp3qwll2wi4gvpx1k70qivpvby5f7dpkrkax1"; + }) + ]; + } + ] []; + } +) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 16f7df76658..4ba603980bd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10553,7 +10553,7 @@ in cmucl_binary = pkgsi686Linux.callPackage ../development/compilers/cmucl/binary.nix { }; - compcert = callPackage ../development/compilers/compcert {}; + compcert = coqPackages.compcert.override { version = "3.9"; }; computecpp-unwrapped = callPackage ../development/compilers/computecpp {}; computecpp = wrapCCWith rec { diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 1ac8c4c4005..fb7e2113018 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -1,5 +1,5 @@ -{ lib, callPackage, newScope, recurseIntoAttrs, ocamlPackages_4_05, ocamlPackages_4_09 -, ocamlPackages_4_10, compcert +{ lib, stdenv, callPackage, newScope, recurseIntoAttrs, ocamlPackages_4_05, ocamlPackages_4_09 +, ocamlPackages_4_10, fetchpatch, makeWrapper, coq2html }@args: let lib = import ../build-support/coq/extra-lib.nix {inherit (args) lib;}; in let @@ -21,6 +21,10 @@ let category-theory = callPackage ../development/coq-modules/category-theory { }; Cheerios = callPackage ../development/coq-modules/Cheerios {}; CoLoR = callPackage ../development/coq-modules/CoLoR {}; + compcert = callPackage ../development/coq-modules/compcert { + ocamlPackages = ocamlPackages_4_05; + inherit fetchpatch makeWrapper coq2html lib stdenv; + }; coq-bits = callPackage ../development/coq-modules/coq-bits {}; coq-elpi = callPackage ../development/coq-modules/coq-elpi {}; coq-ext-lib = callPackage ../development/coq-modules/coq-ext-lib {}; @@ -78,11 +82,7 @@ let topology = callPackage ../development/coq-modules/topology {}; Velisarios = callPackage ../development/coq-modules/Velisarios {}; Verdi = callPackage ../development/coq-modules/Verdi {}; - VST = callPackage ../development/coq-modules/VST (with lib.versions; - lib.switch coq.coq-version [ - { case = "8.11"; out = { compcert = compcert.override { coqPackages = self; version = "3.7"; }; }; } - { case = range "8.12" "8.13"; out = { compcert = compcert.override { coqPackages = self; version = "3.8"; }; }; } - ] {}); + VST = callPackage ../development/coq-modules/VST {}; zorns-lemma = callPackage ../development/coq-modules/zorns-lemma {}; filterPackages = doesFilter: if doesFilter then filterCoqPackages self else self; }; From 83bf34642a6069fba3ca8ae32db3528ba6b202f5 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 14 Jun 2021 13:30:53 +0200 Subject: [PATCH 065/113] llvmPackages_git: Fix the libcxx and libcxxabi builds --- .../compilers/llvm/git/libcxx/default.nix | 5 +- .../llvm/git/libcxx/gnu-install-dirs.patch | 91 ++++++++----------- .../compilers/llvm/git/libcxxabi/default.nix | 5 +- .../llvm/git/libcxxabi/gnu-install-dirs.patch | 20 ++-- 4 files changed, 52 insertions(+), 69 deletions(-) diff --git a/pkgs/development/compilers/llvm/git/libcxx/default.nix b/pkgs/development/compilers/llvm/git/libcxx/default.nix index 8fb6b4a7dbd..f511eba81dc 100644 --- a/pkgs/development/compilers/llvm/git/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/git/libcxx/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, llvm_meta, src, cmake, python3, libcxxabi, fixDarwinDylibNames, version +{ lib, stdenv, llvm_meta, src, cmake, python3, fixDarwinDylibNames, version , enableShared ? !stdenv.hostPlatform.isStatic }: @@ -24,10 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python3 ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; - buildInputs = [ libcxxabi ]; - cmakeFlags = [ - "-DLIBCXX_CXX_ABI=libcxxabi" ] ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1" ++ lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON" ++ lib.optional stdenv.hostPlatform.isWasm [ diff --git a/pkgs/development/compilers/llvm/git/libcxx/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/git/libcxx/gnu-install-dirs.patch index 1f9de00a9d5..f59d7f8dfaf 100644 --- a/pkgs/development/compilers/llvm/git/libcxx/gnu-install-dirs.patch +++ b/pkgs/development/compilers/llvm/git/libcxx/gnu-install-dirs.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9bf1a02f0908..612cd4aab76c 100644 +index 06ee1d74a03e..6c3c6f8f8d47 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,6 +28,8 @@ set(LIBCXX_BINARY_INCLUDE_DIR "${LIBCXX_BINARY_DIR}/include/c++build") @@ -9,92 +9,73 @@ index 9bf1a02f0908..612cd4aab76c 100644 + include(GNUInstallDirs) + set(PACKAGE_NAME libcxx) - set(PACKAGE_VERSION 12.0.0) + set(PACKAGE_VERSION 13.0.0git) set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") -@@ -402,7 +404,7 @@ endif () - if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) - set(LIBCXX_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++) - set(LIBCXX_HEADER_DIR ${LLVM_BINARY_DIR}) -- set(LIBCXX_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++) -+ set(LIBCXX_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++) +@@ -409,7 +411,7 @@ if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) + set(LIBCXX_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}) + set(LIBCXX_GENERATED_INCLUDE_DIR "${LLVM_BINARY_DIR}/include/c++/v1") + set(LIBCXX_GENERATED_INCLUDE_TARGET_DIR "${LLVM_BINARY_DIR}/include/${LLVM_DEFAULT_TARGET_TRIPLE}/c++/v1") +- set(LIBCXX_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}) ++ set(LIBCXX_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}) + set(LIBCXX_INSTALL_INCLUDE_DIR "include/c++/v1") + set(LIBCXX_INSTALL_INCLUDE_TARGET_DIR "include/${LLVM_DEFAULT_TARGET_TRIPLE}/c++/v1") if(LIBCXX_LIBDIR_SUBDIR) - string(APPEND LIBCXX_LIBRARY_DIR /${LIBCXX_LIBDIR_SUBDIR}) - string(APPEND LIBCXX_INSTALL_LIBRARY_DIR /${LIBCXX_LIBDIR_SUBDIR}) -@@ -410,11 +412,11 @@ if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) - elseif(LLVM_LIBRARY_OUTPUT_INTDIR) +@@ -420,14 +422,14 @@ elseif(LLVM_LIBRARY_OUTPUT_INTDIR) set(LIBCXX_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) - set(LIBCXX_HEADER_DIR ${LLVM_BINARY_DIR}) + set(LIBCXX_GENERATED_INCLUDE_DIR "${LLVM_BINARY_DIR}/include/c++/v1") + set(LIBCXX_GENERATED_INCLUDE_TARGET_DIR "${LIBCXX_GENERATED_INCLUDE_DIR}") - set(LIBCXX_INSTALL_LIBRARY_DIR lib${LIBCXX_LIBDIR_SUFFIX}) + set(LIBCXX_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX}) + set(LIBCXX_INSTALL_INCLUDE_DIR "include/c++/v1") + set(LIBCXX_INSTALL_INCLUDE_TARGET_DIR "${LIBCXX_INSTALL_INCLUDE_DIR}") else() set(LIBCXX_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBCXX_LIBDIR_SUFFIX}) - set(LIBCXX_HEADER_DIR ${CMAKE_BINARY_DIR}) + set(LIBCXX_GENERATED_INCLUDE_DIR "${CMAKE_BINARY_DIR}/include/c++/v1") + set(LIBCXX_GENERATED_INCLUDE_TARGET_DIR "${LIBCXX_GENERATED_INCLUDE_DIR}") - set(LIBCXX_INSTALL_LIBRARY_DIR lib${LIBCXX_LIBDIR_SUFFIX}) + set(LIBCXX_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX}) + set(LIBCXX_INSTALL_INCLUDE_DIR "include/c++/v1") + set(LIBCXX_INSTALL_INCLUDE_TARGET_DIR "${LIBCXX_INSTALL_INCLUDE_DIR}") endif() - - file(MAKE_DIRECTORY "${LIBCXX_BINARY_INCLUDE_DIR}") diff --git a/cmake/Modules/HandleLibCXXABI.cmake b/cmake/Modules/HandleLibCXXABI.cmake -index 5d2764e870e9..bb1ec5de6ca2 100644 +index 5a8a4a270a1a..c06bae0001aa 100644 --- a/cmake/Modules/HandleLibCXXABI.cmake +++ b/cmake/Modules/HandleLibCXXABI.cmake @@ -63,7 +63,7 @@ macro(setup_abi_lib abidefines abishared abistatic abifiles abidirs) if (LIBCXX_INSTALL_HEADERS) install(FILES "${LIBCXX_BINARY_INCLUDE_DIR}/${fpath}" -- DESTINATION ${LIBCXX_INSTALL_HEADER_PREFIX}include/c++/v1/${dstdir} -+ DESTINATION ${LIBCXX_INSTALL_HEADER_PREFIX}${CMAKE_INSTALL_INCLUDEDIR}/c++/v1/${dstdir} +- DESTINATION include/c++/v1/${dstdir} ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/c++/v1/${dstdir} COMPONENT cxx-headers PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ ) -diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt -index 29a317b8ae9a..4747263cfd1b 100644 ---- a/include/CMakeLists.txt -+++ b/include/CMakeLists.txt -@@ -252,7 +252,7 @@ if (LIBCXX_INSTALL_HEADERS) - foreach(file ${files}) - get_filename_component(dir ${file} DIRECTORY) - install(FILES ${file} -- DESTINATION ${LIBCXX_INSTALL_HEADER_PREFIX}include/c++/v1/${dir} -+ DESTINATION ${LIBCXX_INSTALL_HEADER_PREFIX}${CMAKE_INSTALL_INCLUDEDIR}/c++/v1/${dir} - COMPONENT cxx-headers - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ - ) -@@ -260,7 +260,7 @@ if (LIBCXX_INSTALL_HEADERS) - - # Install the generated header as __config. - install(FILES ${LIBCXX_BINARY_DIR}/__generated_config -- DESTINATION ${LIBCXX_INSTALL_HEADER_PREFIX}include/c++/v1 -+ DESTINATION ${LIBCXX_INSTALL_HEADER_PREFIX}${CMAKE_INSTALL_INCLUDEDIR}/c++/v1 - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ - RENAME __config - COMPONENT cxx-headers) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 9965104cb5b2..9b55dbb1d822 100644 +index 87b71f7ba334..d20a783079b7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -352,21 +352,21 @@ if (LIBCXX_INSTALL_SHARED_LIBRARY) +@@ -369,21 +369,21 @@ if (LIBCXX_INSTALL_SHARED_LIBRARY) install(TARGETS cxx_shared - ARCHIVE DESTINATION ${LIBCXX_INSTALL_PREFIX}${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx - LIBRARY DESTINATION ${LIBCXX_INSTALL_PREFIX}${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx -- RUNTIME DESTINATION ${LIBCXX_INSTALL_PREFIX}bin COMPONENT cxx) -+ RUNTIME DESTINATION ${LIBCXX_INSTALL_PREFIX}${CMAKE_INSTALL_BINDIR} COMPONENT cxx) + ARCHIVE DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx + LIBRARY DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx +- RUNTIME DESTINATION bin COMPONENT cxx) ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT cxx) endif() if (LIBCXX_INSTALL_STATIC_LIBRARY) install(TARGETS cxx_static - ARCHIVE DESTINATION ${LIBCXX_INSTALL_PREFIX}${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx - LIBRARY DESTINATION ${LIBCXX_INSTALL_PREFIX}${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx -- RUNTIME DESTINATION ${LIBCXX_INSTALL_PREFIX}bin COMPONENT cxx) -+ RUNTIME DESTINATION ${LIBCXX_INSTALL_PREFIX}${CMAKE_INSTALL_BINDIR} COMPONENT cxx) + ARCHIVE DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx + LIBRARY DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx +- RUNTIME DESTINATION bin COMPONENT cxx) ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT cxx) endif() if(LIBCXX_INSTALL_EXPERIMENTAL_LIBRARY) install(TARGETS cxx_experimental - LIBRARY DESTINATION ${LIBCXX_INSTALL_PREFIX}${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx - ARCHIVE DESTINATION ${LIBCXX_INSTALL_PREFIX}${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx -- RUNTIME DESTINATION ${LIBCXX_INSTALL_PREFIX}bin COMPONENT cxx) -+ RUNTIME DESTINATION ${LIBCXX_INSTALL_PREFIX}${CMAKE_INSTALL_BINDIR} COMPONENT cxx) + LIBRARY DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx + ARCHIVE DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx +- RUNTIME DESTINATION bin COMPONENT cxx) ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT cxx) endif() # NOTE: This install command must go after the cxx install command otherwise diff --git a/pkgs/development/compilers/llvm/git/libcxxabi/default.nix b/pkgs/development/compilers/llvm/git/libcxxabi/default.nix index 3bb82d651ec..7fadc6d6dca 100644 --- a/pkgs/development/compilers/llvm/git/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/git/libcxxabi/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, llvm_meta, cmake, python3, src, libunwind, version , enableShared ? !stdenv.hostPlatform.isStatic +, libcxx }: stdenv.mkDerivation rec { @@ -26,7 +27,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python3 ]; buildInputs = lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind; - cmakeFlags = lib.optionals (stdenv.hostPlatform.useLLVM or false) [ + cmakeFlags = [ + "-DLIBCXXABI_LIBCXX_INCLUDES=${libcxx.dev}/include/c++/v1" + ] ++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" ] ++ lib.optionals stdenv.hostPlatform.isWasm [ diff --git a/pkgs/development/compilers/llvm/git/libcxxabi/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/git/libcxxabi/gnu-install-dirs.patch index b49b1685940..45641acb0c7 100644 --- a/pkgs/development/compilers/llvm/git/libcxxabi/gnu-install-dirs.patch +++ b/pkgs/development/compilers/llvm/git/libcxxabi/gnu-install-dirs.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 426c855288fc..a9812a994f53 100644 +index 1e8b73aa38cc..6f7b2a25d205 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,6 +27,8 @@ set(LIBCXXABI_LIBCXX_PATH "${CMAKE_CURRENT_LIST_DIR}/../libcxx" CACHE PATH @@ -9,26 +9,28 @@ index 426c855288fc..a9812a994f53 100644 + include(GNUInstallDirs) + set(PACKAGE_NAME libcxxabi) - set(PACKAGE_VERSION 11.0.0) + set(PACKAGE_VERSION 11.0.0git) set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") -@@ -180,17 +182,17 @@ set(CMAKE_MODULE_PATH - +@@ -196,7 +198,7 @@ set(CMAKE_MODULE_PATH if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) - set(LIBCXXABI_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++) -- set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++) -+ set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++) + set(LIBCXXABI_HEADER_DIR ${LLVM_BINARY_DIR}) + set(LIBCXXABI_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}) +- set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}) ++ set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}) if(LIBCXX_LIBDIR_SUBDIR) string(APPEND LIBCXXABI_LIBRARY_DIR /${LIBCXXABI_LIBDIR_SUBDIR}) string(APPEND LIBCXXABI_INSTALL_LIBRARY_DIR /${LIBCXXABI_LIBDIR_SUBDIR}) - endif() +@@ -204,11 +206,11 @@ if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) elseif(LLVM_LIBRARY_OUTPUT_INTDIR) + set(LIBCXXABI_HEADER_DIR ${LLVM_BINARY_DIR}) set(LIBCXXABI_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) - set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LIBCXXABI_LIBDIR_SUFFIX}) + set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX}) else() + set(LIBCXXABI_HEADER_DIR ${CMAKE_BINARY_DIR}) set(LIBCXXABI_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBCXXABI_LIBDIR_SUFFIX}) - set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LIBCXXABI_LIBDIR_SUFFIX}) + set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX}) endif() - set(LIBCXXABI_INSTALL_PREFIX "" CACHE STRING "Define libc++abi destination prefix.") + set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LIBCXXABI_LIBRARY_DIR}) From 6cbe05ab169ec75e33d1afd4014d6dc42e8103d2 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Mon, 14 Jun 2021 13:43:59 +0100 Subject: [PATCH 066/113] ricty: fix source Moved from http://www.yusa.lab.uec.ac.jp/~yusa/ricty to https://rictyfonts.github.io --- pkgs/data/fonts/ricty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/ricty/default.nix b/pkgs/data/fonts/ricty/default.nix index 435cdb7d163..6bdd331c72c 100644 --- a/pkgs/data/fonts/ricty/default.nix +++ b/pkgs/data/fonts/ricty/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "4.1.1"; src = fetchurl { - url = "http://www.yusa.lab.uec.ac.jp/~yusa/ricty/ricty_generator-${version}.sh"; + url = "https://rictyfonts.github.io/files/ricty_generator-${version}.sh"; sha256 = "03fngb8f5hl7ifigdm5yljhs4z2x80cq8y8kna86d07ghknhzgw6"; }; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A high-quality Japanese font based on Inconsolata and Migu 1M"; - homepage = "http://www.yusa.lab.uec.ac.jp/~yusa/ricty.html"; + homepage = "https://rictyfonts.github.io"; license = licenses.unfree; maintainers = [ maintainers.mikoim ]; }; From b083c7e9eb35ea7a85a94a8d19c0c64d925227d1 Mon Sep 17 00:00:00 2001 From: Sandro Date: Mon, 14 Jun 2021 14:59:21 +0200 Subject: [PATCH 067/113] darwin.mas: Fix dontBuild --- pkgs/os-specific/darwin/mas/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/mas/default.nix b/pkgs/os-specific/darwin/mas/default.nix index 15de553b76b..907d2185327 100644 --- a/pkgs/os-specific/darwin/mas/default.nix +++ b/pkgs/os-specific/darwin/mas/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { bsdtar -xf Payload~ ''; - doBuild = false; + dontBuild = true; installPhase = '' mkdir -p $out From 3209371bbe0b304a4cbb9bca3478c853105f18bd Mon Sep 17 00:00:00 2001 From: deliciouslytyped <47436522+deliciouslytyped@users.noreply.github.com> Date: Mon, 14 Jun 2021 15:47:07 +0200 Subject: [PATCH 068/113] maintainers: add deliciouslytyped --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index df6dcfd26ba..b55f2d16bfc 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2375,6 +2375,12 @@ github = "delan"; githubId = 465303; }; + deliciouslytyped = { + email = "47436522+deliciouslytyped@users.noreply.github.com"; + github = "deliciouslytyped"; + githubId = 47436522; + name = "deliciouslytyped"; + }; delroth = { email = "delroth@gmail.com"; github = "delroth"; From 4489d3e844ef848b1eeb88804a3e81637e47a06a Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 14 Jun 2021 12:14:12 +0800 Subject: [PATCH 069/113] onedrive: 2.4.11 -> 2.4.12 --- .../networking/sync/onedrive/default.nix | 28 +++++++++++++------ 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/sync/onedrive/default.nix b/pkgs/applications/networking/sync/onedrive/default.nix index b7e9f220f00..d53464df7a9 100644 --- a/pkgs/applications/networking/sync/onedrive/default.nix +++ b/pkgs/applications/networking/sync/onedrive/default.nix @@ -1,22 +1,34 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook, ldc, installShellFiles, pkg-config -, curl, sqlite, libnotify -, withSystemd ? stdenv.isLinux, systemd ? null }: +{ stdenv +, lib +, fetchFromGitHub +, autoreconfHook +, ldc +, installShellFiles +, pkg-config +, curl +, sqlite +, libnotify +, withSystemd ? stdenv.isLinux +, systemd +}: stdenv.mkDerivation rec { pname = "onedrive"; - version = "2.4.11"; + version = "2.4.12"; src = fetchFromGitHub { owner = "abraunegg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ioOrkhVeHHqIjoEXcYo8ATJW+2+nZOehf3XbAJUEXpY="; + sha256 = "sha256-rG9W90+wGLnhnfhqJjUIFGP6ZcmaxGkrdhPxQVRyxoc="; }; nativeBuildInputs = [ autoreconfHook ldc installShellFiles pkg-config ]; buildInputs = [ - curl sqlite libnotify + curl + sqlite + libnotify ] ++ lib.optional withSystemd systemd; configureFlags = [ @@ -36,8 +48,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A complete tool to interact with OneDrive on Linux"; homepage = "https://github.com/abraunegg/onedrive"; - license = licenses.gpl3; - maintainers = with maintainers; [ srgom ianmjones ]; + license = licenses.gpl3Only; + maintainers = with maintainers; [ srgom peterhoeg ]; platforms = platforms.linux; }; } From fb754bad11af1cf985f68af6070082a7af636f28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= Date: Sun, 13 Jun 2021 19:52:56 +0300 Subject: [PATCH 070/113] bootiso: add missing dependencies --- pkgs/tools/cd-dvd/bootiso/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/cd-dvd/bootiso/default.nix b/pkgs/tools/cd-dvd/bootiso/default.nix index e6a90248859..5acb901a549 100644 --- a/pkgs/tools/cd-dvd/bootiso/default.nix +++ b/pkgs/tools/cd-dvd/bootiso/default.nix @@ -5,6 +5,8 @@ , makeWrapper , bc , jq +, coreutils +, util-linux , wimlib , file , syslinux @@ -26,15 +28,12 @@ stdenvNoCC.mkDerivation rec { strictDeps = true; buildInputs = [ bash ]; nativeBuildInputs = [ makeWrapper ]; - postPatch = '' - patchShebangs --host bootiso - ''; makeFlags = [ "prefix=${placeholder "out"}" ]; postInstall = '' wrapProgram $out/bin/bootiso \ - --prefix PATH : ${lib.makeBinPath [ bc jq wimlib file syslinux gnugrep busybox ]} \ + --prefix PATH : ${lib.makeBinPath [ bc jq coreutils util-linux wimlib file syslinux gnugrep busybox ]} \ --prefix BOOTISO_SYSLINUX_LIB_ROOT : ${syslinux}/share/syslinux ''; From f0545ba9d32fbc8bc777ee1e6f2586424d545ce8 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 14 Jun 2021 16:55:52 +0200 Subject: [PATCH 071/113] markdown-anki-decks: init at 1.0.0 (#126782) Co-authored-by: Sandro --- .../misc/markdown-anki-decks/default.nix | 45 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/tools/misc/markdown-anki-decks/default.nix diff --git a/pkgs/tools/misc/markdown-anki-decks/default.nix b/pkgs/tools/misc/markdown-anki-decks/default.nix new file mode 100644 index 00000000000..d74eb84dc34 --- /dev/null +++ b/pkgs/tools/misc/markdown-anki-decks/default.nix @@ -0,0 +1,45 @@ +{ lib +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "markdown-anki-decks"; + version = "1.0.0"; + + format = "pyproject"; + + src = python3.pkgs.fetchPypi { + inherit pname version; + sha256 = "R6T8KOHMb1Neg/RG5JQl9+7LxOkAoZL0L5wvVaqm9O0="; + }; + + nativeBuildInputs = with python3.pkgs; [ + poetry-core + ]; + + propagatedBuildInputs = with python3.pkgs; [ + genanki + typer + colorama + shellingham + beautifulsoup4 + markdown + python-frontmatter + ]; + + postPatch = '' + # No API changes. + substituteInPlace pyproject.toml --replace 'python-frontmatter = "^0.5.0"' 'python-frontmatter = "^1.0.0"' + ''; + + # No tests available on Pypi and there is only a failing version assertion test in the repo. + doCheck = false; + + meta = with lib; { + description = "Simple program to convert markdown files into anki decks"; + maintainers = with maintainers; [ jtojnar ]; + homepage = "https://github.com/lukesmurray/markdown-anki-decks"; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a463e9f4540..383f1813ef3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17170,6 +17170,8 @@ in micronucleus = callPackage ../development/tools/misc/micronucleus { }; + markdown-anki-decks = callPackage ../tools/misc/markdown-anki-decks { }; + micropython = callPackage ../development/interpreters/micropython { }; MIDIVisualizer = callPackage ../applications/audio/midi-visualizer { }; From 5d341cdaed4d304b850707ba1d15272c1f019b36 Mon Sep 17 00:00:00 2001 From: ilian Date: Mon, 14 Jun 2021 17:07:21 +0200 Subject: [PATCH 072/113] reaper: 6.28 -> 6.29 (#126838) --- pkgs/applications/audio/reaper/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index 705685811ff..773560c83ca 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -17,11 +17,12 @@ stdenv.mkDerivation rec { pname = "reaper"; - version = "6.28"; + version = "6.29"; src = fetchurl { - url = "https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_x86_64.tar.xz"; - hash = "sha256-38HSjR+rQWPzMOjq1abLn/MP3DCz5YzBg0v2kBsQmR4="; + url = "https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_${stdenv.targetPlatform.qemuArch}.tar.xz"; + hash = if stdenv.isx86_64 then "sha256-DOul6J2Y7szy4+Q4SeO0uG6PSuU+MELE7ky8W3mSpTQ=" + else "sha256-67iTi6bFlbQtyCjnPIjK8K/3aV+zaCsWBRCWmgYonM4="; }; nativeBuildInputs = [ @@ -74,7 +75,7 @@ stdenv.mkDerivation rec { description = "Digital audio workstation"; homepage = "https://www.reaper.fm/"; license = licenses.unfree; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; maintainers = with maintainers; [ jfrankenau ilian ]; }; } From 15353873f2547bfce059cdd4c8c87d74bf96905e Mon Sep 17 00:00:00 2001 From: Andika Demas Riyandi Date: Mon, 14 Jun 2021 22:37:13 +0700 Subject: [PATCH 073/113] sentry-cli: init at 1.66.0 (#126228) --- pkgs/development/tools/sentry-cli/default.nix | 40 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 44 insertions(+) create mode 100644 pkgs/development/tools/sentry-cli/default.nix diff --git a/pkgs/development/tools/sentry-cli/default.nix b/pkgs/development/tools/sentry-cli/default.nix new file mode 100644 index 00000000000..884c0edfb73 --- /dev/null +++ b/pkgs/development/tools/sentry-cli/default.nix @@ -0,0 +1,40 @@ +{ rustPlatform +, fetchFromGitHub +, lib +, openssl +, file +, rpm +, pkg-config +, stdenv +, curl +, Security +, runCommand +}: +rustPlatform.buildRustPackage rec { + pname = "sentry-cli"; + version = "1.66.0"; + + src = fetchFromGitHub { + owner = "getsentry"; + repo = "sentry-cli"; + rev = version; + sha256 = "sha256-ivQBn5GGb64Jq0gpywAg20309QQMpasg/Bu5sHKj02Y="; + }; + doCheck = false; + + # Needed to get openssl-sys to use pkgconfig. + OPENSSL_NO_VENDOR = 1; + + buildInputs = [ openssl file rpm ] ++ lib.optionals stdenv.isDarwin [ Security curl ]; + nativeBuildInputs = [ pkg-config ]; + + cargoSha256 = "sha256-xS88KZWYkg3v8TJZUVVgQhR++CrZGD0DQnLPktSUJQk="; + + meta = with lib; { + homepage = "https://docs.sentry.io/cli/"; + license = licenses.bsd3; + description = "A command line utility to work with Sentry."; + maintainers = with maintainers; [ rizary ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 383f1813ef3..9d0d755d980 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9599,6 +9599,10 @@ in inherit (python27Packages) ldap; }; + sentry-cli = callPackage ../development/tools/sentry-cli { + inherit (darwin.apple_sdk.frameworks) Security; + }; + vtun = callPackage ../tools/networking/vtun { openssl = openssl_1_0_2; }; From 502de3c377ec6a20673c395062b484a1a99c21fd Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 14 Jun 2021 15:36:03 +0000 Subject: [PATCH 074/113] openssl: fix Darwin cross infinite recursion stdenv depends on openssl, and isGNU depends on stdenv. Thanks-to: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Fixes: https://github.com/NixOS/nixpkgs/issues/126829 --- pkgs/development/libraries/openssl/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 2a586f9e9ef..77a6b513ee6 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -54,7 +54,10 @@ let outputs = [ "bin" "dev" "out" "man" ] ++ optional withDocs "doc"; setOutputFlags = false; - separateDebugInfo = !(stdenv.hostPlatform.useLLVM or false) && stdenv.cc.isGNU; + separateDebugInfo = + !stdenv.hostPlatform.isDarwin && + !(stdenv.hostPlatform.useLLVM or false) && + stdenv.cc.isGNU; nativeBuildInputs = [ perl ]; buildInputs = lib.optional withCryptodev cryptodev From 2dfbbc02660c1042fc20b9e5a72a37656b86de83 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 14 Jun 2021 13:09:01 -0300 Subject: [PATCH 075/113] zig: checks are back! --- pkgs/development/compilers/zig/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/zig/default.nix b/pkgs/development/compilers/zig/default.nix index a31a9e6ca43..60ca574f1cc 100644 --- a/pkgs/development/compilers/zig/default.nix +++ b/pkgs/development/compilers/zig/default.nix @@ -37,6 +37,13 @@ stdenv.mkDerivation rec { export HOME=$TMPDIR; ''; + doCheck = true; + checkPhase = '' + runHook preCheck + ./zig test --cache-dir "$TMPDIR" -I $src/test $src/test/behavior.zig + runHook postCheck + ''; + meta = with lib; { homepage = "https://ziglang.org/"; description = @@ -48,4 +55,4 @@ stdenv.mkDerivation rec { broken = stdenv.isDarwin; }; } -# TODO: checkPhase + From 92a5fe180a807813abc8a405cc72d860cd925f4f Mon Sep 17 00:00:00 2001 From: ElXreno Date: Mon, 14 Jun 2021 19:57:27 +0300 Subject: [PATCH 076/113] hashcat: 6.2.1 -> 6.2.2 (#126820) Change-Id: I3aa4d98b448b1a046cdcc103011c58a1a67c23de --- pkgs/tools/security/hashcat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/hashcat/default.nix b/pkgs/tools/security/hashcat/default.nix index f3e61835421..3f38493d752 100644 --- a/pkgs/tools/security/hashcat/default.nix +++ b/pkgs/tools/security/hashcat/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "hashcat"; - version = "6.2.1"; + version = "6.2.2"; src = fetchurl { url = "https://hashcat.net/files/hashcat-${version}.tar.gz"; - sha256 = "sha256-SZTp7o7wUIgdXHmGsrlaOr8hFPeeTbqiilN/jirVyTs="; + sha256 = "0xbs3i5g2w8h5031jwgm13algs3f721k12fghnwfzi05fmzw8d0f"; }; nativeBuildInputs = [ makeWrapper ]; From 50f15c610a027f3f101a01c52f04d8476c3c87f5 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 14 Jun 2021 09:58:11 -0700 Subject: [PATCH 077/113] nixpkgs-review: 2.6.0 -> 2.6.1 (#126845) --- pkgs/tools/package-management/nixpkgs-review/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nixpkgs-review/default.nix b/pkgs/tools/package-management/nixpkgs-review/default.nix index 3bfb89fe105..35606a71347 100644 --- a/pkgs/tools/package-management/nixpkgs-review/default.nix +++ b/pkgs/tools/package-management/nixpkgs-review/default.nix @@ -7,13 +7,13 @@ python3.pkgs.buildPythonApplication rec { pname = "nixpkgs-review"; - version = "2.6.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "Mic92"; repo = "nixpkgs-review"; rev = version; - sha256 = "sha256-096oSvc9DidURGKE0FNEBOQz82+RGg6aJo8o9HhaSp0="; + sha256 = "sha256-wDGmkydBLb3Wij1hjWExgHxva/03vJFqAK5zGH9yUn4="; }; makeWrapperArgs = [ From 57388918ff00f196c64b22574e6da599eb57bec8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 14 Jun 2021 19:22:25 +0200 Subject: [PATCH 078/113] thefuck: 3.30 -> 3.31 --- pkgs/tools/misc/thefuck/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/thefuck/default.nix b/pkgs/tools/misc/thefuck/default.nix index ff6a22cef8e..7ede307a86f 100644 --- a/pkgs/tools/misc/thefuck/default.nix +++ b/pkgs/tools/misc/thefuck/default.nix @@ -5,13 +5,13 @@ buildPythonApplication rec { pname = "thefuck"; - version = "3.30"; + version = "3.31"; src = fetchFromGitHub { owner = "nvbn"; repo = pname; rev = version; - sha256 = "0fnf78956pwhb9cgv1jmgypnkma5xzflkivfrkfiadbgin848yfg"; + sha256 = "sha256-eKKUUJr00sUtT4u91MUgJjyPOXp3NigYVfYUP/sDBhY="; }; propagatedBuildInputs = [ colorama decorator psutil pyte six ]; From cd532ef5051fd02e43de3003c6873aa546ed2e0f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 14 Jun 2021 17:36:59 +0000 Subject: [PATCH 079/113] blueberry: 1.4.2 -> 1.4.3 --- pkgs/tools/bluetooth/blueberry/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/bluetooth/blueberry/default.nix b/pkgs/tools/bluetooth/blueberry/default.nix index b932b8e66c6..9ff8394f004 100644 --- a/pkgs/tools/bluetooth/blueberry/default.nix +++ b/pkgs/tools/bluetooth/blueberry/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "blueberry"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-YwJQryIK92/Tc1s49jM3pCs7dmO3l+RbbFBtuXvhYbQ="; + sha256 = "sha256-UkF50AIFKkvjUHJiemR0Hj5ECZeHQU6beIw2TGrOlbk="; }; nativeBuildInputs = [ From 5682da4b862b501c1303bcfdbf8c636ea66511ff Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 14 Jun 2021 18:11:39 +0000 Subject: [PATCH 080/113] cinnamon.bulky: 1.1 -> 1.3 --- pkgs/desktops/cinnamon/bulky/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/cinnamon/bulky/default.nix b/pkgs/desktops/cinnamon/bulky/default.nix index 03b1cca9fd8..aadb1a989f4 100644 --- a/pkgs/desktops/cinnamon/bulky/default.nix +++ b/pkgs/desktops/cinnamon/bulky/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "bulky"; - version = "1.1"; + version = "1.3"; src = fetchFromGitHub { owner = "linuxmint"; repo = "bulky"; rev = version; - sha256 = "NBlP10IM/+u8IRds4bdFyGWg3pJLRmlSLsdlndMVQqg="; + sha256 = "sha256-jBGrfE8jYQStIs9h/b/1yBu8OEQdPOMHZ/U/KczfX+4="; }; nativeBuildInputs = [ From 2d773cc4e5de86eda00d84976cd6a2e59b74c11e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 14 Jun 2021 20:26:55 +0200 Subject: [PATCH 081/113] exploitdb: 2021-06-05 -> 2021-06-12 --- pkgs/tools/security/exploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index a1e43618346..40ff36c1b18 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2021-06-05"; + version = "2021-06-12"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-91BJ0rgR9pP4rlLz38Tug0Cd5s7WajgdxA7Dtm4Pre0="; + sha256 = "sha256-62Yi5JTrVlN4V2jfiyEUbl8GidaYgcuBkYGyb6ldihQ="; }; installPhase = '' From 8a362be5fee28b7081fe2c0a37a6b0c53498a4ae Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 14 Jun 2021 21:40:14 +0200 Subject: [PATCH 082/113] python3Packages.wled: 0.4.4 -> 0.5.0 (#126319) Co-authored-by: Sandro --- .../python-modules/wled/default.nix | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/wled/default.nix b/pkgs/development/python-modules/wled/default.nix index 92dbc210c6d..973393a8932 100644 --- a/pkgs/development/python-modules/wled/default.nix +++ b/pkgs/development/python-modules/wled/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , aiohttp , backoff +, poetry-core , packaging , yarl , aresponses @@ -13,16 +14,21 @@ buildPythonPackage rec { pname = "wled"; - version = "0.4.4"; - disabled = pythonOlder "3.7"; + version = "0.5.0"; + disabled = pythonOlder "3.8"; + format = "pyproject"; src = fetchFromGitHub { owner = "frenck"; repo = "python-wled"; rev = "v${version}"; - sha256 = "1adh23v4c9kia3ddqdq0brksd5rhgh4ff7l5hil8klx4dmkrjfz3"; + sha256 = "123806fmdihdf9y8dqp5rli5c4i9a74j9rmhay8m68igm1326d5f"; }; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ aiohttp backoff @@ -36,6 +42,13 @@ buildPythonPackage rec { pytestCheckHook ]; + postPatch = '' + # Upstream doesn't set a version for the pyproject.toml + substituteInPlace pyproject.toml \ + --replace "0.0.0" "${version}" \ + --replace "--cov" "" + ''; + pythonImportsCheck = [ "wled" ]; meta = with lib; { From 60f31916040157800c08009a60929d253106de6a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 14 Jun 2021 20:11:06 +0000 Subject: [PATCH 083/113] bpytop: 1.0.66 -> 1.0.67 --- pkgs/tools/system/bpytop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/bpytop/default.nix b/pkgs/tools/system/bpytop/default.nix index 9820e6ac00d..f552ede91b5 100644 --- a/pkgs/tools/system/bpytop/default.nix +++ b/pkgs/tools/system/bpytop/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "bpytop"; - version = "1.0.66"; + version = "1.0.67"; src = fetchFromGitHub { owner = "aristocratos"; repo = pname; rev = "v${version}"; - sha256 = "sha256-gggsZHKbEt4VSMNTkKGFLcPPt2uHRFDCkqyHYx0c9Y0="; + sha256 = "sha256-nvpIqX16WP9kslFo1ne5+QAZcvG+WFm5kDVOLN4C+b0="; }; nativeBuildInputs = [ makeWrapper ]; From cd68c94996d18b897f41528b6d03b67c1d19671c Mon Sep 17 00:00:00 2001 From: legendofmiracles Date: Mon, 14 Jun 2021 14:13:32 -0600 Subject: [PATCH 084/113] rpg-cli: 0.4.0 -> 0.4.1 --- pkgs/games/rpg-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/rpg-cli/default.nix b/pkgs/games/rpg-cli/default.nix index 1c5e8fce97a..6a4e27d8691 100644 --- a/pkgs/games/rpg-cli/default.nix +++ b/pkgs/games/rpg-cli/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rpg-cli"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "facundoolano"; repo = pname; rev = version; - sha256 = "0rbj27zd7ydkvnyszd56hazj64aqqrwn34fsy4jymk50lvicwxjg"; + sha256 = "07ar7almaz005jch7zm63kxyxvk3bphi2gl88xsb2rk5srkbb2s2"; }; - cargoSha256 = "sha256-VftJgRqrFwTElp2/e+zQYZOLZPjbc9C8SZ4DlBEtRvQ="; + cargoSha256 = "sha256-wJPRI3jfV+v/XpIU9+j1jXlyfjkFCEHZdFJx/KMNT9o="; # tests assume the authors macbook, and thus fail doCheck = false; From 90293c9b68a2517edee79a1ad89715279944a51a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 14 Jun 2021 20:16:53 +0000 Subject: [PATCH 085/113] consul-template: 0.25.2 -> 0.26.0 --- pkgs/tools/system/consul-template/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/consul-template/default.nix b/pkgs/tools/system/consul-template/default.nix index c04b6967580..5326f8722d8 100644 --- a/pkgs/tools/system/consul-template/default.nix +++ b/pkgs/tools/system/consul-template/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "consul-template"; - version = "0.25.2"; + version = "0.26.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = "consul-template"; rev = "v${version}"; - sha256 = "sha256-r9/CxXFaeod48NgOFWhl+axiNqjaU+RIEHI71fmYzP8="; + sha256 = "sha256-upVCztpfT+SuuB343GEnT4KSnWul10/cItKJvUqJYo4="; }; - vendorSha256 = "sha256-DLjaDj3fJYl5ICxJuaCLKdd/AfwfUIM8teJLs3a2MHo="; + vendorSha256 = "sha256-IAWuqg8zZ9/ny3ZijxGgHAJDICV09NTGxPvLLP4oLzw="; # consul-template tests depend on vault and consul services running to # execute tests so we skip them here From 8b0e2be7de6e7685f542542e158111f5eb8f348d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 14 Jun 2021 21:08:39 +0000 Subject: [PATCH 086/113] eksctl: 0.52.0 -> 0.53.0 --- pkgs/tools/admin/eksctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index d3ebba0ab43..f3a8a9d4cf6 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.52.0"; + version = "0.53.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-P8v8XliY8XbfdiqSUTUhI4HYBKzAk/LHVSF0OLS8Vag="; + sha256 = "sha256-CWoRkx3OPlIeyUuGCyaGTlJ0zgcgsxlebSG0Zljr0zg="; }; - vendorSha256 = "sha256-4aZVQjcrZ6NKXr0ZFMWEcf6jMtp6TlRlinZ6ZZvLDyE="; + vendorSha256 = "sha256-499c3Y9IUV8lc+O9qcEeFKQDT4QDvOPmu0rmps7M47w="; doCheck = false; From 28552b21f967afbcd431f3ac4a6c0caeac0bcab8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 14 Jun 2021 17:32:02 +0200 Subject: [PATCH 087/113] python3Packages.async-lru: init at unstable-2020-10-24 --- .../python-modules/async-lru/default.nix | 46 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/development/python-modules/async-lru/default.nix diff --git a/pkgs/development/python-modules/async-lru/default.nix b/pkgs/development/python-modules/async-lru/default.nix new file mode 100644 index 00000000000..8a5694ffde7 --- /dev/null +++ b/pkgs/development/python-modules/async-lru/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, pytestCheckHook +, pytest-asyncio +}: + +buildPythonPackage rec { + pname = "async-lru"; + version = "unstable-2020-10-24"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "aio-libs"; + repo = "async-lru"; + rev = "ae252508f9c5aecf9c02ddeb879d06c28dbffc42"; + sha256 = "1gk5qzdvhl2j1mw7xzchbw7bcgk9mzhvqa62nwwmvlbnx88pkwnc"; + }; + + postPatch = '' + sed -i '/^addopts/d' setup.cfg + ''; + + checkInputs = [ + pytestCheckHook + pytest-asyncio + ]; + + disabledTests = [ + # https://github.com/aio-libs/async-lru/issues/341 + "test_alru_cache_deco" + "test_alru_cache_fn_called" + "test_close" + ]; + + pythonImportsCheck = [ "async_lru" ]; + + meta = with lib; { + description = "Simple lru cache for asyncio"; + homepage = "https://github.com/wikibusiness/async_lru"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index eeac0d5e993..4496d7981ce 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -579,6 +579,8 @@ in { async-dns = callPackage ../development/python-modules/async-dns { }; + async-lru = callPackage ../development/python-modules/async-lru { }; + asyncio-dgram = callPackage ../development/python-modules/asyncio-dgram { }; asyncio-mqtt = callPackage ../development/python-modules/asyncio_mqtt { }; From d0e1c4fcd80654731d7a8784225c9ee77fdbfa5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 14 Jun 2021 17:04:23 +0200 Subject: [PATCH 088/113] python3Packages.tgcrypto: init at 1.2.2 --- .../python-modules/tgcrypto/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/python-modules/tgcrypto/default.nix diff --git a/pkgs/development/python-modules/tgcrypto/default.nix b/pkgs/development/python-modules/tgcrypto/default.nix new file mode 100644 index 00000000000..7fd62d7bcbe --- /dev/null +++ b/pkgs/development/python-modules/tgcrypto/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "tgcrypto"; + version = "1.2.2"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "pyrogram"; + repo = "tgcrypto"; + rev = "v${version}"; + sha256 = "1vyjycjb2n790371kf47qc0mkvd4bxmhh65cfxjsrcjpiri7shjf"; + }; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "tgcrypto" ]; + + meta = with lib; { + description = "Fast and Portable Telegram Crypto Library for Python"; + homepage = "https://github.com/pyrogram/tgcrypto"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4496d7981ce..8e6d66522ba 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8353,6 +8353,8 @@ in { tflearn = callPackage ../development/python-modules/tflearn { }; + tgcrypto = callPackage ../development/python-modules/tgcrypto { }; + Theano = callPackage ../development/python-modules/Theano rec { cudaSupport = pkgs.config.cudaSupport or false; cudnnSupport = cudaSupport; From 11a53f3761c7b57bc9a0b32f21c6c0a4e1bc7625 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 14 Jun 2021 17:45:59 +0200 Subject: [PATCH 089/113] python3Packages.pyrogram: init at 1.2.0 --- .../python-modules/pyrogram/default.nix | 48 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/development/python-modules/pyrogram/default.nix diff --git a/pkgs/development/python-modules/pyrogram/default.nix b/pkgs/development/python-modules/pyrogram/default.nix new file mode 100644 index 00000000000..6710d3d286e --- /dev/null +++ b/pkgs/development/python-modules/pyrogram/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, pyaes +, pysocks +, async-lru +, pytestCheckHook +, pytest-asyncio +}: + +buildPythonPackage rec { + pname = "pyrogram"; + version = "1.2.0"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "pyrogram"; + repo = "pyrogram"; + rev = "v${version}"; + sha256 = "0clbnhk1icr4vl29693r6r28f5by5n6pjxjqih21g3yd64q55q3q"; + }; + + propagatedBuildInputs = [ + pyaes + pysocks + async-lru + ]; + + checkInputs = [ + pytestCheckHook + pytest-asyncio + ]; + + pythonImportsCheck = [ + "pyrogram" + "pyrogram.errors" + "pyrogram.types" + ]; + + meta = with lib; { + description = "Telegram MTProto API Client Library and Framework for Python"; + homepage = "https://github.com/pyrogram/pyrogram"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8e6d66522ba..946766924ab 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5201,6 +5201,8 @@ in { pynx584 = callPackage ../development/python-modules/pynx584 { }; + pyrogram = callPackage ../development/python-modules/pyrogram { }; + pysbd = callPackage ../development/python-modules/pysbd { }; pyshark = callPackage ../development/python-modules/pyshark { }; From 71ae2fb1c6122aa8751624537a7ce1446029ef81 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 14 Jun 2021 16:32:57 +0800 Subject: [PATCH 090/113] python3Packages.click-threading: 0.4.4 -> 0.5.0 --- pkgs/development/python-modules/click-threading/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/click-threading/default.nix b/pkgs/development/python-modules/click-threading/default.nix index 1579a6a6a89..529ee08e4f8 100644 --- a/pkgs/development/python-modules/click-threading/default.nix +++ b/pkgs/development/python-modules/click-threading/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "click-threading"; - version = "0.4.4"; + version = "0.5.0"; src = fetchPypi { inherit pname version; - sha256 = "b2b0fada5bf184b56afaccc99d0d2548d8ab07feb2e95e29e490f6b99c605de7"; + sha256 = "sha256-rc/mI8AqWVwQfDFAcvZ6Inj+TrQLcsDRoskDzHivNDk="; }; checkInputs = [ pytest ]; From 72ba8b19609bbaacdd1217facebb7684feab8e14 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 14 Jun 2021 16:33:20 +0800 Subject: [PATCH 091/113] vdirsyncer: 0.16.8 -> 0.18.0 --- .../python-modules/vdirsyncer/default.nix | 29 ++++++++----------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/vdirsyncer/default.nix b/pkgs/development/python-modules/vdirsyncer/default.nix index eb720c7f206..1dd80b52d19 100644 --- a/pkgs/development/python-modules/vdirsyncer/default.nix +++ b/pkgs/development/python-modules/vdirsyncer/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , fetchpatch -, isPy27 +, pythonOlder , click , click-log , click-threading @@ -18,21 +18,23 @@ }: buildPythonPackage rec { - version = "0.16.8"; + version = "0.18.0"; pname = "vdirsyncer"; - disabled = isPy27; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "bfdb422f52e1d4d60bd0635d203fb59fa7f613397d079661eb48e79464ba13c5"; + sha256 = "sha256-J7w+1R93STX7ujkpFcjI1M9jmuUaRLZ0aGtJoQJfwgE="; }; propagatedBuildInputs = [ - click click-log click-threading - requests_toolbelt + atomicwrites + click + click-log + click-threading requests requests_oauthlib # required for google oauth sync - atomicwrites + requests_toolbelt ]; nativeBuildInputs = [ @@ -46,16 +48,8 @@ buildPythonPackage rec { pytest-subtesthack ]; - patches = [ - (fetchpatch { - name = "update-usage-deprecated-method.patch"; - url = "https://github.com/pimutils/vdirsyncer/commit/7577fa21177442aacc2d86640ef28cebf1c4aaef.patch"; - sha256 = "0inkr1wfal20kssij8l5myhpjivxg8wlvhppqc3lvml9d1i75qbh"; - }) - ]; - postPatch = '' - substituteInPlace setup.py --replace "click>=5.0,<6.0" "click" + sed -i -e '/--cov/d' -e '/--no-cov/d' setup.cfg ''; preCheck = '' @@ -63,8 +57,9 @@ buildPythonPackage rec { ''; disabledTests = [ - "test_verbosity" "test_create_collections" # Flaky test exceeds deadline on hydra: https://github.com/pimutils/vdirsyncer/issues/837 + "test_request_ssl" + "test_verbosity" ]; meta = with lib; { From 625f2a8eaa769162287610688293cb77cb4d4f56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 14 Jun 2021 20:35:17 +0200 Subject: [PATCH 092/113] python3Packages.ms-cv: init at 0.1.1 --- .../python-modules/ms-cv/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/ms-cv/default.nix diff --git a/pkgs/development/python-modules/ms-cv/default.nix b/pkgs/development/python-modules/ms-cv/default.nix new file mode 100644 index 00000000000..aa8e361338d --- /dev/null +++ b/pkgs/development/python-modules/ms-cv/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, isPy27 +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "ms-cv"; + version = "0.1.1"; + + disabled = isPy27; + + src = fetchFromGitHub { + owner = "OpenXbox"; + repo = "ms_cv"; + rev = "v${version}"; + sha256 = "0pkna0kvmq1cp4rx3dnzxsvvlxxngryp77k42wkyw2phv19a2mjd"; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "pytest-runner" "" + ''; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Correlation vector implementation in python"; + homepage = "https://github.com/OpenXbox/ms_cv"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 946766924ab..c922a52d685 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4454,6 +4454,8 @@ in { mpyq = callPackage ../development/python-modules/mpyq { }; + ms-cv = callPackage ../development/python-modules/ms-cv { }; + msal = callPackage ../development/python-modules/msal { }; msal-extensions = callPackage ../development/python-modules/msal-extensions { }; From 5de528024e64c866231f6944dca89841786ae200 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 14 Jun 2021 20:46:55 +0200 Subject: [PATCH 093/113] python3Packages.xbox-webapi: init at 2.0.11 --- .../python-modules/xbox-webapi/default.nix | 53 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 55 insertions(+) create mode 100644 pkgs/development/python-modules/xbox-webapi/default.nix diff --git a/pkgs/development/python-modules/xbox-webapi/default.nix b/pkgs/development/python-modules/xbox-webapi/default.nix new file mode 100644 index 00000000000..b16a87e2fd6 --- /dev/null +++ b/pkgs/development/python-modules/xbox-webapi/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, aiohttp +, appdirs +, ecdsa +, ms-cv +, pydantic +, aresponses +, pytest-asyncio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "xbox-webapi"; + version = "2.0.11"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "OpenXbox"; + repo = "xbox-webapi-python"; + rev = "v${version}"; + sha256 = "0li0bq914xizx9fj49s1iwfrv4bpzvl74bwsi5a34r9yizw02cvz"; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "pytest-runner" "" + ''; + + propagatedBuildInputs = [ + aiohttp + appdirs + ecdsa + ms-cv + pydantic + ]; + + checkInputs = [ + aresponses + pytest-asyncio + pytestCheckHook + ]; + + meta = with lib; { + description = "Library to authenticate with Windows Live/Xbox Live and use their API"; + homepage = "https://github.com/OpenXbox/xbox-webapi-python"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c922a52d685..b323c23ec1d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9048,6 +9048,8 @@ in { xattr = callPackage ../development/python-modules/xattr { }; + xbox-webapi = callPackage ../development/python-modules/xbox-webapi { }; + xboxapi = callPackage ../development/python-modules/xboxapi { }; xcffib = callPackage ../development/python-modules/xcffib { }; From 0ff4a377b0e56788fe0d138caee8e6374a164e2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 14 Jun 2021 20:48:26 +0200 Subject: [PATCH 094/113] home-assistant: update component-packages.nix --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index e62d3dbcf4b..5c1eb539572 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -967,7 +967,7 @@ "wunderground" = ps: with ps; [ ]; "x10" = ps: with ps; [ ]; "xbee" = ps: with ps; [ ]; # missing inputs: xbee-helper - "xbox" = ps: with ps; [ aiohttp-cors ]; # missing inputs: xbox-webapi + "xbox" = ps: with ps; [ aiohttp-cors xbox-webapi ]; "xbox_live" = ps: with ps; [ xboxapi ]; "xeoma" = ps: with ps; [ pyxeoma ]; "xiaomi" = ps: with ps; [ ha-ffmpeg ]; From 73e98d5c40ff242df12069735378fa3ee0af82d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 14 Jun 2021 20:49:56 +0200 Subject: [PATCH 095/113] home-assistant: test xbox component --- pkgs/servers/home-assistant/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 551ab4dedf6..b1cc7faa627 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -677,6 +677,7 @@ in with py.pkgs; buildPythonApplication rec { "worldclock" "wsdot" "wunderground" + "xbox" "xiaomi" "xiaomi_aqara" "xiaomi_miio" From 29f750884d546e682d023656f557455cf9bcc392 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 14 Jun 2021 19:59:44 +0000 Subject: [PATCH 096/113] codespell: 2.0.0 -> 2.1.0 --- pkgs/development/python-modules/codespell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/codespell/default.nix b/pkgs/development/python-modules/codespell/default.nix index 7427d391c61..d9b64cb8399 100644 --- a/pkgs/development/python-modules/codespell/default.nix +++ b/pkgs/development/python-modules/codespell/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "codespell"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "codespell-project"; repo = "codespell"; rev = "v${version}"; - sha256 = "187g26s3wzjmvdx9vjabbnajpbg0s9klixyv6baymmgz9lrcv4ln"; + sha256 = "sha256-BhYVztSr2MalILEcOcvMl07CObYa73o3kW8S/idqAO8="; }; checkInputs = [ aspell-python chardet pytestCheckHook pytest-cov pytest-dependency ]; From 50fda7969b6e04bbfb67e160fcd9b17cd4905abb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 14 Jun 2021 17:27:15 +0000 Subject: [PATCH 097/113] alertmanager-irc-relay: 0.4.1 -> 0.4.2 --- pkgs/servers/monitoring/alertmanager-irc-relay/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/alertmanager-irc-relay/default.nix b/pkgs/servers/monitoring/alertmanager-irc-relay/default.nix index 50cf5a00164..f5d4f6ca88f 100644 --- a/pkgs/servers/monitoring/alertmanager-irc-relay/default.nix +++ b/pkgs/servers/monitoring/alertmanager-irc-relay/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "alertmanager-irc-relay"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "google"; repo = "alertmanager-irc-relay"; rev = "v${version}"; - sha256 = "sha256-02uEvcxT5+0OJtqOyuQjgkqL0fZnN7umCSxBqAVPT9U="; + sha256 = "sha256-/gZeIJN7xkDe7f+Q7zh16KG6RC+G/9MIPm3KQManVZ0="; }; vendorSha256 = "sha256-VLG15IXS/fXFMTCJKEqGW6qZ9aOLPhazidVsOywG+w4="; From 8e5962272b2325db525c17d9041f1e6532321a08 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 14 Jun 2021 17:01:21 +0000 Subject: [PATCH 098/113] gnome.aisleriot: 3.22.16 -> 3.22.17 --- pkgs/desktops/gnome/games/aisleriot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/games/aisleriot/default.nix b/pkgs/desktops/gnome/games/aisleriot/default.nix index bdd7c9cc1a3..18bfea263f9 100644 --- a/pkgs/desktops/gnome/games/aisleriot/default.nix +++ b/pkgs/desktops/gnome/games/aisleriot/default.nix @@ -19,14 +19,14 @@ stdenv.mkDerivation rec { pname = "aisleriot"; - version = "3.22.16"; + version = "3.22.17"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = pname; rev = version; - sha256 = "0arjnm5kgnb4pir53hlm94iym80d0srs256sm2hwhwwc5fr1w79i"; + sha256 = "sha256-14z/EdEz1XFDrQZlpoeHW73G187XuZX/uQXp+bAUsmI="; }; nativeBuildInputs = [ From 5ba34e7078f09c4528d183559b8366efbec82c0c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 14 Jun 2021 18:42:09 +0000 Subject: [PATCH 099/113] cheat: 4.2.1 -> 4.2.2 --- pkgs/applications/misc/cheat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/cheat/default.nix b/pkgs/applications/misc/cheat/default.nix index 9c8f060f169..f7a56a48fc7 100644 --- a/pkgs/applications/misc/cheat/default.nix +++ b/pkgs/applications/misc/cheat/default.nix @@ -3,13 +3,13 @@ buildGoModule rec { pname = "cheat"; - version = "4.2.1"; + version = "4.2.2"; src = fetchFromGitHub { owner = "cheat"; repo = "cheat"; rev = version; - sha256 = "sha256-wH0MTTwUmi/QZXo3vWgRYmlPxMxgfhghrTIZAwdVjQ0="; + sha256 = "sha256-YKGCZm0BaFLi+kujl04B4IU1qay15XNfvelxfUkCP8o="; }; subPackages = [ "cmd/cheat" ]; From 9492a02002858610b2ba31d02a3447b6a2594e2e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 9 Jun 2021 09:00:07 +0000 Subject: [PATCH 100/113] kora-icon-theme: 1.4.2 -> 1.4.3 --- pkgs/data/icons/kora-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/kora-icon-theme/default.nix b/pkgs/data/icons/kora-icon-theme/default.nix index bdc7b55d9c2..a2426e842a6 100644 --- a/pkgs/data/icons/kora-icon-theme/default.nix +++ b/pkgs/data/icons/kora-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "kora-icon-theme"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "bikass"; repo = "kora"; rev = "v${version}"; - sha256 = "1qnqz0h2c5kilch3308l8nfshgsrkllyysvqn0mxy70iziw895rv"; + sha256 = "sha256-tSkTwhhugvDTzzcxIln1xq3ZY6boHJR0LRGy20ONO5U="; }; nativeBuildInputs = [ From 177b106e99f3684b9d9a7be31fa9b35caeec1d7c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 8 Jun 2021 22:36:22 +0000 Subject: [PATCH 101/113] libquotient: 0.6.6 -> 0.6.7 --- pkgs/development/libraries/libquotient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libquotient/default.nix b/pkgs/development/libraries/libquotient/default.nix index f4fe894eaf4..7c89e98576a 100644 --- a/pkgs/development/libraries/libquotient/default.nix +++ b/pkgs/development/libraries/libquotient/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "libquotient"; - version = "0.6.6"; + version = "0.6.7"; src = fetchFromGitHub { owner = "quotient-im"; repo = "libQuotient"; rev = version; - sha256 = "sha256-QSpkcQEDTMsFbQBa7dTuL/5HraVChUHqUuJdNMty/4s="; + sha256 = "sha256-fAzYv9OsanXqocEvbSB3OA9OVicwcZ0xT9uYbrFPEHc="; }; buildInputs = [ qtbase qtmultimedia ]; From 7ed53cf84dc589b202fcd1ce8054b9e03599badd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 9 Jun 2021 06:30:51 +0000 Subject: [PATCH 102/113] flyctl: 0.0.222 -> 0.0.223 --- pkgs/development/web/flyctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index e0412b0dd36..262ddc5d721 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.222"; + version = "0.0.223"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "sha256-yFcsbk5CAOqnT1ljOe+lGfEj1sCBsaFNZnfcQOfezs4="; + sha256 = "sha256-HDxFjEXQ33U2SiRz/e6vurZo710ibArdGLZcLoou17I="; }; preBuild = '' From c7f00cd594143b5a62d585f0996e40b2b12f7e88 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 14 Jun 2021 17:55:46 +0000 Subject: [PATCH 103/113] armadillo: 10.5.1 -> 10.5.2 --- pkgs/development/libraries/armadillo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index 9e81ce0c6c8..9fdccfb3faa 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "10.5.1"; + version = "10.5.2"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "sha256-lq1uHLzyjz0cH/ly3ixA2t3b12gyVrrVAtPEY9L2TN8="; + sha256 = "sha256-Y/I87cVIpelASBblDPj4/MSSqxqtxsDO8wv8Kvzq2V8="; }; nativeBuildInputs = [ cmake ]; From feba2c9b39fb63734822303faf2d33a014473e8d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 9 Jun 2021 07:54:54 +0000 Subject: [PATCH 104/113] helmfile: 0.139.7 -> 0.139.8 --- pkgs/applications/networking/cluster/helmfile/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index 6dacc008304..5fa05a9fb58 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helmfile"; - version = "0.139.7"; + version = "0.139.8"; src = fetchFromGitHub { owner = "roboll"; repo = "helmfile"; rev = "v${version}"; - sha256 = "sha256-mxnl5ALave2E61AqJAHlLHDLHOwA2wwjs3sb4WnG82A="; + sha256 = "sha256-4QNtjVc2/diJO92xn4J2ZJO7JYDHmPgOE4kGndU5RW0="; }; - vendorSha256 = "sha256-tdsQx2AvbRC8l7YZFBg2xVqo0CLrOOwA9Nmuei+1ozw="; + vendorSha256 = "sha256-GY2+oecRbI5hEVI5lCsTuU3WYIfUGceINyXGPjorisE="; doCheck = false; From d66fbb4fe1df86c5cb23fb125bc5e4ca4122395e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 8 Jun 2021 08:28:08 +0000 Subject: [PATCH 105/113] corosync: 3.1.3 -> 3.1.4 --- pkgs/servers/corosync/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/corosync/default.nix b/pkgs/servers/corosync/default.nix index 26060150df0..b4926e75b52 100644 --- a/pkgs/servers/corosync/default.nix +++ b/pkgs/servers/corosync/default.nix @@ -10,11 +10,11 @@ with lib; stdenv.mkDerivation rec { pname = "corosync"; - version = "3.1.3"; + version = "3.1.4"; src = fetchurl { url = "http://build.clusterlabs.org/corosync/releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-UlwF1DmWh52yJ4c9SbpaoVaV/L65r4dQ238M3/+Esps="; + sha256 = "sha256-sxoYlAi5RJCQcg0bSqO23t9nTkuuzOeLWPa/dLZZzuo="; }; nativeBuildInputs = [ makeWrapper pkg-config ]; From b8934805a7b3443562483b13d7f87f38b27f5125 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 9 Jun 2021 04:16:42 +0000 Subject: [PATCH 106/113] dnsproxy: 0.37.5 -> 0.37.6 --- pkgs/tools/networking/dnsproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix index 79e9e6e6417..f3ffaecb5f9 100644 --- a/pkgs/tools/networking/dnsproxy/default.nix +++ b/pkgs/tools/networking/dnsproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.37.5"; + version = "0.37.6"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "sha256-j+8PA5kYHaRWbugcBjUIeos6488rw8lCOjCyz7IAcQg="; + sha256 = "sha256-NP3d2ZTvC4qKYOklUcPCvkhPsV/tU9JOCPp9s8m1CwQ="; }; vendorSha256 = null; From 961024ddc93c8a219cb19c490dafa1e48031f247 Mon Sep 17 00:00:00 2001 From: Aamaruvi Yogamani <38222826+Technical27@users.noreply.github.com> Date: Mon, 14 Jun 2021 19:52:57 -0400 Subject: [PATCH 107/113] auto-cpufreq: 1.6.1 -> 1.6.4 --- pkgs/tools/system/auto-cpufreq/default.nix | 4 +- .../prevent-install-and-copy.patch | 56 ++++++++----------- 2 files changed, 24 insertions(+), 36 deletions(-) diff --git a/pkgs/tools/system/auto-cpufreq/default.nix b/pkgs/tools/system/auto-cpufreq/default.nix index f86ac47fdde..28d771f07b2 100644 --- a/pkgs/tools/system/auto-cpufreq/default.nix +++ b/pkgs/tools/system/auto-cpufreq/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonPackage rec { pname = "auto-cpufreq"; - version = "1.6.1"; + version = "1.6.4"; src = fetchFromGitHub { owner = "AdnanHodzic"; repo = pname; rev = "v${version}"; - sha256 = "sha256-oz3C1150CPfT0kkx1x7VIX/Rm06dkjyxeDPFCRJaWNc="; + sha256 = "sha256-9WYuAWcJGosYEsnnkqvZLXXvqF+1nBEozh6F84Kit6w="; }; propagatedBuildInputs = with python3Packages; [ click distro psutil ]; diff --git a/pkgs/tools/system/auto-cpufreq/prevent-install-and-copy.patch b/pkgs/tools/system/auto-cpufreq/prevent-install-and-copy.patch index 7f86f6eda0e..41bd3dc5916 100644 --- a/pkgs/tools/system/auto-cpufreq/prevent-install-and-copy.patch +++ b/pkgs/tools/system/auto-cpufreq/prevent-install-and-copy.patch @@ -1,18 +1,9 @@ diff --git a/auto_cpufreq/core.py b/auto_cpufreq/core.py -index a685db8..1ca1ca1 100644 +index 83d0d64..04b5035 100644 --- a/auto_cpufreq/core.py +++ b/auto_cpufreq/core.py -@@ -72,7 +72,7 @@ def app_version(): - print("Git commit:", check_output(["git", "describe", "--always"]).strip().decode()) - else: - print(getoutput("pacman -Qi auto-cpufreq | grep Version")) -- else: -+ else: - # source code (auto-cpufreq-installer) - try: - print("Git commit:", check_output(["git", "describe", "--always"]).strip().decode()) -@@ -179,31 +179,13 @@ def get_current_gov(): - return print("Currently using:", getoutput("cpufreqctl.auto-cpufreq --governor").strip().split(" ")[0], "governor") +@@ -204,35 +204,13 @@ def get_current_gov(): + def cpufreqctl(): - """ @@ -20,14 +11,18 @@ index a685db8..1ca1ca1 100644 - """ - - # detect if running on a SNAP -- if os.getenv('PKG_MARKER') == "SNAP": +- if os.getenv("PKG_MARKER") == "SNAP": - pass - else: - # deploy cpufreqctl.auto-cpufreq script - if os.path.isfile("/usr/bin/cpufreqctl"): -- shutil.copy(SCRIPTS_DIR / "cpufreqctl.sh", "/usr/bin/cpufreqctl.auto-cpufreq") +- shutil.copy( +- SCRIPTS_DIR / "cpufreqctl.sh", "/usr/bin/cpufreqctl.auto-cpufreq" +- ) - else: -- shutil.copy(SCRIPTS_DIR / "cpufreqctl.sh", "/usr/bin/cpufreqctl.auto-cpufreq") +- shutil.copy( +- SCRIPTS_DIR / "cpufreqctl.sh", "/usr/bin/cpufreqctl.auto-cpufreq" +- ) + # scripts are already in the correct place + pass @@ -37,7 +32,7 @@ index a685db8..1ca1ca1 100644 - remove cpufreqctl.auto-cpufreq script - """ - # detect if running on a SNAP -- if os.getenv('PKG_MARKER') == "SNAP": +- if os.getenv("PKG_MARKER") == "SNAP": - pass - else: - if os.path.isfile("/usr/bin/cpufreqctl.auto-cpufreq"): @@ -45,10 +40,10 @@ index a685db8..1ca1ca1 100644 + # no need to restore + pass + def footer(l=79): - print("\n" + "-" * l + "\n") -@@ -233,74 +215,12 @@ def remove_complete_msg(): - footer() +@@ -276,76 +254,13 @@ def remove_complete_msg(): + def deploy_daemon(): - print("\n" + "-" * 21 + " Deploying auto-cpufreq as a daemon " + "-" * 22 + "\n") @@ -66,22 +61,24 @@ index a685db8..1ca1ca1 100644 - f.seek(0) - f.truncate() - f.write(content.replace(orig_set, change_set)) -- except: -- print("\nERROR:\nWas unable to turn off bluetooth on boot") +- except Exception as e: +- print(f"\nERROR:\nWas unable to turn off bluetooth on boot\n{repr(e)}") - - auto_cpufreq_stats_path.touch(exist_ok=True) - - print("\n* Deploy auto-cpufreq install script") -- shutil.copy(SCRIPTS_DIR / "auto-cpufreq-install.sh", "/usr/bin/auto-cpufreq-install") +- shutil.copy( +- SCRIPTS_DIR / "auto-cpufreq-install.sh", "/usr/bin/auto-cpufreq-install" +- ) - - print("\n* Deploy auto-cpufreq remove script") - shutil.copy(SCRIPTS_DIR / "auto-cpufreq-remove.sh", "/usr/bin/auto-cpufreq-remove") - - call("/usr/bin/auto-cpufreq-install", shell=True) -- + # prevent needless copying and system changes + pass + # remove auto-cpufreq daemon def remove(): - @@ -102,8 +99,8 @@ index a685db8..1ca1ca1 100644 - f.seek(0) - f.truncate() - f.write(content.replace(change_set, orig_set)) -- except: -- print("\nERROR:\nWas unable to turn on bluetooth on boot") +- except Exception as e: +- print(f"\nERROR:\nWas unable to turn on bluetooth on boot\n{repr(e)}") - - # run auto-cpufreq daemon install script - call("/usr/bin/auto-cpufreq-remove", shell=True) @@ -125,15 +122,6 @@ index a685db8..1ca1ca1 100644 def gov_check(): for gov in get_avail_gov(): -@@ -331,7 +251,7 @@ def countdown(s): - if auto_cpufreq_stats_file is not None: - auto_cpufreq_stats_file.seek(0) - auto_cpufreq_stats_file.truncate(0) -- -+ - # execution timestamp - from datetime import datetime - now = datetime.now() diff --git a/scripts/cpufreqctl.sh b/scripts/cpufreqctl.sh index 63a2b5b..e157efe 100755 --- a/scripts/cpufreqctl.sh From 358aa90e30a631c687a7a60150c67eb65b458c37 Mon Sep 17 00:00:00 2001 From: Aamaruvi Yogamani <38222826+Technical27@users.noreply.github.com> Date: Mon, 14 Jun 2021 19:53:47 -0400 Subject: [PATCH 108/113] nixos/auto-cpufreq: fix service wantedBy --- nixos/modules/services/hardware/auto-cpufreq.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/hardware/auto-cpufreq.nix b/nixos/modules/services/hardware/auto-cpufreq.nix index 72c4eccaff7..f846476b30b 100644 --- a/nixos/modules/services/hardware/auto-cpufreq.nix +++ b/nixos/modules/services/hardware/auto-cpufreq.nix @@ -12,7 +12,13 @@ in { config = mkIf cfg.enable { environment.systemPackages = [ pkgs.auto-cpufreq ]; - systemd.packages = [ pkgs.auto-cpufreq ]; - systemd.services.auto-cpufreq.path = with pkgs; [ bash coreutils ]; + systemd = { + packages = [ pkgs.auto-cpufreq ]; + services.auto-cpufreq = { + # Workaround for https://github.com/NixOS/nixpkgs/issues/81138 + wantedBy = [ "multi-user.target" ]; + path = with pkgs; [ bash coreutils ]; + }; + }; }; } From 702586e0548b210a1000e7b630d9ab191844ade9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 14 Jun 2021 19:28:33 +0200 Subject: [PATCH 109/113] croc: 9.1.4 -> 9.1.5 --- pkgs/tools/networking/croc/default.nix | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix index 66c5598d020..6b3e9f839c7 100644 --- a/pkgs/tools/networking/croc/default.nix +++ b/pkgs/tools/networking/croc/default.nix @@ -1,17 +1,17 @@ -{ lib, buildGoModule, fetchFromGitHub, callPackage}: +{ lib, buildGoModule, fetchFromGitHub, callPackage }: buildGoModule rec { pname = "croc"; - version = "9.1.4"; + version = "9.1.5"; src = fetchFromGitHub { owner = "schollz"; repo = pname; rev = "v${version}"; - sha256 = "16HmRluhqCr6Gt+x8PSCU4W9pUJp89l4GO29uI+ZzkI="; + sha256 = "sha256-NjKj1m1g3F+YLNhFLDeO5DXtHIxPRwfSpunhRnSHRFc="; }; - vendorSha256 = "sha256-f0KiXHspGX96k5ViCwI62Qs+rHowpqm+gLy7/iqdnE4="; + vendorSha256 = "sha256-cBf4UV9jBKvmcBG2XLPpPgO05GRB1SV1W3lJCuoQJQ4="; doCheck = false; @@ -19,16 +19,11 @@ buildGoModule rec { passthru = { tests = { - local-relay = callPackage ./test-local-relay.nix {}; + local-relay = callPackage ./test-local-relay.nix { }; }; }; meta = with lib; { - description = - "Easily and securely send things from one computer to another"; - homepage = "https://github.com/schollz/croc"; - license = licenses.mit; - maintainers = with maintainers; [ hugoreeves equirosa ]; - + description = "Easily and securely send things from one computer to another"; longDescription = '' Croc is a command line tool written in Go that allows any two computers to simply and securely transfer files and folders. @@ -41,5 +36,8 @@ buildGoModule rec { - Allows resuming transfers that are interrupted - Does not require a server or port-forwarding ''; + homepage = "https://github.com/schollz/croc"; + license = licenses.mit; + maintainers = with maintainers; [ hugoreeves equirosa SuperSandro2000 ]; }; } From 549b9305d6a13fc4ef36f1d60bbc5c084e4f9315 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Mon, 14 Jun 2021 19:56:55 -0500 Subject: [PATCH 110/113] subsurface: 4.9.10 -> 5.0.1 --- pkgs/applications/misc/subsurface/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix index 19fdd4640e4..5c396ea671e 100644 --- a/pkgs/applications/misc/subsurface/default.nix +++ b/pkgs/applications/misc/subsurface/default.nix @@ -5,13 +5,13 @@ }: let - version = "4.9.10"; + version = "5.0.1"; subsurfaceSrc = (fetchFromGitHub { owner = "Subsurface"; repo = "subsurface"; rev = "v${version}"; - sha256 = "12ndhjplz3cwndwzhfc959dc0i6rm2qf3v2d8n9kba8nj63iblfs"; + sha256 = "01r836ckvrmgprjf4cqxn2n3w5w4pa2fjrhspjndsspic8nwlrwg"; fetchSubmodules = true; }); From 274ee2df9aa3be99fd6257ab76097091348c95c3 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Tue, 15 Jun 2021 01:01:10 +0000 Subject: [PATCH 111/113] staticjinja: 1.0.1 -> 2.1.0, add version test (#126690) Co-authored-by: Sandro --- .../development/python-modules/staticjinja/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/staticjinja/default.nix b/pkgs/development/python-modules/staticjinja/default.nix index 90ba99fe0ac..0681218cd0a 100644 --- a/pkgs/development/python-modules/staticjinja/default.nix +++ b/pkgs/development/python-modules/staticjinja/default.nix @@ -8,11 +8,13 @@ , pytestCheckHook , pytest-check , markdown +, testVersion +, staticjinja }: buildPythonPackage rec { pname = "staticjinja"; - version = "2.0.1"; + version = "2.1.0"; format = "pyproject"; # No tests in pypi @@ -20,7 +22,7 @@ buildPythonPackage rec { owner = "staticjinja"; repo = pname; rev = version; - sha256 = "sha256-sGon3+So4EuVRTUqcP9omfJ91wBzJSm7CSkuefX3S+8="; + sha256 = "sha256-VKsDvWEurBdckWbPG5hQLK3dzdM7XVbrp23fR5wp1xk="; }; nativeBuildInputs = [ @@ -44,6 +46,10 @@ buildPythonPackage rec { export PATH="$PATH:$out/bin"; ''; + passthru.tests.version = testVersion { + package = staticjinja; + }; + meta = with lib; { description = "A library and cli tool that makes it easy to build static sites using Jinja2"; homepage = "https://staticjinja.readthedocs.io/en/latest/"; From 687c03a5d05cee0512ac1b9d8b9ce94e3d2f4f3a Mon Sep 17 00:00:00 2001 From: Icy-Thought <53710398+Icy-Thought@users.noreply.github.com> Date: Tue, 15 Jun 2021 03:30:36 +0200 Subject: [PATCH 112/113] whitesur-icon-theme: init at 2021-05-20 (#126783) Co-authored-by: Sandro --- maintainers/maintainer-list.nix | 6 ++ .../icons/whitesur-icon-theme/default.nix | 63 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 71 insertions(+) create mode 100644 pkgs/data/icons/whitesur-icon-theme/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2596587564c..b1f97ceeec3 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4281,6 +4281,12 @@ githubId = 3661115; name = "Ingo Blechschmidt"; }; + icy-thought = { + name = "Icy-Thought"; + email = "gilganyx@pm.me"; + github = "Icy-Thought"; + githubId = 53710398; + }; idontgetoutmuch = { email = "dominic@steinitz.org"; github = "idontgetoutmuch"; diff --git a/pkgs/data/icons/whitesur-icon-theme/default.nix b/pkgs/data/icons/whitesur-icon-theme/default.nix new file mode 100644 index 00000000000..95f41caca1a --- /dev/null +++ b/pkgs/data/icons/whitesur-icon-theme/default.nix @@ -0,0 +1,63 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, gtk3 +, gnome +, gnome-icon-theme +, hicolor-icon-theme +}: + +stdenvNoCC.mkDerivation rec { + pname = "Whitesur-icon-theme"; + version = "2021-05-20"; + + src = fetchFromGitHub { + owner = "vinceliuice"; + repo = pname; + rev = version; + sha256 = "KboUYozTleOBKNun66g2oj7u/36hyQsPtRSk/x/LAWo="; + }; + + nativeBuildInputs = [ gtk3 ]; + + buildInputs = [ + gnome-icon-theme + gnome.adwaita-icon-theme + hicolor-icon-theme + ]; + + dontDropIconThemeCache = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/icons/WhiteSur{,-dark}/status + echo "$out/share/icons/WhiteSur/status $out/share/icons/WhiteSur-dark/status" | xargs -n 1 cp -r src/status/{16,22,24,32,symbolic} + echo "$out/share/icons/WhiteSur $out/share/icons/WhiteSur-dark" | xargs -n 1 cp -r ./{COPYING,AUTHORS} src/index.theme src/{actions,animations,apps,categories,devices,emblems,mimes,places} links/{actions,apps,categories,devices,emblems,mimes,places,status} + + # Change icon color for dark theme + sed -i "s/#363636/#dedede/g" $out/share/icons/WhiteSur-dark/{actions,devices,places,status}/{16,22,24}/* + sed -i "s/#363636/#dedede/g" $out/share/icons/WhiteSur-dark/actions/32/* + sed -i "s/#363636/#dedede/g" $out/share/icons/WhiteSur-dark/{actions,apps,categories,emblems,devices,mimes,places,status}/symbolic/* + + for f in actions animations apps categories devices emblems mimes places status; do + ln -sf $out/share/icons/WhiteSur/$f $out/share/icons/WhiteSur/$f@2x + ln -sf $out/share/icons/WhiteSur-dark/$f $out/share/icons/WhiteSur-dark/$f@2x + done + + for theme in $out/share/icons/*; do + gtk-update-icon-cache $theme + done + + runHook postInstall + ''; + + meta = with lib; { + description = "MacOS Big Sur style icon theme for Linux desktops"; + homepage = "https://github.com/vinceliuice/WhiteSur-icon-theme"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ icy-thought ]; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 373ff41f0fd..b6f9fc2b60e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22552,6 +22552,8 @@ in weather-icons = callPackage ../data/fonts/weather-icons { }; + whitesur-icon-theme = callPackage ../data/icons/whitesur-icon-theme { }; + wireless-regdb = callPackage ../data/misc/wireless-regdb { }; work-sans = callPackage ../data/fonts/work-sans { }; From 11027eba54f2fe01a1b430685ebacda740877659 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Mon, 14 Jun 2021 22:17:55 -0500 Subject: [PATCH 113/113] subsurface: googlemaps 2018-06-02 -> 2021-03-19 --- pkgs/applications/misc/subsurface/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix index 5c396ea671e..7420267aa7d 100644 --- a/pkgs/applications/misc/subsurface/default.nix +++ b/pkgs/applications/misc/subsurface/default.nix @@ -40,13 +40,13 @@ let googlemaps = stdenv.mkDerivation rec { pname = "googlemaps"; - version = "2018-06-02"; + version = "2021-03-19"; src = fetchFromGitHub { owner = "vladest"; repo = "googlemaps"; - rev = "54a357f9590d9cf011bf1713589f66bad65e00eb"; - sha256 = "159kslp6rj0qznzxijppwvv8jnswlfgf2pw4x8ladi8vp6bzxnzi"; + rev = "8f7def10c203fd3faa5ef96c5010a7294dca0759"; + sha256 = "1irz398g45hk6xizwzd07qcx1ln8f7l6bhjh15f56yc20waqpx1x"; }; nativeBuildInputs = [ qmake ];