diff --git a/nixos/modules/services/misc/weechat.nix b/nixos/modules/services/misc/weechat.nix index 1fcfb440485d..c6ff540ea12f 100644 --- a/nixos/modules/services/misc/weechat.nix +++ b/nixos/modules/services/misc/weechat.nix @@ -46,10 +46,12 @@ in Group = "weechat"; RemainAfterExit = "yes"; }; - script = "exec ${pkgs.screen}/bin/screen -Dm -S ${cfg.sessionName} ${cfg.binary}"; + script = "exec ${config.security.wrapperDir}/screen -Dm -S ${cfg.sessionName} ${cfg.binary}"; wantedBy = [ "multi-user.target" ]; wants = [ "network.target" ]; }; + + security.wrappers.screen.source = "${pkgs.screen}/bin/screen"; }; meta.doc = ./weechat.xml; diff --git a/nixos/modules/services/misc/weechat.xml b/nixos/modules/services/misc/weechat.xml index 9c9ee0448c92..b7f755bbc5c7 100644 --- a/nixos/modules/services/misc/weechat.xml +++ b/nixos/modules/services/misc/weechat.xml @@ -54,7 +54,7 @@ Now, the session can be re-attached like this: -screen -r weechat-screen +screen -x weechat/weechat-screen diff --git a/nixos/modules/services/network-filesystems/openafs/client.nix b/nixos/modules/services/network-filesystems/openafs/client.nix index 52c0966e05bc..240c1392088f 100644 --- a/nixos/modules/services/network-filesystems/openafs/client.nix +++ b/nixos/modules/services/network-filesystems/openafs/client.nix @@ -149,11 +149,13 @@ in packages = { module = mkOption { default = config.boot.kernelPackages.openafs; + defaultText = "config.boot.kernelPackages.openafs"; type = types.package; description = "OpenAFS kernel module package. MUST match the userland package!"; }; programs = mkOption { default = getBin pkgs.openafs; + defaultText = "config.boot.kernelPackages.openafs"; type = types.package; description = "OpenAFS programs package. MUST match the kernel module package!"; }; diff --git a/nixos/modules/services/network-filesystems/openafs/server.nix b/nixos/modules/services/network-filesystems/openafs/server.nix index 4c80ed0839f7..095024d2c8af 100644 --- a/nixos/modules/services/network-filesystems/openafs/server.nix +++ b/nixos/modules/services/network-filesystems/openafs/server.nix @@ -80,6 +80,7 @@ in { package = mkOption { default = pkgs.openafs.server or pkgs.openafs; + defaultText = "pkgs.openafs.server or pkgs.openafs"; type = types.package; description = "OpenAFS package for the server binaries"; }; diff --git a/nixos/modules/services/networking/hostapd.nix b/nixos/modules/services/networking/hostapd.nix index 3af0441a89d8..9f74e4963296 100644 --- a/nixos/modules/services/networking/hostapd.nix +++ b/nixos/modules/services/networking/hostapd.nix @@ -157,9 +157,9 @@ in { description = "hostapd wireless AP"; path = [ pkgs.hostapd ]; - wantedBy = [ "network.target" ]; - - after = [ "${cfg.interface}-cfg.service" "nat.service" "bind.service" "dhcpd.service" "sys-subsystem-net-devices-${cfg.interface}.device" ]; + after = [ "sys-subsystem-net-devices-${cfg.interface}.device" ]; + bindsTo = [ "sys-subsystem-net-devices-${cfg.interface}.device" ]; + requiredBy = [ "network-link-${cfg.interface}.service" ]; serviceConfig = { ExecStart = "${pkgs.hostapd}/bin/hostapd ${configFile}"; diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix index 35cdddc590b8..3379efd1afce 100644 --- a/nixos/modules/services/networking/tinc.nix +++ b/nixos/modules/services/networking/tinc.nix @@ -148,14 +148,6 @@ in } )); - networking.interfaces = flip mapAttrs' cfg.networks (network: data: nameValuePair - ("tinc.${network}") - ({ - virtual = true; - virtualType = "${data.interfaceType}"; - }) - ); - systemd.services = flip mapAttrs' cfg.networks (network: data: nameValuePair ("tinc.${network}") ({ diff --git a/nixos/modules/services/x11/compton.nix b/nixos/modules/services/x11/compton.nix index 8641c05de52e..cafd8d88ec4d 100644 --- a/nixos/modules/services/x11/compton.nix +++ b/nixos/modules/services/x11/compton.nix @@ -238,6 +238,12 @@ in { description = "Compton composite manager"; wantedBy = [ "graphical-session.target" ]; partOf = [ "graphical-session.target" ]; + + # Temporarily fixes corrupt colours with Mesa 18 + environment = mkIf (cfg.backend == "glx") { + allow_rgb10_configs = "false"; + }; + serviceConfig = { ExecStart = "${cfg.package}/bin/compton --config ${configFile}"; RestartSec = 3; diff --git a/nixos/modules/virtualisation/kvmgt.nix b/nixos/modules/virtualisation/kvmgt.nix index fc0bedb68bd0..132815a0ad63 100644 --- a/nixos/modules/virtualisation/kvmgt.nix +++ b/nixos/modules/virtualisation/kvmgt.nix @@ -50,11 +50,17 @@ in { nameValuePair "kvmgt-${name}" { description = "KVMGT VGPU ${name}"; serviceConfig = { - Type = "oneshot"; + Type = "forking"; RemainAfterExit = true; + Restart = "on-failure"; + RestartSec = 5; ExecStart = "${pkgs.runtimeShell} -c 'echo ${value.uuid} > /sys/bus/pci/devices/${cfg.device}/mdev_supported_types/${name}/create'"; ExecStop = "${pkgs.runtimeShell} -c 'echo 1 > /sys/bus/pci/devices/${cfg.device}/${value.uuid}/remove'"; }; + unitConfig = { + StartLimitBurst = 5; + StartLimitIntervalSec = 30; + }; wantedBy = [ "multi-user.target" ]; } ) cfg.vgpus; diff --git a/pkgs/applications/altcoins/monero-gui/default.nix b/pkgs/applications/altcoins/monero-gui/default.nix index 2aff86ae1d38..46e317a3b12a 100644 --- a/pkgs/applications/altcoins/monero-gui/default.nix +++ b/pkgs/applications/altcoins/monero-gui/default.nix @@ -5,20 +5,20 @@ , qtlocation, qtquickcontrols2, qtwebchannel , qtwebengine, qtx11extras, qtxmlpatterns , monero, unbound, readline, boost, libunwind -, pcsclite, zeromq, cppzmq, pkgconfig +, libsodium, pcsclite, zeromq, cppzmq, pkgconfig }: with stdenv.lib; stdenv.mkDerivation rec { name = "monero-gui-${version}"; - version = "0.12.0.0"; + version = "0.13.0.3"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero-gui"; rev = "v${version}"; - sha256 = "1mg5ival8a2wdp14yib4wzqax4xyvd40zjy9anhszljds1439jhl"; + sha256 = "1rvxwz7p1yw9c817n07m60xvmv2p97s82sfzwkg2x880fpxb0gj9"; }; nativeBuildInputs = [ qmake pkgconfig ]; @@ -28,8 +28,8 @@ stdenv.mkDerivation rec { qtdeclarative qtlocation qtquickcontrols2 qtwebchannel qtwebengine qtx11extras qtxmlpatterns monero unbound readline - boost libunwind pcsclite zeromq cppzmq - makeWrapper + boost libunwind libsodium pcsclite zeromq + cppzmq makeWrapper ]; patches = [ @@ -70,7 +70,8 @@ stdenv.mkDerivation rec { cp ${desktopItem}/share/applications/* $out/share/applications # install translations - cp -r release/bin/translations $out/share/ + mkdir -p $out/share/translations + cp translations/*.qm $out/share/translations/ # install icons for n in 16 24 32 48 64 96 128 256; do diff --git a/pkgs/applications/altcoins/monero-gui/move-log-file.patch b/pkgs/applications/altcoins/monero-gui/move-log-file.patch index 08840c6a65e8..74f817d81350 100644 --- a/pkgs/applications/altcoins/monero-gui/move-log-file.patch +++ b/pkgs/applications/altcoins/monero-gui/move-log-file.patch @@ -1,38 +1,27 @@ diff --git a/main.cpp b/main.cpp -index c03b160..a8ea263 100644 +index 79223c0..e80b317 100644 --- a/main.cpp +++ b/main.cpp -@@ -80,14 +80,16 @@ int main(int argc, char *argv[]) - // qDebug() << "High DPI auto scaling - enabled"; - //#endif - -- // Log settings -- Monero::Wallet::init(argv[0], "monero-wallet-gui"); --// qInstallMessageHandler(messageHandler); -- - MainApp app(argc, argv); - - qDebug() << "app startd"; - -+ // Log settings -+ QString logfile = -+ QStandardPaths::writableLocation(QStandardPaths::CacheLocation) -+ + "/monero-wallet-gui.log"; -+ Monero::Wallet::init(argv[0], logfile.toUtf8().constData()); -+ - app.setApplicationName("monero-core"); - app.setOrganizationDomain("getmonero.org"); - app.setOrganizationName("monero-project"); -diff --git a/src/libwalletqt/Wallet.cpp b/src/libwalletqt/Wallet.cpp -index 74649ce..fe1efc6 100644 ---- a/src/libwalletqt/Wallet.cpp -+++ b/src/libwalletqt/Wallet.cpp -@@ -729,7 +729,7 @@ QString Wallet::getWalletLogPath() const - #ifdef Q_OS_MACOS - return QStandardPaths::standardLocations(QStandardPaths::HomeLocation).at(0) + "/Library/Logs/" + filename; - #else -- return QCoreApplication::applicationDirPath() + "/" + filename; -+ return QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + filename; +@@ -115,6 +115,9 @@ int main(int argc, char *argv[]) + QCommandLineOption logPathOption(QStringList() << "l" << "log-file", + QCoreApplication::translate("main", "Log to specified file"), + QCoreApplication::translate("main", "file")); ++ logPathOption.setDefaultValue( ++ QStandardPaths::writableLocation(QStandardPaths::CacheLocation) ++ + "/monero-wallet-gui.log"); + parser.addOption(logPathOption); + parser.addHelpOption(); + parser.process(app); +diff --git a/Logger.cpp b/Logger.cpp +index 660bafc..dae24d4 100644 +--- a/Logger.cpp ++++ b/Logger.cpp +@@ -15,7 +15,7 @@ static const QString default_name = "monero-wallet-gui.log"; + #elif defined(Q_OS_MAC) + static const QString osPath = QStandardPaths::standardLocations(QStandardPaths::HomeLocation).at(0) + "/Library/Logs"; + #else // linux + bsd +- static const QString osPath = QStandardPaths::standardLocations(QStandardPaths::HomeLocation).at(0); ++ static const QString osPath = QStandardPaths::standardLocations(QStandardPaths::CacheLocation).at(0); #endif - } + diff --git a/pkgs/applications/altcoins/monero-gui/move-translations-dir.patch b/pkgs/applications/altcoins/monero-gui/move-translations-dir.patch index 29bb56301547..ff17ce5da1c0 100644 --- a/pkgs/applications/altcoins/monero-gui/move-translations-dir.patch +++ b/pkgs/applications/altcoins/monero-gui/move-translations-dir.patch @@ -1,14 +1,13 @@ diff --git a/TranslationManager.cpp b/TranslationManager.cpp -index fa39d35..5a410f7 100644 +index e7fc52a..83534cc 100644 --- a/TranslationManager.cpp +++ b/TranslationManager.cpp -@@ -29,7 +29,7 @@ bool TranslationManager::setLanguage(const QString &language) - #ifdef Q_OS_MACX - QString dir = qApp->applicationDirPath() + "/../Resources/translations"; - #else +@@ -25,7 +25,7 @@ bool TranslationManager::setLanguage(const QString &language) + return true; + } + - QString dir = qApp->applicationDirPath() + "/translations"; + QString dir = qApp->applicationDirPath() + "/../share/translations"; - #endif - QString filename = "monero-core_" + language; - + + qDebug("%s: loading translation file '%s' from '%s'", diff --git a/pkgs/applications/altcoins/monero/default.nix b/pkgs/applications/altcoins/monero/default.nix index cbba1ecba145..e344f4d94bab 100644 --- a/pkgs/applications/altcoins/monero/default.nix +++ b/pkgs/applications/altcoins/monero/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, fetchpatch +{ stdenv, fetchgit , cmake, pkgconfig, git , boost, miniupnpc, openssl, unbound, cppzmq -, zeromq, pcsclite, readline +, zeromq, pcsclite, readline, libsodium , CoreData, IOKit, PCSC }: @@ -11,35 +11,27 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "monero-${version}"; - version = "0.12.0.0"; + version = "0.13.0.3"; - src = fetchFromGitHub { - owner = "monero-project"; - repo = "monero"; + src = fetchgit { + url = "https://github.com/monero-project/monero.git"; rev = "v${version}"; - sha256 = "1lc9mkrl1m8mdbvj88y8y5rv44vinxf7dyv221ndmw5c5gs5zfgk"; + sha256 = "03qx8y74zxnmabdi5r3a274pp8zvm3xhkdwi1xf5sb40vf4sfmwb"; }; nativeBuildInputs = [ cmake pkgconfig git ]; - patches = [ - # fix daemon crash, remove with 0.12.1.0 update - (fetchpatch { - url = "https://github.com/monero-project/monero/commit/08343ab.diff"; - sha256 = "0f1snrl2mk2czwk1ysympzr8ismjx39fcqgy13276vcmw0cfqi83"; - }) - ]; - buildInputs = [ boost miniupnpc openssl unbound cppzmq zeromq pcsclite readline + libsodium ] ++ optionals stdenv.isDarwin [ IOKit CoreData PCSC ]; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DBUILD_GUI_DEPS=ON" "-DReadline_ROOT_DIR=${readline.dev}" - ]; + ] ++ optional stdenv.isDarwin "-DBoost_USE_MULTITHREADED=OFF"; hardeningDisable = [ "fortify" ]; diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index 611828753e46..a28125d24d4f 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -69,7 +69,8 @@ let name = "clementine-free-${version}"; inherit src patches nativeBuildInputs postPatch; - buildInputs = buildInputs ++ [ makeWrapper ]; + # gst_plugins needed for setup-hooks + buildInputs = buildInputs ++ [ makeWrapper gst_plugins ]; cmakeFlags = [ "-DUSE_SYSTEM_PROJECTM=ON" ]; @@ -101,7 +102,7 @@ let ./clementine-spotify-blob.patch ]; - buildInputs = buildInputs ++ [ libspotify makeWrapper gst_plugins ]; + buildInputs = buildInputs ++ [ libspotify makeWrapper ]; # Only build and install the Spotify blob preBuild = '' cd ext/clementine-spotifyblob diff --git a/pkgs/applications/editors/flpsed/default.nix b/pkgs/applications/editors/flpsed/default.nix index 1c40b509bfe4..104206a14913 100644 --- a/pkgs/applications/editors/flpsed/default.nix +++ b/pkgs/applications/editors/flpsed/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fltk13, ghostscript, xlibs }: +{ stdenv, fetchurl, fltk13, ghostscript }: stdenv.mkDerivation rec { name = "flpsed-${version}"; diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index 0cf0c7bcbc69..8d5dca0a3454 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -2,7 +2,7 @@ gtk2, wrapGAppsHook, libXScrnSaver, libxkbfile, libsecret }: let - version = "1.26.1"; + version = "1.28.2"; channel = "stable"; plat = { @@ -12,9 +12,9 @@ let }.${stdenv.hostPlatform.system}; sha256 = { - "i686-linux" = "1g7kqbz6mrf8ngx2bnwpi9fifq5rjznxgsgwjb532z3nh92ypa8n"; - "x86_64-linux" = "02yldycakn5zxj1ji4nmhdyazqlkjqpzdj3g8j501c3j28pgiwjy"; - "x86_64-darwin" = "0pnsfkh20mj7pzqw7wlfd98jqc6a1mnsq1iira15n7fafqgj8zpl"; + "i686-linux" = "13zgx80qzq1wvss3byh56rvp2bdxywc4xmhhljsqrxf17g86g2zr"; + "x86_64-linux" = "1z50hkr9mcf76hlr1jb80nbvpxbpm2bh0l63yh9yqpalmz66xbfy"; + "x86_64-darwin" = "0n7lavpylg1q89qa64z4z1v7pgmwb2kidc57cgpvjnhjg8idys33"; }.${stdenv.hostPlatform.system}; archive_fmt = if stdenv.hostPlatform.system == "x86_64-darwin" then "zip" else "tar.gz"; diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index d4ac9720e15f..0abe90e0ba73 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -3,7 +3,7 @@ , kguiaddons, ki18n, kitemmodels, kitemviews, kwindowsystem , kio, kcrash , boost, libraw, fftw, eigen, exiv2, libheif, lcms2, gsl, openexr, giflib -, openjpeg, opencolorio, vc, poppler_qt5, curl, ilmbase +, openjpeg, opencolorio, vc, poppler, curl, ilmbase , qtmultimedia, qtx11extras , python3 }: @@ -23,7 +23,7 @@ mkDerivation rec { karchive kconfig kwidgetsaddons kcompletion kcoreaddons kguiaddons ki18n kitemmodels kitemviews kwindowsystem kio kcrash boost libraw fftw eigen exiv2 lcms2 gsl openexr libheif giflib - openjpeg opencolorio poppler_qt5 curl ilmbase + openjpeg opencolorio poppler curl ilmbase qtmultimedia qtx11extras python3 ] ++ lib.optional (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isx86_64) vc; diff --git a/pkgs/applications/graphics/qcomicbook/default.nix b/pkgs/applications/graphics/qcomicbook/default.nix index d67c8ef9b025..c37e21ec898a 100644 --- a/pkgs/applications/graphics/qcomicbook/default.nix +++ b/pkgs/applications/graphics/qcomicbook/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools, qtx11extras, poppler_qt5 }: +{ stdenv, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools, qtx11extras, poppler }: stdenv.mkDerivation rec { name = "qcomicbook-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - qtbase qttools qtx11extras poppler_qt5 + qtbase qttools qtx11extras poppler ]; postInstall = '' diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index a6a489492e31..c353a779b646 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }: buildGoPackage rec { name = "hugo-${version}"; @@ -13,6 +13,13 @@ buildGoPackage rec { sha256 = "0n27vyg66jfx4lwswsmdlybly8c9gy5rk7yhy7wzs3rwzlqv1jzj"; }; + patches = [ + (fetchpatch { + url = "https://github.com/gohugoio/hugo/commit/b137ad4dbd6d14d0a9af68c044aaee61f2c87fe5.diff"; + sha256 = "0w1gpg11idqywqcpwzvx4xabn02kk8y4jmyz4h67mc3yh2dhq3ll"; + }) + ]; + goDeps = ./deps.nix; buildFlags = "-tags extended"; diff --git a/pkgs/applications/misc/xmr-stak/default.nix b/pkgs/applications/misc/xmr-stak/default.nix index b98d10efdee1..877a25fe662e 100644 --- a/pkgs/applications/misc/xmr-stak/default.nix +++ b/pkgs/applications/misc/xmr-stak/default.nix @@ -12,13 +12,13 @@ in stdenv'.mkDerivation rec { name = "xmr-stak-${version}"; - version = "2.4.7"; + version = "2.5.0"; src = fetchFromGitHub { owner = "fireice-uk"; repo = "xmr-stak"; rev = "${version}"; - sha256 = "072gapchmd05ir5ygrvbgdhpjhm7pdjyl61n1ykxzvnvi81z6817"; + sha256 = "1qls0rai9c1cszcqqqmhcdvcsmm23w1jxzlq2b035apkz7ywbxjl"; }; NIX_CFLAGS_COMPILE = "-O3"; diff --git a/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix b/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix index 2beceddc7fba..d24a5780315d 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix @@ -3,7 +3,7 @@ # USAGE: # install the following package globally or in nix-shell: # -# (terraform.withPlugins (old: [terraform-provider-libvirt])) +# (terraform.withPlugins (p: [p.libvirt])) # # configuration.nix: # @@ -36,6 +36,10 @@ buildGoPackage rec { # and wrapped to terraform via deecb4c1aab780047d79978c636eeb879dd68630 propagatedBuildInputs = [ cdrtools ]; + # Terraform allow checking the provider versions, but this breaks + # if the versions are not provided via file paths. + postBuild = "mv go/bin/terraform-provider-libvirt{,_v${version}}"; + meta = with stdenv.lib; { homepage = https://github.com/dmacvicar/terraform-provider-libvirt; description = "Terraform provider for libvirt"; diff --git a/pkgs/applications/networking/instant-messengers/rambox/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/bare.nix index 2a80349c4e62..e08fdad50fb4 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/bare.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/bare.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { inherit src; nodejs = nodejs-8_x; - sha256 = "0mg1ilz65qyxgh5zg1f8fhx7ygz10w8ifamflpwbk8mrvqpkjlvr"; + sha256 = "0hbw47653wh159c34f0rlj3p7xy0lvsyp0wh2hl35kv3fnsfbbm0"; }; patches = [ ./isDev.patch ]; diff --git a/pkgs/applications/window-managers/xmonad/log-applet/default.nix b/pkgs/applications/window-managers/xmonad/log-applet/default.nix index 96f742df3105..57f00887103f 100644 --- a/pkgs/applications/window-managers/xmonad/log-applet/default.nix +++ b/pkgs/applications/window-managers/xmonad/log-applet/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, glib, dbus-glib -, desktopSupport, xlibs +, desktopSupport, xorg , gtk2 , gtk3, gnome3, mate , libxfce4util, xfce4-panel @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "042307grf4zvn61gnflhsj5xsjykrk9sjjsprprm4iij0qpybxcw"; }; - buildInputs = [ glib dbus-glib xlibs.xcbutilwm ] + buildInputs = [ glib dbus-glib xorg.xcbutilwm ] ++ stdenv.lib.optionals (desktopSupport == "gnomeflashback") [ gtk3 gnome3.gnome-panel ] ++ stdenv.lib.optionals (desktopSupport == "mate") [ gtk3 mate.mate-panel ] ++ stdenv.lib.optionals (desktopSupport == "xfce4") [ gtk2 libxfce4util xfce4-panel ] diff --git a/pkgs/development/compilers/julia/1.0.nix b/pkgs/development/compilers/julia/1.0.nix index 2301d0c1f437..528a0d26d056 100644 --- a/pkgs/development/compilers/julia/1.0.nix +++ b/pkgs/development/compilers/julia/1.0.nix @@ -1,6 +1,6 @@ import ./shared.nix { majorVersion = "1"; minorVersion = "0"; - maintenanceVersion = "0"; - src_sha256 = "083277z90m1jxr2d1ysb96rgjj9h5q97l6h54mx3pb3f38ykshz2"; + maintenanceVersion = "1"; + src_sha256 = "0bqb5c63c7jnb753nplqj5v4k9pvh792k8y4b1n5pq8jiibr86i0"; } diff --git a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix index 55faf277b159..48304b6af264 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix @@ -1,11 +1,11 @@ import ./jdk-linux-base.nix { productVersion = "8"; - patchVersion = "181"; + patchVersion = "191"; downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html; - sha256.i686-linux = "0159q5wrlp24v8rc6m1cr3kq8nddpdjdprj3vsmf8z7vpwx052np"; - sha256.x86_64-linux = "1lwiz44vlxn4hc5b43r9arad15lpjfbr7l6h5vafpgxzjmq5ci8q"; - sha256.armv7l-linux = "0zpgb1hqf9zazic66c7nim036ac6ld3dhnsanx4ijlrl7kd3fbn7"; - sha256.aarch64-linux = "191r926501cm6mz8p93ljdfxi0dgzw7ljjsrzsbmmxn4k0q2j0ad"; + sha256.i686-linux = "1dmnv3x28l0rdi92gpmcp38gpy3lf4pl441bijvjhi7j97kk60v4"; + sha256.x86_64-linux = "0r8dvb0hahfybvf9wiv7904rn22n93bfc9x6pgypynj0w83rbhjk"; + sha256.armv7l-linux = "0wgdr9ainzc2yc5qp6ncflnsdygpgrmv2af522djkc83skp5g70v"; + sha256.aarch64-linux = "1rgwf0i9ikcjqbxkvr4x94y62m1kklfdhgqscxil479d5mg6akqz"; jceName = "jce_policy-8.zip"; jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html; sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk"; diff --git a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix index 55faf277b159..48304b6af264 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix @@ -1,11 +1,11 @@ import ./jdk-linux-base.nix { productVersion = "8"; - patchVersion = "181"; + patchVersion = "191"; downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html; - sha256.i686-linux = "0159q5wrlp24v8rc6m1cr3kq8nddpdjdprj3vsmf8z7vpwx052np"; - sha256.x86_64-linux = "1lwiz44vlxn4hc5b43r9arad15lpjfbr7l6h5vafpgxzjmq5ci8q"; - sha256.armv7l-linux = "0zpgb1hqf9zazic66c7nim036ac6ld3dhnsanx4ijlrl7kd3fbn7"; - sha256.aarch64-linux = "191r926501cm6mz8p93ljdfxi0dgzw7ljjsrzsbmmxn4k0q2j0ad"; + sha256.i686-linux = "1dmnv3x28l0rdi92gpmcp38gpy3lf4pl441bijvjhi7j97kk60v4"; + sha256.x86_64-linux = "0r8dvb0hahfybvf9wiv7904rn22n93bfc9x6pgypynj0w83rbhjk"; + sha256.armv7l-linux = "0wgdr9ainzc2yc5qp6ncflnsdygpgrmv2af522djkc83skp5g70v"; + sha256.aarch64-linux = "1rgwf0i9ikcjqbxkvr4x94y62m1kklfdhgqscxil479d5mg6akqz"; jceName = "jce_policy-8.zip"; jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html; sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk"; diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 9e6d35b818f4..4120124d9bae 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -111,8 +111,8 @@ let postPatch = if isRuby25 then '' sed -i configure.ac -e '/config.guess/d' - cp ${config}/config.guess tool/ - cp ${config}/config.sub tool/ + cp --remove-destination ${config}/config.guess tool/ + cp --remove-destination ${config}/config.sub tool/ '' else opString useRailsExpress '' sed -i configure.in -e '/config.guess/d' @@ -202,26 +202,26 @@ let in { ruby_2_3 = generic { - version = rubyVersion "2" "3" "7" ""; + version = rubyVersion "2" "3" "8" ""; sha256 = { - src = "0zvx5kdp1frjs9n95n7ba7dy0alax33wi3nj8034m3ppvnf39k9m"; - git = "11wbzw2ywwfnvlkg3qjg0as2pzk5zyk63y2iis42d91lg1l2flrk"; + src = "1gwsqmrhpx1wanrfvrsj3j76rv888zh7jag2si2r14qf8ihns0dm"; + git = "0158fg1sx6l6applbq0831kl8kzx5jacfl9lfg0shfzicmjlys3f"; }; }; ruby_2_4 = generic { - version = rubyVersion "2" "4" "4" ""; + version = rubyVersion "2" "4" "5" ""; sha256 = { - src = "0nmfr2lijik6cykk0zbj11zcapcrvmdvq83k3r6q3k74g4d1qkr5"; - git = "103cs7hz1v0h84lbrippl87s4lawi20m406rs5dgxl2gr2wyjpy5"; + src = "162izk7c72y73vmdgcbsh8kqihrbm65xvp53r1s139pzwqd78dv7"; + git = "181za4h6bd2bkyzyknxc18i5gq0pnqag60ybc17p0ixw3q7pdj43"; }; }; ruby_2_5 = generic { - version = rubyVersion "2" "5" "1" ""; + version = rubyVersion "2" "5" "2" ""; sha256 = { - src = "1c99k0fjaq7k09104h1b1cqx6mrk2b14ic1jjnxc6yav68i1ij6s"; - git = "1j0fd16aq9x98n0kq9c3kfp2sh6xcsq8q4733p0wfqjh3vz50kyj"; + src = "0wgl1697sdiqh6ksgv40v627jp5557j1zi462krwnzhc9bk408xk"; + git = "00xy323q2f2v102hfgsj9k20vggvvmyhd6byfhbc1qwz2vyrvc47"; }; }; } diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index ca180b3c2294..151e9c483530 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -1,17 +1,17 @@ { patchSet, useRailsExpress, ops, patchLevel }: rec { - "2.3.7" = ops useRailsExpress [ + "2.3.8" = ops useRailsExpress [ "${patchSet}/patches/ruby/2.3/head/railsexpress/01-skip-broken-tests.patch" "${patchSet}/patches/ruby/2.3/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.3/head/railsexpress/03-display-more-detailed-stack-trace.patch" ]; - "2.4.4" = ops useRailsExpress [ + "2.4.5" = ops useRailsExpress [ "${patchSet}/patches/ruby/2.4/head/railsexpress/01-skip-broken-tests.patch" "${patchSet}/patches/ruby/2.4/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.4/head/railsexpress/03-display-more-detailed-stack-trace.patch" ]; - "2.5.1" = ops useRailsExpress [ + "2.5.2" = ops useRailsExpress [ "${patchSet}/patches/ruby/2.5/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch" "${patchSet}/patches/ruby/2.5/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.5/head/railsexpress/03-more-detailed-stacktrace.patch" diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix index 9b5c3d530ebf..1ec15e88f13d 100644 --- a/pkgs/development/libraries/libssh/default.nix +++ b/pkgs/development/libraries/libssh/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, cmake, zlib, openssl, libsodium }: stdenv.mkDerivation rec { - name = "libssh-0.7.5"; + name = "libssh-0.7.6"; src = fetchurl { - url = "https://red.libssh.org/attachments/download/218/${name}.tar.xz"; - sha256 = "15bh6dm9c50ndddzh3gqcgw7axp3ghrspjpkb1z3dr90vkanvs2l"; + url = "https://www.libssh.org/files/0.7/libssh-0.7.6.tar.xz"; + sha256 = "14hhdpn2hflywsi9d5bz2pfjxqkyi07znjij89cpakr7b4w7sq0x"; }; patches = [ diff --git a/pkgs/development/python-modules/astroid/1.6.nix b/pkgs/development/python-modules/astroid/1.6.nix new file mode 100644 index 000000000000..ca26da5a3737 --- /dev/null +++ b/pkgs/development/python-modules/astroid/1.6.nix @@ -0,0 +1,39 @@ +{ lib, fetchPypi, buildPythonPackage, pythonOlder, isPyPy +, lazy-object-proxy, six, wrapt, enum34, singledispatch, backports_functools_lru_cache +, pytest +}: + +buildPythonPackage rec { + pname = "astroid"; + version = "1.6.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "0fir4b67sm7shcacah9n61pvq313m523jb4q80sycrh3p8nmi6zw"; + }; + + # From astroid/__pkginfo__.py + propagatedBuildInputs = [ + lazy-object-proxy + six + wrapt + enum34 + singledispatch + backports_functools_lru_cache + ]; + + checkInputs = [ pytest ]; + + checkPhase = '' + # test_builtin_help is broken + pytest -k "not test_builtin_help" astroid + ''; + + meta = with lib; { + description = "An abstract syntax tree for Python with inference support"; + homepage = https://github.com/PyCQA/astroid; + license = licenses.lgpl2; + platforms = platforms.all; + maintainers = with maintainers; [ nand0p ]; + }; +} diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix index ccf6f4055269..d773c08e189a 100644 --- a/pkgs/development/python-modules/astroid/default.nix +++ b/pkgs/development/python-modules/astroid/default.nix @@ -22,8 +22,8 @@ buildPythonPackage rec { checkInputs = [ pytestrunner pytest ]; meta = with lib; { - description = "A abstract syntax tree for Python with inference support"; - homepage = https://bitbucket.org/logilab/astroid; + description = "An abstract syntax tree for Python with inference support"; + homepage = https://github.com/PyCQA/astroid; license = licenses.lgpl2; platforms = platforms.all; maintainers = with maintainers; [ nand0p ]; diff --git a/pkgs/development/python-modules/blivet/default.nix b/pkgs/development/python-modules/blivet/default.nix index 9d2485711d0c..1c86c02f7a88 100644 --- a/pkgs/development/python-modules/blivet/default.nix +++ b/pkgs/development/python-modules/blivet/default.nix @@ -31,7 +31,7 @@ in buildPythonPackage rec { ''; propagatedBuildInputs = [ - pykickstart pyparted pyblock pyudev selinuxWithPython cryptsetupWithPython + pykickstart pyparted pyblock pyudev selinuxWithPython.py cryptsetupWithPython six ]; diff --git a/pkgs/development/python-modules/pathlib2/default.nix b/pkgs/development/python-modules/pathlib2/default.nix index 412186e6075b..c85b29eac858 100644 --- a/pkgs/development/python-modules/pathlib2/default.nix +++ b/pkgs/development/python-modules/pathlib2/default.nix @@ -8,7 +8,7 @@ , mock }: -if !(pythonOlder "3.4") then null else buildPythonPackage rec { +buildPythonPackage rec { pname = "pathlib2"; version = "2.3.2"; diff --git a/pkgs/development/python-modules/pylint/1.9.nix b/pkgs/development/python-modules/pylint/1.9.nix new file mode 100644 index 000000000000..ad3140cf1572 --- /dev/null +++ b/pkgs/development/python-modules/pylint/1.9.nix @@ -0,0 +1,49 @@ +{ stdenv, lib, buildPythonPackage, fetchPypi, python, astroid, six, isort, + mccabe, configparser, backports_functools_lru_cache, singledispatch, + pytest, pytestrunner, pyenchant }: + +buildPythonPackage rec { + pname = "pylint"; + version = "1.9.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1cxr1j037hsm4spmvl64v2j2rdq72pc2z0gnn3iggd4np6y21wpz"; + }; + + checkInputs = [ pytest pytestrunner pyenchant ]; + + propagatedBuildInputs = [ astroid six isort mccabe configparser backports_functools_lru_cache singledispatch ]; + + postPatch = lib.optionalString stdenv.isDarwin '' + # Remove broken darwin test + rm -vf pylint/test/test_functional.py + ''; + + checkPhase = '' + pytest pylint/test -k "not ${lib.concatStringsSep " and not " ( + [ # Broken test + "test_good_comprehension_checks" + # See PyCQA/pylint#2535 + "test_libmodule" ] ++ + # Disable broken darwin tests + lib.optionals stdenv.isDarwin [ + "test_parallel_execution" + "test_py3k_jobs_option" + ] + )}" + ''; + + postInstall = '' + mkdir -p $out/share/emacs/site-lisp + cp "elisp/"*.el $out/share/emacs/site-lisp/ + ''; + + meta = with lib; { + homepage = https://github.com/PyCQA/pylint; + description = "A bug and style checker for Python"; + platforms = platforms.all; + license = licenses.gpl1Plus; + maintainers = with maintainers; [ nand0p ]; + }; +} diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index c9a44548c142..4f4eb3cfc731 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -1,5 +1,5 @@ -{ stdenv, buildPythonPackage, fetchPypi, python, pythonOlder, astroid, isort, - pytest, pytestrunner, mccabe, pytest_xdist, pyenchant }: +{ stdenv, lib, buildPythonPackage, fetchPypi, python, pythonOlder, astroid, + isort, mccabe, pytest, pytestrunner, pyenchant }: buildPythonPackage rec { pname = "pylint"; @@ -12,21 +12,25 @@ buildPythonPackage rec { sha256 = "31142f764d2a7cd41df5196f9933b12b7ee55e73ef12204b648ad7e556c119fb"; }; - checkInputs = [ pytest pytestrunner pytest_xdist pyenchant ]; + checkInputs = [ pytest pytestrunner pyenchant ]; propagatedBuildInputs = [ astroid isort mccabe ]; - postPatch = '' + postPatch = lib.optionalString stdenv.isDarwin '' # Remove broken darwin test rm -vf pylint/test/test_functional.py ''; checkPhase = '' - cat pylint/test/test_self.py - # Disable broken darwin tests - pytest pylint/test -k "not test_parallel_execution \ - and not test_py3k_jobs_option \ - and not test_good_comprehension_checks" + pytest pylint/test -k "not ${lib.concatStringsSep " and not " ( + # Broken test + [ "test_good_comprehension_checks" ] ++ + # Disable broken darwin tests + lib.optionals stdenv.isDarwin [ + "test_parallel_execution" + "test_py3k_jobs_option" + ] + )}" ''; postInstall = '' @@ -34,8 +38,8 @@ buildPythonPackage rec { cp "elisp/"*.el $out/share/emacs/site-lisp/ ''; - meta = with stdenv.lib; { - homepage = https://www.logilab.org/project/pylint; + meta = with lib; { + homepage = https://github.com/PyCQA/pylint; description = "A bug and style checker for Python"; platforms = platforms.all; license = licenses.gpl1Plus; diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 6146159ad0ab..ba8307d3cb37 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, attrs, hypothesis, py +{ stdenv, buildPythonPackage, pythonOlder, fetchPypi, attrs, hypothesis, py , setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k, more-itertools , atomicwrites, mock, writeText, pathlib2 }: @@ -19,7 +19,8 @@ buildPythonPackage rec { checkInputs = [ hypothesis mock ]; buildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools atomicwrites] - ++ stdenv.lib.optionals (!isPy3k) [ funcsigs pathlib2 ]; + ++ stdenv.lib.optionals (!isPy3k) [ funcsigs ] + ++ stdenv.lib.optionals (pythonOlder "3.6") [ pathlib2 ]; checkPhase = '' runHook preCheck diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index 60f342db12aa..dce19a1d8395 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "sbt-${version}"; - version = "1.2.4"; + version = "1.2.6"; src = fetchurl { urls = [ @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz" "https://cocl.us/sbt-${version}.tgz" ]; - sha256 = "06zv1mm4rhl0h6qa7m4w5lbwjcyqp43r183q36q9zlyip965mnrn"; + sha256 = "1nv8r3j2vhp38qbb123n86wfhb6mvwz7vgrrsjp344zg211psncn"; }; patchPhase = '' diff --git a/pkgs/misc/drivers/sc-controller/default.nix b/pkgs/misc/drivers/sc-controller/default.nix index f1c4ff091573..9de0ba277789 100644 --- a/pkgs/misc/drivers/sc-controller/default.nix +++ b/pkgs/misc/drivers/sc-controller/default.nix @@ -2,7 +2,7 @@ , gtk3, gobjectIntrospection, libappindicator-gtk3, librsvg , evdev, pygobject3, pylibacl, pytest, bluez , linuxHeaders -, libX11, libXext, libXfixes, libusb1, libudev +, libX11, libXext, libXfixes, libusb1, udev }: buildPythonApplication rec { @@ -34,7 +34,7 @@ buildPythonApplication rec { substituteInPlace scc/device_monitor.py --replace "find_library('bluetooth')" "'libbluetooth.so.3'" ''; - LD_LIBRARY_PATH = lib.makeLibraryPath [ libX11 libXext libXfixes libusb1 libudev bluez ]; + LD_LIBRARY_PATH = lib.makeLibraryPath [ libX11 libXext libXfixes libusb1 udev bluez ]; preFixup = '' gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH") diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 60b3ffb2d8dc..f4a728c9d25f 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.76"; + version = "4.14.78"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1gl2wkq4sazvpr0xnn4vrajj3j7w6hfiwdiy34y7jhlazyj1jgzf"; + sha256 = "0v2cwykgd2hxlqja4yl4pq45nhd5x8917ixqq7hj1r3ry304vnpl"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.18.nix b/pkgs/os-specific/linux/kernel/linux-4.18.nix index 9bf33c068b55..d6c4b58b980a 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.18.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.18.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.18.14"; + version = "4.18.16"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1lv2hpxzlk1yzr5dcjb0q0ylvlwx4ln2jvfvf01b9smr1lvd3iin"; + sha256 = "1rjjkhl8lz4y4sn7icy8mp6p1x7rvapybp51p92sanbjy3i19fmy"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 641e368f74e6..f4ef5c6eb1cf 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.161"; + version = "4.4.162"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "11rz66qvbcb6y3fz9k04jzn547sqdahqknd43imsr9sjgkaq60xy"; + sha256 = "0l2agmxzmq89jbh7r00qg4msvmhny40m2jar96fibwpklwd44kki"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index cdf7000fba89..89702c44ccbc 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.133"; + version = "4.9.135"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0qv5n8vipkqcd0hpf5l41h023n46rgja39h895phlcxs4p00ywsk"; + sha256 = "1kjly5ynsg2jy5nj41z21s8f18wfs4nk843jlmmcazzax6xv08z0"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index f58ab5c95cc4..b4df3b7b33e8 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -1,13 +1,13 @@ { stdenv, buildPackages, fetchgit, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.18.2018.09.21"; + version = "4.18.2018.10.12"; modDirVersion = "4.18.0"; src = fetchgit { url = "https://evilpiepirate.org/git/bcachefs.git"; - rev = "2fe17e38d355271a8212a8123a9281e2f9df811f"; - sha256 = "1p35qf7fdwpr8sz4alblmbq6rmhd87rwrrwk6xpgxsfkkhmf36d6"; + rev = "d7f6da1d60ec24266301231538ff6f09716537ed"; + sha256 = "05d7dh41nc35www8vmrn47wlf2mr2b8i4rm15vq3zgm32d0xv3lk"; }; extraConfig = "BCACHEFS_FS m"; diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix index 0654da927769..2969f723b50a 100644 --- a/pkgs/servers/mattermost/default.nix +++ b/pkgs/servers/mattermost/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchFromGitHub, buildGoPackage, buildEnv }: let - version = "5.1.0"; + version = "5.4.0"; mattermost-server = buildGoPackage rec { name = "mattermost-server-${version}"; @@ -10,7 +10,7 @@ let owner = "mattermost"; repo = "mattermost-server"; rev = "v${version}"; - sha256 = "069ihmfr6np991mbgg001y0kyafghn57nsv3kpyyvfmhv07p0qbc"; + sha256 = "0sal5ydm1cwnvf3acmiy0400ghhd6v0wj64mkxqwqf8ysnbxizwq"; }; goPackagePath = "github.com/mattermost/mattermost-server"; @@ -27,7 +27,7 @@ let src = fetchurl { url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz"; - sha256 = "1bm5nqnhk2w3sy8mvm81k7d65j6bgpvakgphgwqgnlm864i4253z"; + sha256 = "06dg0f6nrh3a2v3lnyn2s39nj5jpsvfkx3ypq4zjpks0srv4mgfz"; }; installPhase = '' diff --git a/pkgs/servers/openafs/1.6/module.nix b/pkgs/servers/openafs/1.6/module.nix index 7ad9199b7ace..c133161cf576 100644 --- a/pkgs/servers/openafs/1.6/module.nix +++ b/pkgs/servers/openafs/1.6/module.nix @@ -8,7 +8,7 @@ let kernelBuildDir = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; in stdenv.mkDerivation rec { - name = "openafs-${version}-${kernel.version}"; + name = "openafs-${version}-${kernel.modDirVersion}"; inherit version src; nativeBuildInputs = [ autoconf automake flex perl bison which ] ++ kernel.moduleBuildDependencies; @@ -51,8 +51,8 @@ in stdenv.mkDerivation rec { license = licenses.ipl10; platforms = platforms.linux; maintainers = [ maintainers.z77z maintainers.spacefrogg ]; - broken = versionOlder kernel.version "3.18" || - versionAtLeast kernel.version "4.18"; + broken = versionOlder kernel.version "3.18" + || stdenv.targetPlatform.isAarch64; }; } diff --git a/pkgs/servers/openafs/1.6/srcs.nix b/pkgs/servers/openafs/1.6/srcs.nix index 9e9ff623e5cd..17048b68024e 100644 --- a/pkgs/servers/openafs/1.6/srcs.nix +++ b/pkgs/servers/openafs/1.6/srcs.nix @@ -1,14 +1,14 @@ { fetchurl }: rec { - version = "1.6.22.2"; + version = "1.6.23"; src = fetchurl { url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2"; - sha256 = "15j17igignsfzv5jb47ryczsrz3zsmiqwnj38dx9gzz95807rkyf"; + sha256 = "1gy7a0jhagxif8av540xb1aa6cl7id08nsgjbgady54bnmb0viga"; }; srcs = [ src (fetchurl { url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-doc.tar.bz2"; - sha256 = "1lpydca95nx5pmqvplb9n3akmxbzvhhypswh0s589ywxpv3zynxm"; + sha256 = "18my71s9mddy0k835852ksjzkza7xs73kyxavmdqflh5vkywb6y0"; })]; } diff --git a/pkgs/servers/openafs/1.8/cross-build.patch b/pkgs/servers/openafs/1.8/cross-build.patch new file mode 100644 index 000000000000..2b4fd58b23a4 --- /dev/null +++ b/pkgs/servers/openafs/1.8/cross-build.patch @@ -0,0 +1,223 @@ +diff -Nur --unidirectional-new-file openafs-1.8.2/configure.ac openafs-1.8.2.new/configure.ac +--- openafs-1.8.2/configure.ac 2018-09-11 17:52:48.000000000 +0200 ++++ openafs-1.8.2.new/configure.ac 2018-10-16 15:56:36.512277860 +0200 +@@ -23,6 +23,7 @@ + + AC_PROG_CC + AC_PROG_LIBTOOL ++AX_PROG_CC_FOR_BUILD + + AC_PATH_PROGS([PATH_CPP], [cpp], [${CC-cc} -E], [$PATH:/lib:/usr/ccs/lib]) + AC_SUBST([PATH_CPP]) +diff -Nur --unidirectional-new-file openafs-1.8.2/src/cf/ax_prog_cc_for_build.m4 openafs-1.8.2.new/src/cf/ax_prog_cc_for_build.m4 +--- openafs-1.8.2/src/cf/ax_prog_cc_for_build.m4 1970-01-01 01:00:00.000000000 +0100 ++++ openafs-1.8.2.new/src/cf/ax_prog_cc_for_build.m4 2018-10-16 16:20:40.278641658 +0200 +@@ -0,0 +1,125 @@ ++# =========================================================================== ++# https://www.gnu.org/software/autoconf-archive/ax_prog_cc_for_build.html ++# =========================================================================== ++# ++# SYNOPSIS ++# ++# AX_PROG_CC_FOR_BUILD ++# ++# DESCRIPTION ++# ++# This macro searches for a C compiler that generates native executables, ++# that is a C compiler that surely is not a cross-compiler. This can be ++# useful if you have to generate source code at compile-time like for ++# example GCC does. ++# ++# The macro sets the CC_FOR_BUILD and CPP_FOR_BUILD macros to anything ++# needed to compile or link (CC_FOR_BUILD) and preprocess (CPP_FOR_BUILD). ++# The value of these variables can be overridden by the user by specifying ++# a compiler with an environment variable (like you do for standard CC). ++# ++# It also sets BUILD_EXEEXT and BUILD_OBJEXT to the executable and object ++# file extensions for the build platform, and GCC_FOR_BUILD to `yes' if ++# the compiler we found is GCC. All these variables but GCC_FOR_BUILD are ++# substituted in the Makefile. ++# ++# LICENSE ++# ++# Copyright (c) 2008 Paolo Bonzini ++# ++# Copying and distribution of this file, with or without modification, are ++# permitted in any medium without royalty provided the copyright notice ++# and this notice are preserved. This file is offered as-is, without any ++# warranty. ++ ++#serial 9 ++ ++AU_ALIAS([AC_PROG_CC_FOR_BUILD], [AX_PROG_CC_FOR_BUILD]) ++AC_DEFUN([AX_PROG_CC_FOR_BUILD], [dnl ++AC_REQUIRE([AC_PROG_CC])dnl ++AC_REQUIRE([AC_PROG_CPP])dnl ++AC_REQUIRE([AC_EXEEXT])dnl ++AC_REQUIRE([AC_CANONICAL_HOST])dnl ++ ++dnl Use the standard macros, but make them use other variable names ++dnl ++pushdef([ac_cv_prog_CPP], ac_cv_build_prog_CPP)dnl ++pushdef([ac_cv_prog_gcc], ac_cv_build_prog_gcc)dnl ++pushdef([ac_cv_prog_cc_works], ac_cv_build_prog_cc_works)dnl ++pushdef([ac_cv_prog_cc_cross], ac_cv_build_prog_cc_cross)dnl ++pushdef([ac_cv_prog_cc_g], ac_cv_build_prog_cc_g)dnl ++pushdef([ac_cv_exeext], ac_cv_build_exeext)dnl ++pushdef([ac_cv_objext], ac_cv_build_objext)dnl ++pushdef([ac_exeext], ac_build_exeext)dnl ++pushdef([ac_objext], ac_build_objext)dnl ++pushdef([CC], CC_FOR_BUILD)dnl ++pushdef([CPP], CPP_FOR_BUILD)dnl ++pushdef([CFLAGS], CFLAGS_FOR_BUILD)dnl ++pushdef([CPPFLAGS], CPPFLAGS_FOR_BUILD)dnl ++pushdef([LDFLAGS], LDFLAGS_FOR_BUILD)dnl ++pushdef([host], build)dnl ++pushdef([host_alias], build_alias)dnl ++pushdef([host_cpu], build_cpu)dnl ++pushdef([host_vendor], build_vendor)dnl ++pushdef([host_os], build_os)dnl ++pushdef([ac_cv_host], ac_cv_build)dnl ++pushdef([ac_cv_host_alias], ac_cv_build_alias)dnl ++pushdef([ac_cv_host_cpu], ac_cv_build_cpu)dnl ++pushdef([ac_cv_host_vendor], ac_cv_build_vendor)dnl ++pushdef([ac_cv_host_os], ac_cv_build_os)dnl ++pushdef([ac_cpp], ac_build_cpp)dnl ++pushdef([ac_compile], ac_build_compile)dnl ++pushdef([ac_link], ac_build_link)dnl ++ ++save_cross_compiling=$cross_compiling ++save_ac_tool_prefix=$ac_tool_prefix ++cross_compiling=no ++ac_tool_prefix= ++ ++AC_PROG_CC ++AC_PROG_CPP ++AC_EXEEXT ++ ++ac_tool_prefix=$save_ac_tool_prefix ++cross_compiling=$save_cross_compiling ++ ++dnl Restore the old definitions ++dnl ++popdef([ac_link])dnl ++popdef([ac_compile])dnl ++popdef([ac_cpp])dnl ++popdef([ac_cv_host_os])dnl ++popdef([ac_cv_host_vendor])dnl ++popdef([ac_cv_host_cpu])dnl ++popdef([ac_cv_host_alias])dnl ++popdef([ac_cv_host])dnl ++popdef([host_os])dnl ++popdef([host_vendor])dnl ++popdef([host_cpu])dnl ++popdef([host_alias])dnl ++popdef([host])dnl ++popdef([LDFLAGS])dnl ++popdef([CPPFLAGS])dnl ++popdef([CFLAGS])dnl ++popdef([CPP])dnl ++popdef([CC])dnl ++popdef([ac_objext])dnl ++popdef([ac_exeext])dnl ++popdef([ac_cv_objext])dnl ++popdef([ac_cv_exeext])dnl ++popdef([ac_cv_prog_cc_g])dnl ++popdef([ac_cv_prog_cc_cross])dnl ++popdef([ac_cv_prog_cc_works])dnl ++popdef([ac_cv_prog_gcc])dnl ++popdef([ac_cv_prog_CPP])dnl ++ ++dnl Finally, set Makefile variables ++dnl ++BUILD_EXEEXT=$ac_build_exeext ++BUILD_OBJEXT=$ac_build_objext ++AC_SUBST(BUILD_EXEEXT)dnl ++AC_SUBST(BUILD_OBJEXT)dnl ++AC_SUBST([CFLAGS_FOR_BUILD])dnl ++AC_SUBST([CPPFLAGS_FOR_BUILD])dnl ++AC_SUBST([LDFLAGS_FOR_BUILD])dnl ++]) +diff -Nur --unidirectional-new-file openafs-1.8.2/src/comerr/Makefile.in openafs-1.8.2.new/src/comerr/Makefile.in +--- openafs-1.8.2/src/comerr/Makefile.in 2018-09-11 17:52:48.000000000 +0200 ++++ openafs-1.8.2.new/src/comerr/Makefile.in 2018-10-16 15:48:19.678898925 +0200 +@@ -38,11 +38,14 @@ + compile_et: compile_et.o error_table.o + $(Q)case $(SYS_NAME) in \ + *_linux* | *_umlinux* | *_darwin* ) \ +- $(LT_LDRULE_static_NOQ) compile_et.o error_table.o -L${TOP_LIBDIR} -lopr $(buildtool_roken) $(MT_LIBS);; \ ++ $(LT_LDRULE_static_NOQ) compile_et.o error_table.o -L${TOP_LIBDIR} -lopr_build $(buildtool_roken) $(MT_LIBS);; \ + * ) \ +- $(LT_LDRULE_static_NOQ) compile_et.o error_table.o -L${TOP_LIBDIR} -lopr -ll $(buildtool_roken) $(MT_LIBS);; \ ++ $(LT_LDRULE_static_NOQ) compile_et.o error_table.o -L${TOP_LIBDIR} -lopr_build -ll $(buildtool_roken) $(MT_LIBS);; \ + esac + ++compile_et compile_et.o error_table.o: CC=$(CC_FOR_BUILD) ++compile_et compile_et.o error_table.o: LD=$(CC_FOR_BUILD) ++ + libafscom_err.a: $(LT_objs) + $(LT_LDLIB_lwp) $(LT_objs) + +diff -Nur --unidirectional-new-file openafs-1.8.2/src/config/Makefile.in openafs-1.8.2.new/src/config/Makefile.in +--- openafs-1.8.2/src/config/Makefile.in 2018-09-11 17:52:48.000000000 +0200 ++++ openafs-1.8.2.new/src/config/Makefile.in 2018-10-16 15:48:19.677898926 +0200 +@@ -54,6 +54,8 @@ + + config.o: config.c AFS_component_version_number.c + ++config mkvers config.o mc.o: CC=$(CC_FOR_BUILD) ++ + # + # Include installation targets + # +diff -Nur --unidirectional-new-file openafs-1.8.2/src/opr/Makefile.in openafs-1.8.2.new/src/opr/Makefile.in +--- openafs-1.8.2/src/opr/Makefile.in 2018-09-11 17:52:48.000000000 +0200 ++++ openafs-1.8.2.new/src/opr/Makefile.in 2018-10-16 15:48:19.678898925 +0200 +@@ -21,7 +21,7 @@ + $(TOP_INCDIR)/opr/time.h \ + $(TOP_INCDIR)/opr/uuid.h + +-all: $(HEADERS) liboafs_opr.la $(TOP_LIBDIR)/libopr_pic.a $(TOP_LIBDIR)/libopr.a ++all: $(HEADERS) liboafs_opr.la $(TOP_LIBDIR)/libopr_pic.a $(TOP_LIBDIR)/libopr.a $(TOP_LIBDIR)/libopr_build.a + + liboafs_opr.la: liboafs_opr.la.sym $(LT_objs) $(LT_deps) + $(LT_LDLIB_shlib) $(LT_objs) $(LT_deps) $(LT_libs) +@@ -29,12 +29,26 @@ + libopr.a: $(LT_objs) + $(LT_LDLIB_static) $(LT_objs) + ++LT_objs_build = $(patsubst %.lo, %_build.lo, $(LT_objs)) ++ ++%_build.lo: %.c ++ $(LT_CCRULE) $< ++ ++libopr_build.a: $(LT_objs_build) ++ $(LT_LDLIB_static) $(LT_objs_build) ++ ++libopr_build.a $(LT_objs_build): CC=$(CC_FOR_BUILD) ++libopr_build.a $(LT_objs_build): LD=$(CC_FOR_BUILD) ++ + libopr_pic.la: $(LT_objs) + $(LT_LDLIB_pic) $(LT_objs) + + $(TOP_LIBDIR)/libopr.a: libopr.a + $(INSTALL_DATA) libopr.a $@ + ++$(TOP_LIBDIR)/libopr_build.a: libopr_build.a ++ $(INSTALL_DATA) libopr_build.a $@ ++ + $(TOP_LIBDIR)/libopr_pic.a: libopr_pic.la + $(INSTALL_DATA) .libs/libopr_pic.a $@ + +diff -Nur --unidirectional-new-file openafs-1.8.2/src/rxgen/Makefile.in openafs-1.8.2.new/src/rxgen/Makefile.in +--- openafs-1.8.2/src/rxgen/Makefile.in 2018-09-11 17:52:48.000000000 +0200 ++++ openafs-1.8.2.new/src/rxgen/Makefile.in 2018-10-16 15:48:19.677898926 +0200 +@@ -25,6 +25,8 @@ + + CFLAGS_rpc_main.o= -DPATH_CPP="\"$(PATH_CPP)\"" + ++rxgen $(OBJS): CC=$(CC_FOR_BUILD) ++ + # + # Install targets + # diff --git a/pkgs/servers/openafs/1.8/default.nix b/pkgs/servers/openafs/1.8/default.nix index fc6b1bc2426b..c77bef6ad24e 100644 --- a/pkgs/servers/openafs/1.8/default.nix +++ b/pkgs/servers/openafs/1.8/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, which, autoconf, automake, flex, yacc -, glibc, perl, kerberos, libxslt, docbook_xsl, docbook_xml_dtd_43 -, libtool_2, removeReferencesTo +{ stdenv, buildPackages, fetchurl, which, autoconf, automake, flex +, yacc , glibc, perl, kerberos, libxslt, docbook_xsl +, docbook_xml_dtd_43 , libtool_2, removeReferencesTo , ncurses # Extra ncurses utilities. Only needed for debugging. , tsmbac ? null # Tivoli Storage Manager Backup Client from IBM }: @@ -11,12 +11,13 @@ stdenv.mkDerivation rec { name = "openafs-${version}"; inherit version srcs; + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ autoconf automake flex libxslt libtool_2 perl removeReferencesTo which yacc ]; buildInputs = [ kerberos ncurses ]; - patches = [ ./bosserver.patch ] ++ stdenv.lib.optional (tsmbac != null) ./tsmbac.patch; + patches = [ ./bosserver.patch ./cross-build.patch ] ++ stdenv.lib.optional (tsmbac != null) ./tsmbac.patch; outputs = [ "out" "dev" "man" "doc" "server" ]; @@ -27,6 +28,9 @@ stdenv.mkDerivation rec { # Makefiles don't include install targets for all new shared libs, yet. dontDisableStatic = true; + # Fixes broken format string in 1.8.2 + hardeningDisable=[ "format" ]; + preConfigure = '' patchShebangs . for i in `grep -l -R '/usr/\(include\|src\)' .`; do diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix index cfd9f0561e99..958fcd578c2b 100644 --- a/pkgs/servers/openafs/1.8/module.nix +++ b/pkgs/servers/openafs/1.8/module.nix @@ -8,7 +8,7 @@ let kernelBuildDir = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; in stdenv.mkDerivation rec { - name = "openafs-${version}-${kernel.version}"; + name = "openafs-${version}-${kernel.modDirVersion}"; inherit version src; nativeBuildInputs = [ autoconf automake flex libtool_2 perl which yacc ] @@ -54,9 +54,7 @@ in stdenv.mkDerivation rec { license = licenses.ipl10; platforms = platforms.linux; maintainers = [ maintainers.z77z maintainers.spacefrogg ]; - broken = (versionOlder kernel.version "3.18") || - (versionAtLeast kernel.version "4.18") || - stdenv.targetPlatform.isAarch64; + broken = versionOlder kernel.version "3.18"; }; } diff --git a/pkgs/servers/openafs/1.8/srcs.nix b/pkgs/servers/openafs/1.8/srcs.nix index e51504528999..ffdbe47220d7 100644 --- a/pkgs/servers/openafs/1.8/srcs.nix +++ b/pkgs/servers/openafs/1.8/srcs.nix @@ -1,14 +1,14 @@ { fetchurl }: rec { - version = "1.8.0"; + version = "1.8.2"; src = fetchurl { url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2"; - sha256 = "63fae6b3a4339e4a40945fae1afb9b99a5e7f8e8dbde668938ab8c4ff569fd7d"; + sha256 = "13hksffp7k5f89c9lc5g5b1q0pc9h7wyarq3sjyjqam7c513xz95"; }; srcs = [ src (fetchurl { url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-doc.tar.bz2"; - sha256 = "e26f3bb399f524b4978543eb3ec169fd58f2d409cf4bc22c75c65fb9b09f12e8"; + sha256 = "09n8nymrhpyb0fhahpln2spzhy9pn48hvry35ccqif2jd4wsxdmr"; })]; } diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index c9e8dd04c470..1023db4f6c50 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1,2771 +1,3019 @@ # THIS IS A GENERATED FILE. DO NOT EDIT! -args @ { clangStdenv, fetchurl, fetchgit, fetchpatch, stdenv, pkgconfig, intltool, freetype, fontconfig -, libxslt, expat, libpng, zlib, perl, mesa_noglu, mesa_drivers, spice-protocol -, dbus, libuuid, openssl, gperf, m4, libevdev, tradcpp, libinput, mcpp, makeWrapper, autoreconfHook -, autoconf, automake, libtool, xmlto, asciidoc, flex, bison, python, mtdev, pixman, ... }: with args; +{ lib, newScope, pixman }: -let - - mkDerivation = name: attrs: - let newAttrs = (overrides."${name}" or (x: x)) attrs; - stdenv = newAttrs.stdenv or args.stdenv; - in stdenv.mkDerivation ((removeAttrs newAttrs [ "stdenv" ]) // { - hardeningDisable = [ "bindnow" "relro" ]; - }); - - overrides = import ./overrides.nix {inherit args xorg;}; - - xorg = rec { +lib.makeScope newScope (self: with self; { inherit pixman; - applewmproto = (mkDerivation "applewmproto" { + applewmproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "applewmproto-1.4.2"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/applewmproto-1.4.2.tar.bz2; sha256 = "1zi4p07mp6jmk030p4gmglwxcwp0lzs5mi31y1b4rp8lsqxdxizw"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - appres = (mkDerivation "appres" { + appres = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xproto, libXt }: stdenv.mkDerivation { name = "appres-1.0.4"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/appres-1.0.4.tar.bz2; sha256 = "139yp08qy1w6dccamdy0fh343yhaf1am1v81m2j435nd4ya4wqcz"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 xproto libXt ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 xproto libXt ;}; + }) {}; - bdftopcf = (mkDerivation "bdftopcf" { + bdftopcf = callPackage ({ stdenv, pkgconfig, 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 = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - bigreqsproto = (mkDerivation "bigreqsproto" { + bigreqsproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "bigreqsproto-1.1.2"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/bigreqsproto-1.1.2.tar.bz2; sha256 = "07hvfm84scz8zjw14riiln2v4w03jlhp756ypwhq27g48jmic8a6"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - bitmap = (mkDerivation "bitmap" { + bitmap = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, xbitmaps, libXmu, xproto, libXt }: stdenv.mkDerivation { name = "bitmap-1.0.8"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/bitmap-1.0.8.tar.gz; sha256 = "1z06a1sn3iq72rmh73f11xgb7n46bdav1fvpgczxjp6al88bsbqs"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXaw xbitmaps libXmu xproto libXt ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 libXaw xbitmaps libXmu xproto libXt ;}; + }) {}; - compositeproto = (mkDerivation "compositeproto" { + compositeproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "compositeproto-0.4.2"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/compositeproto-0.4.2.tar.bz2; sha256 = "1z0crmf669hirw4s7972mmp8xig80kfndja9h559haqbpvq5k4q4"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - damageproto = (mkDerivation "damageproto" { + damageproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "damageproto-1.2.1"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/damageproto-1.2.1.tar.bz2; sha256 = "0nzwr5pv9hg7c21n995pdiv0zqhs91yz3r8rn3aska4ykcp12z2w"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - dmxproto = (mkDerivation "dmxproto" { + dmxproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "dmxproto-2.3.1"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/dmxproto-2.3.1.tar.bz2; sha256 = "02b5x9dkgajizm8dqyx2w6hmqx3v25l67mgf35nj6sz0lgk52877"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - dri2proto = (mkDerivation "dri2proto" { + dri2proto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "dri2proto-2.8"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/proto/dri2proto-2.8.tar.bz2; sha256 = "015az1vfdqmil1yay5nlsmpf6cf7vcbpslxjb72cfkzlvrv59dgr"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - dri3proto = (mkDerivation "dri3proto" { + dri3proto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "dri3proto-1.0"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/proto/dri3proto-1.0.tar.bz2; sha256 = "0x609xvnl8jky5m8jdklw4nymx3irkv32w99dfd8nl800bblkgh1"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - encodings = (mkDerivation "encodings" { + encodings = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "encodings-1.0.4"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/encodings-1.0.4.tar.bz2; sha256 = "0ffmaw80vmfwdgvdkp6495xgsqszb6s0iira5j0j6pd4i0lk3mnf"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - fixesproto = (mkDerivation "fixesproto" { + fixesproto = callPackage ({ stdenv, pkgconfig, fetchurl, xextproto }: stdenv.mkDerivation { name = "fixesproto-5.0"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/fixesproto-5.0.tar.bz2; sha256 = "1ki4wiq2iivx5g4w5ckzbjbap759kfqd72yg18m3zpbb4hqkybxs"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xextproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit xextproto ;}; + }) {}; - fontadobe100dpi = (mkDerivation "fontadobe100dpi" { + fontadobe100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation { name = "font-adobe-100dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-adobe-100dpi-1.0.3.tar.bz2; sha256 = "0m60f5bd0caambrk8ksknb5dks7wzsg7g7xaf0j21jxmx8rq9h5j"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; + }) {}; - fontadobe75dpi = (mkDerivation "fontadobe75dpi" { + fontadobe75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation { name = "font-adobe-75dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-adobe-75dpi-1.0.3.tar.bz2; sha256 = "02advcv9lyxpvrjv8bjh1b797lzg6jvhipclz49z8r8y98g4l0n6"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; + }) {}; - fontadobeutopia100dpi = (mkDerivation "fontadobeutopia100dpi" { + fontadobeutopia100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation { name = "font-adobe-utopia-100dpi-1.0.4"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-100dpi-1.0.4.tar.bz2; sha256 = "19dd9znam1ah72jmdh7i6ny2ss2r6m21z9v0l43xvikw48zmwvyi"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; + }) {}; - fontadobeutopia75dpi = (mkDerivation "fontadobeutopia75dpi" { + fontadobeutopia75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation { name = "font-adobe-utopia-75dpi-1.0.4"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-75dpi-1.0.4.tar.bz2; sha256 = "152wigpph5wvl4k9m3l4mchxxisgsnzlx033mn5iqrpkc6f72cl7"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; + }) {}; - fontadobeutopiatype1 = (mkDerivation "fontadobeutopiatype1" { + fontadobeutopiatype1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontdir, mkfontscale }: stdenv.mkDerivation { name = "font-adobe-utopia-type1-1.0.4"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-type1-1.0.4.tar.bz2; sha256 = "0xw0pdnzj5jljsbbhakc6q9ha2qnca1jr81zk7w70yl9bw83b54p"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ mkfontdir mkfontscale ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit mkfontdir mkfontscale ;}; + }) {}; - fontalias = (mkDerivation "fontalias" { + fontalias = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "font-alias-1.0.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-alias-1.0.3.tar.bz2; sha256 = "16ic8wfwwr3jicaml7b5a0sk6plcgc1kg84w02881yhwmqm3nicb"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - fontarabicmisc = (mkDerivation "fontarabicmisc" { + fontarabicmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation { name = "font-arabic-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-arabic-misc-1.0.3.tar.bz2; sha256 = "1x246dfnxnmflzf0qzy62k8jdpkb6jkgspcjgbk8jcq9lw99npah"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf mkfontdir ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit bdftopcf mkfontdir ;}; + }) {}; - fontbh100dpi = (mkDerivation "fontbh100dpi" { + fontbh100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation { name = "font-bh-100dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-bh-100dpi-1.0.3.tar.bz2; sha256 = "10cl4gm38dw68jzln99ijix730y7cbx8np096gmpjjwff1i73h13"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; + }) {}; - fontbh75dpi = (mkDerivation "fontbh75dpi" { + fontbh75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation { name = "font-bh-75dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-bh-75dpi-1.0.3.tar.bz2; sha256 = "073jmhf0sr2j1l8da97pzsqj805f7mf9r2gy92j4diljmi8sm1il"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; + }) {}; - fontbhlucidatypewriter100dpi = (mkDerivation "fontbhlucidatypewriter100dpi" { + fontbhlucidatypewriter100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation { name = "font-bh-lucidatypewriter-100dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2; sha256 = "1fqzckxdzjv4802iad2fdrkpaxl4w0hhs9lxlkyraq2kq9ik7a32"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; + }) {}; - fontbhlucidatypewriter75dpi = (mkDerivation "fontbhlucidatypewriter75dpi" { + fontbhlucidatypewriter75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation { name = "font-bh-lucidatypewriter-75dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2; sha256 = "0cfbxdp5m12cm7jsh3my0lym9328cgm7fa9faz2hqj05wbxnmhaa"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; + }) {}; - fontbhttf = (mkDerivation "fontbhttf" { + fontbhttf = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontdir, mkfontscale }: stdenv.mkDerivation { name = "font-bh-ttf-1.0.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-bh-ttf-1.0.3.tar.bz2; sha256 = "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ mkfontdir mkfontscale ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit mkfontdir mkfontscale ;}; + }) {}; - fontbhtype1 = (mkDerivation "fontbhtype1" { + fontbhtype1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontdir, mkfontscale }: stdenv.mkDerivation { name = "font-bh-type1-1.0.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-bh-type1-1.0.3.tar.bz2; sha256 = "1hb3iav089albp4sdgnlh50k47cdjif9p4axm0kkjvs8jyi5a53n"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ mkfontdir mkfontscale ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit mkfontdir mkfontscale ;}; + }) {}; - fontbitstream100dpi = (mkDerivation "fontbitstream100dpi" { + fontbitstream100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation { name = "font-bitstream-100dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-bitstream-100dpi-1.0.3.tar.bz2; sha256 = "1kmn9jbck3vghz6rj3bhc3h0w6gh0qiaqm90cjkqsz1x9r2dgq7b"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf mkfontdir ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit bdftopcf mkfontdir ;}; + }) {}; - fontbitstream75dpi = (mkDerivation "fontbitstream75dpi" { + fontbitstream75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation { name = "font-bitstream-75dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-bitstream-75dpi-1.0.3.tar.bz2; sha256 = "13plbifkvfvdfym6gjbgy9wx2xbdxi9hfrl1k22xayy02135wgxs"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf mkfontdir ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit bdftopcf mkfontdir ;}; + }) {}; - fontbitstreamtype1 = (mkDerivation "fontbitstreamtype1" { + fontbitstreamtype1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontdir, mkfontscale }: stdenv.mkDerivation { name = "font-bitstream-type1-1.0.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-bitstream-type1-1.0.3.tar.bz2; sha256 = "1256z0jhcf5gbh1d03593qdwnag708rxqa032izmfb5dmmlhbsn6"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ mkfontdir mkfontscale ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit mkfontdir mkfontscale ;}; + }) {}; - fontcronyxcyrillic = (mkDerivation "fontcronyxcyrillic" { + fontcronyxcyrillic = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation { name = "font-cronyx-cyrillic-1.0.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-cronyx-cyrillic-1.0.3.tar.bz2; sha256 = "0ai1v4n61k8j9x2a1knvfbl2xjxk3xxmqaq3p9vpqrspc69k31kf"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf mkfontdir ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit bdftopcf mkfontdir ;}; + }) {}; - fontcursormisc = (mkDerivation "fontcursormisc" { + fontcursormisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation { name = "font-cursor-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-cursor-misc-1.0.3.tar.bz2; sha256 = "0dd6vfiagjc4zmvlskrbjz85jfqhf060cpys8j0y1qpcbsrkwdhp"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf mkfontdir ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit bdftopcf mkfontdir ;}; + }) {}; - fontdaewoomisc = (mkDerivation "fontdaewoomisc" { + fontdaewoomisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation { name = "font-daewoo-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-daewoo-misc-1.0.3.tar.bz2; sha256 = "1s2bbhizzgbbbn5wqs3vw53n619cclxksljvm759h9p1prqdwrdw"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf mkfontdir ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit bdftopcf mkfontdir ;}; + }) {}; - fontdecmisc = (mkDerivation "fontdecmisc" { + fontdecmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation { name = "font-dec-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-dec-misc-1.0.3.tar.bz2; sha256 = "0yzza0l4zwyy7accr1s8ab7fjqkpwggqydbm2vc19scdby5xz7g1"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf mkfontdir ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit bdftopcf mkfontdir ;}; + }) {}; - fontibmtype1 = (mkDerivation "fontibmtype1" { + fontibmtype1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontdir, mkfontscale }: stdenv.mkDerivation { name = "font-ibm-type1-1.0.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-ibm-type1-1.0.3.tar.bz2; sha256 = "1pyjll4adch3z5cg663s6vhi02k8m6488f0mrasg81ssvg9jinzx"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ mkfontdir mkfontscale ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit mkfontdir mkfontscale ;}; + }) {}; - fontisasmisc = (mkDerivation "fontisasmisc" { + fontisasmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation { name = "font-isas-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-isas-misc-1.0.3.tar.bz2; sha256 = "0rx8q02rkx673a7skkpnvfkg28i8gmqzgf25s9yi0lar915sn92q"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf mkfontdir ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit bdftopcf mkfontdir ;}; + }) {}; - fontjismisc = (mkDerivation "fontjismisc" { + fontjismisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation { name = "font-jis-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-jis-misc-1.0.3.tar.bz2; sha256 = "0rdc3xdz12pnv951538q6wilx8mrdndpkphpbblszsv7nc8cw61b"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf mkfontdir ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit bdftopcf mkfontdir ;}; + }) {}; - fontmicromisc = (mkDerivation "fontmicromisc" { + fontmicromisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation { name = "font-micro-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-micro-misc-1.0.3.tar.bz2; sha256 = "1dldxlh54zq1yzfnrh83j5vm0k4ijprrs5yl18gm3n9j1z0q2cws"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf mkfontdir ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit bdftopcf mkfontdir ;}; + }) {}; - fontmisccyrillic = (mkDerivation "fontmisccyrillic" { + fontmisccyrillic = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation { name = "font-misc-cyrillic-1.0.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-misc-cyrillic-1.0.3.tar.bz2; sha256 = "0q2ybxs8wvylvw95j6x9i800rismsmx4b587alwbfqiw6biy63z4"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf mkfontdir ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit bdftopcf mkfontdir ;}; + }) {}; - fontmiscethiopic = (mkDerivation "fontmiscethiopic" { + fontmiscethiopic = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontdir, mkfontscale }: stdenv.mkDerivation { name = "font-misc-ethiopic-1.0.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-misc-ethiopic-1.0.3.tar.bz2; sha256 = "19cq7iq0pfad0nc2v28n681fdq3fcw1l1hzaq0wpkgpx7bc1zjsk"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ mkfontdir mkfontscale ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit mkfontdir mkfontscale ;}; + }) {}; - fontmiscmeltho = (mkDerivation "fontmiscmeltho" { + fontmiscmeltho = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontdir, mkfontscale }: stdenv.mkDerivation { name = "font-misc-meltho-1.0.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-misc-meltho-1.0.3.tar.bz2; sha256 = "148793fqwzrc3bmh2vlw5fdiwjc2n7vs25cic35gfp452czk489p"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ mkfontdir mkfontscale ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit mkfontdir mkfontscale ;}; + }) {}; - fontmiscmisc = (mkDerivation "fontmiscmisc" { + fontmiscmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation { name = "font-misc-misc-1.1.2"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-misc-misc-1.1.2.tar.bz2; sha256 = "150pq6n8n984fah34n3k133kggn9v0c5k07igv29sxp1wi07krxq"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; + }) {}; - fontmuttmisc = (mkDerivation "fontmuttmisc" { + fontmuttmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation { name = "font-mutt-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-mutt-misc-1.0.3.tar.bz2; sha256 = "13qghgr1zzpv64m0p42195k1kc77pksiv059fdvijz1n6kdplpxx"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf mkfontdir ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit bdftopcf mkfontdir ;}; + }) {}; - fontschumachermisc = (mkDerivation "fontschumachermisc" { + fontschumachermisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation { name = "font-schumacher-misc-1.1.2"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-schumacher-misc-1.1.2.tar.bz2; sha256 = "0nkym3n48b4v36y4s927bbkjnsmicajarnf6vlp7wxp0as304i74"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; + }) {}; - fontscreencyrillic = (mkDerivation "fontscreencyrillic" { + fontscreencyrillic = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation { name = "font-screen-cyrillic-1.0.4"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-screen-cyrillic-1.0.4.tar.bz2; sha256 = "0yayf1qlv7irf58nngddz2f1q04qkpr5jwp4aja2j5gyvzl32hl2"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf mkfontdir ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit bdftopcf mkfontdir ;}; + }) {}; - fontsonymisc = (mkDerivation "fontsonymisc" { + fontsonymisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation { name = "font-sony-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-sony-misc-1.0.3.tar.bz2; sha256 = "1xfgcx4gsgik5mkgkca31fj3w72jw9iw76qyrajrsz1lp8ka6hr0"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf mkfontdir ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit bdftopcf mkfontdir ;}; + }) {}; - fontsproto = (mkDerivation "fontsproto" { + fontsproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "fontsproto-2.1.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/proto/fontsproto-2.1.3.tar.bz2; sha256 = "1f2sdsd74y34nnaf4m1zlcbhyv8xb6irnisc99f84c4ivnq4d415"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - fontsunmisc = (mkDerivation "fontsunmisc" { + fontsunmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation { name = "font-sun-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-sun-misc-1.0.3.tar.bz2; sha256 = "1q6jcqrffg9q5f5raivzwx9ffvf7r11g6g0b125na1bhpz5ly7s8"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf mkfontdir ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit bdftopcf mkfontdir ;}; + }) {}; - fontutil = (mkDerivation "fontutil" { + fontutil = callPackage ({ stdenv, pkgconfig, 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 = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - fontwinitzkicyrillic = (mkDerivation "fontwinitzkicyrillic" { + fontwinitzkicyrillic = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation { name = "font-winitzki-cyrillic-1.0.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-winitzki-cyrillic-1.0.3.tar.bz2; sha256 = "181n1bgq8vxfxqicmy1jpm1hnr6gwn1kdhl6hr4frjigs1ikpldb"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf mkfontdir ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit bdftopcf mkfontdir ;}; + }) {}; - fontxfree86type1 = (mkDerivation "fontxfree86type1" { + fontxfree86type1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontdir, mkfontscale }: stdenv.mkDerivation { name = "font-xfree86-type1-1.0.4"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-xfree86-type1-1.0.4.tar.bz2; sha256 = "0jp3zc0qfdaqfkgzrb44vi9vi0a8ygb35wp082yz7rvvxhmg9sya"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ mkfontdir mkfontscale ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit mkfontdir mkfontscale ;}; + }) {}; - gccmakedep = (mkDerivation "gccmakedep" { + gccmakedep = callPackage ({ stdenv, pkgconfig, 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 = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - glproto = (mkDerivation "glproto" { + glproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "glproto-1.4.17"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/proto/glproto-1.4.17.tar.bz2; sha256 = "0h5ykmcddwid5qj6sbrszgkcypwn3mslvswxpgy2n2iixnyr9amd"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - iceauth = (mkDerivation "iceauth" { + iceauth = callPackage ({ stdenv, pkgconfig, fetchurl, libICE, xproto }: stdenv.mkDerivation { name = "iceauth-1.0.7"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/iceauth-1.0.7.tar.bz2; sha256 = "02izdyzhwpgiyjd8brzilwvwnfr72ncjb6mzz3y1icwrxqnsy5hj"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libICE xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libICE xproto ;}; + }) {}; - imake = (mkDerivation "imake" { + imake = callPackage ({ stdenv, pkgconfig, fetchurl, xproto }: stdenv.mkDerivation { name = "imake-1.0.7"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/util/imake-1.0.7.tar.bz2; sha256 = "0zpk8p044jh14bis838shbf4100bjg7mccd7bq54glpsq552q339"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit xproto ;}; + }) {}; - inputproto = (mkDerivation "inputproto" { + inputproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "inputproto-2.3.2"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/proto/inputproto-2.3.2.tar.bz2; sha256 = "07gk7v006zqn3dcfh16l06gnccy7xnqywf3vl9c209ikazsnlfl9"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - kbproto = (mkDerivation "kbproto" { + kbproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "kbproto-1.0.7"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/proto/kbproto-1.0.7.tar.bz2; sha256 = "0mxqj1pzhjpz9495vrjnpi10kv2n1s4vs7di0sh3yvipfq5j30pq"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - libAppleWM = (mkDerivation "libAppleWM" { + libAppleWM = callPackage ({ stdenv, pkgconfig, fetchurl, applewmproto, libX11, libXext, xextproto }: stdenv.mkDerivation { name = "libAppleWM-1.4.1"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/libAppleWM-1.4.1.tar.bz2; sha256 = "0r8x28n45q89x91mz8mv0zkkcxi8wazkac886fyvflhiv2y8ap2y"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ applewmproto libX11 libXext xextproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit applewmproto libX11 libXext xextproto ;}; + }) {}; - libFS = (mkDerivation "libFS" { + libFS = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, xproto, xtrans }: stdenv.mkDerivation { name = "libFS-1.0.7"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/lib/libFS-1.0.7.tar.bz2; sha256 = "1wy4km3qwwajbyl8y9pka0zwizn7d9pfiyjgzba02x3a083lr79f"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto xproto xtrans ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto xproto xtrans ;}; + }) {}; - libICE = (mkDerivation "libICE" { + libICE = callPackage ({ stdenv, pkgconfig, fetchurl, xproto, xtrans }: stdenv.mkDerivation { name = "libICE-1.0.9"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/lib/libICE-1.0.9.tar.bz2; sha256 = "00p2b6bsg6kcdbb39bv46339qcywxfl4hsrz8asm4hy6q7r34w4g"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xproto xtrans ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit xproto xtrans ;}; + }) {}; - libSM = (mkDerivation "libSM" { + libSM = callPackage ({ stdenv, pkgconfig, fetchurl, libICE, libuuid, xproto, xtrans }: stdenv.mkDerivation { name = "libSM-1.2.2"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/lib/libSM-1.2.2.tar.bz2; sha256 = "1gc7wavgs435g9qkp9jw4lhmaiq6ip9llv49f054ad6ryp4sib0b"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libICE libuuid xproto xtrans ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libICE libuuid xproto xtrans ;}; + }) {}; - libWindowsWM = (mkDerivation "libWindowsWM" { + libWindowsWM = callPackage ({ stdenv, pkgconfig, fetchurl, windowswmproto, libX11, libXext, xextproto }: stdenv.mkDerivation { name = "libWindowsWM-1.0.1"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/libWindowsWM-1.0.1.tar.bz2; sha256 = "1p0flwb67xawyv6yhri9w17m1i4lji5qnd0gq8v1vsfb8zw7rw15"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ windowswmproto libX11 libXext xextproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit windowswmproto libX11 libXext xextproto ;}; + }) {}; - libX11 = (mkDerivation "libX11" { + libX11 = callPackage ({ stdenv, pkgconfig, fetchurl, inputproto, kbproto, libxcb, xextproto, xf86bigfontproto, xproto, xtrans }: stdenv.mkDerivation { name = "libX11-1.6.6"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/lib/libX11-1.6.6.tar.bz2; sha256 = "0ks1mxlda7nxfmffihi15ljsn50q8dknl33i2xag8xzc80fiizk5"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ;}; + }) {}; - libXScrnSaver = (mkDerivation "libXScrnSaver" { + libXScrnSaver = callPackage ({ stdenv, pkgconfig, fetchurl, scrnsaverproto, libX11, libXext, xextproto }: stdenv.mkDerivation { name = "libXScrnSaver-1.2.2"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/libXScrnSaver-1.2.2.tar.bz2; sha256 = "07ff4r20nkkrj7h08f9fwamds9b3imj8jz5iz6y38zqw6jkyzwcg"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ scrnsaverproto libX11 libXext xextproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit scrnsaverproto libX11 libXext xextproto ;}; + }) {}; - libXau = (mkDerivation "libXau" { + libXau = callPackage ({ stdenv, pkgconfig, fetchurl, xproto }: stdenv.mkDerivation { name = "libXau-1.0.8"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/lib/libXau-1.0.8.tar.bz2; sha256 = "1wm4pv12f36cwzhldpp7vy3lhm3xdcnp4f184xkxsp7b18r7gm7x"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit xproto ;}; + }) {}; - libXaw = (mkDerivation "libXaw" { + libXaw = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xextproto, libXmu, libXpm, xproto, libXt }: stdenv.mkDerivation { name = "libXaw-1.0.13"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/lib/libXaw-1.0.13.tar.bz2; sha256 = "1kdhxplwrn43d9jp3v54llp05kwx210lrsdvqb6944jp29rhdy4f"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXext xextproto libXmu libXpm xproto libXt ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 libXext xextproto libXmu libXpm xproto libXt ;}; + }) {}; - libXcomposite = (mkDerivation "libXcomposite" { + libXcomposite = callPackage ({ stdenv, pkgconfig, fetchurl, compositeproto, libX11, libXfixes, xproto }: stdenv.mkDerivation { name = "libXcomposite-0.4.4"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/lib/libXcomposite-0.4.4.tar.bz2; sha256 = "0y21nfpa5s8qmx0srdlilyndas3sgl0c6rc26d5fx2vx436m1qpd"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ compositeproto libX11 libXfixes xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit compositeproto libX11 libXfixes xproto ;}; + }) {}; - libXcursor = (mkDerivation "libXcursor" { + libXcursor = callPackage ({ stdenv, pkgconfig, fetchurl, fixesproto, libX11, libXfixes, xproto, libXrender }: stdenv.mkDerivation { name = "libXcursor-1.1.15"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/lib/libXcursor-1.1.15.tar.bz2; sha256 = "0syzlfvh29037p0vnlc8f3jxz8nl55k65blswsakklkwsc6nfki9"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fixesproto libX11 libXfixes xproto libXrender ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fixesproto libX11 libXfixes xproto libXrender ;}; + }) {}; - libXdamage = (mkDerivation "libXdamage" { + libXdamage = callPackage ({ stdenv, pkgconfig, fetchurl, damageproto, fixesproto, libX11, xextproto, libXfixes, xproto }: stdenv.mkDerivation { name = "libXdamage-1.1.4"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/lib/libXdamage-1.1.4.tar.bz2; sha256 = "1bamagq7g6s0d23l8rb3nppj8ifqj05f7z9bhbs4fdg8az3ffgvw"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ damageproto fixesproto libX11 xextproto libXfixes xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit damageproto fixesproto libX11 xextproto libXfixes xproto ;}; + }) {}; - libXdmcp = (mkDerivation "libXdmcp" { + libXdmcp = callPackage ({ stdenv, pkgconfig, fetchurl, xproto }: stdenv.mkDerivation { name = "libXdmcp-1.1.2"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/lib/libXdmcp-1.1.2.tar.bz2; sha256 = "1qp4yhxbfnpj34swa0fj635kkihdkwaiw7kf55cg5zqqg630kzl1"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit xproto ;}; + }) {}; - libXext = (mkDerivation "libXext" { + libXext = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xextproto, xproto }: stdenv.mkDerivation { name = "libXext-1.3.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/lib/libXext-1.3.3.tar.bz2; sha256 = "0dbfn5bznnrhqzvkrcmw4c44yvvpwdcsrvzxf4rk27r36b9x865m"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 xextproto xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 xextproto xproto ;}; + }) {}; - libXfixes = (mkDerivation "libXfixes" { + libXfixes = callPackage ({ stdenv, pkgconfig, fetchurl, fixesproto, libX11, xextproto, xproto }: 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 = [ pkgconfig ]; buildInputs = [ fixesproto libX11 xextproto xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fixesproto libX11 xextproto xproto ;}; + }) {}; - libXfont = (mkDerivation "libXfont" { + libXfont = callPackage ({ stdenv, pkgconfig, fetchurl, libfontenc, fontsproto, freetype, xproto, 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 = [ pkgconfig ]; buildInputs = [ libfontenc fontsproto freetype xproto xtrans zlib ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libfontenc fontsproto freetype xproto xtrans zlib ;}; + }) {}; - libXfont2 = (mkDerivation "libXfont2" { + libXfont2 = callPackage ({ stdenv, pkgconfig, fetchurl, libfontenc, fontsproto, freetype, xproto, xtrans, zlib }: stdenv.mkDerivation { name = "libXfont2-2.0.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/lib/libXfont2-2.0.3.tar.bz2; sha256 = "0klwmimmhm3axpj8pwn5l41lbggh47r5aazhw63zxkbwfgyvg2hf"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libfontenc fontsproto freetype xproto xtrans zlib ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libfontenc fontsproto freetype xproto xtrans zlib ;}; + }) {}; - libXft = (mkDerivation "libXft" { + libXft = callPackage ({ stdenv, pkgconfig, fetchurl, fontconfig, freetype, libX11, xproto, libXrender }: stdenv.mkDerivation { name = "libXft-2.3.2"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2; sha256 = "0k6wzi5rzs0d0n338ms8n8lfyhq914hw4yl2j7553wqxfqjci8zm"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontconfig freetype libX11 xproto libXrender ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontconfig freetype libX11 xproto libXrender ;}; + }) {}; - libXi = (mkDerivation "libXi" { + libXi = callPackage ({ stdenv, pkgconfig, fetchurl, inputproto, libX11, libXext, xextproto, libXfixes, xproto }: stdenv.mkDerivation { name = "libXi-1.7.9"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/lib/libXi-1.7.9.tar.bz2; sha256 = "0idg1wc01hndvaa820fvfs7phvd1ymf0lldmq6386i7rhkzvirn2"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ inputproto libX11 libXext xextproto libXfixes xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit inputproto libX11 libXext xextproto libXfixes xproto ;}; + }) {}; - libXinerama = (mkDerivation "libXinerama" { + libXinerama = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xextproto, xineramaproto }: stdenv.mkDerivation { name = "libXinerama-1.1.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/lib/libXinerama-1.1.3.tar.bz2; sha256 = "1qlqfvzw45gdzk9xirgwlp2qgj0hbsyiqj8yh8zml2bk2ygnjibs"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXext xextproto xineramaproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 libXext xextproto xineramaproto ;}; + }) {}; - libXmu = (mkDerivation "libXmu" { + libXmu = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xextproto, xproto, libXt }: stdenv.mkDerivation { name = "libXmu-1.1.2"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/lib/libXmu-1.1.2.tar.bz2; sha256 = "02wx6jw7i0q5qwx87yf94fsn3h0xpz1k7dz1nkwfwm1j71ydqvkm"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXext xextproto xproto libXt ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 libXext xextproto xproto libXt ;}; + }) {}; - libXp = (mkDerivation "libXp" { + libXp = callPackage ({ stdenv, pkgconfig, fetchurl, printproto, libX11, libXau, libXext, xextproto }: 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 = [ pkgconfig ]; buildInputs = [ printproto libX11 libXau libXext xextproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit printproto libX11 libXau libXext xextproto ;}; + }) {}; - libXpm = (mkDerivation "libXpm" { + libXpm = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xextproto, xproto, libXt }: stdenv.mkDerivation { name = "libXpm-3.5.12"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/lib/libXpm-3.5.12.tar.bz2; sha256 = "1v5xaiw4zlhxspvx76y3hq4wpxv7mpj6parqnwdqvpj8vbinsspx"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXext xextproto xproto libXt ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 libXext xextproto xproto libXt ;}; + }) {}; - libXpresent = (mkDerivation "libXpresent" { + libXpresent = callPackage ({ stdenv, pkgconfig, fetchurl, presentproto, libX11, xextproto, xproto }: 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 = [ pkgconfig ]; buildInputs = [ presentproto libX11 xextproto xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit presentproto libX11 xextproto xproto ;}; + }) {}; - libXrandr = (mkDerivation "libXrandr" { + libXrandr = callPackage ({ stdenv, pkgconfig, fetchurl, randrproto, renderproto, libX11, libXext, xextproto, xproto, libXrender }: stdenv.mkDerivation { name = "libXrandr-1.5.1"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/lib/libXrandr-1.5.1.tar.bz2; sha256 = "06pmphx8lp3iywqnh88fvbfb0d8xgkx0qpvan49akpja1vxfgy8z"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ randrproto renderproto libX11 libXext xextproto xproto libXrender ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit randrproto renderproto libX11 libXext xextproto xproto libXrender ;}; + }) {}; - libXrender = (mkDerivation "libXrender" { + libXrender = callPackage ({ stdenv, pkgconfig, fetchurl, renderproto, libX11, xproto }: 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 = [ pkgconfig ]; buildInputs = [ renderproto libX11 xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit renderproto libX11 xproto ;}; + }) {}; - libXres = (mkDerivation "libXres" { + libXres = callPackage ({ stdenv, pkgconfig, fetchurl, resourceproto, libX11, libXext, xextproto, xproto }: stdenv.mkDerivation { name = "libXres-1.2.0"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/lib/libXres-1.2.0.tar.bz2; sha256 = "1m0jr0lbz9ixpp9ihk68349q0i7ry2379lnfzdy4mrl86ijc2xgz"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ resourceproto libX11 libXext xextproto xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit resourceproto libX11 libXext xextproto xproto ;}; + }) {}; - libXt = (mkDerivation "libXt" { + libXt = callPackage ({ stdenv, pkgconfig, fetchurl, libICE, kbproto, libSM, libX11, xproto }: stdenv.mkDerivation { name = "libXt-1.1.5"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/lib/libXt-1.1.5.tar.bz2; sha256 = "06lz6i7rbrp19kgikpaz4c97fw7n31k2h2aiikczs482g2zbdvj6"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libICE kbproto libSM libX11 xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libICE kbproto libSM libX11 xproto ;}; + }) {}; - libXtst = (mkDerivation "libXtst" { + libXtst = callPackage ({ stdenv, pkgconfig, fetchurl, inputproto, recordproto, libX11, libXext, xextproto, 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 = [ pkgconfig ]; buildInputs = [ inputproto recordproto libX11 libXext xextproto libXi ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit inputproto recordproto libX11 libXext xextproto libXi ;}; + }) {}; - libXv = (mkDerivation "libXv" { + libXv = callPackage ({ stdenv, pkgconfig, fetchurl, videoproto, libX11, libXext, xextproto, xproto }: 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 = [ pkgconfig ]; buildInputs = [ videoproto libX11 libXext xextproto xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit videoproto libX11 libXext xextproto xproto ;}; + }) {}; - libXvMC = (mkDerivation "libXvMC" { + libXvMC = callPackage ({ stdenv, pkgconfig, fetchurl, videoproto, libX11, libXext, xextproto, xproto, libXv }: stdenv.mkDerivation { name = "libXvMC-1.0.10"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/lib/libXvMC-1.0.10.tar.bz2; sha256 = "0bpffxr5dal90a8miv2w0rif61byqxq2f5angj4z1bnznmws00g5"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ videoproto libX11 libXext xextproto xproto libXv ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit videoproto libX11 libXext xextproto xproto libXv ;}; + }) {}; - libXxf86dga = (mkDerivation "libXxf86dga" { + libXxf86dga = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xextproto, xf86dgaproto, xproto }: stdenv.mkDerivation { name = "libXxf86dga-1.1.4"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/lib/libXxf86dga-1.1.4.tar.bz2; sha256 = "0zn7aqj8x0951d8zb2h2andldvwkzbsc4cs7q023g6nzq6vd9v4f"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXext xextproto xf86dgaproto xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 libXext xextproto xf86dgaproto xproto ;}; + }) {}; - libXxf86misc = (mkDerivation "libXxf86misc" { + libXxf86misc = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xextproto, xf86miscproto, xproto }: stdenv.mkDerivation { name = "libXxf86misc-1.0.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/lib/libXxf86misc-1.0.3.tar.bz2; sha256 = "0nvbq9y6k6m9hxdvg3crycqsnnxf1859wrisqcs37z9fhq044gsn"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXext xextproto xf86miscproto xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 libXext xextproto xf86miscproto xproto ;}; + }) {}; - libXxf86vm = (mkDerivation "libXxf86vm" { + libXxf86vm = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xextproto, xf86vidmodeproto, xproto }: 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 = [ pkgconfig ]; buildInputs = [ libX11 libXext xextproto xf86vidmodeproto xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 libXext xextproto xf86vidmodeproto xproto ;}; + }) {}; - libdmx = (mkDerivation "libdmx" { + libdmx = callPackage ({ stdenv, pkgconfig, fetchurl, dmxproto, libX11, libXext, xextproto }: stdenv.mkDerivation { name = "libdmx-1.1.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/lib/libdmx-1.1.3.tar.bz2; sha256 = "00djlxas38kbsrglcmwmxfbmxjdchlbj95pqwjvdg8jn5rns6zf9"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ dmxproto libX11 libXext xextproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit dmxproto libX11 libXext xextproto ;}; + }) {}; - libfontenc = (mkDerivation "libfontenc" { + libfontenc = callPackage ({ stdenv, pkgconfig, fetchurl, xproto, zlib }: stdenv.mkDerivation { name = "libfontenc-1.1.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/lib/libfontenc-1.1.3.tar.bz2; sha256 = "08gxmrhgw97mv0pvkfmd46zzxrn6zdw4g27073zl55gwwqq8jn3h"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xproto zlib ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit xproto zlib ;}; + }) {}; - libpciaccess = (mkDerivation "libpciaccess" { + libpciaccess = callPackage ({ stdenv, pkgconfig, fetchurl, zlib }: stdenv.mkDerivation { name = "libpciaccess-0.14"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/lib/libpciaccess-0.14.tar.bz2; sha256 = "197jbcpvp4z4x6j705mq2y4fsnnypy6f85y8xalgwhgx5bhl7x9x"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ zlib ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit zlib ;}; + }) {}; - libpthreadstubs = (mkDerivation "libpthreadstubs" { + libpthreadstubs = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "libpthread-stubs-0.4"; builder = ./builder.sh; src = fetchurl { url = http://xcb.freedesktop.org/dist/libpthread-stubs-0.4.tar.bz2; sha256 = "0cz7s9w8lqgzinicd4g36rjg08zhsbyngh0w68c3np8nlc8mkl74"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - libxcb = (mkDerivation "libxcb" { + libxcb = callPackage ({ stdenv, pkgconfig, fetchurl, libxslt, libpthreadstubs, python, libXau, xcbproto, libXdmcp }: stdenv.mkDerivation { name = "libxcb-1.12"; builder = ./builder.sh; src = fetchurl { url = http://xcb.freedesktop.org/dist/libxcb-1.12.tar.bz2; sha256 = "0nvv0la91cf8p5qqlb3r5xnmg1jn2wphn4fb5jfbr6byqsvv3psa"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libxslt libpthreadstubs python libXau xcbproto libXdmcp ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libxslt libpthreadstubs python libXau xcbproto libXdmcp ;}; + }) {}; - libxkbfile = (mkDerivation "libxkbfile" { + libxkbfile = callPackage ({ stdenv, pkgconfig, fetchurl, kbproto, libX11 }: stdenv.mkDerivation { name = "libxkbfile-1.0.9"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/lib/libxkbfile-1.0.9.tar.bz2; sha256 = "0smimr14zvail7ar68n7spvpblpdnih3jxrva7cpa6cn602px0ai"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ kbproto libX11 ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit kbproto libX11 ;}; + }) {}; - libxshmfence = (mkDerivation "libxshmfence" { + libxshmfence = callPackage ({ stdenv, pkgconfig, fetchurl, xproto }: stdenv.mkDerivation { name = "libxshmfence-1.2"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/lib/libxshmfence-1.2.tar.bz2; sha256 = "032b0nlkdrpbimdld4gqvhqx53rzn8fawvf1ybhzn7lcswgjs6yj"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit xproto ;}; + }) {}; - lndir = (mkDerivation "lndir" { + lndir = callPackage ({ stdenv, pkgconfig, fetchurl, xproto }: 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 = [ pkgconfig ]; buildInputs = [ xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit xproto ;}; + }) {}; - luit = (mkDerivation "luit" { + luit = callPackage ({ stdenv, pkgconfig, fetchurl, libfontenc }: stdenv.mkDerivation { name = "luit-1.1.1"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/luit-1.1.1.tar.bz2; sha256 = "0dn694mk56x6hdk6y9ylx4f128h5jcin278gnw2gb807rf3ygc1h"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libfontenc ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libfontenc ;}; + }) {}; - makedepend = (mkDerivation "makedepend" { + makedepend = callPackage ({ stdenv, pkgconfig, fetchurl, xproto }: stdenv.mkDerivation { name = "makedepend-1.0.5"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/util/makedepend-1.0.5.tar.bz2; sha256 = "09alw99r6y2bbd1dc786n3jfgv4j520apblyn7cw6jkjydshba7p"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit xproto ;}; + }) {}; - mkfontdir = (mkDerivation "mkfontdir" { + mkfontdir = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "mkfontdir-1.0.7"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/mkfontdir-1.0.7.tar.bz2; sha256 = "0c3563kw9fg15dpgx4dwvl12qz6sdqdns1pxa574hc7i5m42mman"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - mkfontscale = (mkDerivation "mkfontscale" { + mkfontscale = callPackage ({ stdenv, pkgconfig, fetchurl, libfontenc, freetype, xproto, zlib }: stdenv.mkDerivation { name = "mkfontscale-1.1.2"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/mkfontscale-1.1.2.tar.bz2; sha256 = "081z8lwh9c1gyrx3ad12whnpv3jpfbqsc366mswpfm48mwl54vcc"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libfontenc freetype xproto zlib ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libfontenc freetype xproto zlib ;}; + }) {}; - presentproto = (mkDerivation "presentproto" { + presentproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "presentproto-1.1"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/proto/presentproto-1.1.tar.bz2; sha256 = "1f96dlgfwhsd0834z8ydjzjnb0cwha5r6lxgia4say4zhsl276zn"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - printproto = (mkDerivation "printproto" { + printproto = callPackage ({ stdenv, pkgconfig, fetchurl, libXau }: stdenv.mkDerivation { name = "printproto-1.0.5"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/proto/printproto-1.0.5.tar.bz2; sha256 = "06liap8n4s25sgp27d371cc7yg9a08dxcr3pmdjp761vyin3360j"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libXau ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libXau ;}; + }) {}; - randrproto = (mkDerivation "randrproto" { + randrproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "randrproto-1.5.0"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/proto/randrproto-1.5.0.tar.bz2; sha256 = "0s4496z61y5q45q20gldwpf788b9nsa8hb13gnck1mwwwwrmarsc"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - recordproto = (mkDerivation "recordproto" { + recordproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "recordproto-1.14.2"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/recordproto-1.14.2.tar.bz2; sha256 = "0w3kgr1zabwf79bpc28dcnj0fpni6r53rpi82ngjbalj5s6m8xx7"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - renderproto = (mkDerivation "renderproto" { + renderproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "renderproto-0.11.1"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/renderproto-0.11.1.tar.bz2; sha256 = "0dr5xw6s0qmqg0q5pdkb4jkdhaja0vbfqla79qh5j1xjj9dmlwq6"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - resourceproto = (mkDerivation "resourceproto" { + resourceproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "resourceproto-1.2.0"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/resourceproto-1.2.0.tar.bz2; sha256 = "0638iyfiiyjw1hg3139pai0j6m65gkskrvd9684zgc6ydcx00riw"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - scrnsaverproto = (mkDerivation "scrnsaverproto" { + scrnsaverproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "scrnsaverproto-1.2.2"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/scrnsaverproto-1.2.2.tar.bz2; sha256 = "0rfdbfwd35d761xkfifcscx56q0n56043ixlmv70r4v4l66hmdwb"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - sessreg = (mkDerivation "sessreg" { + sessreg = callPackage ({ stdenv, pkgconfig, fetchurl, xproto }: stdenv.mkDerivation { name = "sessreg-1.1.1"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/sessreg-1.1.1.tar.bz2; sha256 = "1qd66mg2bnppqz4xgdjzif2488zl82vx2c26ld3nb8pnyginm9vq"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit xproto ;}; + }) {}; - setxkbmap = (mkDerivation "setxkbmap" { + setxkbmap = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libxkbfile }: stdenv.mkDerivation { name = "setxkbmap-1.3.1"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/setxkbmap-1.3.1.tar.bz2; sha256 = "1qfk097vjysqb72pq89h0la3462kbb2dh1d11qzs2fr67ybb7pd9"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libxkbfile ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 libxkbfile ;}; + }) {}; - smproxy = (mkDerivation "smproxy" { + smproxy = callPackage ({ stdenv, pkgconfig, 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 = [ pkgconfig ]; buildInputs = [ libICE libSM libXmu libXt ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libICE libSM libXmu libXt ;}; + }) {}; - twm = (mkDerivation "twm" { + twm = callPackage ({ stdenv, pkgconfig, fetchurl, libICE, libSM, libX11, libXext, libXmu, xproto, libXt }: stdenv.mkDerivation { name = "twm-1.0.9"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/twm-1.0.9.tar.bz2; sha256 = "02iicvhkp3i7q5rliyymiq9bppjr0pzfs6rgb78kppryqdx1cxf5"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libICE libSM libX11 libXext libXmu xproto libXt ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libICE libSM libX11 libXext libXmu xproto libXt ;}; + }) {}; - utilmacros = (mkDerivation "utilmacros" { + utilmacros = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "util-macros-1.19.2"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/util/util-macros-1.19.2.tar.bz2; sha256 = "04p7ydqxgq37jklnfj18b70zsifiz4h50wvrk94i2112mmv37r6p"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - videoproto = (mkDerivation "videoproto" { + videoproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "videoproto-2.3.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/proto/videoproto-2.3.3.tar.bz2; sha256 = "00m7rh3pwmsld4d5fpii3xfk5ciqn17kkk38gfpzrrh8zn4ki067"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - windowswmproto = (mkDerivation "windowswmproto" { + windowswmproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "windowswmproto-1.0.4"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/windowswmproto-1.0.4.tar.bz2; sha256 = "0syjxgy4m8l94qrm03nvn5k6bkxc8knnlld1gbllym97nvnv0ny0"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - x11perf = (mkDerivation "x11perf" { + x11perf = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, libXft, libXmu, xproto, libXrender }: stdenv.mkDerivation { name = "x11perf-1.6.0"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/x11perf-1.6.0.tar.bz2; sha256 = "0lb716yfdb8f11h4cz93d1bapqdxf1xplsb21kbp4xclq7g9hw78"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXext libXft libXmu xproto libXrender ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 libXext libXft libXmu xproto libXrender ;}; + }) {}; - xauth = (mkDerivation "xauth" { + xauth = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXau, libXext, libXmu, xproto }: stdenv.mkDerivation { name = "xauth-1.0.10"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/xauth-1.0.10.tar.bz2; sha256 = "0kgwz9rmxjfdvi2syf8g0ms5rr5cgyqx4n0n1m960kyz7k745zjs"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXau libXext libXmu xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 libXau libXext libXmu xproto ;}; + }) {}; - xbacklight = (mkDerivation "xbacklight" { + xbacklight = callPackage ({ stdenv, pkgconfig, fetchurl, libxcb, xcbutil }: stdenv.mkDerivation { name = "xbacklight-1.2.2"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/xbacklight-1.2.2.tar.bz2; sha256 = "0pmzaz4kp38qv2lqiw5rnqhwzmwrq65m1x5j001mmv99wh9isnk1"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libxcb xcbutil ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libxcb xcbutil ;}; + }) {}; - xbitmaps = (mkDerivation "xbitmaps" { + xbitmaps = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "xbitmaps-1.1.1"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/xbitmaps-1.1.1.tar.bz2; sha256 = "178ym90kwidia6nas4qr5n5yqh698vv8r02js0r4vg3b6lsb0w9n"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - xcbproto = (mkDerivation "xcbproto" { + xcbproto = callPackage ({ stdenv, pkgconfig, fetchurl, python }: stdenv.mkDerivation { name = "xcb-proto-1.12"; builder = ./builder.sh; src = fetchurl { url = http://xcb.freedesktop.org/dist/xcb-proto-1.12.tar.bz2; sha256 = "01j91946q8f34l1mbvmmgvyc393sm28ym4lxlacpiav4qsjan8jr"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ python ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit python ;}; + }) {}; - xcbutil = (mkDerivation "xcbutil" { + xcbutil = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xproto }: stdenv.mkDerivation { name = "xcb-util-0.4.0"; builder = ./builder.sh; src = fetchurl { url = http://xcb.freedesktop.org/dist/xcb-util-0.4.0.tar.bz2; sha256 = "1sahmrgbpyki4bb72hxym0zvxwnycmswsxiisgqlln9vrdlr9r26"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gperf m4 libxcb xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit gperf m4 libxcb xproto ;}; + }) {}; - xcbutilcursor = (mkDerivation "xcbutilcursor" { + xcbutilcursor = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xcbutilimage, xcbutilrenderutil, xproto }: 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 = [ pkgconfig ]; buildInputs = [ gperf m4 libxcb xcbutilimage xcbutilrenderutil xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit gperf m4 libxcb xcbutilimage xcbutilrenderutil xproto ;}; + }) {}; - xcbutilerrors = (mkDerivation "xcbutilerrors" { + xcbutilerrors = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xcbproto, xproto }: stdenv.mkDerivation { name = "xcb-util-errors-1.0"; builder = ./builder.sh; src = fetchurl { url = http://xcb.freedesktop.org/dist/xcb-util-errors-1.0.tar.bz2; sha256 = "158rm913dg3hxrrhyvvxr8bcm0pjy5jws70dhy2s12w1krv829k8"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gperf m4 libxcb xcbproto xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit gperf m4 libxcb xcbproto xproto ;}; + }) {}; - xcbutilimage = (mkDerivation "xcbutilimage" { + xcbutilimage = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xcbutil, xproto }: stdenv.mkDerivation { name = "xcb-util-image-0.4.0"; builder = ./builder.sh; src = fetchurl { url = http://xcb.freedesktop.org/dist/xcb-util-image-0.4.0.tar.bz2; sha256 = "1z1gxacg7q4cw6jrd26gvi5y04npsyavblcdad1xccc8swvnmf9d"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gperf m4 libxcb xcbutil xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit gperf m4 libxcb xcbutil xproto ;}; + }) {}; - xcbutilkeysyms = (mkDerivation "xcbutilkeysyms" { + xcbutilkeysyms = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xproto }: stdenv.mkDerivation { name = "xcb-util-keysyms-0.4.0"; builder = ./builder.sh; src = fetchurl { url = http://xcb.freedesktop.org/dist/xcb-util-keysyms-0.4.0.tar.bz2; sha256 = "1nbd45pzc1wm6v5drr5338j4nicbgxa5hcakvsvm5pnyy47lky0f"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gperf m4 libxcb xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit gperf m4 libxcb xproto ;}; + }) {}; - xcbutilrenderutil = (mkDerivation "xcbutilrenderutil" { + xcbutilrenderutil = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xproto }: stdenv.mkDerivation { name = "xcb-util-renderutil-0.3.9"; builder = ./builder.sh; src = fetchurl { url = http://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2; sha256 = "0nza1csdvvxbmk8vgv8vpmq7q8h05xrw3cfx9lwxd1hjzd47xsf6"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gperf m4 libxcb xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit gperf m4 libxcb xproto ;}; + }) {}; - xcbutilwm = (mkDerivation "xcbutilwm" { + xcbutilwm = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xproto }: stdenv.mkDerivation { name = "xcb-util-wm-0.4.1"; builder = ./builder.sh; src = fetchurl { url = http://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2; sha256 = "0gra7hfyxajic4mjd63cpqvd20si53j1q3rbdlkqkahfciwq3gr8"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gperf m4 libxcb xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit gperf m4 libxcb xproto ;}; + }) {}; - xclock = (mkDerivation "xclock" { + xclock = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, libXft, libxkbfile, libXmu, xproto, libXrender, libXt }: stdenv.mkDerivation { name = "xclock-1.0.7"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/xclock-1.0.7.tar.bz2; sha256 = "1l3xv4bsca6bwxx73jyjz0blav86i7vwffkhdb1ac81y9slyrki3"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXaw libXft libxkbfile libXmu xproto libXrender libXt ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 libXaw libXft libxkbfile libXmu xproto libXrender libXt ;}; + }) {}; - xcmiscproto = (mkDerivation "xcmiscproto" { + xcmiscproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "xcmiscproto-1.2.2"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/xcmiscproto-1.2.2.tar.bz2; sha256 = "1pyjv45wivnwap2wvsbrzdvjc5ql8bakkbkrvcv6q9bjjf33ccmi"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - xcmsdb = (mkDerivation "xcmsdb" { + xcmsdb = callPackage ({ stdenv, pkgconfig, 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 = [ pkgconfig ]; buildInputs = [ libX11 ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 ;}; + }) {}; - xcompmgr = (mkDerivation "xcompmgr" { + xcompmgr = callPackage ({ stdenv, pkgconfig, fetchurl, libXcomposite, libXdamage, libXext, libXfixes, libXrender }: stdenv.mkDerivation { name = "xcompmgr-1.1.7"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/xcompmgr-1.1.7.tar.bz2; sha256 = "14k89mz13jxgp4h2pz0yq0fbkw1lsfcb3acv8vkknc9i4ld9n168"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libXcomposite libXdamage libXext libXfixes libXrender ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libXcomposite libXdamage libXext libXfixes libXrender ;}; + }) {}; - xcursorgen = (mkDerivation "xcursorgen" { + xcursorgen = callPackage ({ stdenv, pkgconfig, fetchurl, libpng, libX11, libXcursor }: stdenv.mkDerivation { name = "xcursorgen-1.0.6"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/xcursorgen-1.0.6.tar.bz2; sha256 = "0v7nncj3kaa8c0524j7ricdf4rvld5i7c3m6fj55l5zbah7r3j1i"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libpng libX11 libXcursor ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libpng libX11 libXcursor ;}; + }) {}; - xcursorthemes = (mkDerivation "xcursorthemes" { + xcursorthemes = callPackage ({ stdenv, pkgconfig, fetchurl, libXcursor }: stdenv.mkDerivation { name = "xcursor-themes-1.0.4"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/data/xcursor-themes-1.0.4.tar.bz2; sha256 = "11mv661nj1p22sqkv87ryj2lcx4m68a04b0rs6iqh3fzp42jrzg3"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libXcursor ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libXcursor ;}; + }) {}; - xdm = (mkDerivation "xdm" { + xdm = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXau, libXaw, libXdmcp, libXext, libXft, libXinerama, libXmu, libXpm, libXt }: stdenv.mkDerivation { name = "xdm-1.1.11"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/xdm-1.1.11.tar.bz2; sha256 = "0iqw11977lpr9nk1is4fca84d531vck0mq7jldwl44m0vrnl5nnl"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm libXt ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm libXt ;}; + }) {}; - xdpyinfo = (mkDerivation "xdpyinfo" { + xdpyinfo = callPackage ({ stdenv, pkgconfig, fetchurl, libdmx, libX11, libxcb, libXcomposite, libXext, libXi, libXinerama, xproto, 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 = [ pkgconfig ]; buildInputs = [ libdmx libX11 libxcb libXcomposite libXext libXi libXinerama xproto libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libdmx libX11 libxcb libXcomposite libXext libXi libXinerama xproto libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ;}; + }) {}; - xdriinfo = (mkDerivation "xdriinfo" { + xdriinfo = callPackage ({ stdenv, pkgconfig, fetchurl, glproto, libX11 }: stdenv.mkDerivation { name = "xdriinfo-1.0.5"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/xdriinfo-1.0.5.tar.bz2; sha256 = "0681d0y8liqakkpz7mmsf689jcxrvs5291r20qi78mc9xxk3gfjc"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ glproto libX11 ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit glproto libX11 ;}; + }) {}; - xev = (mkDerivation "xev" { + xev = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xproto, libXrandr }: stdenv.mkDerivation { name = "xev-1.2.2"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/xev-1.2.2.tar.bz2; sha256 = "0krivhrxpq6719103r541xpi3i3a0y15f7ypc4lnrx8sdhmfcjnr"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 xproto libXrandr ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 xproto libXrandr ;}; + }) {}; - xextproto = (mkDerivation "xextproto" { + xextproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "xextproto-7.3.0"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/proto/xextproto-7.3.0.tar.bz2; sha256 = "1c2vma9gqgc2v06rfxdiqgwhxmzk2cbmknwf1ng3m76vr0xb5x7k"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - xeyes = (mkDerivation "xeyes" { + xeyes = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, libXmu, xproto, 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 = [ pkgconfig ]; - buildInputs = [ libX11 libXext libXmu libXrender libXt ]; + buildInputs = [ libX11 libXext libXmu xproto libXrender libXt ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 libXext libXmu libXrender libXt ;}; + }) {}; - xf86bigfontproto = (mkDerivation "xf86bigfontproto" { + xf86bigfontproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "xf86bigfontproto-1.2.0"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/xf86bigfontproto-1.2.0.tar.bz2; sha256 = "0j0n7sj5xfjpmmgx6n5x556rw21hdd18fwmavp95wps7qki214ms"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - xf86dgaproto = (mkDerivation "xf86dgaproto" { + xf86dgaproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "xf86dgaproto-2.1"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/xf86dgaproto-2.1.tar.bz2; sha256 = "0l4hx48207mx0hp09026r6gy9nl3asbq0c75hri19wp1118zcpmc"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - xf86driproto = (mkDerivation "xf86driproto" { + xf86driproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "xf86driproto-2.1.1"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2; sha256 = "07v69m0g2dfzb653jni4x656jlr7l84c1k39j8qc8vfb45r8sjww"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - xf86inputevdev = (mkDerivation "xf86inputevdev" { + xf86inputevdev = callPackage ({ stdenv, pkgconfig, fetchurl, inputproto, udev, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-input-evdev-2.10.5"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-input-evdev-2.10.5.tar.bz2; sha256 = "03dphgwjaxxyys8axc1kyysp6xvy9bjxicsdrhi2jvdgbchadnly"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ inputproto udev xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit inputproto udev xorgserver xproto ;}; + }) {}; - xf86inputjoystick = (mkDerivation "xf86inputjoystick" { + xf86inputjoystick = callPackage ({ stdenv, pkgconfig, fetchurl, inputproto, kbproto, xorgserver, xproto }: 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 = [ pkgconfig ]; buildInputs = [ inputproto kbproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit inputproto kbproto xorgserver xproto ;}; + }) {}; - xf86inputkeyboard = (mkDerivation "xf86inputkeyboard" { + xf86inputkeyboard = callPackage ({ stdenv, pkgconfig, fetchurl, inputproto, xorgserver, xproto }: 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 = [ pkgconfig ]; buildInputs = [ inputproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit inputproto xorgserver xproto ;}; + }) {}; - xf86inputlibinput = (mkDerivation "xf86inputlibinput" { + xf86inputlibinput = callPackage ({ stdenv, pkgconfig, fetchurl, inputproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-input-libinput-0.26.0"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-input-libinput-0.26.0.tar.bz2; sha256 = "0yrqs88b7yn9nljwlxzn76jfmvf0sh939kzij5b2jvr2qa7mbjmb"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ inputproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit inputproto xorgserver xproto ;}; + }) {}; - xf86inputmouse = (mkDerivation "xf86inputmouse" { + xf86inputmouse = callPackage ({ stdenv, pkgconfig, fetchurl, inputproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-input-mouse-1.9.2"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-input-mouse-1.9.2.tar.bz2; sha256 = "0bsbgww9421792zan43j60mndqprhfxhc48agsi15d3abjqda9gl"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ inputproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit inputproto xorgserver xproto ;}; + }) {}; - xf86inputsynaptics = (mkDerivation "xf86inputsynaptics" { + xf86inputsynaptics = callPackage ({ stdenv, pkgconfig, fetchurl, inputproto, randrproto, recordproto, libX11, libXi, xorgserver, xproto, libXtst }: stdenv.mkDerivation { name = "xf86-input-synaptics-1.9.0"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-input-synaptics-1.9.0.tar.bz2; sha256 = "0niv0w1czbxh4y3qkqbpdp5gjwhp3379inwhknhif0m4sy4k5fmg"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ;}; + }) {}; - xf86inputvmmouse = (mkDerivation "xf86inputvmmouse" { + xf86inputvmmouse = callPackage ({ stdenv, pkgconfig, fetchurl, inputproto, udev, randrproto, xorgserver, xproto }: 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 = [ pkgconfig ]; buildInputs = [ inputproto udev randrproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit inputproto udev randrproto xorgserver xproto ;}; + }) {}; - xf86inputvoid = (mkDerivation "xf86inputvoid" { + xf86inputvoid = callPackage ({ stdenv, pkgconfig, fetchurl, xorgserver, xproto }: 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 = [ pkgconfig ]; buildInputs = [ xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit xorgserver xproto ;}; + }) {}; - xf86miscproto = (mkDerivation "xf86miscproto" { + xf86miscproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "xf86miscproto-0.9.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/proto/xf86miscproto-0.9.3.tar.bz2; sha256 = "15dhcdpv61fyj6rhzrhnwri9hlw8rjfy05z1vik118lc99mfrf25"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - xf86videoamdgpu = (mkDerivation "xf86videoamdgpu" { + xf86videoamdgpu = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, mesa_noglu, libGL, libdrm, udev, randrproto, renderproto, videoproto, xextproto, xf86driproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-amdgpu-1.4.0"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-video-amdgpu-1.4.0.tar.bz2; sha256 = "0z56ifw3xiq9dychv8chg1cny0hq4v3c1r9pqcybk5fp7nzw9jpq"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto mesa_noglu libGL libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto mesa_noglu libGL libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; + }) {}; - xf86videoark = (mkDerivation "xf86videoark" { + xf86videoark = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, xextproto, xorgserver, xproto }: 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 = [ pkgconfig ]; buildInputs = [ fontsproto libpciaccess xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto libpciaccess xextproto xorgserver xproto ;}; + }) {}; - xf86videoast = (mkDerivation "xf86videoast" { + xf86videoast = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: 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 = [ pkgconfig ]; buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; + }) {}; - xf86videoati = (mkDerivation "xf86videoati" { + xf86videoati = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libdrm, udev, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86driproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-ati-18.0.1"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-video-ati-18.0.1.tar.bz2; sha256 = "180l2yw8c63cbcs3zk729vx439aig1d7yicpyxj0nmfl4y0kpskj"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; + }) {}; - xf86videochips = (mkDerivation "xf86videochips" { + xf86videochips = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-chips-1.2.7"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-video-chips-1.2.7.tar.bz2; sha256 = "0n4zypmbkjzkw36cjy2braaivhvj60np6w80lcs9mfpabs66ia3f"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; + }) {}; - xf86videocirrus = (mkDerivation "xf86videocirrus" { + xf86videocirrus = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: 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 = [ pkgconfig ]; buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; + }) {}; - xf86videodummy = (mkDerivation "xf86videodummy" { + xf86videodummy = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, randrproto, renderproto, videoproto, xf86dgaproto, xorgserver, xproto }: 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 = [ pkgconfig ]; buildInputs = [ fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ;}; + }) {}; - xf86videofbdev = (mkDerivation "xf86videofbdev" { + xf86videofbdev = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-fbdev-0.4.4"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-video-fbdev-0.4.4.tar.bz2; sha256 = "06ym7yy017lanj730hfkpfk4znx3dsj8jq3qvyzsn8w294kb7m4x"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xorgserver xproto ;}; + }) {}; - xf86videogeode = (mkDerivation "xf86videogeode" { + xf86videogeode = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-geode-2.11.17"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-video-geode-2.11.17.tar.bz2; sha256 = "0h9w6cfj7s86rg72c6qci8f733hg4g7paan5fwmmj7p74ckd9d07"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; + }) {}; - xf86videoglide = (mkDerivation "xf86videoglide" { + xf86videoglide = callPackage ({ stdenv, pkgconfig, fetchurl, xextproto, xorgserver, xproto }: 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 = [ pkgconfig ]; buildInputs = [ xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit xextproto xorgserver xproto ;}; + }) {}; - xf86videoglint = (mkDerivation "xf86videoglint" { + xf86videoglint = callPackage ({ stdenv, pkgconfig, fetchurl, libpciaccess, videoproto, xextproto, xf86dgaproto, xorgserver, xproto }: 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 = [ pkgconfig ]; buildInputs = [ libpciaccess videoproto xextproto xf86dgaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libpciaccess videoproto xextproto xf86dgaproto xorgserver xproto ;}; + }) {}; - xf86videoi128 = (mkDerivation "xf86videoi128" { + xf86videoi128 = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-i128-1.3.6"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-video-i128-1.3.6.tar.bz2; sha256 = "171b8lbxr56w3isph947dnw7x87hc46v6m3mcxdcz44gk167x0pq"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; + }) {}; - xf86videoi740 = (mkDerivation "xf86videoi740" { + xf86videoi740 = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-i740-1.3.6"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-video-i740-1.3.6.tar.bz2; sha256 = "0c8nl0yyyw08n4zd6sgw9p3a858wpgf6raczjd70gf47lncms389"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; + }) {}; - xf86videointel = (mkDerivation "xf86videointel" { + xf86videointel = callPackage ({ stdenv, pkgconfig, fetchurl, dri2proto, dri3proto, fontsproto, libdrm, libpng, udev, libpciaccess, presentproto, randrproto, renderproto, libX11, xcbutil, libxcb, libXcursor, libXdamage, libXext, xextproto, xf86driproto, libXfixes, xorgserver, xproto, 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 = [ pkgconfig ]; buildInputs = [ dri2proto dri3proto fontsproto libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit dri2proto dri3proto fontsproto libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ;}; + }) {}; - xf86videomach64 = (mkDerivation "xf86videomach64" { + xf86videomach64 = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libdrm, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86driproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-mach64-6.9.5"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-video-mach64-6.9.5.tar.bz2; sha256 = "07xlf5nsjm0x18ij5gyy4lf8hwpl10i8chi3skpqjh84drdri61y"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; + }) {}; - xf86videomga = (mkDerivation "xf86videomga" { + xf86videomga = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libdrm, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86driproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-mga-1.6.5"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-video-mga-1.6.5.tar.bz2; sha256 = "08ll52hlar9z446v0wwca5qkj3hxhswwm7vvcgic9xv4cf7csqxn"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; + }) {}; - xf86videoneomagic = (mkDerivation "xf86videoneomagic" { + xf86videoneomagic = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-neomagic-1.2.9"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-video-neomagic-1.2.9.tar.bz2; sha256 = "1whb2kgyqaxdjim27ya404acz50izgmafwnb6y9m89q5n6b97y3j"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libpciaccess xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto libpciaccess xorgserver xproto ;}; + }) {}; - xf86videonewport = (mkDerivation "xf86videonewport" { + xf86videonewport = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, randrproto, renderproto, videoproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-newport-0.2.4"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/xf86-video-newport-0.2.4.tar.bz2; sha256 = "1yafmp23jrfdmc094i6a4dsizapsc9v0pl65cpc8w1kvn7343k4i"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto randrproto renderproto videoproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto randrproto renderproto videoproto xorgserver xproto ;}; + }) {}; - xf86videonouveau = (mkDerivation "xf86videonouveau" { + xf86videonouveau = callPackage ({ stdenv, pkgconfig, fetchurl, dri2proto, fontsproto, libdrm, udev, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-nouveau-1.0.15"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-video-nouveau-1.0.15.tar.bz2; sha256 = "0k0xah72ryjwak4dc4crszxrlkmi9x1s7p3sd4la642n77yi1pmf"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; + }) {}; - xf86videonv = (mkDerivation "xf86videonv" { + xf86videonv = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: 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 = [ pkgconfig ]; buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; + }) {}; - xf86videoopenchrome = (mkDerivation "xf86videoopenchrome" { + xf86videoopenchrome = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, glproto, libdrm, udev, libpciaccess, randrproto, renderproto, videoproto, libX11, libXext, xextproto, xf86driproto, xorgserver, xproto, 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 = [ pkgconfig ]; buildInputs = [ fontsproto glproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto glproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ;}; + }) {}; - xf86videoqxl = (mkDerivation "xf86videoqxl" { + xf86videoqxl = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libdrm, udev, libpciaccess, randrproto, renderproto, videoproto, xf86dgaproto, xorgserver, xproto }: 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 = [ pkgconfig ]; buildInputs = [ fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xf86dgaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xf86dgaproto xorgserver xproto ;}; + }) {}; - xf86videor128 = (mkDerivation "xf86videor128" { + xf86videor128 = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libdrm, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86driproto, xf86miscproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-r128-6.10.2"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-video-r128-6.10.2.tar.bz2; sha256 = "1pkpka5m4cd6iy0f8iqnmg6xci14nb6887ilvxzn3xrsgx8j3nl4"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xorgserver xproto ;}; + }) {}; - xf86videorendition = (mkDerivation "xf86videorendition" { + xf86videorendition = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-rendition-4.2.6"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-video-rendition-4.2.6.tar.bz2; sha256 = "1a7rqafxzc2hd0s5pnq8s8j9d3jg64ndc0xnq4160kasyqhwy3k6"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;}; + }) {}; - xf86videos3virge = (mkDerivation "xf86videos3virge" { + xf86videos3virge = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-s3virge-1.10.7"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-video-s3virge-1.10.7.tar.bz2; sha256 = "1nm4cngjbw226q63rdacw6nx5lgxv7l7rsa8vhpr0gs80pg6igjx"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; + }) {}; - xf86videosavage = (mkDerivation "xf86videosavage" { + xf86videosavage = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libdrm, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86driproto, xorgserver, xproto }: 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 = [ pkgconfig ]; buildInputs = [ fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; + }) {}; - xf86videosiliconmotion = (mkDerivation "xf86videosiliconmotion" { + xf86videosiliconmotion = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, videoproto, xextproto, xorgserver, xproto }: 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 = [ pkgconfig ]; buildInputs = [ fontsproto libpciaccess videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto libpciaccess videoproto xextproto xorgserver xproto ;}; + }) {}; - xf86videosis = (mkDerivation "xf86videosis" { + xf86videosis = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libdrm, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86dgaproto, xf86driproto, xineramaproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-sis-0.10.9"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-video-sis-0.10.9.tar.bz2; sha256 = "03f1abjjf68y8y1iz768rn95va9d33wmbwfbsqrgl6k0gi0bf9jj"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xineramaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xineramaproto xorgserver xproto ;}; + }) {}; - xf86videosisusb = (mkDerivation "xf86videosisusb" { + xf86videosisusb = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xineramaproto, xorgserver, xproto }: 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 = [ pkgconfig ]; buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xineramaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xineramaproto xorgserver xproto ;}; + }) {}; - xf86videosuncg6 = (mkDerivation "xf86videosuncg6" { + xf86videosuncg6 = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, randrproto, renderproto, xorgserver, xproto }: 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 = [ pkgconfig ]; buildInputs = [ fontsproto randrproto renderproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto randrproto renderproto xorgserver xproto ;}; + }) {}; - xf86videosunffb = (mkDerivation "xf86videosunffb" { + xf86videosunffb = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, randrproto, renderproto, xextproto, xorgserver, xproto }: 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 = [ pkgconfig ]; buildInputs = [ fontsproto randrproto renderproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto randrproto renderproto xextproto xorgserver xproto ;}; + }) {}; - xf86videosunleo = (mkDerivation "xf86videosunleo" { + xf86videosunleo = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, randrproto, renderproto, xorgserver, xproto }: 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 = [ pkgconfig ]; buildInputs = [ fontsproto randrproto renderproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto randrproto renderproto xorgserver xproto ;}; + }) {}; - xf86videotdfx = (mkDerivation "xf86videotdfx" { + xf86videotdfx = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libdrm, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86driproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-tdfx-1.4.7"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-video-tdfx-1.4.7.tar.bz2; sha256 = "0hia45z4jc472fxp00803nznizcn4h1ybp63jcsb4lmd9vhqxx2c"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; + }) {}; - xf86videotga = (mkDerivation "xf86videotga" { + xf86videotga = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86dgaproto, xorgserver, xproto }: 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 = [ pkgconfig ]; buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;}; + }) {}; - xf86videotrident = (mkDerivation "xf86videotrident" { + xf86videotrident = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86dgaproto, xorgserver, xproto }: 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 = [ pkgconfig ]; buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;}; + }) {}; - xf86videov4l = (mkDerivation "xf86videov4l" { + xf86videov4l = callPackage ({ stdenv, pkgconfig, fetchurl, randrproto, videoproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-v4l-0.2.0"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/xf86-video-v4l-0.2.0.tar.bz2; sha256 = "0pcjc75hgbih3qvhpsx8d4fljysfk025slxcqyyhr45dzch93zyb"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ randrproto videoproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit randrproto videoproto xorgserver xproto ;}; + }) {}; - xf86videovesa = (mkDerivation "xf86videovesa" { + xf86videovesa = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-vesa-2.4.0"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-video-vesa-2.4.0.tar.bz2; sha256 = "1373vsxn6qh00na0s9c09kf09gj78rzi98zq93id8v5zsya3qi5z"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;}; + }) {}; - xf86videovmware = (mkDerivation "xf86videovmware" { + xf86videovmware = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libdrm, udev, libpciaccess, randrproto, renderproto, videoproto, libX11, libXext, xextproto, xineramaproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-vmware-13.2.1"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-video-vmware-13.2.1.tar.bz2; sha256 = "0azn3g0vcki47n5jddagk2rmbwdvp845k8p7d2r56zxs3w8ggxz2"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ;}; + }) {}; - xf86videovoodoo = (mkDerivation "xf86videovoodoo" { + xf86videovoodoo = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, xextproto, xf86dgaproto, xorgserver, xproto }: 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 = [ pkgconfig ]; buildInputs = [ fontsproto libpciaccess randrproto renderproto xextproto xf86dgaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xf86dgaproto xorgserver xproto ;}; + }) {}; - xf86videowsfb = (mkDerivation "xf86videowsfb" { + xf86videowsfb = callPackage ({ stdenv, pkgconfig, fetchurl, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-wsfb-0.4.0"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/xf86-video-wsfb-0.4.0.tar.bz2; sha256 = "0hr8397wpd0by1hc47fqqrnaw3qdqd8aqgwgzv38w5k3l3jy6p4p"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit xorgserver xproto ;}; + }) {}; - xf86videoxgi = (mkDerivation "xf86videoxgi" { + xf86videoxgi = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, glproto, libdrm, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86driproto, xineramaproto, xorgserver, xproto }: 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 = [ pkgconfig ]; buildInputs = [ fontsproto glproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xineramaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto glproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xineramaproto xorgserver xproto ;}; + }) {}; - xf86vidmodeproto = (mkDerivation "xf86vidmodeproto" { + xf86vidmodeproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "xf86vidmodeproto-2.3.1"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/xf86vidmodeproto-2.3.1.tar.bz2; sha256 = "0w47d7gfa8zizh2bshdr2rffvbr4jqjv019mdgyh6cmplyd4kna5"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - xfs = (mkDerivation "xfs" { + xfs = callPackage ({ stdenv, pkgconfig, fetchurl, libXfont, xproto, xtrans }: stdenv.mkDerivation { name = "xfs-1.1.4"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/xfs-1.1.4.tar.bz2; sha256 = "1ylz4r7adf567rnlbb52yi9x3qi4pyv954kkhm7ld4f0fkk7a2x4"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libXfont xproto xtrans ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libXfont xproto xtrans ;}; + }) {}; - xgamma = (mkDerivation "xgamma" { + xgamma = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xproto, 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 = [ pkgconfig ]; buildInputs = [ libX11 xproto libXxf86vm ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 xproto libXxf86vm ;}; + }) {}; - xgc = (mkDerivation "xgc" { + xgc = callPackage ({ stdenv, pkgconfig, 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 = [ pkgconfig ]; buildInputs = [ libXaw libXt ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libXaw libXt ;}; + }) {}; - xhost = (mkDerivation "xhost" { + xhost = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXau, libXmu, xproto }: stdenv.mkDerivation { name = "xhost-1.0.7"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/xhost-1.0.7.tar.bz2; sha256 = "16n26xw6l01zq31d4qvsaz50misvizhn7iihzdn5f7s72pp1krlk"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXau libXmu xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 libXau libXmu xproto ;}; + }) {}; - xineramaproto = (mkDerivation "xineramaproto" { + xineramaproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "xineramaproto-1.2.1"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/xineramaproto-1.2.1.tar.bz2; sha256 = "0ns8abd27x7gbp4r44z3wc5k9zqxxj8zjnazqpcyr4n17nxp8xcp"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - xinit = (mkDerivation "xinit" { + xinit = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xproto }: stdenv.mkDerivation { name = "xinit-1.4.0"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/xinit-1.4.0.tar.bz2; sha256 = "1vw2wlg74ig52naw0cha3pgzcwwk25l834j42cg8m5zmybp3a213"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 xproto ;}; + }) {}; - xinput = (mkDerivation "xinput" { + xinput = callPackage ({ stdenv, pkgconfig, fetchurl, inputproto, libX11, libXext, libXi, libXinerama, libXrandr }: stdenv.mkDerivation { name = "xinput-1.6.2"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/xinput-1.6.2.tar.bz2; sha256 = "1i75mviz9dyqyf7qigzmxq8vn31i86aybm662fzjz5c086dx551n"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ inputproto libX11 libXext libXi libXinerama libXrandr ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit inputproto libX11 libXext libXi libXinerama libXrandr ;}; + }) {}; - xkbcomp = (mkDerivation "xkbcomp" { + xkbcomp = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libxkbfile, xproto }: stdenv.mkDerivation { name = "xkbcomp-1.4.2"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/xkbcomp-1.4.2.tar.bz2; sha256 = "0944rrkkf0dxp07vhh9yr4prslxhqyw63qmbjirbv1bypswvrn3d"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libxkbfile xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 libxkbfile xproto ;}; + }) {}; - xkbevd = (mkDerivation "xkbevd" { + xkbevd = callPackage ({ stdenv, pkgconfig, 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 = [ pkgconfig ]; buildInputs = [ libX11 libxkbfile ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 libxkbfile ;}; + }) {}; - xkbprint = (mkDerivation "xkbprint" { + xkbprint = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libxkbfile, xproto }: 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 = [ pkgconfig ]; buildInputs = [ libX11 libxkbfile xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 libxkbfile xproto ;}; + }) {}; - xkbutils = (mkDerivation "xkbutils" { + xkbutils = callPackage ({ stdenv, pkgconfig, fetchurl, inputproto, libX11, libXaw, xproto, 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 = [ pkgconfig ]; buildInputs = [ inputproto libX11 libXaw xproto libXt ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit inputproto libX11 libXaw xproto libXt ;}; + }) {}; - xkeyboardconfig = (mkDerivation "xkeyboardconfig" { + xkeyboardconfig = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xproto }: stdenv.mkDerivation { name = "xkeyboard-config-2.24"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.24.tar.bz2; sha256 = "1my4786pd7iv5x392r9skj3qclmbd26nqzvh2fllwkkbyj08bcci"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 xproto ]; - configureFlags = [ "--with-xkb-rules-symlink=xorg" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 xproto ;}; + }) {}; - xkill = (mkDerivation "xkill" { + xkill = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXmu, xproto }: stdenv.mkDerivation { name = "xkill-1.0.4"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/xkill-1.0.4.tar.bz2; sha256 = "0bl1ky8ps9jg842j4mnmf4zbx8nkvk0h77w7bqjlpwij9wq2mvw8"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXmu xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 libXmu xproto ;}; + }) {}; - xlsatoms = (mkDerivation "xlsatoms" { + xlsatoms = callPackage ({ stdenv, pkgconfig, fetchurl, libxcb }: stdenv.mkDerivation { name = "xlsatoms-1.1.2"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/xlsatoms-1.1.2.tar.bz2; sha256 = "196yjik910xsr7dwy8daa0amr0r22ynfs360z0ndp9mx7mydrra7"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libxcb ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libxcb ;}; + }) {}; - xlsclients = (mkDerivation "xlsclients" { + xlsclients = callPackage ({ stdenv, pkgconfig, fetchurl, libxcb }: stdenv.mkDerivation { name = "xlsclients-1.1.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/xlsclients-1.1.3.tar.bz2; sha256 = "0g9x7rrggs741x9xwvv1k9qayma980d88nhdqw7j3pn3qvy6d5jx"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libxcb ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libxcb ;}; + }) {}; - xlsfonts = (mkDerivation "xlsfonts" { + xlsfonts = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xproto }: stdenv.mkDerivation { name = "xlsfonts-1.0.5"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/xlsfonts-1.0.5.tar.bz2; sha256 = "1yi774g6r1kafsbnxbkrwyndd3i60362ck1fps9ywz076pn5naa0"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 xproto ;}; + }) {}; - xmag = (mkDerivation "xmag" { + xmag = callPackage ({ stdenv, pkgconfig, 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 = [ pkgconfig ]; buildInputs = [ libX11 libXaw libXmu libXt ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 libXaw libXmu libXt ;}; + }) {}; - xmessage = (mkDerivation "xmessage" { + xmessage = callPackage ({ stdenv, pkgconfig, fetchurl, libXaw, libXt }: stdenv.mkDerivation { name = "xmessage-1.0.4"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/xmessage-1.0.4.tar.bz2; sha256 = "0s5bjlpxnmh8sxx6nfg9m0nr32r1sr3irr71wsnv76s33i34ppxw"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libXaw libXt ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libXaw libXt ;}; + }) {}; - xmodmap = (mkDerivation "xmodmap" { + xmodmap = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xproto }: stdenv.mkDerivation { name = "xmodmap-1.0.9"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/xmodmap-1.0.9.tar.bz2; sha256 = "0y649an3jqfq9klkp9y5gj20xb78fw6g193f5mnzpl0hbz6fbc5p"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 xproto ;}; + }) {}; - xorgcffiles = (mkDerivation "xorgcffiles" { + xorgcffiles = callPackage ({ stdenv, pkgconfig, 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 = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - xorgdocs = (mkDerivation "xorgdocs" { + xorgdocs = callPackage ({ stdenv, pkgconfig, 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 = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - xorgserver = (mkDerivation "xorgserver" { + xorgserver = callPackage ({ stdenv, pkgconfig, fetchurl, dri2proto, dri3proto, renderproto, openssl, libX11, libXau, libXaw, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, libXmu, libXpm, libXrender, libXres, libXt }: stdenv.mkDerivation { name = "xorg-server-1.19.6"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/xserver/xorg-server-1.19.6.tar.bz2; sha256 = "15y13ihgkggmly5s07vzvpn35gzx1w0hrkbnlcvcy05h3lpm0cm7"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ dri2proto dri3proto renderproto openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit dri2proto dri3proto renderproto openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ;}; + }) {}; - xorgsgmldoctools = (mkDerivation "xorgsgmldoctools" { + xorgsgmldoctools = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "xorg-sgml-doctools-1.11"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2; sha256 = "0k5pffyi5bx8dmfn033cyhgd3gf6viqj3x769fqixifwhbgy2777"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - xpr = (mkDerivation "xpr" { + xpr = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXmu, xproto }: stdenv.mkDerivation { name = "xpr-1.0.4"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2; sha256 = "1dbcv26w2yand2qy7b3h5rbvw1mdmdd57jw88v53sgdr3vrqvngy"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXmu xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 libXmu xproto ;}; + }) {}; - xprop = (mkDerivation "xprop" { + xprop = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xproto }: stdenv.mkDerivation { name = "xprop-1.2.2"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/xprop-1.2.2.tar.bz2; sha256 = "1ilvhqfjcg6f1hqahjkp8qaay9rhvmv2blvj3w9asraq0aqqivlv"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 xproto ;}; + }) {}; - xproto = (mkDerivation "xproto" { + xproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "xproto-7.0.31"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/proto/xproto-7.0.31.tar.bz2; sha256 = "0ivpxz0rx2a7nahkpkhfgymz7j0pwzaqvyqpdgw9afmxl1yp9yf6"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - xrandr = (mkDerivation "xrandr" { + xrandr = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xproto, libXrandr, libXrender }: stdenv.mkDerivation { name = "xrandr-1.5.0"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/xrandr-1.5.0.tar.bz2; sha256 = "1kaih7rmzxr1vp5a5zzjhm5x7dn9mckya088sqqw026pskhx9ky1"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 xproto libXrandr libXrender ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 xproto libXrandr libXrender ;}; + }) {}; - xrdb = (mkDerivation "xrdb" { + xrdb = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXmu, xproto }: stdenv.mkDerivation { name = "xrdb-1.1.0"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/xrdb-1.1.0.tar.bz2; sha256 = "0nsnr90wazcdd50nc5dqswy0bmq6qcj14nnrhyi7rln9pxmpp0kk"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXmu xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 libXmu xproto ;}; + }) {}; - xrefresh = (mkDerivation "xrefresh" { + xrefresh = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xproto }: stdenv.mkDerivation { name = "xrefresh-1.0.5"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/xrefresh-1.0.5.tar.bz2; sha256 = "1mlinwgvql6s1rbf46yckbfr9j22d3c3z7jx3n6ix7ca18dnf4rj"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 xproto ;}; + }) {}; - xset = (mkDerivation "xset" { + xset = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, libXmu, xproto, libXxf86misc }: stdenv.mkDerivation { name = "xset-1.2.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/xset-1.2.3.tar.bz2; sha256 = "0qw0iic27bz3yz2wynf1gxs70hhkcf9c4jrv7zhlg1mq57xz90j3"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXext libXmu xproto libXxf86misc ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 libXext libXmu xproto libXxf86misc ;}; + }) {}; - xsetroot = (mkDerivation "xsetroot" { + xsetroot = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xbitmaps, libXcursor, libXmu }: stdenv.mkDerivation { name = "xsetroot-1.1.0"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/xsetroot-1.1.0.tar.bz2; sha256 = "1bazzsf9sy0q2bj4lxvh1kvyrhmpggzb7jg575i15sksksa3xwc8"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 xbitmaps libXcursor libXmu ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 xbitmaps libXcursor libXmu ;}; + }) {}; - xtrans = (mkDerivation "xtrans" { + xtrans = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "xtrans-1.3.5"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/lib/xtrans-1.3.5.tar.bz2; sha256 = "00c3ph17acnsch3gbdmx33b9ifjnl5w7vx8hrmic1r1cjcv3pgdd"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - xvinfo = (mkDerivation "xvinfo" { + xvinfo = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xproto, libXv }: stdenv.mkDerivation { name = "xvinfo-1.1.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/xvinfo-1.1.3.tar.bz2; sha256 = "1sz5wqhxd1fqsfi1w5advdlwzkizf2fgl12hdpk66f7mv9l8pflz"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 xproto libXv ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 xproto libXv ;}; + }) {}; - xwd = (mkDerivation "xwd" { + xwd = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xproto }: stdenv.mkDerivation { name = "xwd-1.0.6"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/xwd-1.0.6.tar.bz2; sha256 = "0ybx48agdvjp9lgwvcw79r1x6jbqbyl3fliy3i5xwy4d4si9dcrv"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 xproto ;}; + }) {}; - xwininfo = (mkDerivation "xwininfo" { + xwininfo = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libxcb, xproto }: stdenv.mkDerivation { name = "xwininfo-1.1.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/xwininfo-1.1.3.tar.bz2; sha256 = "1y1zn8ijqslb5lfpbq4bb78kllhch8in98ps7n8fg3dxjpmb13i1"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libxcb xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 libxcb xproto ;}; + }) {}; - xwud = (mkDerivation "xwud" { + xwud = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xproto }: stdenv.mkDerivation { name = "xwud-1.0.4"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/xwud-1.0.4.tar.bz2; sha256 = "1ggql6maivah58kwsh3z9x1hvzxm1a8888xx4s78cl77ryfa1cyn"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 xproto ;}; + }) {}; -}; in xorg +}) diff --git a/pkgs/servers/x11/xorg/extra.list b/pkgs/servers/x11/xorg/extra.list index 28b698bdc816..17b42e416ab6 100644 --- a/pkgs/servers/x11/xorg/extra.list +++ b/pkgs/servers/x11/xorg/extra.list @@ -2,7 +2,7 @@ http://xcb.freedesktop.org/dist/libpthread-stubs-0.4.tar.bz2 http://xcb.freedesktop.org/dist/libxcb-1.12.tar.bz2 http://xcb.freedesktop.org/dist/xcb-proto-1.12.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-0.4.0.tar.bz2 -http://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.3.tar.bz2 +https://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.3.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-image-0.4.0.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-keysyms-0.4.0.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2 diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 37daa0dc9bc4..701a8984ada1 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -13,6 +13,9 @@ use strict; use warnings; +use File::Basename; +use File::Spec::Functions; + my $tmpDir = "/tmp/xorg-unpack"; @@ -43,7 +46,6 @@ $pcMap{"\$DRI2PROTO"} = "dri2proto"; my $downloadCache = "./download-cache"; -$ENV{'NIX_DOWNLOAD_CACHE'} = $downloadCache; mkdir $downloadCache, 0755; @@ -76,7 +78,17 @@ while (<>) { $pkgURLs{$pkg} = $tarball; $pkgNames{$pkg} = $pkgName; - my ($hash, $path) = `PRINT_PATH=1 QUIET=1 nix-prefetch-url '$tarball'`; + my $cachePath = catdir($downloadCache, basename($tarball)); + my $hash; + my $path; + if (-e $cachePath) { + $path = readlink($cachePath); + $hash = `nix-hash --type sha256 --base32 --flat $cachePath`; + } + else { + ($hash, $path) = `PRINT_PATH=1 QUIET=1 nix-prefetch-url '$tarball'`; + `nix-store --realise --add-root $cachePath --indirect $path`; + } chomp $hash; chomp $path; $pkgHashes{$pkg} = $hash; @@ -157,7 +169,7 @@ while (<>) { if ($file =~ /AC_PATH_PROG\(FCCACHE/) { # Don't run fc-cache. die if defined $extraAttrs{$pkg}; - $extraAttrs{$pkg} = " preInstall = \"installFlags=(FCCACHE=true)\"; "; + push @{$extraAttrs{$pkg}}, "preInstall = \"installFlags=(FCCACHE=true)\";"; } my $isFont; @@ -178,7 +190,7 @@ while (<>) { } if ($isFont) { - $extraAttrs{$pkg} = " configureFlags = [ \"--with-fontrootdir=\$(out)/lib/X11/fonts\" ]; "; + push @{$extraAttrs{$pkg}}, "configureFlags = [ \"--with-fontrootdir=\$(out)/lib/X11/fonts\" ];"; } sub process { @@ -231,23 +243,9 @@ open OUT, ">default.nix"; print OUT ""; print OUT <' -i include/os.h"; meta.platforms = stdenv.lib.platforms.unix; - } else throw "unsupported xorg abiCompat ${args.abiCompat} for ${attrs_passed.name}"; + } else throw "unsupported xorg abiCompat ${abiCompat} for ${attrs_passed.name}"; in attrs // (let version = (builtins.parseDrvName attrs.name).version; commonBuildInputs = attrs.buildInputs ++ [ xtrans ]; commonPropagatedBuildInputs = [ - args.zlib args.libGL args.libGLU args.dbus + zlib libGL libGLU dbus xf86bigfontproto glproto xf86driproto compositeproto scrnsaverproto resourceproto xf86dgaproto dmxproto /*libdmx not used*/ xf86vidmodeproto - recordproto libXext pixman libXfont libxshmfence args.libunwind + recordproto libXext pixman libXfont libxshmfence libunwind damageproto xcmiscproto bigreqsproto inputproto xextproto randrproto renderproto presentproto dri2proto dri3proto kbproto xineramaproto resourceproto scrnsaverproto videoproto @@ -491,9 +503,9 @@ in if (!isDarwin) then { outputs = [ "out" "dev" ]; - buildInputs = commonBuildInputs ++ [ args.libdrm args.mesa_noglu ]; - propagatedBuildInputs = [ libpciaccess args.epoxy ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [ - args.udev + buildInputs = commonBuildInputs ++ [ libdrm mesa_noglu ]; + propagatedBuildInputs = [ libpciaccess epoxy ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [ + udev ]; prePatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' export CFLAGS+=" -D__uid_t=uid_t -D__gid_t=gid_t" @@ -504,8 +516,8 @@ in "--enable-xcsecurity" # enable SECURITY extension "--with-default-font-path=" # there were only paths containing "${prefix}", # and there are no fonts in this package anyway - "--with-xkb-bin-directory=${xorg.xkbcomp}/bin" - "--with-xkb-path=${xorg.xkeyboardconfig}/share/X11/xkb" + "--with-xkb-bin-directory=${self.xkbcomp}/bin" + "--with-xkb-path=${self.xkeyboardconfig}/share/X11/xkb" "--with-xkb-output=$out/share/X11/xkb/compiled" "--enable-glamor" ] ++ lib.optionals stdenv.hostPlatform.isMusl [ @@ -523,12 +535,12 @@ in ''; passthru.version = version; # needed by virtualbox guest additions } else { - nativeBuildInputs = attrs.nativeBuildInputs ++ [ args.autoreconfHook xorg.utilmacros xorg.fontutil ]; + nativeBuildInputs = attrs.nativeBuildInputs ++ [ autoreconfHook self.utilmacros self.fontutil ]; buildInputs = commonBuildInputs ++ [ - args.bootstrap_cmds args.automake args.autoconf - args.apple_sdk.libs.Xplugin - args.apple_sdk.frameworks.Carbon - args.apple_sdk.frameworks.Cocoa + bootstrap_cmds automake autoconf + apple_sdk.libs.Xplugin + apple_sdk.frameworks.Carbon + apple_sdk.frameworks.Cocoa ]; propagatedBuildInputs = commonPropagatedBuildInputs ++ [ libAppleWM applewmproto @@ -536,22 +548,22 @@ in # XQuartz patchset patches = [ - (args.fetchpatch { + (fetchpatch { url = "https://github.com/XQuartz/xorg-server/commit/e88fd6d785d5be477d5598e70d105ffb804771aa.patch"; sha256 = "1q0a30m1qj6ai924afz490xhack7rg4q3iig2gxsjjh98snikr1k"; name = "use-cppflags-not-cflags.patch"; }) - (args.fetchpatch { + (fetchpatch { url = "https://github.com/XQuartz/xorg-server/commit/75ee9649bcfe937ac08e03e82fd45d9e18110ef4.patch"; sha256 = "1vlfylm011y00j8mig9zy6gk9bw2b4ilw2qlsc6la49zi3k0i9fg"; name = "use-old-mitrapezoids-and-mitriangles-routines.patch"; }) - (args.fetchpatch { + (fetchpatch { url = "https://github.com/XQuartz/xorg-server/commit/c58f47415be79a6564a9b1b2a62c2bf866141e73.patch"; sha256 = "19sisqzw8x2ml4lfrwfvavc2jfyq2bj5xcf83z89jdxg8g1gdd1i"; name = "revert-fb-changes-1.patch"; }) - (args.fetchpatch { + (fetchpatch { url = "https://github.com/XQuartz/xorg-server/commit/56e6f1f099d2821e5002b9b05b715e7b251c0c97.patch"; sha256 = "0zm9g0g1jvy79sgkvy0rjm6ywrdba2xjd1nsnjbxjccckbr6i396"; name = "revert-fb-changes-2.patch"; @@ -570,7 +582,7 @@ in preConfigure = '' mkdir -p $out/Applications export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error" - substituteInPlace hw/xquartz/pbproxy/Makefile.in --replace -F/System -F${args.apple_sdk.frameworks.ApplicationServices} + substituteInPlace hw/xquartz/pbproxy/Makefile.in --replace -F/System -F${apple_sdk.frameworks.ApplicationServices} ''; postInstall = '' rm -fr $out/share/X11/xkb/compiled @@ -582,110 +594,111 @@ in cp ${darwinOtherX}/share/man -rT $out/share/man '' ; passthru.version = version; - }); + })); - lndir = attrs: attrs // { + lndir = super.lndir.overrideAttrs (attrs: { preConfigure = '' substituteInPlace lndir.c \ --replace 'n_dirs--;' "" ''; - }; + }); - twm = attrs: attrs // { - nativeBuildInputs = attrs.nativeBuildInputs ++ [args.bison args.flex]; - }; + twm = super.twm.overrideAttrs (attrs: { + nativeBuildInputs = attrs.nativeBuildInputs ++ [bison flex]; + }); - xauth = attrs: attrs // { + xauth = super.xauth.overrideAttrs (attrs: { doCheck = false; # fails - }; + }); - xcursorthemes = attrs: attrs // { - buildInputs = attrs.buildInputs ++ [xorg.xcursorgen]; + xcursorthemes = super.xcursorthemes.overrideAttrs (attrs: { + buildInputs = attrs.buildInputs ++ [self.xcursorgen]; configureFlags = [ "--with-cursordir=$(out)/share/icons" ]; - }; + }); - xinit = attrs: attrs // { - stdenv = if isDarwin then args.clangStdenv else stdenv; - buildInputs = attrs.buildInputs ++ lib.optional isDarwin args.bootstrap_cmds; + xinit = (super.xinit.override { + stdenv = if isDarwin then clangStdenv else stdenv; + }).overrideAttrs (attrs: { + buildInputs = attrs.buildInputs ++ lib.optional isDarwin bootstrap_cmds; configureFlags = [ - "--with-xserver=${xorg.xorgserver.out}/bin/X" + "--with-xserver=${self.xorgserver.out}/bin/X" ] ++ lib.optionals isDarwin [ "--with-bundle-id-prefix=org.nixos.xquartz" "--with-launchdaemons-dir=\${out}/LaunchDaemons" "--with-launchagents-dir=\${out}/LaunchAgents" ]; - propagatedBuildInputs = [ xorg.xauth ] - ++ lib.optionals isDarwin [ xorg.libX11 xorg.xproto ]; + propagatedBuildInputs = [ self.xauth ] + ++ lib.optionals isDarwin [ self.libX11 self.xproto ]; prePatch = '' sed -i 's|^defaultserverargs="|&-logfile \"$HOME/.xorg.log\"|p' startx.cpp ''; - }; + }); - xf86videointel = attrs: attrs // { + xf86videointel = super.xf86videointel.overrideAttrs (attrs: { # the update script only works with released tarballs :-/ name = "xf86-video-intel-2017-10-19"; - src = args.fetchurl { + src = fetchurl { url = "http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/" + "4798e18b2b2c8b0a05dc967e6140fd9962bc1a73.tar.gz"; sha256 = "1zpgbibfpdassswfj68zwhhfpvd2p80rpxw92bis6lv81ssknwby"; }; - buildInputs = attrs.buildInputs ++ [xorg.libXfixes xorg.libXScrnSaver xorg.pixman]; - nativeBuildInputs = attrs.nativeBuildInputs ++ [args.autoreconfHook xorg.utilmacros]; + buildInputs = attrs.buildInputs ++ [self.libXfixes self.libXScrnSaver self.pixman]; + nativeBuildInputs = attrs.nativeBuildInputs ++ [autoreconfHook self.utilmacros]; configureFlags = [ "--with-default-dri=3" "--enable-tools" ]; meta = attrs.meta // { platforms = ["i686-linux" "x86_64-linux"]; }; - }; + }); - xf86videoxgi = attrs: attrs // { + xf86videoxgi = super.xf86videoxgi.overrideAttrs (attrs: { patches = [ # fixes invalid open mode # https://cgit.freedesktop.org/xorg/driver/xf86-video-xgi/commit/?id=bd94c475035739b42294477cff108e0c5f15ef67 - (args.fetchpatch { + (fetchpatch { url = "https://cgit.freedesktop.org/xorg/driver/xf86-video-xgi/patch/?id=bd94c475035739b42294477cff108e0c5f15ef67"; sha256 = "0myfry07655adhrpypa9rqigd6rfx57pqagcwibxw7ab3wjay9f6"; }) - (args.fetchpatch { + (fetchpatch { url = "https://cgit.freedesktop.org/xorg/driver/xf86-video-xgi/patch/?id=78d1138dd6e214a200ca66fa9e439ee3c9270ec8"; sha256 = "0z3643afgrync280zrp531ija0hqxc5mrwjif9nh9lcnzgnz2d6d"; }) ]; - }; + }); - xorgcffiles = attrs: attrs // { + xorgcffiles = super.xorgcffiles.overrideAttrs (attrs: { postInstall = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace $out/lib/X11/config/darwin.cf --replace "/usr/bin/" "" ''; - }; + }); - xwd = attrs: attrs // { - buildInputs = with xorg; attrs.buildInputs ++ [libXt libxkbfile]; - }; + xwd = super.xwd.overrideAttrs (attrs: { + buildInputs = with self; attrs.buildInputs ++ [libXt libxkbfile]; + }); - kbproto = attrs: attrs // { + kbproto = super.kbproto.overrideAttrs (attrs: { outputs = [ "out" "doc" ]; - }; + }); - xextproto = attrs: attrs // { + xextproto = super.xextproto.overrideAttrs (attrs: { outputs = [ "out" "doc" ]; - }; + }); - xproto = attrs: attrs // { + xproto = super.xproto.overrideAttrs (attrs: { outputs = [ "out" "doc" ]; - }; + }); - xrdb = attrs: attrs // { - configureFlags = [ "--with-cpp=${args.mcpp}/bin/mcpp" ]; - }; + xrdb = super.xrdb.overrideAttrs (attrs: { + configureFlags = [ "--with-cpp=${mcpp}/bin/mcpp" ]; + }); - sessreg = attrs: attrs // { + sessreg = super.sessreg.overrideAttrs (attrs: { preBuild = "sed -i 's|gcc -E|gcc -E -P|' man/Makefile"; - }; + }); - xrandr = attrs: attrs // { + xrandr = super.xrandr.overrideAttrs (attrs: { postInstall = '' rm $out/bin/xkeystone ''; - }; + }); } diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 6e67e8eb6e14..fb1dc378b51b 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -106,7 +106,7 @@ mirror://xorg/individual/proto/videoproto-2.3.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/windowswmproto-1.0.4.tar.bz2 mirror://xorg/individual/app/x11perf-1.6.0.tar.bz2 mirror://xorg/individual/app/xauth-1.0.10.tar.bz2 -mirror://xorg/individual/app/xbacklight-1.2.1.tar.bz2 +mirror://xorg/individual/app/xbacklight-1.2.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/xbitmaps-1.1.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xcmiscproto-1.2.2.tar.bz2 mirror://xorg/individual/app/xcmsdb-1.0.5.tar.bz2 @@ -175,10 +175,10 @@ mirror://xorg/individual/app/xgc-1.0.5.tar.bz2 mirror://xorg/individual/app/xhost-1.0.7.tar.bz2 mirror://xorg/X11R7.7/src/everything/xineramaproto-1.2.1.tar.bz2 mirror://xorg/individual/app/xinput-1.6.2.tar.bz2 -mirror://xorg/individual/app/xkbcomp-1.4.0.tar.bz2 +mirror://xorg/individual/app/xkbcomp-1.4.2.tar.bz2 mirror://xorg/individual/app/xkbevd-1.1.4.tar.bz2 mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2 -mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.22.tar.bz2 +mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.24.tar.bz2 mirror://xorg/individual/app/xkill-1.0.4.tar.bz2 mirror://xorg/individual/app/xlsatoms-1.1.2.tar.bz2 mirror://xorg/individual/app/xlsclients-1.1.3.tar.bz2 diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 22aa478d743c..d4082465b19e 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2018-09-03"; + version = "2018-09-14"; name = "oh-my-zsh-${version}"; src = fetchgit { url = "https://github.com/robbyrussell/oh-my-zsh"; - rev = "69e637c35578305e19dbfc520e65c514180db6ef"; - sha256 = "067qwvdlghjb2kcv4fydnnbwss2kb4fgn1qib88ygz82fpvb0cwf"; + rev = "489be2452a6410a2c7837910c4cd3c0ed47a7481"; + sha256 = "05svfd2q4w4hnd9rsh57z7rsc50lavg3lqm3nmm6dqak1nnrkhbz"; }; pathsToLink = [ "/share/oh-my-zsh" ]; diff --git a/pkgs/tools/X11/ncview/default.nix b/pkgs/tools/X11/ncview/default.nix index e4ba08a6ff36..1f793aa6c4c9 100644 --- a/pkgs/tools/X11/ncview/default.nix +++ b/pkgs/tools/X11/ncview/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, netcdf, x11, xorg, udunits, expat +, netcdf, xlibsWrapper, xorg, udunits, expat }: let @@ -14,7 +14,7 @@ in stdenv.mkDerivation { sha256 = "1gliziyxil2fcz85hj6z0jq33avrxdcjs74d500lhxwvgd8drfp8"; }; - buildInputs = [ netcdf x11 xorg.libXaw udunits expat ]; + buildInputs = [ netcdf xlibsWrapper xorg.libXaw udunits expat ]; meta = with stdenv.lib; { description = "Visual browser for netCDF format files"; diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index ee1ee2e61789..75737e2da7fc 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -2,12 +2,12 @@ , liburcu, zlib, libaio, zstd, lz4 }: stdenv.mkDerivation rec { - name = "bcachefs-tools-unstable-2018-08-22"; + name = "bcachefs-tools-unstable-2018-10-12"; src = fetchgit { url = "https://evilpiepirate.org/git/bcachefs-tools.git"; - rev = "ebf97e8e01a8e76ff4bec23f29106430852c3081"; - sha256 = "0f2ycin0gmi1a4fm7qln0c10zn451gljfbc2piy1fm768xqqrmld"; + rev = "55fbb25501330038e1714905b9ddeb25d875c11c"; + sha256 = "0cwzbyf133jc0fkc8nmjcvv3wmglqhyxda1hh10hgxrbq5vm39wx"; }; enableParallelBuilding = true; diff --git a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix index 5879fd9d0821..24aab7dc6dd4 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix @@ -35,7 +35,7 @@ buildPythonApplication rec { ''; propagatedBuildInputs = [ - pykickstart pyparted pyblock libselinux cryptsetup + pykickstart pyparted pyblock libselinux.py cryptsetup ] ++ stdenv.lib.optional useNixUdev systemd; # tests are currently _heavily_ broken upstream diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac98f9daa57e..2af734f402f4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13586,21 +13586,19 @@ with pkgs; inherit (darwin.apple_sdk.libs) Xplugin; }; - xorg = recurseIntoAttrs (lib.callPackagesWith pkgs ../servers/x11/xorg { - inherit clangStdenv fetchurl fetchgit fetchpatch stdenv intltool freetype fontconfig - libxslt expat libpng zlib perl mesa_drivers spice-protocol libunwind - dbus libuuid openssl gperf m4 libevdev tradcpp libinput mcpp makeWrapper autoreconfHook - autoconf automake libtool mtdev pixman libGL libGLU - cairo epoxy; - inherit (buildPackages) pkgconfig xmlto asciidoc flex bison; - inherit (darwin) apple_sdk cf-private libobjc; + # Use `lib.callPackageWith __splicedPackages` rather than plain `callPackage` + # so as not to have the newly bound xorg items already in scope, which would + # have created a cycle. + xorg = recurseIntoAttrs ((lib.callPackageWith __splicedPackages ../servers/x11/xorg { + }).overrideScope' (lib.callPackageWith __splicedPackages ../servers/x11/xorg/overrides.nix { + inherit (darwin) apple_sdk; bootstrap_cmds = if stdenv.isDarwin then darwin.bootstrap_cmds else null; python = python2; # Incompatible with Python 3x udev = if stdenv.isLinux then udev else null; libdrm = if stdenv.isLinux then libdrm else null; abiCompat = config.xorg.abiCompat # `config` because we have no `xorg.override` or (if stdenv.isDarwin then "1.18" else null); # 1.19 needs fixing on Darwin - } // { inherit xlibsWrapper; } ); + }) // { inherit xlibsWrapper; } ); xwayland = callPackage ../servers/x11/xorg/xwayland.nix { }; @@ -17197,7 +17195,6 @@ with pkgs; krita = libsForQt5.callPackage ../applications/graphics/krita { openjpeg = openjpeg_1; - poppler_qt5 = libsForQt5.poppler; }; krusader = libsForQt5.callPackage ../applications/misc/krusader { }; @@ -19206,6 +19203,7 @@ with pkgs; winswitch = callPackage ../tools/X11/winswitch { }; wings = callPackage ../applications/graphics/wings { + esdl = esdl.override { erlang = erlangR18; }; erlang = erlangR18; }; @@ -21963,11 +21961,6 @@ with pkgs; callPackage ../applications/networking/cluster/terraform-providers {} ); - terraform-provider-libvirt = callPackage ../applications/networking/cluster/terraform-provider-libvirt {}; - - terraform-provider-ibm = callPackage ../applications/networking/cluster/terraform-provider-ibm {}; - - terraform-inventory = callPackage ../applications/networking/cluster/terraform-inventory {}; terraform-landscape = callPackage ../applications/networking/cluster/terraform-landscape {}; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 62010d2d7895..92599e6982aa 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -712,7 +712,8 @@ in { # argparse is part of stdlib in 2.7 and 3.2+ argparse = null; - astroid = callPackage ../development/python-modules/astroid { }; + astroid = if isPy3k then callPackage ../development/python-modules/astroid { } + else callPackage ../development/python-modules/astroid/1.6.nix { }; attrdict = callPackage ../development/python-modules/attrdict { }; @@ -10362,7 +10363,8 @@ in { pygpgme = callPackage ../development/python-modules/pygpgme { }; - pylint = callPackage ../development/python-modules/pylint { }; + pylint = if isPy3k then callPackage ../development/python-modules/pylint { } + else callPackage ../development/python-modules/pylint/1.9.nix { }; pyopencl = callPackage ../development/python-modules/pyopencl { }; diff --git a/pkgs/top-level/splice.nix b/pkgs/top-level/splice.nix index 82a781083e2c..ec6ed357c688 100644 --- a/pkgs/top-level/splice.nix +++ b/pkgs/top-level/splice.nix @@ -112,7 +112,9 @@ let inherit (pkgs.stdenv) buildPlatform targetPlatform hostPlatform; }; - splicedPackagesWithXorg = splicedPackages // splicedPackages.xorg; + splicedPackagesWithXorg = splicedPackages // builtins.removeAttrs splicedPackages.xorg [ + "callPackage" "newScope" "overrideScope" "packages" + ]; in