From a893df3f9fd1bb39a4a9f084debd19d89db35e23 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 30 Apr 2021 21:56:18 +0200 Subject: [PATCH 01/83] wayland-protocols: Switch to Meson According to diffoscope this is fine (only the Nix store path changes). Cross-compilation with doCheck=true is broken (requires pkg-config in nativeBuildInputs but doesn't play nicely with checkInputs). --- .../libraries/wayland/protocols.nix | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix index 8a2b05aa4dff..7f3ec5f3d597 100644 --- a/pkgs/development/libraries/wayland/protocols.nix +++ b/pkgs/development/libraries/wayland/protocols.nix @@ -1,15 +1,29 @@ -{ lib, stdenv, fetchurl, wayland-scanner }: +{ lib, stdenv, fetchurl +, pkg-config +, meson, ninja, wayland-scanner +, python3, wayland +}: stdenv.mkDerivation rec { pname = "wayland-protocols"; version = "1.21"; + doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + src = fetchurl { url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz"; sha256 = "1rfdlkzz67qsb955zqb8jbw3m22pl6ppvrvfq8bqiqcb5n24b6dr"; }; - nativeBuildInputs = [ wayland-scanner ]; + postPatch = lib.optionalString doCheck '' + patchShebangs tests/ + ''; + + depsBuildBuild = [ pkg-config ]; + nativeBuildInputs = [ meson ninja wayland-scanner ]; + checkInputs = [ python3 wayland ]; + + mesonFlags = [ "-Dtests=${lib.boolToString doCheck}" ]; meta = { description = "Wayland protocol extensions"; From 1c26edbf8daf56a319a01836c9f2596bfa26a65e Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 7 May 2021 16:51:59 +0200 Subject: [PATCH 02/83] openblas: 0.3.13 -> 0.3.15 --- .../libraries/science/math/openblas/default.nix | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index f464a755f6e4..ccb37d295bff 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, perl, which +{ lib, stdenv, fetchFromGitHub, perl, which # Most packages depending on openblas expect integer width to match # pointer width, but some expect to use 32-bit integers always # (for compatibility with reference BLAS). @@ -116,7 +116,7 @@ let in stdenv.mkDerivation rec { pname = "openblas"; - version = "0.3.13"; + version = "0.3.15"; outputs = [ "out" "dev" ]; @@ -124,19 +124,9 @@ stdenv.mkDerivation rec { owner = "xianyi"; repo = "OpenBLAS"; rev = "v${version}"; - sha256 = "14jxh0v3jfbw4mfjx4mcz4dd51lyq7pqvh9k8dg94539ypzjr2lj"; + sha256 = "1qjr02cqncv20abdp1yzr55n7smhx6h9chqvb0xbp18byynvj87w"; }; - # apply https://github.com/xianyi/OpenBLAS/pull/3060 to fix a crash on arm - # remove this when updating to 0.3.14 or newer - patches = [ - (fetchpatch { - name = "label-get_cpu_ftr-as-volatile.patch"; - url = "https://github.com/xianyi/OpenBLAS/commit/6fe0f1fab9d6a7f46d71d37ebb210fbf56924fbc.diff"; - sha256 = "06gwh73k4sas1ap2fi3jvpifbjkys2vhmnbj4mzrsvj279ljsfdk"; - }) - ]; - inherit blas64; # Some hardening features are disabled due to sporadic failures in From 7dd1b04b4e62075de67183d535c7c68985127925 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 16 May 2021 19:55:06 +0200 Subject: [PATCH 03/83] dav1d: 0.8.2 -> 0.9.0 --- pkgs/development/libraries/dav1d/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/dav1d/default.nix b/pkgs/development/libraries/dav1d/default.nix index 51df5a9254a5..fe6926fe809a 100644 --- a/pkgs/development/libraries/dav1d/default.nix +++ b/pkgs/development/libraries/dav1d/default.nix @@ -10,14 +10,14 @@ assert useVulkan -> withExamples; stdenv.mkDerivation rec { pname = "dav1d"; - version = "0.8.2"; + version = "0.9.0"; src = fetchFromGitLab { domain = "code.videolan.org"; owner = "videolan"; repo = pname; rev = version; - sha256 = "0plmnxpz66yv3nqv1kgbyyfnwfqi9dqs0zbsdj488i6464a1m6si"; + sha256 = "0ki3wlyaqr80gl1srbbd18dd5bs1sl9icxym8ar62abpvgzxl5yk"; }; nativeBuildInputs = [ meson ninja nasm pkg-config ]; From 9682a2a496769dec8a051d6a5d7b35fec359c4c8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 16 May 2021 19:52:36 +0000 Subject: [PATCH 04/83] jmol: 14.31.38 -> 14.31.39 --- pkgs/applications/science/chemistry/jmol/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index d8f7bd5eb552..93ec987e2c69 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -17,14 +17,14 @@ let }; in stdenv.mkDerivation rec { - version = "14.31.38"; + version = "14.31.39"; pname = "jmol"; src = let baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - sha256 = "sha256-yXJ1KtTH3bi24GFiVXu8zzQkreDkqbCxgm7fVoSJepg="; + sha256 = "sha256-ss+QvBsmivqNdjXW45Sv9h/JXuZpryCGmRTsUgcDlRE="; }; patchPhase = '' From 65dbed73949e4c0207e75dcc7271b29f9e457670 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 30 Apr 2021 18:26:25 +0000 Subject: [PATCH 05/83] libjpeg: 2.0.6 -> 2.1.0 --- pkgs/development/libraries/libjpeg-turbo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index f2d4e00d1aad..bca6f50bde8c 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "libjpeg-turbo"; - version = "2.0.6"; + version = "2.1.0"; src = fetchFromGitHub { owner = "libjpeg-turbo"; repo = "libjpeg-turbo"; rev = version; - sha256 = "0njdxfmyk8smj8bbd6fs3lxjaq3lybivwgg16gpnbiyl984dpi9b"; + sha256 = "sha256-Ma3Q/zMJPjsQmoaYJtVbHJOx65AfGLWJYi2iRFm3l5s="; }; # This is needed by freeimage From 9974c90a1597a7b2b009e798374615899d57db7d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 5 May 2021 23:53:47 +0200 Subject: [PATCH 06/83] python3Packages.sqlalchemy: 1.3.23 -> 1.4.15 --- .../python-modules/sqlalchemy/default.nix | 33 ++++++++++++------- 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 5964e382084f..0e03b17963ee 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -1,4 +1,11 @@ -{ stdenv, lib, fetchPypi, buildPythonPackage, isPy3k, isPy35, fetchpatch +{ stdenv +, lib +, fetchPypi +, buildPythonPackage +, isPy3k +, pythonOlder +, greenlet +, importlib-metadata , mock , pysqlite ? null , pytestCheckHook @@ -7,19 +14,17 @@ buildPythonPackage rec { pname = "SQLAlchemy"; - version = "1.3.23"; + version = "1.4.15"; src = fetchPypi { inherit pname version; - sha256 = "6fca33672578666f657c131552c4ef8979c1606e494f78cd5199742dfb26918b"; + sha256 = "1rj9h3mcxrgh5q8qvz7m39diyil27l5mldr49mgz6xfibk3h1w8g"; }; - patches = [ - # fix test_pyodbc_extra_connect_azure test failure - (fetchpatch { - url = "https://github.com/sqlalchemy/sqlalchemy/commit/7293b3dc0e9eb3dae84ffd831494b85355df8e73.patch"; - sha256 = "1z61lzxamz74771ddlqmbxba1dcr77f016vqfcmb44dxb228w2db"; - }) + propagatedBuildInputs = [ + greenlet + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata ]; checkInputs = [ @@ -28,7 +33,9 @@ buildPythonPackage rec { mock ] ++ lib.optional (!isPy3k) pysqlite; - pytestFlagsArray = [ "-n auto" ]; + pytestFlagsArray = [ + "-n auto" + ]; postInstall = '' sed -e 's:--max-worker-restart=5::g' -i setup.cfg @@ -37,8 +44,10 @@ buildPythonPackage rec { dontUseSetuptoolsCheck = true; # disable mem-usage tests on mac, has trouble serializing pickle files - disabledTests = lib.optionals isPy35 [ "exception_persistent_flush_py3k "] - ++ lib.optionals stdenv.isDarwin [ "MemUsageWBackendTest" "MemUsageTest" ]; + disabledTests = lib.optionals stdenv.isDarwin [ + "MemUsageWBackendTest" + "MemUsageTest" + ]; meta = with lib; { homepage = "http://www.sqlalchemy.org/"; From ce09a10d5cda4dc680dc74fd5cd311a209b441f1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 6 May 2021 02:00:01 +0200 Subject: [PATCH 07/83] python3Packages.marshmallow-sqlalchemy: 0.24.2 -> 0.25.0 --- .../marshmallow-sqlalchemy/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix index ba10c89e1405..a5483245d663 100644 --- a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, pythonOlder , fetchPypi , marshmallow , sqlalchemy @@ -9,11 +10,12 @@ buildPythonPackage rec { pname = "marshmallow-sqlalchemy"; - version = "0.24.2"; + version = "0.25.0"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "ee3ead3b83de6608c6850ff60515691b0dc556ca226680f8a82b9f785cdb71b1"; + sha256 = "0i39ckrixh1w9fmkm0wl868gvza72j5la0x6dd0cij9shf1iyjgi"; }; propagatedBuildInputs = [ @@ -21,6 +23,10 @@ buildPythonPackage rec { sqlalchemy ]; + pythonImportsCheck = [ + "marshmallow_sqlalchemy" + ]; + checkInputs = [ pytest-lazy-fixture pytestCheckHook @@ -28,7 +34,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/marshmallow-code/marshmallow-sqlalchemy"; - description = "SQLAlchemy integration with marshmallow "; + description = "SQLAlchemy integration with marshmallow"; license = licenses.mit; }; From e543608ad161d1146617bc8cc288149087b7d7fa Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 6 May 2021 02:03:26 +0200 Subject: [PATCH 08/83] python3Packages.marshmallow: 3.10.0 -> 3.11.1 --- .../python-modules/marshmallow/default.nix | 45 ++++++++++++------- 1 file changed, 29 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/marshmallow/default.nix b/pkgs/development/python-modules/marshmallow/default.nix index a7ca14beb942..0deeb0e53866 100644 --- a/pkgs/development/python-modules/marshmallow/default.nix +++ b/pkgs/development/python-modules/marshmallow/default.nix @@ -1,27 +1,40 @@ -{ lib, buildPythonPackage, fetchPypi, - dateutil, simplejson, isPy27 +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, pytestCheckHook +, pytz +, simplejson }: buildPythonPackage rec { pname = "marshmallow"; - version = "3.10.0"; - disabled = isPy27; + version = "3.11.1"; + disabled = pythonOlder "3.5"; - meta = { - homepage = "https://github.com/marshmallow-code/marshmallow"; + src = fetchFromGitHub { + owner = "marshmallow-code"; + repo = pname; + rev = version; + sha256 = "1ypm142y3giaqydc7fkigm9r057yp2sd1ng5zr2x3w3wbbj5yfm6"; + }; + + pythonImportsCheck = [ + "marshmallow" + ]; + + checkInputs = [ + pytestCheckHook + pytz + simplejson + ]; + + meta = with lib; { description = '' A lightweight library for converting complex objects to and from simple Python datatypes. ''; - license = lib.licenses.mit; + homepage = "https://github.com/marshmallow-code/marshmallow"; + license = licenses.mit; }; - - src = fetchPypi { - inherit pname version; - sha256 = "4ab2fdb7f36eb61c3665da67a7ce281c8900db08d72ba6bf0e695828253581f7"; - }; - - propagatedBuildInputs = [ dateutil simplejson ]; - - doCheck = false; } From 4342c332dae3e60a61f35925a7e83ac007f93853 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 17 May 2021 01:01:03 +0000 Subject: [PATCH 09/83] libqmi: 1.28.2 -> 1.28.4 --- pkgs/development/libraries/libqmi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix index 8a3179b03427..a812a2d78489 100644 --- a/pkgs/development/libraries/libqmi/default.nix +++ b/pkgs/development/libraries/libqmi/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "libqmi"; - version = "1.28.2"; + version = "1.28.4"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz"; - sha256 = "jIw+5xmHTSUpvOmzWwKP5DWzbwA5eaNg060JOESdt4M="; + sha256 = "sha256-OxTNKrUiGnrbs5/tFu9pdTjqHHkwiCGtLRm1BeHarqA="; }; nativeBuildInputs = [ From b4ad7b676b7fecd81b13ebf2bdc73a4da58e585b Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 17 May 2021 15:18:49 +0200 Subject: [PATCH 10/83] cargo-c: 0.8.0 -> 0.8.1 --- pkgs/development/tools/rust/cargo-c/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-c/default.nix b/pkgs/development/tools/rust/cargo-c/default.nix index 9458cb030a7c..71394c098907 100644 --- a/pkgs/development/tools/rust/cargo-c/default.nix +++ b/pkgs/development/tools/rust/cargo-c/default.nix @@ -5,7 +5,7 @@ rustPlatform.buildRustPackage rec { pname = "cargo-c"; - version = "0.8.0"; + version = "0.8.1"; src = stdenv.mkDerivation rec { name = "${pname}-source-${version}"; @@ -14,11 +14,11 @@ rustPlatform.buildRustPackage rec { owner = "lu-zero"; repo = pname; rev = "v${version}"; - sha256 = "1rvbikhbqsfa2sh79kapqg4yz19r1yhqfykl6cf4yjg6vawkwfw1"; + sha256 = "0fd0xql5cbqgmir2z3ah91iasaq9133wmi5bnhiy3dv7drcqv4rc"; }; cargoLock = fetchurl { url = "https://github.com/lu-zero/${pname}/releases/download/v${version}/Cargo.lock"; - sha256 = "17cdac8ym59jwjxs3k4isazknhrlr6lw0j0r76n5xf0dd7apfgcs"; + sha256 = "1xlh3h77rxhqyr1nkqyanb120lwdks6fklh202camqpmznd763g5"; }; installPhase = '' @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "0pxakfiidxfczh3harnjhb1zv340r812jxzwam8z2kyw3mkyhh8z"; + cargoSha256 = "0b952xkg0l31laqlhsv3cqdag7v15k9na6xr6q9y8xwy1fjh9gzv"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] From ded99630e9d8275bc6f0759730294f71216d8a52 Mon Sep 17 00:00:00 2001 From: Luka Blaskovic Date: Sat, 15 May 2021 07:58:22 +0000 Subject: [PATCH 11/83] rustc: 1_52, use correct llvm version --- pkgs/development/compilers/rust/1_52.nix | 13 +++++++------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/compilers/rust/1_52.nix b/pkgs/development/compilers/rust/1_52.nix index 775792d06f60..822708741bda 100644 --- a/pkgs/development/compilers/rust/1_52.nix +++ b/pkgs/development/compilers/rust/1_52.nix @@ -15,21 +15,22 @@ , CoreFoundation, Security , pkgsBuildTarget, pkgsBuildBuild, pkgsBuildHost , makeRustPlatform -, llvmPackages_11, llvm_11 +, llvmPackages_11 +, llvmPackages_12, llvm_12 } @ args: import ./default.nix { rustcVersion = "1.52.1"; rustcSha256 = "sha256-Om8jom0Oj4erv78yxc19qgwLcdCYar78Vrml+/vQv5g="; - llvmSharedForBuild = pkgsBuildBuild.llvmPackages_11.libllvm.override { enableSharedLibraries = true; }; - llvmSharedForHost = pkgsBuildHost.llvmPackages_11.libllvm.override { enableSharedLibraries = true; }; - llvmSharedForTarget = pkgsBuildTarget.llvmPackages_11.libllvm.override { enableSharedLibraries = true; }; + llvmSharedForBuild = pkgsBuildBuild.llvmPackages_12.libllvm.override { enableSharedLibraries = true; }; + llvmSharedForHost = pkgsBuildHost.llvmPackages_12.libllvm.override { enableSharedLibraries = true; }; + llvmSharedForTarget = pkgsBuildTarget.llvmPackages_12.libllvm.override { enableSharedLibraries = true; }; llvmBootstrapForDarwin = llvmPackages_11; # For use at runtime - llvmShared = llvm_11.override { enableSharedLibraries = true; }; + llvmShared = llvm_12.override { enableSharedLibraries = true; }; # Note: the version MUST be one version prior to the version we're # building @@ -55,4 +56,4 @@ import ./default.nix { ]; } -(builtins.removeAttrs args [ "fetchpatch" "pkgsBuildHost" "llvmPackages_11" "llvm_11"]) +(builtins.removeAttrs args [ "fetchpatch" "pkgsBuildHost" "llvmPackages_11" "llvmPackages_12" "llvm_12"]) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index caf024b835d6..f5dcba2edee2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11532,7 +11532,7 @@ in }; rust_1_52 = callPackage ../development/compilers/rust/1_52.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; - llvm_11 = llvmPackages_11.libllvm; + llvm_12 = llvmPackages_12.libllvm; }; rust = rust_1_52; From 164f8530a95b14a61d682e1930428e8de7e76890 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 17 May 2021 07:31:58 +0000 Subject: [PATCH 12/83] k9s: 0.24.8 -> 0.24.9 --- pkgs/applications/networking/cluster/k9s/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index 8d515528a026..965c50cf03b0 100644 --- a/pkgs/applications/networking/cluster/k9s/default.nix +++ b/pkgs/applications/networking/cluster/k9s/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "k9s"; - version = "0.24.8"; + version = "0.24.9"; src = fetchFromGitHub { owner = "derailed"; repo = "k9s"; rev = "v${version}"; - sha256 = "sha256-6RGm2uiYvsdpWdhNwDTw4z1O6uNErkWTuyOiwKIvXOY="; + sha256 = "sha256-9/P6OaSZDJ98EQ9DM4Oib0T1sC1K3WxUXh4IQU3qXbs="; }; buildFlagsArray = '' @@ -18,7 +18,7 @@ buildGoModule rec { -X github.com/derailed/k9s/cmd.commit=${src.rev} ''; - vendorSha256 = "sha256-lzxGTubm+qQes5QKaamfmSkXs4qquHHjIhts8YmKlYI="; + vendorSha256 = "sha256-hqmymxP4zK8GVqOxzB6vRfFyo+VIeI1suBu64/oEVig="; doCheck = false; From 4cb95494964f105b0f8f8691214e7e1ae0a5d453 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 11 May 2021 08:21:45 +0000 Subject: [PATCH 13/83] chibi: 0.9.1 -> 0.10 --- pkgs/development/interpreters/chibi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/chibi/default.nix b/pkgs/development/interpreters/chibi/default.nix index 92531eacd20d..c0ee8988c094 100644 --- a/pkgs/development/interpreters/chibi/default.nix +++ b/pkgs/development/interpreters/chibi/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, makeWrapper }: let - version = "0.9.1"; + version = "0.10"; name = "chibi-scheme-${version}"; in stdenv.mkDerivation { @@ -18,7 +18,7 @@ stdenv.mkDerivation { owner = "ashinn"; repo = "chibi-scheme"; rev = version; - sha256 = "0nd63i924ifh39cba1hd4sbi6vh1cb73v97nrn4bf8rrjh3k8pdi"; + sha256 = "sha256-7vDxcnXhq1wJSLFHGxtwh+H+KWxh6B0JXSMPzSmQFXo="; }; nativeBuildInputs = [ makeWrapper ]; From d8e8c257f38af31ce0f9fb23ea68f271c54f0de3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 30 Apr 2021 18:22:38 +0000 Subject: [PATCH 14/83] libksba: 1.5.0 -> 1.5.1 --- pkgs/development/libraries/libksba/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libksba/default.nix b/pkgs/development/libraries/libksba/default.nix index e623aa0d1119..c8998446c7da 100644 --- a/pkgs/development/libraries/libksba/default.nix +++ b/pkgs/development/libraries/libksba/default.nix @@ -1,11 +1,11 @@ { buildPackages, lib, stdenv, fetchurl, gettext, libgpgerror }: stdenv.mkDerivation rec { - name = "libksba-1.5.0"; + name = "libksba-1.5.1"; src = fetchurl { url = "mirror://gnupg/libksba/${name}.tar.bz2"; - sha256 = "1fm0mf3wq9fmyi1rmc1vk2fafn6liiw2mgxml3g7ybbb44lz2jmf"; + sha256 = "sha256-sPTGXk5EfZojSfa4wOd6KL6VMeRUi6AsVF0fRtx7+SE="; }; outputs = [ "out" "dev" "info" ]; From 3f398ec167dd14ee441dc584718582131ae7d994 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 30 Apr 2021 18:17:54 +0000 Subject: [PATCH 15/83] libgcrypt: 1.9.2 -> 1.9.3 --- pkgs/development/libraries/libgcrypt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index 6b761d2170c3..d829329a12f3 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -4,11 +4,11 @@ assert enableCapabilities -> stdenv.isLinux; stdenv.mkDerivation rec { pname = "libgcrypt"; - version = "1.9.2"; + version = "1.9.3"; src = fetchurl { url = "mirror://gnupg/libgcrypt/${pname}-${version}.tar.bz2"; - sha256 = "sha256-ssENCRUTsnHkcXcnRgex/7o9lbGIu/qHl/lIrskFPFo="; + sha256 = "sha256-l+vk+U4vfjW3UhlM4VoPPGYyTg/2ryZlm7+1/y7DKP0="; }; outputs = [ "out" "dev" "info" ]; From ac760b45b580ec8a8adaf30bc33b2f7a33546a9b Mon Sep 17 00:00:00 2001 From: ajs124 Date: Sat, 1 May 2021 00:35:48 +0200 Subject: [PATCH 16/83] libgcrypt: add meta.changelog --- pkgs/development/libraries/libgcrypt/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index d829329a12f3..506b1a5b25fb 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -58,6 +58,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.gnu.org/software/libgcrypt/"; + changelog = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=blob;f=NEWS;hb=refs/tags/${pname}-${version}"; description = "General-purpose cryptographic library"; license = licenses.lgpl2Plus; platforms = platforms.all; From b11d65c8508542efbd161c5922d51b55b431fe90 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Mon, 17 May 2021 17:12:39 +0200 Subject: [PATCH 17/83] pkg-config-wrapper: mangle PKG_CONFIG_PATH{,_FOR_BUILD} correctly Previously, mangleVarList would be used which would concatenate the variables using a space as a separator. Paths are however separated by `:` in PKG_CONFIG_PATH leading to entries being broken. This is fixed by introducing mangleVarListGeneric which allows us to specify the desired separator. Reproducer for the issue prior to this change: $ nix-shell -A pkgsLLVM.wayland [nix-shell] $ pkg-config --libs expat Package expat was not found in the pkg-config search path. Perhaps you should add the directory containing `expat.pc' to the PKG_CONFIG_PATH environment variable No package 'expat' found $ printf 'Host: %s\nBuild: %s' $PKG_CONFIG_PATH $PKG_CONFIG_PATH_FOR_BUILD Host: /nix/store/5h308a4ab8w7prcp8iflh5pnl78mayi2-expat-2.2.10-x86_64-unknown-linux-gnu-dev/lib/pkgconfig:/nix/store/z3y9ska2h4l1map25m195iq577g7g3gz-libxml2-x86_64-unknown-linux-gnu-2.9.12-dev/lib/pkgconfig:/nix/store/lbz5m1s0r7zn0cxvl21czfspli6ribzb-zlib-1.2.11-x86_64-unknown-linux-gnu-dev/lib/pkgconfig:/nix/store/rfhvp8r8n3ygpzh8j0l34lk8hwwi3z0h-libffi-3.3-x86_64-unknown-linux-gnu-dev/lib/pkgconfig Build: /nix/store/dw11ywy7qwfz53qisz0dggbgix88jah2-wayland-1.19.0-bin/lib/pkgconfig strace reveals the issue: stat("/nix/store/dw11ywy7qwfz53qisz0dggbgix88jah2-wayland-1.19.0-bin/lib/pkgconfig /nix/store/5h308a4ab8w7prcp8iflh5pnl78mayi2-expat-2.2.10-x86_64-unknown-linux-gnu-dev/lib/pkgconfig/expat-uninstalled.pc", 0x7fff49829fa0) = -1 ENOENT (No such file or directory) In the pkg-config wrapper $PKG_CONFIG_PATH_FOR_BUILD and $PKG_CONFIG_PATH are concatenated with a space which leads to two paths being messed up. This issue likely only affects native cross compilation. --- pkgs/build-support/pkg-config-wrapper/add-flags.sh | 2 +- pkgs/build-support/wrapper-common/utils.bash | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/pkg-config-wrapper/add-flags.sh b/pkgs/build-support/pkg-config-wrapper/add-flags.sh index 35ecf62ca230..90aee712be63 100644 --- a/pkgs/build-support/pkg-config-wrapper/add-flags.sh +++ b/pkgs/build-support/pkg-config-wrapper/add-flags.sh @@ -6,7 +6,7 @@ var_templates_list=( accumulateRoles for var in "${var_templates_list[@]}"; do - mangleVarList "$var" ${role_suffixes[@]+"${role_suffixes[@]}"} + mangleVarListGeneric ":" "$var" ${role_suffixes[@]+"${role_suffixes[@]}"} done export NIX_PKG_CONFIG_WRAPPER_FLAGS_SET_@suffixSalt@=1 diff --git a/pkgs/build-support/wrapper-common/utils.bash b/pkgs/build-support/wrapper-common/utils.bash index 66b7c3f3e83c..f773270f7de9 100644 --- a/pkgs/build-support/wrapper-common/utils.bash +++ b/pkgs/build-support/wrapper-common/utils.bash @@ -13,7 +13,9 @@ accumulateRoles() { fi } -mangleVarList() { +mangleVarListGeneric() { + local sep="$1" + shift local var="$1" shift local -a role_suffixes=("$@") @@ -25,11 +27,15 @@ mangleVarList() { for suffix in "${role_suffixes[@]}"; do local inputVar="${var}${suffix}" if [ -v "$inputVar" ]; then - export ${outputVar}+="${!outputVar:+ }${!inputVar}" + export ${outputVar}+="${!outputVar:+$sep}${!inputVar}" fi done } +mangleVarList() { + mangleVarListGeneric " " "$@" +} + mangleVarBool() { local var="$1" shift From 9057122e0f38fbc3aa3b246550fd1d9efae503e2 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 18 May 2021 16:06:05 +0200 Subject: [PATCH 18/83] libdrm: 2.4.105 -> 2.4.106 --- pkgs/development/libraries/libdrm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index b7fd94f9f123..ca90750b8c24 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "libdrm"; - version = "2.4.105"; + version = "2.4.106"; src = fetchurl { url = "https://dri.freedesktop.org/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0iiamypwdfiz250ki120nh598r48yyacmnndb4mkximdgi5h478x"; + sha256 = "1m3vwpabjg3az84vmyxi96jyd7rrqm6qkhk1gq41w5wv89aarn4j"; }; outputs = [ "out" "dev" "bin" ]; From 3530837417da13076a2c8412de2c0c385dfbd648 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 18 May 2021 16:15:03 +0200 Subject: [PATCH 19/83] llvmPackages*.clang: fix linker invocation with LLVMgold plugin When using GNU binutils, clang passes the LLVMgold.so plugin to the linker for certain operations that require special support in the linker like doing link time optimization (LTO). When passing the plugin to the linker's command line, clang assumes that llvm and itself are installed in the same prefix and thus `/path/to/clang/bin/../lib/LLVMgold.so` is the plugin. Since we install clang and llvm to separate store paths, this assumption does not hold. When clang-unwrapped only had a single output, we worked around this issue by symlinking `$out/lib/LLVMgold.so` to `${llvm}/lib/LLVMgold.so`. However since we split all llvm packages into multiple outputs clang's `$out` no longer has a lib directory and clang can't discover clangs lib output on its own. As a result LTO was broken. Instead of introducing yet another hack and having a symlink to LLVMgold.so in `$out/lib` (despite having `$lib/lib` as well), we patch clang to use a hard coded path to `${libllvm.lib}/lib` for discovering `LLVMgold.so`. Resolves #123361. --- .../compilers/llvm/10/clang/default.nix | 11 +++++------ .../compilers/llvm/11/clang/default.nix | 11 +++++------ .../compilers/llvm/12/clang/default.nix | 11 +++++------ .../compilers/llvm/5/clang/LLVMgold-path.patch | 14 ++++++++++++++ .../compilers/llvm/5/clang/default.nix | 11 +++++------ .../compilers/llvm/6/clang/default.nix | 11 +++++------ .../compilers/llvm/7/clang/default.nix | 11 +++++------ .../compilers/llvm/8/clang/default.nix | 11 +++++------ .../compilers/llvm/9/clang/default.nix | 11 +++++------ .../llvm/clang-11-12-LLVMgold-path.patch | 13 +++++++++++++ .../compilers/llvm/clang-6-10-LLVMgold-path.patch | 15 +++++++++++++++ 11 files changed, 82 insertions(+), 48 deletions(-) create mode 100644 pkgs/development/compilers/llvm/5/clang/LLVMgold-path.patch create mode 100644 pkgs/development/compilers/llvm/clang-11-12-LLVMgold-path.patch create mode 100644 pkgs/development/compilers/llvm/clang-6-10-LLVMgold-path.patch diff --git a/pkgs/development/compilers/llvm/10/clang/default.nix b/pkgs/development/compilers/llvm/10/clang/default.nix index e0c52651cadc..b42f40b96943 100644 --- a/pkgs/development/compilers/llvm/10/clang/default.nix +++ b/pkgs/development/compilers/llvm/10/clang/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, llvm_meta, fetch, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3 +{ lib, stdenv, llvm_meta, fetch, substituteAll, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3 , buildLlvmTools , fixDarwinDylibNames , enableManpages ? false @@ -46,6 +46,10 @@ let # https://reviews.llvm.org/D51899 ./compiler-rt-baremetal.patch ./gnu-install-dirs.patch + (substituteAll { + src = ../../clang-6-10-LLVMgold-path.patch; + libllvmLibdir = "${libllvm.lib}/lib"; + }) ]; postPatch = '' @@ -64,12 +68,7 @@ let outputs = [ "out" "lib" "dev" "python" ]; - # Clang expects to find LLVMgold in its own prefix postInstall = '' - if [ -e ${libllvm.lib}/lib/LLVMgold.so ]; then - ln -sv ${libllvm.lib}/lib/LLVMgold.so $lib/lib - fi - ln -sv $out/bin/clang $out/bin/cpp # Move libclang to 'lib' output diff --git a/pkgs/development/compilers/llvm/11/clang/default.nix b/pkgs/development/compilers/llvm/11/clang/default.nix index f23394a8b754..07e5326128aa 100644 --- a/pkgs/development/compilers/llvm/11/clang/default.nix +++ b/pkgs/development/compilers/llvm/11/clang/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, llvm_meta, fetch, fetchpatch, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3 +{ lib, stdenv, llvm_meta, fetch, fetchpatch, substituteAll, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3 , buildLlvmTools , fixDarwinDylibNames , enableManpages ? false @@ -57,6 +57,10 @@ let excludes = [ "docs/*" "test/*" ]; sha256 = "0gxgmi0qbm89mq911dahallhi8m6wa9vpklklqmxafx4rplrr8ph"; }) + (substituteAll { + src = ../../clang-11-12-LLVMgold-path.patch; + libllvmLibdir = "${libllvm.lib}/lib"; + }) ]; postPatch = '' @@ -75,12 +79,7 @@ let outputs = [ "out" "lib" "dev" "python" ]; - # Clang expects to find LLVMgold in its own prefix postInstall = '' - if [ -e ${libllvm.lib}/lib/LLVMgold.so ]; then - ln -sv ${libllvm.lib}/lib/LLVMgold.so $lib/lib - fi - ln -sv $out/bin/clang $out/bin/cpp # Move libclang to 'lib' output diff --git a/pkgs/development/compilers/llvm/12/clang/default.nix b/pkgs/development/compilers/llvm/12/clang/default.nix index 3d1106dbc52c..dbd6ea1e1ac4 100644 --- a/pkgs/development/compilers/llvm/12/clang/default.nix +++ b/pkgs/development/compilers/llvm/12/clang/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, llvm_meta, fetch, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3 +{ lib, stdenv, llvm_meta, fetch, substituteAll, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3 , buildLlvmTools , fixDarwinDylibNames , enableManpages ? false @@ -44,6 +44,10 @@ let ./purity.patch # https://reviews.llvm.org/D51899 ./gnu-install-dirs.patch + (substituteAll { + src = ../../clang-11-12-LLVMgold-path.patch; + libllvmLibdir = "${libllvm.lib}/lib"; + }) ]; postPatch = '' @@ -59,12 +63,7 @@ let outputs = [ "out" "lib" "dev" "python" ]; - # Clang expects to find LLVMgold in its own prefix postInstall = '' - if [ -e ${libllvm.lib}/lib/LLVMgold.so ]; then - ln -sv ${libllvm.lib}/lib/LLVMgold.so $lib/lib - fi - ln -sv $out/bin/clang $out/bin/cpp # Move libclang to 'lib' output diff --git a/pkgs/development/compilers/llvm/5/clang/LLVMgold-path.patch b/pkgs/development/compilers/llvm/5/clang/LLVMgold-path.patch new file mode 100644 index 000000000000..6a09c91b5132 --- /dev/null +++ b/pkgs/development/compilers/llvm/5/clang/LLVMgold-path.patch @@ -0,0 +1,14 @@ +diff --git a/lib/Driver/ToolChains/CommonArgs.cpp b/lib/Driver/ToolChains/CommonArgs.cpp +index 00bd60bc24bb..17416b0bd3c0 100644 +--- a/lib/Driver/ToolChains/CommonArgs.cpp ++++ b/lib/Driver/ToolChains/CommonArgs.cpp +@@ -376,8 +376,7 @@ void tools::AddGoldPlugin(const ToolChain &ToolChain, const ArgList &Args, + // as gold requires -plugin to come before any -plugin-opt that -Wl might + // forward. + CmdArgs.push_back("-plugin"); +- std::string Plugin = +- ToolChain.getDriver().Dir + "/../lib" CLANG_LIBDIR_SUFFIX "/LLVMgold.so"; ++ std::string Plugin = "@libllvmLibdir@" "/LLVMgold.so"; + CmdArgs.push_back(Args.MakeArgString(Plugin)); + + // Try to pass driver level flags relevant to LTO code generation down to diff --git a/pkgs/development/compilers/llvm/5/clang/default.nix b/pkgs/development/compilers/llvm/5/clang/default.nix index b5887a23c65e..df3d26139866 100644 --- a/pkgs/development/compilers/llvm/5/clang/default.nix +++ b/pkgs/development/compilers/llvm/5/clang/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, llvm_meta, fetch, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3 +{ lib, stdenv, llvm_meta, fetch, substituteAll, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3 , buildLlvmTools , fixDarwinDylibNames , enableManpages ? false @@ -43,6 +43,10 @@ let patches = [ ./purity.patch ./gnu-install-dirs.patch + (substituteAll { + src = ./LLVMgold-path.patch; + libllvmLibdir = "${libllvm.lib}/lib"; + }) ]; postPatch = '' @@ -58,12 +62,7 @@ let outputs = [ "out" "lib" "dev" "python" ]; - # Clang expects to find LLVMgold in its own prefix postInstall = '' - if [ -e ${libllvm.lib}/lib/LLVMgold.so ]; then - ln -sv ${libllvm.lib}/lib/LLVMgold.so $lib/lib - fi - ln -sv $out/bin/clang $out/bin/cpp # Move libclang to 'lib' output diff --git a/pkgs/development/compilers/llvm/6/clang/default.nix b/pkgs/development/compilers/llvm/6/clang/default.nix index eba9111d9d32..ee8859c159a1 100644 --- a/pkgs/development/compilers/llvm/6/clang/default.nix +++ b/pkgs/development/compilers/llvm/6/clang/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, llvm_meta, fetch, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3 +{ lib, stdenv, llvm_meta, fetch, substituteAll, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3 , buildLlvmTools , fixDarwinDylibNames , enableManpages ? false @@ -43,6 +43,10 @@ let patches = [ ./purity.patch ./gnu-install-dirs.patch + (substituteAll { + src = ../../clang-6-10-LLVMgold-path.patch; + libllvmLibdir = "${libllvm.lib}/lib"; + }) ]; postPatch = '' @@ -58,12 +62,7 @@ let outputs = [ "out" "lib" "dev" "python" ]; - # Clang expects to find LLVMgold in its own prefix postInstall = '' - if [ -e ${libllvm.lib}/lib/LLVMgold.so ]; then - ln -sv ${libllvm.lib}/lib/LLVMgold.so $lib/lib - fi - ln -sv $out/bin/clang $out/bin/cpp # Move libclang to 'lib' output diff --git a/pkgs/development/compilers/llvm/7/clang/default.nix b/pkgs/development/compilers/llvm/7/clang/default.nix index e1b031ad352b..afa1669ace61 100644 --- a/pkgs/development/compilers/llvm/7/clang/default.nix +++ b/pkgs/development/compilers/llvm/7/clang/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, llvm_meta, fetch, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3 +{ lib, stdenv, llvm_meta, fetch, substituteAll, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3 , buildLlvmTools , fixDarwinDylibNames , enableManpages ? false @@ -52,6 +52,10 @@ let # needed for our bootstrapping to not interfere with C. ./unwindlib.patch ./gnu-install-dirs.patch + (substituteAll { + src = ../../clang-6-10-LLVMgold-path.patch; + libllvmLibdir = "${libllvm.lib}/lib"; + }) ]; postPatch = '' @@ -70,12 +74,7 @@ let outputs = [ "out" "lib" "dev" "python" ]; - # Clang expects to find LLVMgold in its own prefix postInstall = '' - if [ -e ${libllvm.lib}/lib/LLVMgold.so ]; then - ln -sv ${libllvm.lib}/lib/LLVMgold.so $lib/lib - fi - ln -sv $out/bin/clang $out/bin/cpp # Move libclang to 'lib' output diff --git a/pkgs/development/compilers/llvm/8/clang/default.nix b/pkgs/development/compilers/llvm/8/clang/default.nix index c3399dccd1d7..5cb7720d026f 100644 --- a/pkgs/development/compilers/llvm/8/clang/default.nix +++ b/pkgs/development/compilers/llvm/8/clang/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, llvm_meta, fetch, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3 +{ lib, stdenv, llvm_meta, fetch, substituteAll, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3 , buildLlvmTools , fixDarwinDylibNames , enableManpages ? false @@ -59,6 +59,10 @@ let # make clang -xhip use $PATH to find executables ./HIP-use-PATH-8.patch ./gnu-install-dirs.patch + (substituteAll { + src = ../../clang-6-10-LLVMgold-path.patch; + libllvmLibdir = "${libllvm.lib}/lib"; + }) ]; postPatch = '' @@ -77,12 +81,7 @@ let outputs = [ "out" "lib" "dev" "python" ]; - # Clang expects to find LLVMgold in its own prefix postInstall = '' - if [ -e ${libllvm.lib}/lib/LLVMgold.so ]; then - ln -sv ${libllvm.lib}/lib/LLVMgold.so $lib/lib - fi - ln -sv $out/bin/clang $out/bin/cpp # Move libclang to 'lib' output diff --git a/pkgs/development/compilers/llvm/9/clang/default.nix b/pkgs/development/compilers/llvm/9/clang/default.nix index 700fcb414fce..c98b4a830c42 100644 --- a/pkgs/development/compilers/llvm/9/clang/default.nix +++ b/pkgs/development/compilers/llvm/9/clang/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, llvm_meta, fetch, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3 +{ lib, stdenv, llvm_meta, fetch, substituteAll, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3 , buildLlvmTools , fixDarwinDylibNames , enableManpages ? false @@ -52,6 +52,10 @@ let # make clang -xhip use $PATH to find executables ./HIP-use-PATH-9.patch ./gnu-install-dirs.patch + (substituteAll { + src = ../../clang-6-10-LLVMgold-path.patch; + libllvmLibdir = "${libllvm.lib}/lib"; + }) ]; postPatch = '' @@ -70,12 +74,7 @@ let outputs = [ "out" "lib" "dev" "python" ]; - # Clang expects to find LLVMgold in its own prefix postInstall = '' - if [ -e ${libllvm.lib}/lib/LLVMgold.so ]; then - ln -sv ${libllvm.lib}/lib/LLVMgold.so $lib/lib - fi - ln -sv $out/bin/clang $out/bin/cpp # Move libclang to 'lib' output diff --git a/pkgs/development/compilers/llvm/clang-11-12-LLVMgold-path.patch b/pkgs/development/compilers/llvm/clang-11-12-LLVMgold-path.patch new file mode 100644 index 000000000000..8f8991976f33 --- /dev/null +++ b/pkgs/development/compilers/llvm/clang-11-12-LLVMgold-path.patch @@ -0,0 +1,13 @@ +diff --git a/lib/Driver/ToolChains/CommonArgs.cpp b/lib/Driver/ToolChains/CommonArgs.cpp +index 6b6e276b8ce7..7896542a1202 100644 +--- a/lib/Driver/ToolChains/CommonArgs.cpp ++++ b/lib/Driver/ToolChains/CommonArgs.cpp +@@ -409,7 +409,7 @@ void tools::addLTOOptions(const ToolChain &ToolChain, const ArgList &Args, + + SmallString<1024> Plugin; + llvm::sys::path::native( +- Twine(D.Dir) + "/../lib" CLANG_LIBDIR_SUFFIX "/LLVMgold" + Suffix, ++ Twine("@libllvmLibdir@" "/LLVMgold") + Suffix, + Plugin); + CmdArgs.push_back(Args.MakeArgString(Plugin)); + } diff --git a/pkgs/development/compilers/llvm/clang-6-10-LLVMgold-path.patch b/pkgs/development/compilers/llvm/clang-6-10-LLVMgold-path.patch new file mode 100644 index 000000000000..93504316edf3 --- /dev/null +++ b/pkgs/development/compilers/llvm/clang-6-10-LLVMgold-path.patch @@ -0,0 +1,15 @@ +diff --git a/lib/Driver/ToolChains/CommonArgs.cpp b/lib/Driver/ToolChains/CommonArgs.cpp +index 37ec73468570..b73e75aa6e59 100644 +--- a/lib/Driver/ToolChains/CommonArgs.cpp ++++ b/lib/Driver/ToolChains/CommonArgs.cpp +@@ -370,8 +370,8 @@ void tools::AddGoldPlugin(const ToolChain &ToolChain, const ArgList &Args, + #endif + + SmallString<1024> Plugin; +- llvm::sys::path::native(Twine(ToolChain.getDriver().Dir) + +- "/../lib" CLANG_LIBDIR_SUFFIX "/LLVMgold" + ++ llvm::sys::path::native(Twine("@libllvmLibdir@" ++ "/LLVMgold") + + Suffix, + Plugin); + CmdArgs.push_back(Args.MakeArgString(Plugin)); From 1738b9877a761e249a4836df59143f7209b55bb5 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Sun, 16 May 2021 13:16:15 +0200 Subject: [PATCH 20/83] imagemagick: 7.0.11-9 -> 7.0.11-12 --- pkgs/applications/graphics/ImageMagick/7.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index c4e1f3406f6d..fffd7c755c58 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -18,13 +18,13 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "7.0.11-9"; + version = "7.0.11-12"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = version; - sha256 = "sha256-eL9zFrgkLb3pS8/UlQB5+p50UG8j3Q7TNDwcO/3BuXo="; + sha256 = "sha256-vTCfpHcja0z/aplcunUDlg/90EbfrR/xQ9bzdG0n2RY="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big From 23d9ef391a661cb6ab20bb89bdb8a91da76af6a6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 28 Apr 2021 05:54:43 +0000 Subject: [PATCH 21/83] dbus-glib: 0.110 -> 0.112 --- pkgs/development/libraries/dbus-glib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix index f56a1eaac245..4f22e178cf05 100644 --- a/pkgs/development/libraries/dbus-glib/default.nix +++ b/pkgs/development/libraries/dbus-glib/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "dbus-glib-0.110"; + name = "dbus-glib-0.112"; src = fetchurl { url = "${meta.homepage}/releases/dbus-glib/${name}.tar.gz"; - sha256 = "09g8swvc95bk1z6j8sw463p2v0dqmgm2zjfndf7i8sbcyq67dr3w"; + sha256 = "sha256-fVUNzN/NKG4ziVUBgp7Zce62XGFOc6rbSgiu73GbFDo="; }; outputs = [ "out" "dev" "devdoc" ]; From ac55fe71192c8fafee9ec168cc95a5896d33ac34 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 28 Apr 2021 08:43:37 +0200 Subject: [PATCH 22/83] dbus-glib: update license --- pkgs/development/libraries/dbus-glib/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix index 4f22e178cf05..0bab4eb1949e 100644 --- a/pkgs/development/libraries/dbus-glib/default.nix +++ b/pkgs/development/libraries/dbus-glib/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://dbus.freedesktop.org"; - license = with lib.licenses; [ afl21 gpl2 ]; + license = with lib.licenses; [ afl21 gpl2Plus ]; description = "Obsolete glib bindings for D-Bus lightweight IPC mechanism"; maintainers = [ ]; platforms = lib.platforms.unix; From e0ea95634e20c4256234d0246c74c12afc24bb6e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 18 May 2021 19:52:14 +0000 Subject: [PATCH 23/83] kodiPackages.inputstream-adaptive: 2.6.14 -> 2.6.15 --- .../video/kodi-packages/inputstream-adaptive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix b/pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix index 62ebe39788f4..f1efcbfd2781 100644 --- a/pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix +++ b/pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix @@ -2,13 +2,13 @@ buildKodiBinaryAddon rec { pname = "inputstream-adaptive"; namespace = "inputstream.adaptive"; - version = "2.6.14"; + version = "2.6.15"; src = fetchFromGitHub { owner = "xbmc"; repo = "inputstream.adaptive"; rev = "${version}-${rel}"; - sha256 = "sha256-5hYB9J4syY+2XOTdg9h7xLk8MMEG88EETIgkUmz4KOU="; + sha256 = "sha256-Q4MaHIUM/ixAKyTklwuXCu7t/po+q5ZT+YpYf1n+PkA="; }; extraNativeBuildInputs = [ gtest ]; From fa8d1b336de1603a8babb713fdbe57f8413df617 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Wed, 19 May 2021 04:10:17 +0000 Subject: [PATCH 24/83] xorg.libX11: 1.7.0 -> 1.7.1 https://lists.x.org/archives/xorg-announce/2021-May/003089.html https://lists.x.org/archives/xorg-announce/2021-May/003088.html --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 441d8834e086..706e292732b0 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -703,11 +703,11 @@ lib.makeScope newScope (self: with self; { }) {}; libX11 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libxcb, xtrans }: stdenv.mkDerivation { - name = "libX11-1.7.0"; + name = "libX11-1.7.1"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/lib/libX11-1.7.0.tar.bz2"; - sha256 = "0m6bfwllr3pq2c00l51y62yiq15kphc8dw69zf67qhwmclxzkj1n"; + url = "mirror://xorg/individual/lib/libX11-1.7.1.tar.bz2"; + sha256 = "0isxad59hvdwggbxqqjjjg3zmih9xiq4d9mdsnqbyb2nmbg46kp6"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 093aba26f639..139dd60eb3f2 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -175,7 +175,7 @@ mirror://xorg/individual/lib/libICE-1.0.10.tar.bz2 mirror://xorg/individual/lib/libpciaccess-0.16.tar.bz2 mirror://xorg/individual/lib/libSM-1.2.3.tar.bz2 mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2 -mirror://xorg/individual/lib/libX11-1.7.0.tar.bz2 +mirror://xorg/individual/lib/libX11-1.7.1.tar.bz2 mirror://xorg/individual/lib/libXau-1.0.9.tar.bz2 mirror://xorg/individual/lib/libXaw-1.0.14.tar.bz2 mirror://xorg/individual/lib/libXaw3d-1.6.3.tar.bz2 From 786579c0b8ee5311af04feb036d04b78efd4b5b2 Mon Sep 17 00:00:00 2001 From: Atemu Date: Tue, 18 May 2021 13:12:28 +0200 Subject: [PATCH 25/83] libndctl: build docs with asciidoc instead of asciidoctor Removes dependency on ruby 2.7 and isn't much slower --- pkgs/development/libraries/libndctl/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libndctl/default.nix b/pkgs/development/libraries/libndctl/default.nix index 91a2c378c03c..6e82191e7558 100644 --- a/pkgs/development/libraries/libndctl/default.nix +++ b/pkgs/development/libraries/libndctl/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook -, asciidoctor, pkg-config, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt +, asciidoc, pkg-config, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt , json_c, kmod, which, util-linux, udev, keyutils }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" "man" "dev" ]; nativeBuildInputs = - [ autoreconfHook asciidoctor pkg-config xmlto docbook_xml_dtd_45 docbook_xsl libxslt + [ autoreconfHook asciidoc pkg-config xmlto docbook_xml_dtd_45 docbook_xsl libxslt which ]; @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--without-bash" "--without-systemd" + "--disable-asciidoctor" # depends on ruby 2.7, use asciidoc instead ]; patchPhase = '' From 4aee58ec96d102e3a1788031d41912051a9277a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20S=C3=A1nchez=20Mu=C3=B1oz?= Date: Mon, 17 May 2021 12:22:48 +0200 Subject: [PATCH 26/83] pythonPackages.buildPythonPackage: enable verbose output with `pyproject` This makes the build log more useful --- pkgs/development/interpreters/python/hooks/pip-build-hook.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/python/hooks/pip-build-hook.sh b/pkgs/development/interpreters/python/hooks/pip-build-hook.sh index 6dd384b4847f..745f02e8c9bc 100644 --- a/pkgs/development/interpreters/python/hooks/pip-build-hook.sh +++ b/pkgs/development/interpreters/python/hooks/pip-build-hook.sh @@ -7,7 +7,7 @@ pipBuildPhase() { mkdir -p dist echo "Creating a wheel..." - @pythonInterpreter@ -m pip wheel --no-index --no-deps --no-clean --no-build-isolation --wheel-dir dist . + @pythonInterpreter@ -m pip wheel --verbose --no-index --no-deps --no-clean --no-build-isolation --wheel-dir dist . echo "Finished creating a wheel..." runHook postBuild From 8dfa5a432ad1737d5ab0a7ad68a6b2e654bcef66 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Wed, 19 May 2021 22:55:59 +0200 Subject: [PATCH 27/83] libwacom: 1.9 -> 1.10 --- pkgs/development/libraries/libwacom/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/development/libraries/libwacom/default.nix index c17b8be592aa..5bb6445ac38f 100644 --- a/pkgs/development/libraries/libwacom/default.nix +++ b/pkgs/development/libraries/libwacom/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, glib, pkg-config, udev, libgudev, doxygen }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, glib, pkg-config, udev, libgudev, doxygen, python3 }: stdenv.mkDerivation rec { pname = "libwacom"; - version = "1.9"; + version = "1.10"; outputs = [ "out" "dev" ]; @@ -10,10 +10,10 @@ stdenv.mkDerivation rec { owner = "linuxwacom"; repo = "libwacom"; rev = "libwacom-${version}"; - sha256 = "sha256-o1xCSrWKPzz1GePEVB1jgx2cGzRtw0I6c4wful08Vx4="; + sha256 = "sha256-Q7b54AMAxdIzN7TUuhIdlrXaVtj2szV4n3y9bAE0LsU="; }; - nativeBuildInputs = [ pkg-config meson ninja doxygen ]; + nativeBuildInputs = [ pkg-config meson ninja doxygen python3 ]; mesonFlags = [ "-Dtests=disabled" ]; From ba7ede846b691775a6e4fd7e87fad0cc3a42b30d Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 23 Apr 2021 12:17:55 +0200 Subject: [PATCH 28/83] mesa: Cleanup enableRadv (not used anymore) --- pkgs/development/libraries/mesa/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 2b94f9c3bb50..64217d2deefc 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -5,7 +5,6 @@ , llvmPackages, libffi, libomxil-bellagio, libva-minimal , libelf, libvdpau , libglvnd -, enableRadv ? true , galliumDrivers ? ["auto"] , driDrivers ? ["auto"] , vulkanDrivers ? ["auto"] From 7106fca0fe441c9b3851aa12d125c69af8a9ffd9 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 23 Apr 2021 12:07:02 +0200 Subject: [PATCH 29/83] mesa: 21.0.1 -> 21.0.3 Note: The update to Mesa 21.0.2 was reverted (25ae1fd29f8) because it caused major issues with Sway (segfault on startup [0]). This is still the case and might affect all packages that directly depend on "mesa" (for libgbm or libglapi) but it only causes issues when the package depends on a "mesa" version that differs from "mesa.drivers" used for "/run/opengl-driver/". I've noticed this while testing Mesa updates with the NixOS option "hardware.opengl.package" (as usual) instead of rebuilding my whole system (which would work). Unfortunately this can/will likely also cause issues when mixing different channels, using Flakes/Overlays, etc. The cause of this should be similar to [1] ("mesa" updates now cause the same issues that "glibc" updates already do, maybe triggered by certain Mesa changes) and some additional discussions is in [2],[3]. Note: Don't backport this to NixOS 21.05, at least not without careful consideration. [0]: https://github.com/NixOS/nixpkgs/pull/118753#issuecomment-818950977 [1]: https://github.com/NixOS/nixpkgs/issues/95808 [2]: https://github.com/NixOS/nixpkgs/pull/120325 [3]: https://github.com/NixOS/nixpkgs/pull/119558 --- pkgs/development/libraries/mesa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 64217d2deefc..6c44441dd92d 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -31,7 +31,7 @@ with lib; let # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule - version = "21.0.1"; + version = "21.0.3"; branch = versions.major version; self = stdenv.mkDerivation { @@ -45,7 +45,7 @@ self = stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" ]; - sha256 = "1fqj2xhhd1ary0pfg31jq6fqcnd6qgyrw1445nmz554k8n2ck7rp"; + sha256 = "0awiyvicvcn3b18x0vx5ik3ly0k3k51ivz2ljj8pnx6ms95nyp2n"; }; prePatch = "patchShebangs ."; From 7b4845412184db1e4c608ce7127a66d5fd9c1a4f Mon Sep 17 00:00:00 2001 From: Arthur Gautier Date: Thu, 20 May 2021 00:00:40 +0000 Subject: [PATCH 30/83] rubygems: ensure temporary directories are cleaned up see #123718 Signed-off-by: Arthur Gautier --- pkgs/development/interpreters/ruby/default.nix | 2 +- pkgs/development/interpreters/ruby/rubygems/default.nix | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 9179866fe9e3..9386eb75abdd 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -12,7 +12,7 @@ let opString = lib.optionalString; patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; }; config = import ./config.nix { inherit fetchFromSavannah; }; - rubygems = import ./rubygems { inherit stdenv lib fetchurl; }; + rubygems = import ./rubygems { inherit stdenv lib fetchurl fetchpatch; }; # Contains the ruby version heuristics rubyVersion = import ./ruby-version.nix { inherit lib; }; diff --git a/pkgs/development/interpreters/ruby/rubygems/default.nix b/pkgs/development/interpreters/ruby/rubygems/default.nix index db508caae310..cf2ca1b766ea 100644 --- a/pkgs/development/interpreters/ruby/rubygems/default.nix +++ b/pkgs/development/interpreters/ruby/rubygems/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl }: +{ stdenv, lib, fetchurl, fetchpatch }: stdenv.mkDerivation rec { name = "rubygems"; @@ -13,6 +13,12 @@ stdenv.mkDerivation rec { ./0001-add-post-extract-hook.patch ./0002-binaries-with-env-shebang.patch ./0003-gem-install-default-to-user.patch + # Ensure tmp directory are not left behind + # https://github.com/rubygems/rubygems/pull/4610 + (fetchpatch { + url = "https://github.com/rubygems/rubygems/commit/2c2ffde6e4a9f7f571d38af687034fb8507a833d.patch"; + sha256 = "sha256-bs2dXALKiJvMgk7lKjMx0NzGqlEqDYBBO35UrzNifms="; + }) ]; installPhase = '' From 1005c18c5021deb0fb4879c0a12af6206083bad5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 17 May 2021 07:25:42 +0000 Subject: [PATCH 31/83] just: 0.9.1 -> 0.9.3 --- pkgs/development/tools/just/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix index 247d055f5786..a93807c939f2 100644 --- a/pkgs/development/tools/just/default.nix +++ b/pkgs/development/tools/just/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "just"; - version = "0.9.1"; + version = "0.9.3"; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5W/5HgXjDmr2JGYGy5FPmCNIuAagmzEHnskDUg+FzjY="; + sha256 = "sha256-rcHS0QchUzgcSVIw01x0p1lU/q2CqC5QAwLSFuBTPtE="; }; - cargoSha256 = "sha256-4lLWtj/MLaSZU7nC4gVn7TyhaLtO1FUSinQejocpiuY="; + cargoSha256 = "sha256-LZL95AFzbWhdWPGjJr7lZORtVOUdz8lno0T8xSkblHU="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; From 15fe3cb44956060b4143b0a122a50f76db5d930b Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Sat, 15 May 2021 22:40:50 +0200 Subject: [PATCH 32/83] openethereum: 3.2.5 -> 3.2.6 Override of LLVM is no longer requires as of rust 1.52 --- pkgs/applications/blockchains/openethereum/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/blockchains/openethereum/default.nix b/pkgs/applications/blockchains/openethereum/default.nix index b4b5d13f1407..be2373941b32 100644 --- a/pkgs/applications/blockchains/openethereum/default.nix +++ b/pkgs/applications/blockchains/openethereum/default.nix @@ -10,18 +10,18 @@ , darwin }: -rustPlatform.buildRustPackage.override { stdenv = stdenv; } rec { +rustPlatform.buildRustPackage rec { pname = "openethereum"; - version = "3.2.5"; + version = "3.2.6"; src = fetchFromGitHub { owner = "openethereum"; repo = "openethereum"; rev = "v${version}"; - sha256 = "1g48fkznvr9fs3j9zy2d9pcwnahmyghxg2b9bsn2mxpyczmfqrki"; + sha256 = "0lxps3cyg8dzb9qr1kg91s9jc3mnm6hxybwcbhva38pcq4yc40xc"; }; - cargoSha256 = "02nlm5ariv4dr6b3rckzs7hw1xrl83yvhimrzb0g5l0j0sxh1nhc"; + cargoSha256 = "08yrpls3szmw6vy2c4d6b1k907ga0809ylvyx0zb6f8mp8z7ahl2"; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 45863ae5dffa..669b33271362 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27860,7 +27860,7 @@ in zcash = callPackage ../applications/blockchains/zcash { stdenv = llvmPackages_11.stdenv; }; - openethereum = callPackage ../applications/blockchains/openethereum { stdenv = llvmPackages_12.stdenv; }; + openethereum = callPackage ../applications/blockchains/openethereum { }; parity-ui = callPackage ../applications/blockchains/parity-ui { }; From d06f6a0ac6713b911577d4bbaaba6d527858299d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 20 May 2021 04:20:00 +0000 Subject: [PATCH 33/83] libsass: 3.6.4 -> 3.6.5 https://github.com/sass/libsass/releases/tag/3.6.5 --- pkgs/development/libraries/libsass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libsass/default.nix b/pkgs/development/libraries/libsass/default.nix index f4caa22b3229..9b61ce65d453 100644 --- a/pkgs/development/libraries/libsass/default.nix +++ b/pkgs/development/libraries/libsass/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libsass"; - version = "3.6.4"; + version = "3.6.5"; src = fetchFromGitHub { owner = "sass"; repo = pname; rev = version; - sha256 = "074kvacdan85h4qrvsk97575ys9xgkc044gplz3m6vn4a8pcl2rn"; + sha256 = "1cxj6r85d5f3qxdwzxrmkx8z875hig4cr8zsi30w6vj23cyds3l2"; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' From 88c2c543bf01063adf57ca2f4ff200cf8fbbd18b Mon Sep 17 00:00:00 2001 From: Atemu Date: Wed, 19 May 2021 16:18:21 +0200 Subject: [PATCH 34/83] Revert "git: Use asciidoctor instead of asciidoc for manpages" This reverts commit bbf96d898b96ea2d1ff19a09e545499e4f32d8d0. Removes dependency on ruby 2.7 and isn't much slower. See https://github.com/NixOS/nixpkgs/pull/123502 for more info --- .../version-management/git-and-tools/git/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index aff39a6a44f4..2bb63e2405eb 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -2,7 +2,7 @@ , curl, openssl, zlib, expat, perlPackages, python3, gettext, cpio , gnugrep, gnused, gawk, coreutils # needed at runtime by git-filter-branch etc , openssh, pcre2 -, asciidoctor, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xsl_ns, docbook_xml_dtd_45 +, asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45 , libxslt, tcl, tk, makeWrapper, libiconv , svnSupport, subversionClient, perlLibs, smtpPerlLibs , perlSupport ? true @@ -68,8 +68,8 @@ stdenv.mkDerivation { ''; nativeBuildInputs = [ gettext perlPackages.perl makeWrapper ] - ++ lib.optionals withManual [ asciidoctor texinfo xmlto docbook2x - docbook_xsl docbook_xsl_ns docbook_xml_dtd_45 libxslt ]; + ++ lib.optionals withManual [ asciidoc texinfo xmlto docbook2x + docbook_xsl docbook_xml_dtd_45 libxslt ]; buildInputs = [curl openssl zlib expat cpio libiconv] ++ lib.optionals perlSupport [ perlPackages.perl ] ++ lib.optionals guiSupport [tcl tk] @@ -148,7 +148,7 @@ stdenv.mkDerivation { } # Install git-subtree. - make -C contrib/subtree install ${lib.optionalString withManual "USE_ASCIIDOCTOR=1 install-doc"} + make -C contrib/subtree install ${lib.optionalString withManual "install-doc"} rm -rf contrib/subtree # Install contrib stuff. @@ -233,7 +233,7 @@ stdenv.mkDerivation { '') + lib.optionalString withManual ''# Install man pages - make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES USE_ASCIIDOCTOR=1 PERL_PATH="${buildPackages.perl}/bin/perl" cmd-list.made install install-html \ + make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES PERL_PATH="${buildPackages.perl}/bin/perl" cmd-list.made install install-html \ -C Documentation '' + (if guiSupport then '' From c6ca1ba9c7975dfab7dec0e7ee5c6f31c458333f Mon Sep 17 00:00:00 2001 From: Andrew Brooks Date: Fri, 30 Apr 2021 17:25:06 -0500 Subject: [PATCH 35/83] tcl: Add tclPackageHook and mkTclDerivation Implement tclPackageHook, a setup hook that adjusts TCLLIBPATH to include the paths of any installed Tcl packages, propagates that TCLLIBPATH to anti-dependencies, and wraps any installed binaries to set their TCLLIBPATH. Additionally, implement a makePythonPackage-style mkDerivation wrapper to use reasonable defaults for Tcl packages and use tclPackageHook. --- pkgs/development/interpreters/tcl/generic.nix | 94 +++++++++++-------- .../interpreters/tcl/mk-tcl-derivation.nix | 69 ++++++++++++++ .../interpreters/tcl/tcl-package-hook.sh | 74 +++++++++++++++ 3 files changed, 197 insertions(+), 40 deletions(-) create mode 100644 pkgs/development/interpreters/tcl/mk-tcl-derivation.nix create mode 100644 pkgs/development/interpreters/tcl/tcl-package-hook.sh diff --git a/pkgs/development/interpreters/tcl/generic.nix b/pkgs/development/interpreters/tcl/generic.nix index e665e8cfb1ea..4c144699fc8f 100644 --- a/pkgs/development/interpreters/tcl/generic.nix +++ b/pkgs/development/interpreters/tcl/generic.nix @@ -1,55 +1,69 @@ -{ lib, stdenv +{ lib, stdenv, callPackage, makeSetupHook, makeWrapper # Version specific stuff , release, version, src , ... }: -stdenv.mkDerivation { - pname = "tcl"; - inherit version; +let + baseInterp = + stdenv.mkDerivation { + pname = "tcl"; + inherit version; - inherit src; + inherit src; - outputs = [ "out" "man" ]; + outputs = [ "out" "man" ]; - setOutputFlags = false; + setOutputFlags = false; - preConfigure = '' - cd unix - ''; + preConfigure = '' + cd unix + ''; - configureFlags = [ - "--enable-threads" - # Note: using $out instead of $man to prevent a runtime dependency on $man. - "--mandir=${placeholder "out"}/share/man" - "--enable-man-symlinks" - # Don't install tzdata because NixOS already has a more up-to-date copy. - "--with-tzdata=no" - "tcl_cv_strtod_unbroken=ok" - ] ++ lib.optional stdenv.is64bit "--enable-64bit"; + configureFlags = [ + "--enable-threads" + # Note: using $out instead of $man to prevent a runtime dependency on $man. + "--mandir=${placeholder "out"}/share/man" + "--enable-man-symlinks" + # Don't install tzdata because NixOS already has a more up-to-date copy. + "--with-tzdata=no" + "tcl_cv_strtod_unbroken=ok" + ] ++ lib.optional stdenv.is64bit "--enable-64bit"; - enableParallelBuilding = true; + enableParallelBuilding = true; - postInstall = let - dllExtension = stdenv.hostPlatform.extensions.sharedLibrary; - in '' - make install-private-headers - ln -s $out/bin/tclsh${release} $out/bin/tclsh - ln -s $out/lib/libtcl${release}${dllExtension} $out/lib/libtcl${dllExtension} - ''; + postInstall = let + dllExtension = stdenv.hostPlatform.extensions.sharedLibrary; + in '' + make install-private-headers + ln -s $out/bin/tclsh${release} $out/bin/tclsh + ln -s $out/lib/libtcl${release}${dllExtension} $out/lib/libtcl${dllExtension} + ''; - meta = with lib; { - description = "The Tcl scripting language"; - homepage = "https://www.tcl.tk/"; - license = licenses.tcltk; - platforms = platforms.all; - maintainers = with maintainers; [ vrthra ]; - }; + meta = with lib; { + description = "The Tcl scripting language"; + homepage = "https://www.tcl.tk/"; + license = licenses.tcltk; + platforms = platforms.all; + maintainers = with maintainers; [ vrthra ]; + }; - passthru = rec { - inherit release version; - libPrefix = "tcl${release}"; - libdir = "lib/${libPrefix}"; - }; -} + passthru = rec { + inherit release version; + libPrefix = "tcl${release}"; + libdir = "lib/${libPrefix}"; + tclPackageHook = callPackage ({}: makeSetupHook { + name = "tcl-package-hook"; + deps = [ makeWrapper ]; + } ./tcl-package-hook.sh) {}; + }; + }; + + mkTclDerivation = callPackage ./mk-tcl-derivation.nix { tcl = baseInterp; }; + +in baseInterp.overrideAttrs (self: { + passthru = self.passthru // { + inherit mkTclDerivation; + }; +}) diff --git a/pkgs/development/interpreters/tcl/mk-tcl-derivation.nix b/pkgs/development/interpreters/tcl/mk-tcl-derivation.nix new file mode 100644 index 000000000000..4f3ffe6f995f --- /dev/null +++ b/pkgs/development/interpreters/tcl/mk-tcl-derivation.nix @@ -0,0 +1,69 @@ +# Generic builder for tcl packages/applications, generally based on mk-python-derivation.nix +{ tcl +, lib +, makeWrapper +, runCommand +, writeScript +}: + +{ buildInputs ? [] +, nativeBuildInputs ? [] +, propagatedBuildInputs ? [] +, checkInputs ? [] + +# true if we should skip the configuration phase altogether +, dontConfigure ? false + +# Extra flags passed to configure step +, configureFlags ? [] + +# Whether or not we should add common Tcl-related configure flags +, addTclConfigureFlags ? true + +, meta ? {} +, passthru ? {} +, doCheck ? true +, ... } @ attrs: + +let + inherit (tcl) stdenv; + inherit (lib) getBin optionalAttrs optionals; + + defaultTclPkgConfigureFlags = [ + "--with-tcl=${tcl}/lib" + "--with-tclinclude=${tcl}/include" + "--exec-prefix=\${out}" + ]; + + self = (stdenv.mkDerivation ((builtins.removeAttrs attrs [ + "addTclConfigureFlags" "checkPhase" "checkInputs" "doCheck" + ]) // { + + buildInputs = buildInputs ++ [ makeWrapper tcl.tclPackageHook ]; + nativeBuildInputs = nativeBuildInputs ++ [ tcl ]; + propagatedBuildInputs = propagatedBuildInputs ++ [ tcl ]; + + TCLSH = "${getBin tcl}/bin/tclsh"; + + # Run tests after install, at which point we've done all TCLLIBPATH setup + doCheck = false; + doInstallCheck = attrs.doCheck or ((attrs ? doInstallCheck) && attrs.doInstallCheck); + installCheckInputs = checkInputs ++ (optionals (attrs ? installCheckInputs) attrs.installCheckInputs); + + # Add typical values expected by TEA for configureFlags + configureFlags = + if (!dontConfigure && addTclConfigureFlags) + then (configureFlags ++ defaultTclPkgConfigureFlags) + else configureFlags; + + meta = { + platforms = tcl.meta.platforms; + } // meta; + + + } // optionalAttrs (attrs?checkPhase) { + installCheckPhase = attrs.checkPhase; + } + )); + +in lib.extendDerivation true passthru self diff --git a/pkgs/development/interpreters/tcl/tcl-package-hook.sh b/pkgs/development/interpreters/tcl/tcl-package-hook.sh new file mode 100644 index 000000000000..5f105e2fc7ea --- /dev/null +++ b/pkgs/development/interpreters/tcl/tcl-package-hook.sh @@ -0,0 +1,74 @@ +# This hook ensures that we do the following in post-fixup: +# * wrap any installed executables with a wrapper that configures TCLLIBPATH +# * write a setup hook that extends the TCLLIBPATH of any anti-dependencies + +# Add a directory to TCLLIBPATH, provided that it exists +_addToTclLibPath() { + local -r tclPkg="$1" + if [ -z "$tclPkg" ]; then + return + fi + + if [ ! -d "$tclPkg" ]; then + >&2 echo "can't add $tclPkg to TCLLIBPATH; that directory doesn't exist" + exit 1 + fi + + if [[ "$tclPkg" == *" "* ]]; then + tclPkg="{$tclPkg}" + fi + + if [ -z "${TCLLIBPATH-}" ]; then + export TCLLIBPATH="$tclPkg" + else + if [[ "$TCLLIBPATH" != *"$tclPkg"* ]]; then + export TCLLIBPATH="${TCLLIBPATH} $tclPkg" + fi + fi +} + +# Locate any directory containing an installed pkgIndex file +findInstalledTclPkgs() { + local -r newLibDir="${!outputLib}/lib" + if [ ! -d "$newLibDir" ]; then + >&2 echo "Assuming no loadable tcl packages installed ($newLibDir does not exist)" + return + fi + echo "$(find "$newLibDir" -name pkgIndex.tcl -exec dirname {} \;)" +} + +# Wrap any freshly-installed binaries and set up their TCLLIBPATH +wrapTclBins() { + if [ -z "${TCLLIBPATH-}" ]; then + echo "skipping automatic Tcl binary wrapping (nothing to do)" + return + fi + + local -r tclBinsDir="${!outputBin}/bin" + if [ ! -d "$tclBinsDir" ]; then + echo "No outputBin found, not using any TCLLIBPATH wrapper" + return + fi + + find "$tclBinsDir" -type f -executable -print | + while read -r someBin; do + echo "Adding TCLLIBPATH wrapper for $someBin" + wrapProgram "$someBin" --set TCLLIBPATH "$TCLLIBPATH" + done +} + +# Generate hook to adjust TCLLIBPATH in anti-dependencies +writeTclLibPathHook() { + local -r hookPath="${!outputLib}/nix-support/setup-hook" + mkdir -p "$(dirname "$hookPath")" + + typeset -f _addToTclLibPath >> "$hookPath" + local -r tclPkgs=$(findInstalledTclPkgs) + while IFS= read -r tclPkg; do + echo "_addToTclLibPath \"$tclPkg\"" >> "$hookPath" + _addToTclLibPath "$tclPkg" true + done <<< "$tclPkgs" +} + +postFixupHooks+=(writeTclLibPathHook) +postFixupHooks+=(wrapTclBins) From 9571f53665d43f5f625affa43b484e20758e6df3 Mon Sep 17 00:00:00 2001 From: Andrew Brooks Date: Fri, 30 Apr 2021 17:37:34 -0500 Subject: [PATCH 36/83] tclreadline: simplify package with tcl.mkTclDerivation --- pkgs/development/interpreters/tclreadline/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/tclreadline/default.nix b/pkgs/development/interpreters/tclreadline/default.nix index 44d2745dac8b..de671bab5739 100644 --- a/pkgs/development/interpreters/tclreadline/default.nix +++ b/pkgs/development/interpreters/tclreadline/default.nix @@ -8,7 +8,7 @@ , tk }: -stdenv.mkDerivation rec { +tcl.mkTclDerivation rec { pname = "tclreadline"; version = "2.3.8"; @@ -26,7 +26,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ readline - tcl tk ]; @@ -35,7 +34,6 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-tclshrl" "--enable-wishrl" - "--with-tcl=${tcl}/lib" "--with-tk=${tk}/lib" "--with-readline-includes=${readline.dev}/include/readline" "--with-libtool=${libtool}" From c247eb0bce961bbd4495bed0fa6c4013465fb516 Mon Sep 17 00:00:00 2001 From: Andrew Brooks Date: Fri, 30 Apr 2021 17:40:22 -0500 Subject: [PATCH 37/83] incrtcl: Simplify package with tcl.mkTclDerivation --- pkgs/development/libraries/incrtcl/default.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/development/libraries/incrtcl/default.nix b/pkgs/development/libraries/incrtcl/default.nix index 67ae5623db12..dae01961a10c 100644 --- a/pkgs/development/libraries/incrtcl/default.nix +++ b/pkgs/development/libraries/incrtcl/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, writeText, tcl }: -stdenv.mkDerivation rec { +tcl.mkTclDerivation rec { pname = "incrtcl"; version = "4.2.0"; @@ -9,18 +9,12 @@ stdenv.mkDerivation rec { sha256 = "0w28v0zaraxcq1s9pa6cihqqwqvvwfgz275lks7w4gl7hxjxmasw"; }; - buildInputs = [ tcl ]; - configureFlags = [ "--with-tcl=${tcl}/lib" ]; enableParallelBuilding = true; patchPhase = '' substituteInPlace configure --replace "\''${TCL_SRC_DIR}/generic" "${tcl}/include" ''; - preConfigure = '' - configureFlags="--exec_prefix=$prefix $configureFlags" - ''; - postInstall = '' rmdir $out/bin mv $out/lib/itcl${version}/* $out/lib From ad0d23d5e16bd29681763a717f673109f1051650 Mon Sep 17 00:00:00 2001 From: Andrew Brooks Date: Fri, 30 Apr 2021 17:41:56 -0500 Subject: [PATCH 38/83] itktcl: Simplify package with tcl.mkTclDerivation --- pkgs/development/libraries/itktcl/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/itktcl/default.nix b/pkgs/development/libraries/itktcl/default.nix index 570190a43c1e..66039c61b4d5 100644 --- a/pkgs/development/libraries/itktcl/default.nix +++ b/pkgs/development/libraries/itktcl/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, tcl, tk, incrtcl }: -stdenv.mkDerivation rec { +tcl.mkTclDerivation rec { pname = "itk-tcl"; version = "4.1.0"; @@ -9,11 +9,10 @@ stdenv.mkDerivation rec { sha256 = "1iy964jfgsfnc1agk1w6bbm44x18ily8d4wmr7cc9z9f4acn2r6s"; }; - buildInputs = [ tcl tk incrtcl ]; + buildInputs = [ tk incrtcl ]; enableParallelBuilding = true; configureFlags = [ - "--with-tcl=${tcl}/lib" "--with-tk=${tk}/lib" "--with-itcl=${incrtcl}/lib" "--with-tkinclude=${tk.dev}/include" From e3ce7a6a5c3905ef59deac384c7a0d563b09b992 Mon Sep 17 00:00:00 2001 From: Andrew Brooks Date: Fri, 30 Apr 2021 17:43:30 -0500 Subject: [PATCH 39/83] tcllib: Simplify package with tcl.mkTclDerivation --- pkgs/development/libraries/tcllib/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/tcllib/default.nix b/pkgs/development/libraries/tcllib/default.nix index 4cab15ca5c22..90c4528a6454 100644 --- a/pkgs/development/libraries/tcllib/default.nix +++ b/pkgs/development/libraries/tcllib/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchurl, tcl }: +{ lib, fetchurl, tcl }: -stdenv.mkDerivation rec { +tcl.mkTclDerivation rec { pname = "tcllib"; version = "1.20"; @@ -9,12 +9,6 @@ stdenv.mkDerivation rec { sha256 = "0wax281h6ksz974a5qpfgf9y34lmlpd8i87lkm1w94ybbd3rgc73"; }; - passthru = { - libPrefix = "tcllib${version}"; - }; - - buildInputs = [ tcl ]; - meta = { homepage = "https://sourceforge.net/projects/tcllib/"; description = "Tcl-only library of standard routines for Tcl"; From 3dc650b7800a0aa2290535b1ea97eaccf143f858 Mon Sep 17 00:00:00 2001 From: Andrew Brooks Date: Fri, 30 Apr 2021 17:49:16 -0500 Subject: [PATCH 40/83] tclx: Leverage tcl.mkTclDerivation --- pkgs/development/libraries/tclx/default.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/tclx/default.nix b/pkgs/development/libraries/tclx/default.nix index 85eae730575f..9582aabf654a 100644 --- a/pkgs/development/libraries/tclx/default.nix +++ b/pkgs/development/libraries/tclx/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchurl, tcl }: +{ lib, fetchurl, tcl }: -stdenv.mkDerivation rec { +tcl.mkTclDerivation rec { name = "tclx-${version}.${patch}"; version = "8.4"; patch = "1"; @@ -10,13 +10,11 @@ stdenv.mkDerivation rec { sha256 = "1v2qwzzidz0is58fd1p7wfdbscxm3ip2wlbqkj5jdhf6drh1zd59"; }; - passthru = { - libPrefix = ""; # Using tclx${version} did not work - }; - - buildInputs = [ tcl ]; - - configureFlags = [ "--with-tcl=${tcl}/lib" "--exec-prefix=\${prefix}" ]; + # required in order for tclx to properly detect tclx.tcl at runtime + postInstall = + let tclXPkg = "tclx${version}"; + tclXLib = "$prefix/lib/${tclXPkg}"; + in "ln -s ${tclXLib} ${tclXLib}/${tclXPkg}"; meta = { homepage = "http://tclx.sourceforge.net/"; From 17a71176b06238bcecaf4a625570764ea6c71f30 Mon Sep 17 00:00:00 2001 From: Andrew Brooks Date: Fri, 30 Apr 2021 17:50:15 -0500 Subject: [PATCH 41/83] tix: Simplify package with tcl.mkTclDerivation --- pkgs/development/libraries/tix/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/tix/default.nix b/pkgs/development/libraries/tix/default.nix index e0f91330efca..86f56cc9dc3c 100644 --- a/pkgs/development/libraries/tix/default.nix +++ b/pkgs/development/libraries/tix/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, tcl, tk, fetchpatch } : -stdenv.mkDerivation { +tcl.mkTclDerivation { version = "8.4.3"; pname = "tix"; src = fetchurl { @@ -20,7 +20,7 @@ stdenv.mkDerivation { sha256 = "1jaz0l22xj7x1k4rb9ia6i1psnbwk4pblgq4gfvya7gg7fbb7r36"; }) ; - buildInputs = [ tcl tk ]; + buildInputs = [ tk ]; # the configure script expects to find the location of the sources of # tcl and tk in {tcl,tk}Config.sh # In fact, it only needs some private headers. We copy them in @@ -35,7 +35,6 @@ stdenv.mkDerivation { done; ''; configureFlags = [ - "--with-tclinclude=${tcl}/include" "--with-tclconfig=." "--with-tkinclude=${tk.dev}/include" "--with-tkconfig=." @@ -52,4 +51,3 @@ stdenv.mkDerivation { ]; }; } - From 5f3066af19a46a64e59bf2b0a62c1b60d49456e0 Mon Sep 17 00:00:00 2001 From: Andrew Brooks Date: Fri, 30 Apr 2021 17:50:54 -0500 Subject: [PATCH 42/83] tcltls: Simplify package with tcl.mkTclDerivation --- pkgs/development/libraries/tcltls/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/tcltls/default.nix b/pkgs/development/libraries/tcltls/default.nix index e88358bbce0a..3fac78724ea2 100644 --- a/pkgs/development/libraries/tcltls/default.nix +++ b/pkgs/development/libraries/tcltls/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, tcl, openssl }: -stdenv.mkDerivation rec { +tcl.mkTclDerivation rec { pname = "tcltls"; version = "1.6.7"; @@ -9,22 +9,12 @@ stdenv.mkDerivation rec { sha256 = "1f53sfcnrridjl5ayrq1xrqkahs8khf8c3d0m2brndbhahzdw6ai"; }; - buildInputs = [ tcl openssl ]; + buildInputs = [ openssl ]; configureFlags = [ - "--with-tcl=${tcl}/lib" - "--with-tclinclude=${tcl}/include" "--with-ssl-dir=${openssl.dev}" ]; - preConfigure = '' - configureFlags="--exec_prefix=$prefix $configureFlags" - ''; - - passthru = { - libPrefix = "tls${version}"; - }; - meta = { homepage = "http://tls.sourceforge.net/"; description = "An OpenSSL / RSA-bsafe Tcl extension"; From 98b8fc35791d1883cc8e43c755507a712f8c40c4 Mon Sep 17 00:00:00 2001 From: Andrew Brooks Date: Fri, 30 Apr 2021 17:51:25 -0500 Subject: [PATCH 43/83] tk: Simplify package with tcl.mkTclDerivation --- pkgs/development/libraries/tk/generic.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/tk/generic.nix b/pkgs/development/libraries/tk/generic.nix index ecb3840b2de3..b829d846be56 100644 --- a/pkgs/development/libraries/tk/generic.nix +++ b/pkgs/development/libraries/tk/generic.nix @@ -2,7 +2,7 @@ , enableAqua ? stdenv.isDarwin, darwin , ... }: -stdenv.mkDerivation { +tcl.mkTclDerivation { name = "tk-${tcl.version}"; inherit src patches; @@ -33,14 +33,13 @@ stdenv.mkDerivation { configureFlags = [ "--enable-threads" - "--with-tcl=${tcl}/lib" ] ++ lib.optional stdenv.is64bit "--enable-64bit" ++ lib.optional enableAqua "--enable-aqua"; nativeBuildInputs = [ pkg-config ]; buildInputs = lib.optional enableAqua (with darwin.apple_sdk.frameworks; [ Cocoa ]); - propagatedBuildInputs = [ tcl libXft ]; + propagatedBuildInputs = [ libXft ]; doCheck = false; # fails. can't find itself From 311ea59a3e9314fd0df316409766d7c3cd0ccc6b Mon Sep 17 00:00:00 2001 From: Andrew Brooks Date: Fri, 30 Apr 2021 17:59:45 -0500 Subject: [PATCH 44/83] expect: Simplify package with tcl.mkTclDerivation --- pkgs/tools/misc/expect/default.nix | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/misc/expect/default.nix b/pkgs/tools/misc/expect/default.nix index 1315ac8540cb..03e8e260ac6b 100644 --- a/pkgs/tools/misc/expect/default.nix +++ b/pkgs/tools/misc/expect/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, buildPackages, fetchurl, tcl, makeWrapper, autoreconfHook, fetchpatch }: -stdenv.mkDerivation rec { +tcl.mkTclDerivation rec { pname = "expect"; version = "5.45.4"; @@ -20,24 +20,14 @@ stdenv.mkDerivation rec { sed -i "s,/bin/stty,$(type -p stty),g" configure.in ''; - nativeBuildInputs = [ autoreconfHook makeWrapper tcl ]; - buildInputs = [ tcl ]; + nativeBuildInputs = [ autoreconfHook makeWrapper ]; strictDeps = true; hardeningDisable = [ "format" ]; - configureFlags = [ - "--with-tcl=${buildPackages.tcl}/lib" - "--with-tclinclude=${tcl}/include" - "--exec-prefix=${placeholder "out"}" - ]; - - postInstall = '' + postInstall = lib.optionalString stdenv.isDarwin '' for i in $out/bin/*; do - wrapProgram $i \ - --prefix PATH : "${tcl}/bin" \ - --prefix TCLLIBPATH ' ' $out/lib/* \ - ${lib.optionalString stdenv.isDarwin "--prefix DYLD_LIBRARY_PATH : $out/lib/expect${version}"} + wrapProgram $i --prefix DYLD_LIBRARY_PATH : $out/lib/expect${version} done ''; From 87c5626e416261d45a96ec016978294d7b16ec7c Mon Sep 17 00:00:00 2001 From: Andrew Brooks Date: Fri, 30 Apr 2021 18:03:24 -0500 Subject: [PATCH 45/83] poke: Simplify package with tcl.tclPackageHook --- pkgs/applications/editors/poke/default.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/applications/editors/poke/default.nix b/pkgs/applications/editors/poke/default.nix index a8435eb1e6ba..7f8a2fdaa7ac 100644 --- a/pkgs/applications/editors/poke/default.nix +++ b/pkgs/applications/editors/poke/default.nix @@ -40,7 +40,7 @@ in stdenv.mkDerivation rec { ] ++ lib.optional guiSupport makeWrapper; buildInputs = [ boehmgc readline ] - ++ lib.optional guiSupport tk + ++ lib.optionals guiSupport [tk tcl.tclPackageHook tcllib] ++ lib.optional miSupport json_c ++ lib.optional nbdSupport libnbd ++ lib.optional textStylingSupport gettext @@ -57,11 +57,6 @@ in stdenv.mkDerivation rec { doCheck = !isCross; checkInputs = lib.optionals (!isCross) [ dejagnu ]; - postFixup = lib.optionalString guiSupport '' - wrapProgram "$out/bin/poke-gui" \ - --prefix TCLLIBPATH ' ' ${tcllib}/lib/tcllib${tcllib.version} - ''; - meta = with lib; { description = "Interactive, extensible editor for binary data"; homepage = "http://www.jemarch.net/poke"; From 499adf6b0c5cd0808ade19c739d9e2bed1d5b553 Mon Sep 17 00:00:00 2001 From: Andrew Brooks Date: Fri, 30 Apr 2021 18:05:22 -0500 Subject: [PATCH 46/83] remind: Simplify package with tcl.mkTclDerivation --- pkgs/tools/misc/remind/default.nix | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/misc/remind/default.nix b/pkgs/tools/misc/remind/default.nix index 293cc136c8c8..d10811ffa049 100644 --- a/pkgs/tools/misc/remind/default.nix +++ b/pkgs/tools/misc/remind/default.nix @@ -3,20 +3,18 @@ , fetchurl , tk , tcllib -, makeWrapper +, tcl , tkremind ? true }: let - inherit (lib) optional optionalString; - tclLibraries = lib.optionals tkremind [ tcllib tk ]; - tclLibPaths = lib.concatStringsSep " " - (map (p: "${p}/lib/${p.libPrefix}") tclLibraries); + inherit (lib) optional optionals optionalString; + tclLibraries = optionals tkremind [ tcllib tk ]; tkremindPatch = optionalString tkremind '' substituteInPlace scripts/tkremind --replace "exec wish" "exec ${tk}/bin/wish" ''; in -stdenv.mkDerivation rec { +tcl.mkTclDerivation rec { pname = "remind"; version = "03.03.06"; @@ -25,7 +23,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-lpoMAXDJxwODY0/aoo25GRBYWFhE4uf11pR5/ITZX1s="; }; - nativeBuildInputs = optional tkremind makeWrapper; propagatedBuildInputs = tclLibraries; postPatch = '' @@ -37,10 +34,6 @@ stdenv.mkDerivation rec { ${tkremindPatch} ''; - postInstall = optionalString tkremind '' - wrapProgram $out/bin/tkremind --set TCLLIBPATH "${tclLibPaths}" - ''; - meta = with lib; { homepage = "https://dianne.skoll.ca/projects/remind/"; description = "Sophisticated calendar and alarm program for the console"; From 12315866d1e3a4161da705e8e00eb9ea06f62360 Mon Sep 17 00:00:00 2001 From: Andrew Brooks Date: Fri, 30 Apr 2021 18:09:25 -0500 Subject: [PATCH 47/83] fossil: Remove unneeded TCLLIBPATH export The use of tcl.mkTclDerivation in tcllib ensures that it will already be present on TCLLIBPATH when tests are run. --- pkgs/applications/version-management/fossil/default.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index af2ed175ac87..5b15f19c673d 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-uNDJIBlt2K4pFS+nRI5ROh+nxYiHG3heP7/Ae0KgX7k="; }; - nativeBuildInputs = [ installShellFiles tcl ]; + nativeBuildInputs = [ installShellFiles tcl tcllib ]; buildInputs = [ zlib openssl readline sqlite which ed ] ++ lib.optional stdenv.isDarwin libiconv; @@ -36,10 +36,6 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-internal-sqlite" ] ++ lib.optional withJson "--json"; - preCheck = '' - export TCLLIBPATH="${tcllib}/lib/tcllib${tcllib.version}" - ''; - preBuild = '' export USER=nonexistent-but-specified-user ''; From bf222c3835a917ccc9d474a80f272e3a0be314c4 Mon Sep 17 00:00:00 2001 From: Andrew Brooks Date: Fri, 30 Apr 2021 18:13:16 -0500 Subject: [PATCH 48/83] bwidget: Simplify bwidget package with tcl.mkTclDerivation --- .../development/libraries/bwidget/default.nix | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/bwidget/default.nix b/pkgs/development/libraries/bwidget/default.nix index f3f09497a660..f289077c88bb 100644 --- a/pkgs/development/libraries/bwidget/default.nix +++ b/pkgs/development/libraries/bwidget/default.nix @@ -1,8 +1,11 @@ -{ lib, stdenv, fetchurl, tcl }: +{ lib, fetchurl, tcl }: -stdenv.mkDerivation rec { - pname = "bwidget"; +let version = "1.9.14"; + libPrefix = "bwidget${version}"; +in tcl.mkTclDerivation { + pname = "bwidget"; + inherit version; src = fetchurl { url = "mirror://sourceforge/tcllib/bwidget-${version}.tar.gz"; @@ -12,16 +15,10 @@ stdenv.mkDerivation rec { dontBuild = true; installPhase = '' - mkdir -p "$out/lib/${passthru.libPrefix}" - cp -R *.tcl lang images "$out/lib/${passthru.libPrefix}" + mkdir -p "$out/lib/${libPrefix}" + cp -R *.tcl lang images "$out/lib/${libPrefix}" ''; - passthru = { - libPrefix = "bwidget${version}"; - }; - - buildInputs = [ tcl ]; - meta = { homepage = "https://sourceforge.net/projects/tcllib"; description = "High-level widget set for Tcl/Tk"; From f17ca3f517a66ab13d7da5ca4c549df158c71634 Mon Sep 17 00:00:00 2001 From: Andrew Brooks Date: Fri, 30 Apr 2021 18:23:34 -0500 Subject: [PATCH 49/83] tcl2048: Simplify package with tcl.mkTclDerivation --- pkgs/games/tcl2048/default.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/games/tcl2048/default.nix b/pkgs/games/tcl2048/default.nix index 734e7be3666b..dbc429746846 100644 --- a/pkgs/games/tcl2048/default.nix +++ b/pkgs/games/tcl2048/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, tcl, tcllib, runtimeShell }: -stdenv.mkDerivation { +tcl.mkTclDerivation { name = "tcl2048-0.4.0"; src = fetchurl { @@ -8,20 +8,12 @@ stdenv.mkDerivation { sha256 = "53f5503efd7f029b2614b0f9b1e3aac6c0342735a3c9b811d74a5135fee3e89e"; }; - phases = "installPhase"; + buildInputs = [ tcllib ]; + phases = "installPhase fixupPhase"; installPhase = '' mkdir -pv $out/bin - cp $src $out/2048.tcl - cat > $out/bin/2048 << EOF - #!${runtimeShell} - - # wrapper for tcl2048 - export TCLLIBPATH="${tcllib}/lib/tcllib${tcllib.version}" - ${tcl}/bin/tclsh $out/2048.tcl - EOF - - chmod +x $out/bin/2048 + install -m 755 $src $out/bin/2048 ''; meta = { From a4f54890d5639a84ef8352bcd51b186473a416a6 Mon Sep 17 00:00:00 2001 From: Andrew Brooks Date: Fri, 30 Apr 2021 18:25:35 -0500 Subject: [PATCH 50/83] xconq: Simplify package with tcl.tclPackageHook --- pkgs/games/xconq/default.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/games/xconq/default.nix b/pkgs/games/xconq/default.nix index 8f4366fbcb87..6d7c9f4e6fbb 100644 --- a/pkgs/games/xconq/default.nix +++ b/pkgs/games/xconq/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ cpio xorgproto libX11 libXmu libXaw libXt tcl tk libXext - fontconfig makeWrapper ]; + fontconfig makeWrapper tcl.tclPackageHook ]; configureFlags = [ "--enable-alternate-scoresdir=scores" @@ -39,12 +39,6 @@ stdenv.mkDerivation rec { sed -re 's@MediumBlue@LightBlue@g' -i tcltk/tkconq.tcl ''; - postInstall = '' - for file in $out/bin/*; do - wrapProgram $file --prefix TCLLIBPATH ' ' "${tk}/lib" - done - ''; - meta = with lib; { description = "A programmable turn-based strategy game"; maintainers = with maintainers; [ raskin ]; From 1f74a70740886a618f26d8cec548e6a7c5086d53 Mon Sep 17 00:00:00 2001 From: Andrew Brooks Date: Fri, 30 Apr 2021 18:47:47 -0500 Subject: [PATCH 51/83] maintainers: add agbrooks --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a5338d5155bc..32f263f75a39 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -302,6 +302,12 @@ githubId = 4296804; name = "Alex Franchuk"; }; + agbrooks = { + email = "andrewgrantbrooks@gmail.com"; + github = "agbrooks"; + githubId = 19290901; + name = "Andrew Brooks"; + }; aherrmann = { email = "andreash87@gmx.ch"; github = "aherrmann"; From 9979565b0c7f7b4ac95848af15c23b14ba6ab4a9 Mon Sep 17 00:00:00 2001 From: Andrew Brooks Date: Fri, 30 Apr 2021 18:48:46 -0500 Subject: [PATCH 52/83] scid: Simplify package with tcl.mkTclDerivation --- pkgs/games/scid/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/scid/default.nix b/pkgs/games/scid/default.nix index 7b1a15c0a551..b85af66065ab 100644 --- a/pkgs/games/scid/default.nix +++ b/pkgs/games/scid/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchurl, tcl, tk, libX11, zlib, makeWrapper }: +{ lib, fetchurl, tcl, tk, libX11, zlib, makeWrapper }: -stdenv.mkDerivation { +tcl.mkTclDerivation { pname = "scid"; version = "4.3"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ tcl tk libX11 zlib ]; + buildInputs = [ tk libX11 zlib ]; prePatch = '' sed -i -e '/^ *set headerPath *{/a ${tcl}/include ${tk}/include' \ @@ -45,13 +45,13 @@ stdenv.mkDerivation { for cmd in $out/bin/* do wrapProgram "$cmd" \ - --set TCLLIBPATH "${tcl}/${tcl.libdir}" \ --set TK_LIBRARY "${tk}/lib/${tk.libPrefix}" done ''; meta = { description = "Chess database with play and training functionality"; + maintainers = with maintainers; [ agbrooks ]; homepage = "http://scid.sourceforge.net/"; license = lib.licenses.gpl2; }; From c677478b0bb5d8d78402db1c38d2946d54d26147 Mon Sep 17 00:00:00 2001 From: Andrew Brooks Date: Fri, 30 Apr 2021 18:50:04 -0500 Subject: [PATCH 53/83] scid-vs-pc: Simplify package with tcl.mkTclDerivation --- pkgs/games/scid-vs-pc/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/games/scid-vs-pc/default.nix b/pkgs/games/scid-vs-pc/default.nix index 33373e0e7b1d..2837f96357a7 100644 --- a/pkgs/games/scid-vs-pc/default.nix +++ b/pkgs/games/scid-vs-pc/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchurl, tcl, tk, libX11, zlib, makeWrapper, makeDesktopItem }: +{ lib, fetchurl, tcl, tk, libX11, zlib, makeWrapper, makeDesktopItem }: -stdenv.mkDerivation rec { +tcl.mkTclDerivation rec { pname = "scid-vs-pc"; version = "4.21"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ tcl tk libX11 zlib ]; + buildInputs = [ tk libX11 zlib ]; prePatch = '' sed -i -e '/^ *set headerPath *{/a ${tcl}/include ${tk}/include' \ @@ -49,7 +49,6 @@ stdenv.mkDerivation rec { for cmd in $out/bin/* ; do wrapProgram "$cmd" \ - --set TCLLIBPATH "${tcl}/${tcl.libdir}" \ --set TK_LIBRARY "${tk}/lib/${tk.libPrefix}" done ''; @@ -79,4 +78,3 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; }; } - From fab8407b549c32d7e73163741b5ea7b6c38ce7a4 Mon Sep 17 00:00:00 2001 From: Andrew Brooks Date: Fri, 30 Apr 2021 19:07:32 -0500 Subject: [PATCH 54/83] tix: Prevent tcl.mkTclDerivation from altering configureFlags --- pkgs/development/libraries/tix/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/tix/default.nix b/pkgs/development/libraries/tix/default.nix index 86f56cc9dc3c..c42847ef5335 100644 --- a/pkgs/development/libraries/tix/default.nix +++ b/pkgs/development/libraries/tix/default.nix @@ -34,6 +34,7 @@ tcl.mkTclDerivation { ln -s $i private_headers/generic; done; ''; + addTclConfigureFlags = false; configureFlags = [ "--with-tclconfig=." "--with-tkinclude=${tk.dev}/include" From 17a561e1cfcc9bd94e8287cd3fa092bea0362ebb Mon Sep 17 00:00:00 2001 From: Andrew Brooks Date: Fri, 7 May 2021 11:55:08 -0500 Subject: [PATCH 55/83] scid: Correct typo in maintainers --- pkgs/games/scid/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/scid/default.nix b/pkgs/games/scid/default.nix index b85af66065ab..43794f6bc255 100644 --- a/pkgs/games/scid/default.nix +++ b/pkgs/games/scid/default.nix @@ -51,7 +51,7 @@ tcl.mkTclDerivation { meta = { description = "Chess database with play and training functionality"; - maintainers = with maintainers; [ agbrooks ]; + maintainers = with lib.maintainers; [ agbrooks ]; homepage = "http://scid.sourceforge.net/"; license = lib.licenses.gpl2; }; From a49a274abf77dbd6f698e5b6a72bb2b4848d5337 Mon Sep 17 00:00:00 2001 From: Andrew Brooks Date: Fri, 7 May 2021 12:51:47 -0500 Subject: [PATCH 56/83] Revert "xconq: Simplify package with tcl.tclPackageHook" This reverts commit 113826a892512eb2e19985310fd7d4a39db4d75e, which ended up breaking the Tk import at runtime. --- pkgs/games/xconq/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/games/xconq/default.nix b/pkgs/games/xconq/default.nix index 6d7c9f4e6fbb..8f4366fbcb87 100644 --- a/pkgs/games/xconq/default.nix +++ b/pkgs/games/xconq/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ cpio xorgproto libX11 libXmu libXaw libXt tcl tk libXext - fontconfig makeWrapper tcl.tclPackageHook ]; + fontconfig makeWrapper ]; configureFlags = [ "--enable-alternate-scoresdir=scores" @@ -39,6 +39,12 @@ stdenv.mkDerivation rec { sed -re 's@MediumBlue@LightBlue@g' -i tcltk/tkconq.tcl ''; + postInstall = '' + for file in $out/bin/*; do + wrapProgram $file --prefix TCLLIBPATH ' ' "${tk}/lib" + done + ''; + meta = with lib; { description = "A programmable turn-based strategy game"; maintainers = with maintainers; [ raskin ]; From 1c44a44932786cdc5ba99d87b5a505f5ae94eaee Mon Sep 17 00:00:00 2001 From: Andrew Brooks Date: Fri, 7 May 2021 18:25:33 -0500 Subject: [PATCH 57/83] bwidget: add missing dependency on tk --- pkgs/development/libraries/bwidget/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/bwidget/default.nix b/pkgs/development/libraries/bwidget/default.nix index f289077c88bb..0cba8b21fe63 100644 --- a/pkgs/development/libraries/bwidget/default.nix +++ b/pkgs/development/libraries/bwidget/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, tcl }: +{ lib, fetchurl, tcl, tk }: let version = "1.9.14"; @@ -13,6 +13,7 @@ in tcl.mkTclDerivation { }; dontBuild = true; + propagatedBuildInputs = [tk]; installPhase = '' mkdir -p "$out/lib/${libPrefix}" @@ -22,6 +23,7 @@ in tcl.mkTclDerivation { meta = { homepage = "https://sourceforge.net/projects/tcllib"; description = "High-level widget set for Tcl/Tk"; + maintainers = with lib.maintainers; [ agbrooks ]; license = lib.licenses.tcltk; platforms = lib.platforms.linux; }; From e22fe366afc982c0e0e2af11d4f1a54a4a00035b Mon Sep 17 00:00:00 2001 From: Andrew Brooks Date: Mon, 10 May 2021 11:01:19 -0500 Subject: [PATCH 58/83] tcl: fix TCLLIBPATH edge cases in tcl package hook TCLLIBPATH was not actually extended if a package's path was a substring of a package already on the path. This commit fixes that behavior. Additionally, '--prefix' is now used in place of '--set', as the latter was found to break tkremind from the remind package. --- pkgs/development/interpreters/tcl/tcl-package-hook.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/tcl/tcl-package-hook.sh b/pkgs/development/interpreters/tcl/tcl-package-hook.sh index 5f105e2fc7ea..261feda55af1 100644 --- a/pkgs/development/interpreters/tcl/tcl-package-hook.sh +++ b/pkgs/development/interpreters/tcl/tcl-package-hook.sh @@ -21,7 +21,7 @@ _addToTclLibPath() { if [ -z "${TCLLIBPATH-}" ]; then export TCLLIBPATH="$tclPkg" else - if [[ "$TCLLIBPATH" != *"$tclPkg"* ]]; then + if [[ "$TCLLIBPATH" != *"$tclPkg "* && "$TCLLIBPATH" != *"$tclPkg" ]]; then export TCLLIBPATH="${TCLLIBPATH} $tclPkg" fi fi @@ -53,7 +53,7 @@ wrapTclBins() { find "$tclBinsDir" -type f -executable -print | while read -r someBin; do echo "Adding TCLLIBPATH wrapper for $someBin" - wrapProgram "$someBin" --set TCLLIBPATH "$TCLLIBPATH" + wrapProgram "$someBin" --prefix TCLLIBPATH ' ' "$TCLLIBPATH" done } From 29c577c21835d0588aa346c6ebb84e90498ec6e0 Mon Sep 17 00:00:00 2001 From: Andrew Brooks Date: Tue, 11 May 2021 10:15:36 -0500 Subject: [PATCH 59/83] poke: revise formatting Co-authored-by: Sandro --- pkgs/applications/editors/poke/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/poke/default.nix b/pkgs/applications/editors/poke/default.nix index 7f8a2fdaa7ac..64ecbaa92927 100644 --- a/pkgs/applications/editors/poke/default.nix +++ b/pkgs/applications/editors/poke/default.nix @@ -40,7 +40,7 @@ in stdenv.mkDerivation rec { ] ++ lib.optional guiSupport makeWrapper; buildInputs = [ boehmgc readline ] - ++ lib.optionals guiSupport [tk tcl.tclPackageHook tcllib] + ++ lib.optionals guiSupport [ tk tcl.tclPackageHook tcllib ] ++ lib.optional miSupport json_c ++ lib.optional nbdSupport libnbd ++ lib.optional textStylingSupport gettext From ca4b34f09eb11f853ab0194bd1f6300a5ee5e4ee Mon Sep 17 00:00:00 2001 From: Andrew Brooks Date: Tue, 11 May 2021 10:16:00 -0500 Subject: [PATCH 60/83] tcl: combine inherit expressions Co-authored-by: Sandro --- pkgs/development/interpreters/tcl/generic.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/tcl/generic.nix b/pkgs/development/interpreters/tcl/generic.nix index 4c144699fc8f..23a7c1eb1171 100644 --- a/pkgs/development/interpreters/tcl/generic.nix +++ b/pkgs/development/interpreters/tcl/generic.nix @@ -9,9 +9,7 @@ let baseInterp = stdenv.mkDerivation { pname = "tcl"; - inherit version; - - inherit src; + inherit version src; outputs = [ "out" "man" ]; From f9ce367eb2b42bb1860510332792f53a66f71d6c Mon Sep 17 00:00:00 2001 From: Andrew Brooks Date: Tue, 11 May 2021 10:16:16 -0500 Subject: [PATCH 61/83] bwidget: revise formatting Co-authored-by: Sandro --- pkgs/development/libraries/bwidget/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/bwidget/default.nix b/pkgs/development/libraries/bwidget/default.nix index 0cba8b21fe63..57af14440227 100644 --- a/pkgs/development/libraries/bwidget/default.nix +++ b/pkgs/development/libraries/bwidget/default.nix @@ -13,7 +13,7 @@ in tcl.mkTclDerivation { }; dontBuild = true; - propagatedBuildInputs = [tk]; + propagatedBuildInputs = [ tk ]; installPhase = '' mkdir -p "$out/lib/${libPrefix}" From 5d3ee3a49a2a91950530992cedf50ab134c4fb9b Mon Sep 17 00:00:00 2001 From: Andrew Brooks Date: Tue, 11 May 2021 10:16:57 -0500 Subject: [PATCH 62/83] bwidget: make installPhase slightly clearer Co-authored-by: Sandro --- pkgs/development/libraries/bwidget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/bwidget/default.nix b/pkgs/development/libraries/bwidget/default.nix index 57af14440227..7a799afb8a8f 100644 --- a/pkgs/development/libraries/bwidget/default.nix +++ b/pkgs/development/libraries/bwidget/default.nix @@ -16,8 +16,8 @@ in tcl.mkTclDerivation { propagatedBuildInputs = [ tk ]; installPhase = '' - mkdir -p "$out/lib/${libPrefix}" - cp -R *.tcl lang images "$out/lib/${libPrefix}" + mkdir -p "$out/lib/bwidget${version}" + cp -R *.tcl lang images "$out/lib/bwidget${version}" ''; meta = { From f9595e4ffc28a30ec7d223f23d67176adaf2c4d8 Mon Sep 17 00:00:00 2001 From: Andrew Brooks Date: Tue, 11 May 2021 10:17:28 -0500 Subject: [PATCH 63/83] bwidget: replace verbose let/in expression with rec Co-authored-by: Sandro --- pkgs/development/libraries/bwidget/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/bwidget/default.nix b/pkgs/development/libraries/bwidget/default.nix index 7a799afb8a8f..34f0e8b5b495 100644 --- a/pkgs/development/libraries/bwidget/default.nix +++ b/pkgs/development/libraries/bwidget/default.nix @@ -1,11 +1,8 @@ { lib, fetchurl, tcl, tk }: -let - version = "1.9.14"; - libPrefix = "bwidget${version}"; -in tcl.mkTclDerivation { +tcl.mkTclDerivation rec { pname = "bwidget"; - inherit version; + version = "1.9.14"; src = fetchurl { url = "mirror://sourceforge/tcllib/bwidget-${version}.tar.gz"; From 49db5c9de6c6f8a79c30b5364edda6040a39521d Mon Sep 17 00:00:00 2001 From: Andrew Brooks Date: Tue, 11 May 2021 10:17:54 -0500 Subject: [PATCH 64/83] tclx: simplify postInstall phase Co-authored-by: Sandro --- pkgs/development/libraries/tclx/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/tclx/default.nix b/pkgs/development/libraries/tclx/default.nix index 9582aabf654a..27602684c171 100644 --- a/pkgs/development/libraries/tclx/default.nix +++ b/pkgs/development/libraries/tclx/default.nix @@ -11,10 +11,9 @@ tcl.mkTclDerivation rec { }; # required in order for tclx to properly detect tclx.tcl at runtime - postInstall = - let tclXPkg = "tclx${version}"; - tclXLib = "$prefix/lib/${tclXPkg}"; - in "ln -s ${tclXLib} ${tclXLib}/${tclXPkg}"; + postInstall = '' + ln -s $prefix/lib/${tclXPkg} $prefix/lib/tclx${version}/tclx${version} + ''; meta = { homepage = "http://tclx.sourceforge.net/"; From 927251e7814d9c530dc0ed89a2a887a692bc8187 Mon Sep 17 00:00:00 2001 From: Andrew Brooks Date: Tue, 11 May 2021 10:27:51 -0500 Subject: [PATCH 65/83] tcl: avoid readonly local in package hook If a path with a space were added to TCLLIBPATH, _addToTclLibPath would attempt to mutate the tclPkg local and fail. --- pkgs/development/interpreters/tcl/tcl-package-hook.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/tcl/tcl-package-hook.sh b/pkgs/development/interpreters/tcl/tcl-package-hook.sh index 261feda55af1..f729096a36e6 100644 --- a/pkgs/development/interpreters/tcl/tcl-package-hook.sh +++ b/pkgs/development/interpreters/tcl/tcl-package-hook.sh @@ -4,7 +4,7 @@ # Add a directory to TCLLIBPATH, provided that it exists _addToTclLibPath() { - local -r tclPkg="$1" + local tclPkg="$1" if [ -z "$tclPkg" ]; then return fi From 4b5d85bf4433d41598b2e5d6c59c131f4ad0d049 Mon Sep 17 00:00:00 2001 From: Andrew Brooks Date: Tue, 11 May 2021 11:17:44 -0500 Subject: [PATCH 66/83] tcl: use double square brackets consistently in tcl package hook --- .../development/interpreters/tcl/tcl-package-hook.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/interpreters/tcl/tcl-package-hook.sh b/pkgs/development/interpreters/tcl/tcl-package-hook.sh index f729096a36e6..747783cb1c27 100644 --- a/pkgs/development/interpreters/tcl/tcl-package-hook.sh +++ b/pkgs/development/interpreters/tcl/tcl-package-hook.sh @@ -5,11 +5,11 @@ # Add a directory to TCLLIBPATH, provided that it exists _addToTclLibPath() { local tclPkg="$1" - if [ -z "$tclPkg" ]; then + if [[ -z "$tclPkg" ]]; then return fi - if [ ! -d "$tclPkg" ]; then + if [[ ! -d "$tclPkg" ]]; then >&2 echo "can't add $tclPkg to TCLLIBPATH; that directory doesn't exist" exit 1 fi @@ -18,7 +18,7 @@ _addToTclLibPath() { tclPkg="{$tclPkg}" fi - if [ -z "${TCLLIBPATH-}" ]; then + if [[ -z "${TCLLIBPATH-}" ]]; then export TCLLIBPATH="$tclPkg" else if [[ "$TCLLIBPATH" != *"$tclPkg "* && "$TCLLIBPATH" != *"$tclPkg" ]]; then @@ -30,7 +30,7 @@ _addToTclLibPath() { # Locate any directory containing an installed pkgIndex file findInstalledTclPkgs() { local -r newLibDir="${!outputLib}/lib" - if [ ! -d "$newLibDir" ]; then + if [[ ! -d "$newLibDir" ]]; then >&2 echo "Assuming no loadable tcl packages installed ($newLibDir does not exist)" return fi @@ -39,13 +39,13 @@ findInstalledTclPkgs() { # Wrap any freshly-installed binaries and set up their TCLLIBPATH wrapTclBins() { - if [ -z "${TCLLIBPATH-}" ]; then + if [[ -z "${TCLLIBPATH-}" ]]; then echo "skipping automatic Tcl binary wrapping (nothing to do)" return fi local -r tclBinsDir="${!outputBin}/bin" - if [ ! -d "$tclBinsDir" ]; then + if [[ ! -d "$tclBinsDir" ]]; then echo "No outputBin found, not using any TCLLIBPATH wrapper" return fi From 9502d50b3ed4b4b3b7f989eacceb72e5a1ac458d Mon Sep 17 00:00:00 2001 From: Andrew Brooks Date: Tue, 11 May 2021 12:25:25 -0500 Subject: [PATCH 67/83] tclx: fix undefined variable error --- pkgs/development/libraries/tclx/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/tclx/default.nix b/pkgs/development/libraries/tclx/default.nix index 27602684c171..a8cf2a44fab6 100644 --- a/pkgs/development/libraries/tclx/default.nix +++ b/pkgs/development/libraries/tclx/default.nix @@ -12,7 +12,7 @@ tcl.mkTclDerivation rec { # required in order for tclx to properly detect tclx.tcl at runtime postInstall = '' - ln -s $prefix/lib/${tclXPkg} $prefix/lib/tclx${version}/tclx${version} + ln -s $prefix/lib/tclx${version} $prefix/lib/tclx${version}/tclx${version} ''; meta = { From b7b9680e665fe0ec81ae52008ed93c41bb480e4e Mon Sep 17 00:00:00 2001 From: Andrew Brooks Date: Fri, 21 May 2021 14:28:19 -0500 Subject: [PATCH 68/83] tcl: update maintainers When I reached out to vrthra / Rahul Gopinath about this PR, he indicated that he no longer has the time to serve as tcl maintainer and suggested that I take on the responsibility. --- pkgs/development/interpreters/tcl/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/tcl/generic.nix b/pkgs/development/interpreters/tcl/generic.nix index 23a7c1eb1171..beb95d51d2c1 100644 --- a/pkgs/development/interpreters/tcl/generic.nix +++ b/pkgs/development/interpreters/tcl/generic.nix @@ -44,7 +44,7 @@ let homepage = "https://www.tcl.tk/"; license = licenses.tcltk; platforms = platforms.all; - maintainers = with maintainers; [ vrthra ]; + maintainers = with maintainers; [ agbrooks ]; }; passthru = rec { From 25c0253f00e792ae631668ec00d003ccf7c0c304 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Fri, 21 May 2021 22:28:04 +0200 Subject: [PATCH 69/83] atk: support cross-compilation by disabling introspection --- pkgs/development/libraries/atk/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix index 7961211dc63e..38c557316982 100644 --- a/pkgs/development/libraries/atk/default.nix +++ b/pkgs/development/libraries/atk/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchurl, meson, ninja, gettext, pkg-config, glib , fixDarwinDylibNames, gobject-introspection, gnome +, withIntrospection ? stdenv.buildPlatform == stdenv.hostPlatform }: let @@ -17,8 +18,9 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ meson ninja pkg-config gettext gobject-introspection glib ] - ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + nativeBuildInputs = [ meson ninja pkg-config gettext glib ] + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames + ++ lib.optional withIntrospection gobject-introspection; propagatedBuildInputs = [ # Required by atk.pc @@ -31,6 +33,10 @@ stdenv.mkDerivation rec { ./fix_pc.patch ]; + mesonFlags = [ + "-Dintrospection=${lib.boolToString withIntrospection}" + ]; + doCheck = true; passthru = { From 7099f24c4a1788e074c4851d68fc7d56d7c8e3a7 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 21 May 2021 13:13:47 +0200 Subject: [PATCH 70/83] libxml2: Work around lxml API misuse --- pkgs/development/libraries/libxml2/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index ca3cbc4a1884..1b58b4539e46 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl +{ stdenv, lib, fetchurl, fetchpatch , zlib, xz, libintl, python, gettext, ncurses, findXMLCatalogs , pythonSupport ? enableShared && stdenv.buildPlatform == stdenv.hostPlatform , icuSupport ? false, icu ? null @@ -27,6 +27,13 @@ stdenv.mkDerivation rec { # https://github.com/NixOS/nixpkgs/pull/63174 # https://github.com/NixOS/nixpkgs/pull/72342 ./utf8-xmlErrorFuncHandler.patch + + # Work around lxml API misuse. + # https://gitlab.gnome.org/GNOME/libxml2/issues/255 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/libxml2/commit/85b1792e37b131e7a51af98a37f92472e8de5f3f.patch"; + sha256 = "epqlNs2S0Zczox3KyCB6R2aJKh87lXydlZ0x6tLHweE="; + }) ]; outputs = [ "bin" "dev" "out" "man" "doc" ] From 4634f31bb189e193f2abaae723910c69d562ebf1 Mon Sep 17 00:00:00 2001 From: Andrew Brooks Date: Fri, 21 May 2021 17:38:52 -0500 Subject: [PATCH 71/83] tcltls: 1.6.7 -> 1.7.21 Upgrade tcltls and use new tcl-lang.org homepage. This version no longer needs to be built against openssl_1_0_2. --- pkgs/development/libraries/tcltls/default.nix | 9 +++++---- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/tcltls/default.nix b/pkgs/development/libraries/tcltls/default.nix index 3fac78724ea2..6b671c4569c4 100644 --- a/pkgs/development/libraries/tcltls/default.nix +++ b/pkgs/development/libraries/tcltls/default.nix @@ -2,11 +2,11 @@ tcl.mkTclDerivation rec { pname = "tcltls"; - version = "1.6.7"; + version = "1.7.21"; src = fetchurl { - url = "mirror://sourceforge/tls/tls${version}-src.tar.gz"; - sha256 = "1f53sfcnrridjl5ayrq1xrqkahs8khf8c3d0m2brndbhahzdw6ai"; + url = "https://core.tcl-lang.org/tcltls/uv/tcltls-${version}.tar.gz"; + sha256 = "0xf1rfsnn4k9j1bd2a1p8ir0xr4a3phgr9lcgbazh4084l2y8sl0"; }; buildInputs = [ openssl ]; @@ -16,8 +16,9 @@ tcl.mkTclDerivation rec { ]; meta = { - homepage = "http://tls.sourceforge.net/"; + homepage = "https://core.tcl-lang.org/tcltls/index"; description = "An OpenSSL / RSA-bsafe Tcl extension"; + maintainers = [ lib.maintainers.agbrooks ]; license = lib.licenses.tcltk; platforms = lib.platforms.unix; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d043230cab52..12efcf07f59e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18082,9 +18082,7 @@ in tcllib = callPackage ../development/libraries/tcllib { }; - tcltls = callPackage ../development/libraries/tcltls { - openssl = openssl_1_0_2; - }; + tcltls = callPackage ../development/libraries/tcltls { }; tclx = callPackage ../development/libraries/tclx { }; From a815199298bc2b1f1f671bfd46e8955084855f31 Mon Sep 17 00:00:00 2001 From: Andrew Brooks Date: Fri, 21 May 2021 19:08:31 -0500 Subject: [PATCH 72/83] tcltls: remove unused stdenv argument --- pkgs/development/libraries/tcltls/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/tcltls/default.nix b/pkgs/development/libraries/tcltls/default.nix index 6b671c4569c4..8883ad5dd440 100644 --- a/pkgs/development/libraries/tcltls/default.nix +++ b/pkgs/development/libraries/tcltls/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, tcl, openssl }: +{ lib, fetchurl, tcl, openssl }: tcl.mkTclDerivation rec { pname = "tcltls"; From afb9f518f1d68432555014e34bb338190e7861cf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 9 May 2021 00:01:47 +0200 Subject: [PATCH 73/83] python3Packages.importlib-metadata: 3.7.3 -> 4.0.1 --- .../development/python-modules/importlib-metadata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/importlib-metadata/default.nix b/pkgs/development/python-modules/importlib-metadata/default.nix index 4149de3f43ae..d430c4cf29c2 100644 --- a/pkgs/development/python-modules/importlib-metadata/default.nix +++ b/pkgs/development/python-modules/importlib-metadata/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "importlib-metadata"; - version = "3.7.3"; + version = "4.0.1"; disabled = pythonOlder "3.6"; src = fetchPypi { pname = "importlib_metadata"; inherit version; - sha256 = "742add720a20d0467df2f444ae41704000f50e1234f46174b51f9c6031a1bd71"; + sha256 = "sha256-jFARluSfud9d9DgzvbHkMo9khHdj7IpQcDFItzeE1YE="; }; nativeBuildInputs = [ setuptools-scm ]; From 83bfa45eae1af04a912be499691364288f8e93a2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 22 May 2021 10:23:08 +0000 Subject: [PATCH 74/83] btrfs-progs: 5.11.1 -> 5.12.1 --- pkgs/tools/filesystems/btrfs-progs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index 9a05a0d67fec..aad633f3ba46 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "btrfs-progs"; - version = "5.11.1"; + version = "5.12.1"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "sha256-46rMxHVuxOVQLLKp+Ftn1SiWZE9MPA+IprxZjHC96/4="; + sha256 = "sha256-lQhG/qRU+0scOfD6RUmDZEVy35HfXAYEezNb8tVHN1k="; }; nativeBuildInputs = [ From e56bed6bdb14416b37ed8557c70020a48a21e86f Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 15 Apr 2021 20:38:05 +0200 Subject: [PATCH 75/83] mesa: 21.0.3 -> 21.1.1 Note: This update likely causes some issues when running an application that has a direct dependency on Mesa (e.g. Sway and XWayland) and was compiled against a different Nixpkgs revision. See 7106fca0fe4 for more details regarding that issue. --- pkgs/development/libraries/mesa/default.nix | 4 ++-- .../libraries/mesa/missing-includes.patch | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 6c44441dd92d..e7ad10076863 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -31,7 +31,7 @@ with lib; let # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule - version = "21.0.3"; + version = "21.1.1"; branch = versions.major version; self = stdenv.mkDerivation { @@ -45,7 +45,7 @@ self = stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" ]; - sha256 = "0awiyvicvcn3b18x0vx5ik3ly0k3k51ivz2ljj8pnx6ms95nyp2n"; + sha256 = "1lldnf307w6j0d874544f1dinn0gnnp1ds2xph8qjkh5g6imxhpf"; }; prePatch = "patchShebangs ."; diff --git a/pkgs/development/libraries/mesa/missing-includes.patch b/pkgs/development/libraries/mesa/missing-includes.patch index 72488893c6b6..c17d54908553 100644 --- a/pkgs/development/libraries/mesa/missing-includes.patch +++ b/pkgs/development/libraries/mesa/missing-includes.patch @@ -9,14 +9,14 @@ #include "pipe/p_compiler.h" #include "pipe/p_state.h" ---- ./src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h -+++ ./src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h +--- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h ++++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h @@ -28,6 +28,8 @@ #ifndef RADV_AMDGPU_WINSYS_H #define RADV_AMDGPU_WINSYS_H - + +#include + - #include "radv_radeon_winsys.h" - #include "ac_gpu_info.h" - #include "addrlib/addrinterface.h" + #include + #include + #include "util/list.h" From 56c1c26e75a310fb6ff10bbf711ec0fa7168f92d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 26 May 2021 00:48:33 +0200 Subject: [PATCH 76/83] Revert "python3Packages.pywemo: disable failing test" This reverts commit a0160c0ae804fa12a98f7020e786fc2565b81974. The original issue was a result of a libxml2 regression that has since been fixed. --- pkgs/development/python-modules/pywemo/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/python-modules/pywemo/default.nix b/pkgs/development/python-modules/pywemo/default.nix index 7448f1f7f2c7..ceb190fe753a 100644 --- a/pkgs/development/python-modules/pywemo/default.nix +++ b/pkgs/development/python-modules/pywemo/default.nix @@ -47,11 +47,6 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = [ - # https://github.com/NixOS/nixpkgs/issues/124165 - "test_bridge_getdevicestatus" - ]; - pythonImportsCheck = [ "pywemo" ]; meta = with lib; { From 1cbd7ffb5668a5c518fb4069e2f2d85a2ebec784 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 28 May 2021 22:54:57 +0200 Subject: [PATCH 77/83] python3Packages.SQLAlchemy: 1.4.15 -> 1.4.16 https://github.com/sqlalchemy/sqlalchemy/releases/tag/rel_1_4_16 --- pkgs/development/python-modules/sqlalchemy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 0e03b17963ee..ec427003fc47 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "SQLAlchemy"; - version = "1.4.15"; + version = "1.4.16"; src = fetchPypi { inherit pname version; - sha256 = "1rj9h3mcxrgh5q8qvz7m39diyil27l5mldr49mgz6xfibk3h1w8g"; + sha256 = "15yl9frbxsq90hq5b8znqy34fg5kqdw1jjw933kz709rbpxw4lzd"; }; propagatedBuildInputs = [ From 77673388f5435bee11ceb455529b2940d111979b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 28 May 2021 23:01:22 +0200 Subject: [PATCH 78/83] python3Packages.SQLAlchemy: don't run tests in parallel Test failures on hydra look suspiciously like they stem from xdist. gw0 ok / gw1 ok / gw2 ok / gw3 ok / gw4 ok / gw5 ok / gw6 ok / gw7 ok / gw8 ok / gw9 ok / gw10 ok / gw11 ok / gw12 ok / gw13 ok / gw14 ok / gw15 ok / gw16 ok / gw17 ok / gw18 ok / gw19 C / gw20 C / gw21 C / gw22 C / gw23 C / gw24 C / gw25 C / gw26 C / gw27 C / gw28 C / gw29 C / gw30 C / gw31 C / gw32 C / gw33 C / gw34 C / gw35 C / gw36 C / gw37 C / gw38 C / gw39 C / gw40 C / gw41 C / gw42 C / gw43 C / gw44 C / gw45 C / gw46 C / gw47 CINTERNALERROR> def worker_internal_error(self, node, formatted_error): INTERNALERROR> """ INTERNALERROR> pytest_internalerror() was called on the worker. INTERNALERROR> INTERNALERROR> pytest_internalerror() arguments are an excinfo and an excrepr, which can't INTERNALERROR> be serialized, so we go with a poor man's solution of raising an exception INTERNALERROR> here ourselves using the formatted message. INTERNALERROR> """ INTERNALERROR> self._active_nodes.remove(node) INTERNALERROR> try: INTERNALERROR> > assert False, formatted_error INTERNALERROR> E AssertionError: Traceback (most recent call last): INTERNALERROR> E File "/nix/store/4v6lhz8sq9jwl3af8abs6cgpbh9lignr-python3.8-pytest-6.2.3/lib/python3.8/site-packages/_pytest/main.py", line 267, in wrap_session INTERNALERROR> E config.hook.pytest_sessionstart(session=session) INTERNALERROR> E File "/nix/store/r4lwmmknxwx3gq2bv73yf0rkli9d902d-python3.8-pluggy-0.13.1/lib/python3.8/site-packages/pluggy/hooks.py", line 286, in __call__ INTERNALERROR> E return self._hookexec(self, self.get_hookimpls(), kwargs) INTERNALERROR> E File "/nix/store/r4lwmmknxwx3gq2bv73yf0rkli9d902d-python3.8-pluggy-0.13.1/lib/python3.8/site-packages/pluggy/manager.py", line 93, in _hookexec INTERNALERROR> E return self._inner_hookexec(hook, methods, kwargs) INTERNALERROR> E File "/nix/store/r4lwmmknxwx3gq2bv73yf0rkli9d902d-python3.8-pluggy-0.13.1/lib/python3.8/site-packages/pluggy/manager.py", line 84, in INTERNALERROR> E self._inner_hookexec = lambda hook, methods, kwargs: hook.multicall( INTERNALERROR> E File "/nix/store/r4lwmmknxwx3gq2bv73yf0rkli9d902d-python3.8-pluggy-0.13.1/lib/python3.8/site-packages/pluggy/callers.py", line 208, in _multicall INTERNALERROR> E return outcome.get_result() INTERNALERROR> E File "/nix/store/r4lwmmknxwx3gq2bv73yf0rkli9d902d-python3.8-pluggy-0.13.1/lib/python3.8/site-packages/pluggy/callers.py", line 80, in get_result INTERNALERROR> E raise ex[1].with_traceback(ex[2]) INTERNALERROR> E File "/nix/store/r4lwmmknxwx3gq2bv73yf0rkli9d902d-python3.8-pluggy-0.13.1/lib/python3.8/site-packages/pluggy/callers.py", line 187, in _multicall INTERNALERROR> E res = hook_impl.function(*args) INTERNALERROR> E File "/build/SQLAlchemy-1.4.15/test/../lib/sqlalchemy/testing/plugin/pytestplugin.py", line 135, in pytest_sessionstart INTERNALERROR> E asyncio._assume_async(plugin_base.post_begin) INTERNALERROR> E File "/nix/store/03hwa29jf7794x48983j44g0qvancijw-python3.8-SQLAlchemy-1.4.15/lib/python3.8/site-packages/sqlalchemy/testing/asyncio.py", line 50, in _assume_async INTERNALERROR> E return _util_async_run(fn, *args, **kwargs) INTERNALERROR> E File "/nix/store/03hwa29jf7794x48983j44g0qvancijw-python3.8-SQLAlchemy-1.4.15/lib/python3.8/site-packages/sqlalchemy/util/_concurrency_py3k.py", line 167, in _util_async_run INTERNALERROR> E loop = asyncio.get_event_loop() INTERNALERROR> E File "/nix/store/4s0h5aawbap3xhldxhcijvl26751qrjr-python3-3.8.9/lib/python3.8/asyncio/events.py", line 639, in get_event_loop INTERNALERROR> E raise RuntimeError('There is no current event loop in thread %r.' INTERNALERROR> E RuntimeError: There is no current event loop in thread 'Dummy-1'. INTERNALERROR> E assert False INTERNALERROR> INTERNALERROR> /nix/store/ws9fk09ssyzhy93i8janlh274nay3190-python3.8-pytest-xdist-2.2.1/lib/python3.8/site-packages/xdist/dsession.py:187: AssertionError [gw18] node down: Not properly terminated replacing crashed worker gw18 [gw48] linux Python 3.8.9 cwd: /build/SQLAlchemy-1.4.15 gw0 ok / gw1 ok / gw2 ok / gw3 ok / gw4 ok / gw5 ok / gw6 ok / gw7 ok / gw8 ok / gw9 ok / gw10 ok / gw11 ok / gw12 ok / gw13 ok / gw14 ok / gw15 ok / gw16 ok / gw17 ok / gw48 C / gw19 C / gw20 C / gw21 C / gw22 C / gw23 C / gw24 C / gw25 C / gw26 C / gw27 C / gw28 C / gw29 C / gw30 C / gw31 C / gw32 C / gw33 C / gw34 C / gw35 C / gw36 C / gw37 C / gw38 C / gw39 C / gw40 C / gw41 C / gw42 C / gw43 C / gw44 C / gw45 C / gw46 C / gw47 CINTERNALERROR> Traceback (most recent call last): INTERNALERROR> File "/nix/store/4v6lhz8sq9jwl3af8abs6cgpbh9lignr-python3.8-pytest-6.2.3/lib/python3.8/site-packages/_pytest/main.py", line 269, in wrap_session INTERNALERROR> session.exitstatus = doit(config, session) or 0 INTERNALERROR> File "/nix/store/4v6lhz8sq9jwl3af8abs6cgpbh9lignr-python3.8-pytest-6.2.3/lib/python3.8/site-packages/_pytest/main.py", line 323, in _main INTERNALERROR> config.hook.pytest_runtestloop(session=session) INTERNALERROR> File "/nix/store/r4lwmmknxwx3gq2bv73yf0rkli9d902d-python3.8-pluggy-0.13.1/lib/python3.8/site-packages/pluggy/hooks.py", line 286, in __call__ INTERNALERROR> return self._hookexec(self, self.get_hookimpls(), kwargs) INTERNALERROR> File "/nix/store/r4lwmmknxwx3gq2bv73yf0rkli9d902d-python3.8-pluggy-0.13.1/lib/python3.8/site-packages/pluggy/manager.py", line 93, in _hookexec INTERNALERROR> return self._inner_hookexec(hook, methods, kwargs) INTERNALERROR> File "/nix/store/r4lwmmknxwx3gq2bv73yf0rkli9d902d-python3.8-pluggy-0.13.1/lib/python3.8/site-packages/pluggy/manager.py", line 84, in INTERNALERROR> self._inner_hookexec = lambda hook, methods, kwargs: hook.multicall( INTERNALERROR> File "/nix/store/r4lwmmknxwx3gq2bv73yf0rkli9d902d-python3.8-pluggy-0.13.1/lib/python3.8/site-packages/pluggy/callers.py", line 208, in _multicall INTERNALERROR> return outcome.get_result() INTERNALERROR> File "/nix/store/r4lwmmknxwx3gq2bv73yf0rkli9d902d-python3.8-pluggy-0.13.1/lib/python3.8/site-packages/pluggy/callers.py", line 80, in get_result INTERNALERROR> raise ex[1].with_traceback(ex[2]) INTERNALERROR> File "/nix/store/r4lwmmknxwx3gq2bv73yf0rkli9d902d-python3.8-pluggy-0.13.1/lib/python3.8/site-packages/pluggy/callers.py", line 187, in _multicall INTERNALERROR> res = hook_impl.function(*args) INTERNALERROR> File "/nix/store/ws9fk09ssyzhy93i8janlh274nay3190-python3.8-pytest-xdist-2.2.1/lib/python3.8/site-packages/xdist/dsession.py", line 112, in pytest_runtestloop INTERNALERROR> self.loop_once() INTERNALERROR> File "/nix/store/ws9fk09ssyzhy93i8janlh274nay3190-python3.8-pytest-xdist-2.2.1/lib/python3.8/site-packages/xdist/dsession.py", line 135, in loop_once INTERNALERROR> call(**kwargs) INTERNALERROR> File "/nix/store/ws9fk09ssyzhy93i8janlh274nay3190-python3.8-pytest-xdist-2.2.1/lib/python3.8/site-packages/xdist/dsession.py", line 224, in worker_errordown INTERNALERROR> self._active_nodes.remove(node) INTERNALERROR> KeyError: --- pkgs/development/python-modules/sqlalchemy/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index ec427003fc47..5eb1a19c8917 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -29,14 +29,9 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook - pytest_xdist mock ] ++ lib.optional (!isPy3k) pysqlite; - pytestFlagsArray = [ - "-n auto" - ]; - postInstall = '' sed -e 's:--max-worker-restart=5::g' -i setup.cfg ''; From 70029711d476db16abd90ddb25bafe93942019b8 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 2 Jun 2021 22:55:34 +0200 Subject: [PATCH 79/83] mesa: 21.1.1 -> 21.1.2 --- pkgs/development/libraries/mesa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index e7ad10076863..8f24d83d92aa 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -31,7 +31,7 @@ with lib; let # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule - version = "21.1.1"; + version = "21.1.2"; branch = versions.major version; self = stdenv.mkDerivation { @@ -45,7 +45,7 @@ self = stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" ]; - sha256 = "1lldnf307w6j0d874544f1dinn0gnnp1ds2xph8qjkh5g6imxhpf"; + sha256 = "0pw2wba4q66rhdx0hpimvxmrl7k2vv315gmmk17kl7snc0vvdd13"; }; prePatch = "patchShebangs ."; From 430ac9b8303638aef0e45316d469b6312858a74d Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 6 Jun 2021 12:01:57 -0700 Subject: [PATCH 80/83] apple_sdk_11: alias JavaVM Apple removed JavaVM but JavaNativeFoundation seems to be the replacement. Should be safe to substitute usage of JavaVM with JavaNativeFoundation. --- pkgs/os-specific/darwin/apple-sdk-11.0/apple_sdk.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/apple_sdk.nix b/pkgs/os-specific/darwin/apple-sdk-11.0/apple_sdk.nix index 14945380e20c..6e987c5dfb41 100644 --- a/pkgs/os-specific/darwin/apple-sdk-11.0/apple_sdk.nix +++ b/pkgs/os-specific/darwin/apple-sdk-11.0/apple_sdk.nix @@ -151,6 +151,9 @@ in rec { # This framework doesn't exist in newer SDKs (somewhere around 10.13), but # there are references to it in nixpkgs. QuickTime = throw "QuickTime framework not available"; + + # Seems to be appropriate given https://developer.apple.com/forums/thread/666686 + JavaVM = super.JavaNativeFoundation; }; bareFrameworks = ( From 012a33b0ded655184819e2270bd39e85c4d93cfd Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 6 Jun 2021 16:30:11 -0700 Subject: [PATCH 81/83] mesa: fix darwin build --- pkgs/development/libraries/mesa/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 8f24d83d92aa..3c7ea16b26ae 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -4,7 +4,7 @@ , expat, libdrm, xorg, wayland, wayland-protocols, openssl , llvmPackages, libffi, libomxil-bellagio, libva-minimal , libelf, libvdpau -, libglvnd +, libglvnd, libunwind , galliumDrivers ? ["auto"] , driDrivers ? ["auto"] , vulkanDrivers ? ["auto"] @@ -127,6 +127,7 @@ self = stdenv.mkDerivation { libpthreadstubs openssl /*or another sha1 provider*/ ] ++ lib.optionals (elem "wayland" eglPlatforms) [ wayland wayland-protocols ] ++ lib.optionals stdenv.isLinux [ libomxil-bellagio libva-minimal ] + ++ lib.optionals stdenv.isDarwin [ libunwind ] ++ lib.optional withValgrind valgrind-light; depsBuildBuild = [ pkg-config ]; From f503104ca5efe3c55726f6ca59ac3d1860aff488 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 9 Jun 2021 01:14:26 +0200 Subject: [PATCH 82/83] python3Packages.authcaptureproxy: relax importlib-metadata dependency --- .../python-modules/authcaptureproxy/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/authcaptureproxy/default.nix b/pkgs/development/python-modules/authcaptureproxy/default.nix index 0f1f6d046463..a780ae59be70 100644 --- a/pkgs/development/python-modules/authcaptureproxy/default.nix +++ b/pkgs/development/python-modules/authcaptureproxy/default.nix @@ -27,9 +27,10 @@ buildPythonPackage rec { postPatch = '' # https://github.com/alandtse/auth_capture_proxy/issues/14 - substituteInPlace pyproject.toml --replace \ - "poetry.masonry.api" \ - "poetry.core.masonry.api" + # https://github.com/alandtse/auth_capture_proxy/issues/15 + substituteInPlace pyproject.toml \ + --replace "poetry.masonry.api" "poetry.core.masonry.api" \ + --replace 'importlib-metadata = "^3.4.0"' 'importlib-metadata = "*"' ''; nativeBuildInputs = [ From 413994ab1c54bdcdb579eee3a4fa5962d661a8a7 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 15 Jun 2021 19:43:00 -0700 Subject: [PATCH 83/83] xorg: fix bad merge conflict --- pkgs/servers/x11/xorg/default.nix | 3568 ----------------------------- 1 file changed, 3568 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index bcdaa6db4d04..ed6108d51480 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -3132,3573 +3132,5 @@ lib.makeScope newScope (self: with self; { buildInputs = [ libX11 xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; -||||||| 4b7c8d538e1 - 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; - }) - { }; })