nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-03 21:40:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge staging into release

Browse Source
This commit is contained in:
Frederik Rietdijk
2018-10-20 21:00:53 +02:00
parent b97e1dc662 0da77aaaf8
commit 4a4e11f026
62 changed files with 1590 additions and 1005 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/services/misc/weechat.nix
View File

@@ -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;

2
nixos/modules/services/misc/weechat.xml
View File

@@ -54,7 +54,7 @@
</programlisting>
Now, the session can be re-attached like this:
<programlisting>
screen -r weechat-screen
screen -x weechat/weechat-screen
</programlisting>
</para>

2
nixos/modules/services/network-filesystems/openafs/client.nix
View File

@@ -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!";
};

1
nixos/modules/services/network-filesystems/openafs/server.nix
View File

@@ -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";
};

6
nixos/modules/services/networking/hostapd.nix
View File

@@ -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}";

8
nixos/modules/services/networking/tinc.nix
View File

@@ -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}")
({

6
nixos/modules/services/x11/compton.nix
View File

@@ -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;

8
nixos/modules/virtualisation/kvmgt.nix
View File

@@ -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;

13
pkgs/applications/altcoins/monero-gui/default.nix
View File

@@ -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

55
pkgs/applications/altcoins/monero-gui/move-log-file.patch
View File

@@ -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
}

15
pkgs/applications/altcoins/monero-gui/move-translations-dir.patch
View File

@@ -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'",

24
pkgs/applications/altcoins/monero/default.nix
View File

@@ -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" ];

5
pkgs/applications/audio/clementine/default.nix
View File

@@ -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

2
pkgs/applications/editors/flpsed/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, fltk13, ghostscript, xlibs }:
{ stdenv, fetchurl, fltk13, ghostscript }:
stdenv.mkDerivation rec {
name = "flpsed-${version}";

8
pkgs/applications/editors/vscode/default.nix
View File

@@ -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";

4
pkgs/applications/graphics/krita/default.nix
View File

@@ -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;

4
pkgs/applications/graphics/qcomicbook/default.nix
View File

@@ -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 = ''

9
pkgs/applications/misc/hugo/default.nix
View File

@@ -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";

4
pkgs/applications/misc/xmr-stak/default.nix
View File

@@ -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";

6
pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix
View File

@@ -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";

2
pkgs/applications/networking/instant-messengers/rambox/bare.nix
View File

@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
inherit src;
nodejs = nodejs-8_x;
sha256 = "0mg1ilz65qyxgh5zg1f8fhx7ygz10w8ifamflpwbk8mrvqpkjlvr";
sha256 = "0hbw47653wh159c34f0rlj3p7xy0lvsyp0wh2hl35kv3fnsfbbm0";
};
patches = [ ./isDev.patch ];

4
pkgs/applications/window-managers/xmonad/log-applet/default.nix
View File

@@ -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 ]

4
pkgs/development/compilers/julia/1.0.nix
View File

@@ -1,6 +1,6 @@
import ./shared.nix {
majorVersion = "1";
minorVersion = "0";
maintenanceVersion = "0";
src_sha256 = "083277z90m1jxr2d1ysb96rgjj9h5q97l6h54mx3pb3f38ykshz2";
maintenanceVersion = "1";
src_sha256 = "0bqb5c63c7jnb753nplqj5v4k9pvh792k8y4b1n5pq8jiibr86i0";
}

10
pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix
View File

@@ -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";

10
pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
View File

@@ -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";

22
pkgs/development/interpreters/ruby/default.nix
View File

@@ -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";
};
};
}

6
pkgs/development/interpreters/ruby/patchsets.nix
View File

@@ -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"

6
pkgs/development/libraries/libssh/default.nix
View File

@@ -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 = [

39
pkgs/development/python-modules/astroid/1.6.nix Normal file
View File

@@ -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 ];
};
}

4
pkgs/development/python-modules/astroid/default.nix
View File

@@ -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 ];

2
pkgs/development/python-modules/blivet/default.nix
View File

@@ -31,7 +31,7 @@ in buildPythonPackage rec {
'';
propagatedBuildInputs = [
pykickstart pyparted pyblock pyudev selinuxWithPython cryptsetupWithPython
pykickstart pyparted pyblock pyudev selinuxWithPython.py cryptsetupWithPython
six
];

2
pkgs/development/python-modules/pathlib2/default.nix
View File

@@ -8,7 +8,7 @@
, mock
}:
if !(pythonOlder "3.4") then null else buildPythonPackage rec {
buildPythonPackage rec {
pname = "pathlib2";
version = "2.3.2";

49
pkgs/development/python-modules/pylint/1.9.nix Normal file
View File

@@ -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 ];
};
}

26
pkgs/development/python-modules/pylint/default.nix
View File

@@ -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;

5
pkgs/development/python-modules/pytest/default.nix
View File

@@ -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

4
pkgs/development/tools/build-managers/sbt/default.nix
View File

@@ -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 = ''

4
pkgs/misc/drivers/sc-controller/default.nix
View File

@@ -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")

4
pkgs/os-specific/linux/kernel/linux-4.14.nix
View File

@@ -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 {}))

4
pkgs/os-specific/linux/kernel/linux-4.18.nix
View File

@@ -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 {}))

4
pkgs/os-specific/linux/kernel/linux-4.4.nix
View File

@@ -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 {}))

4
pkgs/os-specific/linux/kernel/linux-4.9.nix
View File

@@ -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 {}))

6
pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
View File

@@ -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";

6
pkgs/servers/mattermost/default.nix
View File

@@ -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 = ''

6
pkgs/servers/openafs/1.6/module.nix
View File

@@ -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;
};
}

6
pkgs/servers/openafs/1.6/srcs.nix
View File

@@ -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";
})];
}

223
pkgs/servers/openafs/1.8/cross-build.patch Normal file
View File

@@ -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 <bonzini@gnu.org>
+#
+# 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
#

12
pkgs/servers/openafs/1.8/default.nix
View File

@@ -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

6
pkgs/servers/openafs/1.8/module.nix
View File

@@ -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";
};
}

6
pkgs/servers/openafs/1.8/srcs.nix
View File

@@ -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";
})];
}

1270
pkgs/servers/x11/xorg/default.nix
View File

File diff suppressed because it is too large Load Diff

2
pkgs/servers/x11/xorg/extra.list
View File

@@ -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

63
pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
View File

@@ -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 <<EOF;
# 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;
@@ -258,13 +256,13 @@ foreach my $pkg (sort (keys %pkgURLs)) {
print "$pkg\n";
my %requires = ();
my $inputs = "";
my @buildInputs;
foreach my $req (sort @{$pkgRequires{$pkg}}) {
if (defined $pcMap{$req}) {
# Some packages have .pc that depends on itself.
next if $pcMap{$req} eq $pkg;
if (!defined $requires{$pcMap{$req}}) {
$inputs .= "$pcMap{$req} ";
push @buildInputs, $pcMap{$req};
$requires{$pcMap{$req}} = 1;
}
} else {
@@ -272,25 +270,34 @@ foreach my $pkg (sort (keys %pkgURLs)) {
}
}
my $extraAttrs = $extraAttrs{"$pkg"};
$extraAttrs = "" unless defined $extraAttrs;
my $buildInputsStr = join "", map { $_ . " " } @buildInputs;
my @arguments = @buildInputs;
unshift @arguments, "stdenv", "pkgconfig", "fetchurl";
my $argumentsStr = join ", ", @arguments;
my $extraAttrsStr = "";
if (defined $extraAttrs{$pkg}) {
$extraAttrsStr = join "", map { "\n " . $_ } @{$extraAttrs{$pkg}};
}
print OUT <<EOF
$pkg = (mkDerivation "$pkg" {
$pkg = callPackage ({ $argumentsStr }: stdenv.mkDerivation {
name = "$pkgNames{$pkg}";
builder = ./builder.sh;
src = fetchurl {
url = $pkgURLs{$pkg};
sha256 = "$pkgHashes{$pkg}";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ $inputs];$extraAttrs
buildInputs = [ $buildInputsStr];$extraAttrsStr
meta.platforms = stdenv.lib.platforms.unix;
}) // {inherit $inputs;};
}) {};
EOF
}
print OUT "}; in xorg\n";
print OUT "})\n";
close OUT;

2
pkgs/servers/x11/xorg/old.list
View File

@@ -1,7 +1,7 @@
mirror://xorg/individual/app/twm-1.0.8.tar.bz2
mirror://xorg/individual/app/xclock-1.0.7.tar.bz2
mirror://xorg/individual/app/xdm-1.1.11.tar.bz2
mirror://xorg/individual/app/xeyes-1.1.1.tar.bz2
mirror://xorg/individual/app/xeyes-1.1.2.tar.bz2
mirror://xorg/individual/app/xfs-1.1.4.tar.bz2
mirror://xorg/individual/app/xinit-1.4.0.tar.bz2
mirror://xorg/individual/app/xmessage-1.0.4.tar.bz2

529
pkgs/servers/x11/xorg/overrides.nix
View File

@@ -1,7 +1,13 @@
{ args, xorg }:
{ abiCompat ? null,
stdenv, makeWrapper, lib, fetchurl, fetchpatch,
automake, autoconf, libtool, intltool, mtdev, libevdev, libinput,
python, freetype, apple_sdk, tradcpp, fontconfig, mesa_drivers,
libGL, spice-protocol, zlib, libGLU, dbus, libunwind, libdrm,
mesa_noglu, udev, bootstrap_cmds, bison, flex, clangStdenv, autoreconfHook,
mcpp, epoxy, openssl, pkgconfig }:
let
inherit (args) stdenv makeWrapper;
inherit (stdenv) lib isDarwin;
inherit (lib) overrideDerivation;
@@ -9,83 +15,84 @@ let
(stdenv.hostPlatform != stdenv.buildPlatform)
"--enable-malloc0returnsnull";
in
self: super:
{
bdftopcf = attrs: attrs // {
buildInputs = attrs.buildInputs ++ [ xorg.xproto xorg.fontsproto ];
};
bdftopcf = super.bdftopcf.overrideAttrs (attrs: {
buildInputs = attrs.buildInputs ++ [ self.xproto self.fontsproto ];
});
bitmap = attrs: attrs // {
bitmap = super.bitmap.overrideAttrs (attrs: {
nativeBuildInputs = attrs.nativeBuildInputs ++ [ makeWrapper ];
postInstall = ''
paths=(
"$out/share/X11/%T/%N"
"$out/include/X11/%T/%N"
"${xorg.xbitmaps}/include/X11/%T/%N"
"${self.xbitmaps}/include/X11/%T/%N"
)
wrapProgram "$out/bin/bitmap" \
--suffix XFILESEARCHPATH : $(IFS=:; echo "''${paths[*]}")
makeWrapper "$out/bin/bitmap" "$out/bin/bitmap-color" \
--suffix XFILESEARCHPATH : "$out/share/X11/%T/%N-color"
'';
};
});
encodings = attrs: attrs // {
buildInputs = attrs.buildInputs ++ [ xorg.mkfontscale ];
};
encodings = super.encodings.overrideAttrs (attrs: {
buildInputs = attrs.buildInputs ++ [ self.mkfontscale ];
});
fontbhttf = attrs: attrs // {
fontbhttf = super.fontbhttf.overrideAttrs (attrs: {
meta = attrs.meta // { license = lib.licenses.unfreeRedistributable; };
};
});
fontcursormisc = attrs: attrs // {
buildInputs = attrs.buildInputs ++ [ xorg.mkfontscale ];
};
fontcursormisc = super.fontcursormisc.overrideAttrs (attrs: {
buildInputs = attrs.buildInputs ++ [ self.mkfontscale ];
});
fontmiscmisc = attrs: attrs // {
fontmiscmisc = super.fontmiscmisc.overrideAttrs (attrs: {
postInstall =
''
ALIASFILE=${xorg.fontalias}/share/fonts/X11/misc/fonts.alias
ALIASFILE=${self.fontalias}/share/fonts/X11/misc/fonts.alias
test -f $ALIASFILE
cp $ALIASFILE $out/lib/X11/fonts/misc/fonts.alias
'';
};
});
imake = attrs: attrs // {
inherit (xorg) xorgcffiles;
imake = super.imake.overrideAttrs (attrs: {
inherit (self) xorgcffiles;
x11BuildHook = ./imake.sh;
patches = [./imake.patch ./imake-cc-wrapper-uberhack.patch];
setupHook = if stdenv.isDarwin then ./darwin-imake-setup-hook.sh else null;
CFLAGS = [ "-DIMAKE_COMPILETIME_CPP=\\\"${if stdenv.isDarwin
then "${args.tradcpp}/bin/cpp"
then "${tradcpp}/bin/cpp"
else "gcc"}\\\""
];
tradcpp = if stdenv.isDarwin then args.tradcpp else null;
};
tradcpp = if stdenv.isDarwin then tradcpp else null;
});
mkfontdir = attrs: attrs // {
preBuild = "substituteInPlace mkfontdir.in --replace @bindir@ ${xorg.mkfontscale}/bin";
};
mkfontdir = super.mkfontdir.overrideAttrs (attrs: {
preBuild = "substituteInPlace mkfontdir.in --replace @bindir@ ${self.mkfontscale}/bin";
});
mkfontscale = attrs: attrs // {
patches = lib.singleton (args.fetchpatch {
mkfontscale = super.mkfontscale.overrideAttrs (attrs: {
patches = lib.singleton (fetchpatch {
name = "mkfontscale-fix-sig11.patch";
url = "https://bugs.freedesktop.org/attachment.cgi?id=113951";
sha256 = "0i2xf768mz8kvm7i514v0myna9m6jqw82f9a03idabdpamxvwnim";
});
patchFlags = [ "-p0" ];
};
});
libxcb = attrs : attrs // {
nativeBuildInputs = attrs.nativeBuildInputs ++ [ args.python ];
libxcb = super.libxcb.overrideAttrs (attrs: {
nativeBuildInputs = attrs.nativeBuildInputs ++ [ python ];
configureFlags = [ "--enable-xkb" "--enable-xinput" ];
outputs = [ "out" "dev" "man" "doc" ];
};
});
xcbproto = attrs : attrs // {
nativeBuildInputs = attrs.nativeBuildInputs ++ [ args.python ];
};
xcbproto = super.xcbproto.overrideAttrs (attrs: {
nativeBuildInputs = attrs.nativeBuildInputs ++ [ python ];
});
libX11 = attrs: attrs // {
libX11 = super.libX11.overrideAttrs (attrs: {
outputs = [ "out" "dev" "man" ];
configureFlags = attrs.configureFlags or []
++ malloc0ReturnsNullCrossFlag;
@@ -98,260 +105,264 @@ in
rm -rf $out/share/doc
'';
CPP = stdenv.lib.optionalString stdenv.isDarwin "clang -E -";
};
});
libAppleWM = attrs: attrs // {
buildInputs = attrs.buildInputs ++ [ args.apple_sdk.frameworks.ApplicationServices ];
libAppleWM = super.libAppleWM.overrideAttrs (attrs: {
buildInputs = attrs.buildInputs ++ [ apple_sdk.frameworks.ApplicationServices ];
preConfigure = ''
substituteInPlace src/Makefile.in --replace -F/System -F${args.apple_sdk.frameworks.ApplicationServices}
substituteInPlace src/Makefile.in --replace -F/System -F${apple_sdk.frameworks.ApplicationServices}
'';
};
});
libXau = attrs: attrs // {
libXau = super.libXau.overrideAttrs (attrs: {
outputs = [ "out" "dev" ];
};
});
libXdmcp = attrs: attrs // {
libXdmcp = super.libXdmcp.overrideAttrs (attrs: {
outputs = [ "out" "dev" "doc" ];
};
});
libXfont = attrs: attrs // {
libXfont = super.libXfont.overrideAttrs (attrs: {
outputs = [ "out" "dev" ];
propagatedBuildInputs = [ args.freetype ]; # propagate link reqs. like bzip2
propagatedBuildInputs = [ freetype ]; # propagate link reqs. like bzip2
# prevents "misaligned_stack_error_entering_dyld_stub_binder"
configureFlags = lib.optionals isDarwin [
"CFLAGS=-O0"
];
};
});
libXxf86vm = attrs: attrs // {
libXxf86vm = super.libXxf86vm.overrideAttrs (attrs: {
outputs = [ "out" "dev" ];
configureFlags = attrs.configureFlags or []
++ malloc0ReturnsNullCrossFlag;
};
});
# Propagate some build inputs because of header file dependencies.
# Note: most of these are in Requires.private, so maybe builder.sh
# should propagate them automatically.
libXt = attrs: attrs // {
libXt = super.libXt.overrideAttrs (attrs: {
preConfigure = ''
sed 's,^as_dummy.*,as_dummy="\$PATH",' -i configure
'';
configureFlags = attrs.configureFlags or []
++ malloc0ReturnsNullCrossFlag;
propagatedBuildInputs = [ xorg.libSM ];
propagatedBuildInputs = [ self.libSM ];
CPP = stdenv.lib.optionalString stdenv.isDarwin "clang -E -";
outputs = [ "out" "dev" "devdoc" ];
};
});
# See https://bugs.freedesktop.org/show_bug.cgi?id=47792
# Once the bug is fixed upstream, this can be removed.
luit = attrs: attrs // {
luit = super.luit.overrideAttrs (attrs: {
configureFlags = [ "--disable-selective-werror" ];
};
});
compositeproto = attrs: attrs // {
propagatedBuildInputs = [ xorg.fixesproto ];
};
compositeproto = super.compositeproto.overrideAttrs (attrs: {
propagatedBuildInputs = [ self.fixesproto ];
});
libICE = attrs: attrs // {
libICE = super.libICE.overrideAttrs (attrs: {
outputs = [ "out" "dev" "doc" ];
};
});
libXcomposite = attrs: attrs // {
libXcomposite = super.libXcomposite.overrideAttrs (attrs: {
outputs = [ "out" "dev" ];
propagatedBuildInputs = [ xorg.libXfixes ];
};
propagatedBuildInputs = [ self.libXfixes ];
});
libXaw = attrs: attrs // {
libXaw = super.libXaw.overrideAttrs (attrs: {
outputs = [ "out" "dev" "devdoc" ];
propagatedBuildInputs = [ xorg.libXmu ];
};
propagatedBuildInputs = [ self.libXmu ];
});
libXcursor = attrs: attrs // {
libXcursor = super.libXcursor.overrideAttrs (attrs: {
outputs = [ "out" "dev" ];
};
});
libXdamage = attrs: attrs // {
libXdamage = super.libXdamage.overrideAttrs (attrs: {
outputs = [ "out" "dev" ];
};
});
libXft = attrs: attrs // {
libXft = super.libXft.overrideAttrs (attrs: {
outputs = [ "out" "dev" ];
propagatedBuildInputs = [ xorg.libXrender args.freetype args.fontconfig ];
propagatedBuildInputs = [ self.libXrender freetype fontconfig ];
configureFlags = attrs.configureFlags or []
++ malloc0ReturnsNullCrossFlag;
# the include files need ft2build.h, and Requires.private isn't enough for us
postInstall = ''
sed "/^Requires:/s/$/, freetype2/" -i "$dev/lib/pkgconfig/xft.pc"
'';
};
passthru = {
inherit freetype fontconfig;
};
});
libXext = attrs: attrs // {
libXext = super.libXext.overrideAttrs (attrs: {
outputs = [ "out" "dev" "man" "doc" ];
propagatedBuildInputs = [ xorg.xproto xorg.libXau ];
propagatedBuildInputs = [ self.xproto self.libXau ];
configureFlags = attrs.configureFlags or []
++ malloc0ReturnsNullCrossFlag;
};
});
libXfixes = attrs: attrs // {
libXfixes = super.libXfixes.overrideAttrs (attrs: {
outputs = [ "out" "dev" ];
};
});
libXi = attrs: attrs // {
libXi = super.libXi.overrideAttrs (attrs: {
outputs = [ "out" "dev" "man" "doc" ];
propagatedBuildInputs = [ xorg.libXfixes ];
};
propagatedBuildInputs = [ self.libXfixes ];
});
libXinerama = attrs: attrs // {
libXinerama = super.libXinerama.overrideAttrs (attrs: {
outputs = [ "out" "dev" ];
};
});
libXmu = attrs: attrs // {
libXmu = super.libXmu.overrideAttrs (attrs: {
outputs = [ "out" "dev" "doc" ];
buildFlags = ''BITMAP_DEFINES=-DBITMAPDIR=\"/no-such-path\"'';
};
});
libXrandr = attrs: attrs // {
libXrandr = super.libXrandr.overrideAttrs (attrs: {
outputs = [ "out" "dev" ];
configureFlags = attrs.configureFlags or []
++ malloc0ReturnsNullCrossFlag;
propagatedBuildInputs = [xorg.libXrender];
};
propagatedBuildInputs = [self.libXrender];
});
libSM = attrs: attrs // {
libSM = super.libSM.overrideAttrs (attrs: {
outputs = [ "out" "dev" "doc" ];
propagatedBuildInputs = [ xorg.libICE ];
};
propagatedBuildInputs = [ self.libICE ];
});
libXrender = attrs: attrs // {
libXrender = super.libXrender.overrideAttrs (attrs: {
outputs = [ "out" "dev" "doc" ];
configureFlags = attrs.configureFlags or []
++ malloc0ReturnsNullCrossFlag;
propagatedBuildInputs = [ xorg.renderproto ];
};
propagatedBuildInputs = [ self.renderproto ];
});
libXres = attrs: attrs // {
libXres = super.libXres.overrideAttrs (attrs: {
outputs = [ "out" "dev" "devdoc" ];
};
});
libXv = attrs: attrs // {
libXv = super.libXv.overrideAttrs (attrs: {
outputs = [ "out" "dev" "devdoc" ];
};
});
libXvMC = attrs: attrs // {
libXvMC = super.libXvMC.overrideAttrs (attrs: {
outputs = [ "out" "dev" "doc" ];
buildInputs = attrs.buildInputs ++ [xorg.renderproto];
};
buildInputs = attrs.buildInputs ++ [self.renderproto];
});
libXp = attrs: attrs // {
libXp = super.libXp.overrideAttrs (attrs: {
outputs = [ "out" "dev" ];
};
});
libXpm = attrs: attrs // {
libXpm = super.libXpm.overrideAttrs (attrs: {
name = "libXpm-3.5.12";
src = args.fetchurl {
src = fetchurl {
url = mirror://xorg/individual/lib/libXpm-3.5.12.tar.bz2;
sha256 = "1v5xaiw4zlhxspvx76y3hq4wpxv7mpj6parqnwdqvpj8vbinsspx";
};
outputs = [ "bin" "dev" "out" ]; # tiny man in $bin
patchPhase = "sed -i '/USE_GETTEXT_TRUE/d' sxpm/Makefile.in cxpm/Makefile.in";
};
});
libXpresent = attrs: attrs
// { buildInputs = with xorg; attrs.buildInputs ++ [ libXext libXfixes libXrandr ]; };
libXpresent = super.libXpresent.overrideAttrs (attrs: {
buildInputs = with self; attrs.buildInputs ++ [ libXext libXfixes libXrandr ];
});
libxkbfile = attrs: attrs // {
libxkbfile = super.libxkbfile.overrideAttrs (attrs: {
outputs = [ "out" "dev" ]; # mainly to avoid propagation
};
});
libxshmfence = attrs: attrs // {
libxshmfence = super.libxshmfence.overrideAttrs (attrs: {
name = "libxshmfence-1.3";
src = args.fetchurl {
src = fetchurl {
url = mirror://xorg/individual/lib/libxshmfence-1.3.tar.bz2;
sha256 = "1ir0j92mnd1nk37mrv9bz5swnccqldicgszvfsh62jd14q6k115q";
};
outputs = [ "out" "dev" ]; # mainly to avoid propagation
};
});
libpciaccess = attrs: attrs // {
libpciaccess = super.libpciaccess.overrideAttrs (attrs: {
meta = attrs.meta // { platforms = stdenv.lib.platforms.linux; };
};
});
setxkbmap = attrs: attrs // {
setxkbmap = super.setxkbmap.overrideAttrs (attrs: {
postInstall =
''
mkdir -p $out/share
ln -sfn ${xorg.xkeyboardconfig}/etc/X11 $out/share/X11
ln -sfn ${self.xkeyboardconfig}/etc/X11 $out/share/X11
'';
};
});
utilmacros = attrs: attrs // { # not needed for releases, we propagate the needed tools
propagatedBuildInputs = with args; [ automake autoconf libtool ];
};
utilmacros = super.utilmacros.overrideAttrs (attrs: { # not needed for releases, we propagate the needed tools
propagatedBuildInputs = [ automake autoconf libtool ];
});
x11perf = attrs: attrs // {
buildInputs = attrs.buildInputs ++ [ args.freetype args.fontconfig ];
};
x11perf = super.x11perf.overrideAttrs (attrs: {
buildInputs = attrs.buildInputs ++ [ freetype fontconfig ];
});
xcbutil = attrs: attrs // {
xcbutil = super.xcbutil.overrideAttrs (attrs: {
outputs = [ "out" "dev" ];
};
});
xcbutilcursor = attrs: attrs // {
xcbutilcursor = super.xcbutilcursor.overrideAttrs (attrs: {
outputs = [ "out" "dev" ];
meta = attrs.meta // { maintainers = [ stdenv.lib.maintainers.lovek323 ]; };
};
});
xcbutilimage = attrs: attrs // {
xcbutilimage = super.xcbutilimage.overrideAttrs (attrs: {
outputs = [ "out" "dev" ]; # mainly to get rid of propagating others
};
});
xcbutilkeysyms = attrs: attrs // {
xcbutilkeysyms = super.xcbutilkeysyms.overrideAttrs (attrs: {
outputs = [ "out" "dev" ]; # mainly to get rid of propagating others
};
});
xcbutilrenderutil = attrs: attrs // {
xcbutilrenderutil = super.xcbutilrenderutil.overrideAttrs (attrs: {
outputs = [ "out" "dev" ]; # mainly to get rid of propagating others
};
});
xcbutilwm = attrs: attrs // {
xcbutilwm = super.xcbutilwm.overrideAttrs (attrs: {
outputs = [ "out" "dev" ]; # mainly to get rid of propagating others
};
});
xf86inputevdev = attrs: attrs // {
xf86inputevdev = super.xf86inputevdev.overrideAttrs (attrs: {
outputs = [ "out" "dev" ]; # to get rid of xorgserver.dev; man is tiny
preBuild = "sed -e '/motion_history_proc/d; /history_size/d;' -i src/*.c";
installFlags = "sdkdir=\${out}/include/xorg";
buildInputs = attrs.buildInputs ++ [ args.mtdev args.libevdev ];
};
buildInputs = attrs.buildInputs ++ [ mtdev libevdev ];
});
xf86inputmouse = attrs: attrs // {
xf86inputmouse = super.xf86inputmouse.overrideAttrs (attrs: {
installFlags = "sdkdir=\${out}/include/xorg";
};
});
xf86inputjoystick = attrs: attrs // {
xf86inputjoystick = super.xf86inputjoystick.overrideAttrs (attrs: {
installFlags = "sdkdir=\${out}/include/xorg";
};
});
xf86inputlibinput = attrs: attrs // rec {
xf86inputlibinput = super.xf86inputlibinput.overrideAttrs (attrs: rec {
name = "xf86-input-libinput-0.26.0";
src = args.fetchurl {
src = fetchurl {
url = "mirror://xorg/individual/driver/${name}.tar.bz2";
sha256 = "0yrqs88b7yn9nljwlxzn76jfmvf0sh939kzij5b2jvr2qa7mbjmb";
};
outputs = [ "out" "dev" ];
buildInputs = attrs.buildInputs ++ [ args.libinput ];
buildInputs = attrs.buildInputs ++ [ libinput ];
installFlags = "sdkdir=\${dev}/include/xorg";
};
});
xf86inputsynaptics = attrs: attrs // {
xf86inputsynaptics = super.xf86inputsynaptics.overrideAttrs (attrs: {
outputs = [ "out" "dev" ]; # *.pc pulls xorgserver.dev
buildInputs = attrs.buildInputs ++ [args.mtdev args.libevdev];
buildInputs = attrs.buildInputs ++ [mtdev libevdev];
installFlags = "sdkdir=\${out}/include/xorg configdir=\${out}/share/X11/xorg.conf.d";
};
});
xf86inputvmmouse = attrs: attrs // {
xf86inputvmmouse = super.xf86inputvmmouse.overrideAttrs (attrs: {
configureFlags = [
"--sysconfdir=$(out)/etc"
"--with-xorg-conf-dir=$(out)/share/X11/xorg.conf.d"
@@ -361,82 +372,83 @@ in
meta = attrs.meta // {
platforms = ["i686-linux" "x86_64-linux"];
};
};
});
# Obsolete drivers that don't compile anymore.
xf86videoark = attrs: attrs // { meta = attrs.meta // { broken = true; }; };
xf86videogeode = attrs: attrs // { meta = attrs.meta // { broken = true; }; };
xf86videoglide = attrs: attrs // { meta = attrs.meta // { broken = true; }; };
xf86videoi128 = attrs: attrs // { meta = attrs.meta // { broken = true; }; };
xf86videonewport = attrs: attrs // { meta = attrs.meta // { broken = true; }; };
xf86videotga = attrs: attrs // { meta = attrs.meta // { broken = true; }; };
xf86videov4l = attrs: attrs // { meta = attrs.meta // { broken = true; }; };
xf86videovoodoo = attrs: attrs // { meta = attrs.meta // { broken = true; }; };
xf86videowsfb = attrs: attrs // { meta = attrs.meta // { broken = true; }; };
xf86videoark = super.xf86videoark.overrideAttrs (attrs: { meta = attrs.meta // { broken = true; }; });
xf86videogeode = super.xf86videogeode.overrideAttrs (attrs: { meta = attrs.meta // { broken = true; }; });
xf86videoglide = super.xf86videoglide.overrideAttrs (attrs: { meta = attrs.meta // { broken = true; }; });
xf86videoi128 = super.xf86videoi128.overrideAttrs (attrs: { meta = attrs.meta // { broken = true; }; });
xf86videonewport = super.xf86videonewport.overrideAttrs (attrs: { meta = attrs.meta // { broken = true; }; });
xf86videotga = super.xf86videotga.overrideAttrs (attrs: { meta = attrs.meta // { broken = true; }; });
xf86videov4l = super.xf86videov4l.overrideAttrs (attrs: { meta = attrs.meta // { broken = true; }; });
xf86videovoodoo = super.xf86videovoodoo.overrideAttrs (attrs: { meta = attrs.meta // { broken = true; }; });
xf86videowsfb = super.xf86videowsfb.overrideAttrs (attrs: { meta = attrs.meta // { broken = true; }; });
xf86videoamdgpu = attrs: attrs // {
xf86videoamdgpu = super.xf86videoamdgpu.overrideAttrs (attrs: {
configureFlags = [ "--with-xorg-conf-dir=$(out)/share/X11/xorg.conf.d" ];
};
});
xf86videoati = attrs: attrs // {
NIX_CFLAGS_COMPILE = "-I${xorg.xorgserver.dev or xorg.xorgserver}/include/xorg";
};
xf86videoati = super.xf86videoati.overrideAttrs (attrs: {
NIX_CFLAGS_COMPILE = "-I${self.xorgserver.dev or self.xorgserver}/include/xorg";
});
xf86videovmware = attrs: attrs // {
buildInputs = attrs.buildInputs ++ [ args.mesa_drivers ]; # for libxatracker
xf86videovmware = super.xf86videovmware.overrideAttrs (attrs: {
buildInputs = attrs.buildInputs ++ [ mesa_drivers ]; # for libxatracker
meta = attrs.meta // {
platforms = ["i686-linux" "x86_64-linux"];
};
};
});
xf86videoqxl = attrs: attrs // {
buildInputs = attrs.buildInputs ++ [ args.spice-protocol ];
};
xf86videoqxl = super.xf86videoqxl.overrideAttrs (attrs: {
buildInputs = attrs.buildInputs ++ [ spice-protocol ];
});
xf86videosiliconmotion = attrs: attrs // {
xf86videosiliconmotion = super.xf86videosiliconmotion.overrideAttrs (attrs: {
meta = attrs.meta // {
platforms = ["i686-linux" "x86_64-linux"];
};
};
});
xdriinfo = attrs: attrs // {
buildInputs = attrs.buildInputs ++ [args.libGL];
};
xdriinfo = super.xdriinfo.overrideAttrs (attrs: {
buildInputs = attrs.buildInputs ++ [libGL];
});
xvinfo = attrs: attrs // {
buildInputs = attrs.buildInputs ++ [xorg.libXext];
};
xvinfo = super.xvinfo.overrideAttrs (attrs: {
buildInputs = attrs.buildInputs ++ [self.libXext];
});
xkbcomp = attrs: attrs // {
configureFlags = [ "--with-xkb-config-root=${xorg.xkeyboardconfig}/share/X11/xkb" ];
};
xkbcomp = super.xkbcomp.overrideAttrs (attrs: {
configureFlags = [ "--with-xkb-config-root=${self.xkeyboardconfig}/share/X11/xkb" ];
});
xkeyboardconfig = attrs: attrs // {
buildInputs = attrs.buildInputs ++ [args.intltool];
xkeyboardconfig = super.xkeyboardconfig.overrideAttrs (attrs: {
buildInputs = attrs.buildInputs ++ [intltool];
#TODO: resurrect patches for US_intl?
patches = [ ./xkeyboard-config-eo.patch ];
configureFlags = [ "--with-xkb-rules-symlink=xorg" ];
# 1: compatibility for X11/xkb location
# 2: I think pkgconfig/ is supposed to be in /lib/
postInstall = ''
ln -s share "$out/etc"
mkdir -p "$out/lib" && ln -s ../share/pkgconfig "$out/lib/"
'';
};
});
xlsfonts = attrs: attrs // {
xlsfonts = super.xlsfonts.overrideAttrs (attrs: {
meta = attrs.meta // { license = lib.licenses.mit; };
};
});
xorgserver = with xorg; attrs_passed:
xorgserver = with self; super.xorgserver.overrideAttrs (attrs_passed:
# exchange attrs if abiCompat is set
let
version = (builtins.parseDrvName attrs_passed.name).version;
attrs = with args;
if (args.abiCompat == null || lib.hasPrefix args.abiCompat version) then attrs_passed
else if (args.abiCompat == "1.17") then {
attrs =
if (abiCompat == null || lib.hasPrefix abiCompat version) then attrs_passed
else if (abiCompat == "1.17") then {
name = "xorg-server-1.17.4";
builder = ./builder.sh;
src = fetchurl {
@@ -446,7 +458,7 @@ in
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ];
meta.platforms = stdenv.lib.platforms.unix;
} else if (args.abiCompat == "1.18") then {
} else if (abiCompat == "1.18") then {
name = "xorg-server-1.18.4";
builder = ./builder.sh;
src = fetchurl {
@@ -457,19 +469,19 @@ in
buildInputs = [ dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ];
postPatch = stdenv.lib.optionalString stdenv.isLinux "sed '1i#include <malloc.h>' -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
'';
};
});
}

6
pkgs/servers/x11/xorg/tarballs-7.7.list
View File

@@ -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

6
pkgs/shells/zsh/oh-my-zsh/default.nix
View File

@@ -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" ];

4
pkgs/tools/X11/ncview/default.nix
View File

@@ -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";

6
pkgs/tools/filesystems/bcachefs-tools/default.nix
View File

@@ -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;

2
pkgs/tools/filesystems/nixpart/0.4/blivet.nix
View File

@@ -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

23
pkgs/top-level/all-packages.nix
View File

@@ -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 {};

6
pkgs/top-level/python-packages.nix
View File

@@ -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 { };

4
pkgs/top-level/splice.nix
View File

@@ -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