mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-01 15:11:25 +00:00
Merge staging-next into master
This commit is contained in:
Frederik Rietdijk
commit
6c72782d36
@ -9,7 +9,7 @@ let
|
||||
xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
|
||||
xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr
|
||||
xorg.libXcursor xorg.libxkbfile xorg.libXScrnSaver libcap systemd libnotify
|
||||
xorg.libxcb libsecret gnome3.gconf
|
||||
xorg.libxcb libsecret gnome2.GConf
|
||||
];
|
||||
|
||||
libPathNative = lib.makeLibraryPath packages;
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{ stdenv, fetchurl, zlib, glib, alsaLib, makeDesktopItem
|
||||
, dbus, gtk2, atk, pango, freetype, fontconfig, libgnome-keyring3, gdk_pixbuf
|
||||
, cairo, cups, expat, libgpgerror, nspr, gnome3, nss, xorg, systemd, libnotify
|
||||
, cairo, cups, expat, libgpgerror, nspr, gnome2, nss, xorg, systemd, libnotify
|
||||
}:
|
||||
|
||||
let
|
||||
libPath = stdenv.lib.makeLibraryPath [
|
||||
stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome-keyring3 nss
|
||||
fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gnome3.gconf
|
||||
fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gnome2.GConf
|
||||
xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
|
||||
xorg.libXcomposite xorg.libXi xorg.libXfixes libnotify xorg.libXrandr
|
||||
xorg.libXcursor
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, dpkg, glib, dbus, makeWrapper, gnome3, gtk3, atk, cairo, pango
|
||||
{ stdenv, fetchurl, dpkg, lib, glib, dbus, makeWrapper, gnome2, gnome3, gtk3, atk, cairo, pango
|
||||
, gdk_pixbuf, freetype, fontconfig, nspr, nss, xorg, alsaLib, cups, expat, udev, wrapGAppsHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
rpath = stdenv.lib.makeLibraryPath [
|
||||
alsaLib
|
||||
gnome3.gconf
|
||||
gnome2.GConf
|
||||
gdk_pixbuf
|
||||
pango
|
||||
gnome3.defaultIconTheme
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, pkgconfig, gtk2, gnome3, libgksu,
|
||||
{ stdenv, fetchurl, pkgconfig, gtk2, gnome2, gnome3, libgksu,
|
||||
intltool, libstartup_notification, gtk-doc, wrapGAppsHook
|
||||
}:
|
||||
|
||||
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk2 gnome3.gconf libstartup_notification gnome3.libgnome-keyring
|
||||
gtk2 gnome2.GConf libstartup_notification gnome3.libgnome-keyring
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, lib, fetchurl, dpkg, atk, glib, pango, gdk_pixbuf, gnome3, gtk2, cairo
|
||||
{ stdenv, lib, fetchurl, dpkg, atk, glib, pango, gdk_pixbuf, gnome2, gtk2, cairo
|
||||
, freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr
|
||||
, libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver
|
||||
, libxcb, nss, nspr, alsaLib, cups, expat, udev, libpulseaudio }:
|
||||
|
||||
let
|
||||
libPath = stdenv.lib.makeLibraryPath [
|
||||
stdenv.cc.cc gtk2 gnome3.gconf atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
|
||||
stdenv.cc.cc gtk2 gnome2.GConf atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
|
||||
libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb
|
||||
libXrender libX11 libXtst libXScrnSaver nss nspr alsaLib cups expat udev libpulseaudio
|
||||
];
|
||||
|
||||
@ -4,7 +4,13 @@ let
|
||||
|
||||
pythonPackages = python2.pkgs.override {
|
||||
overrides = self: super: with self; {
|
||||
backports_ssl_match_hostname = self.backports_ssl_match_hostname_3_4_0_2;
|
||||
backports_ssl_match_hostname = super.backports_ssl_match_hostname.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "3.4.0.2";
|
||||
src = oldAttrs.src.override {
|
||||
inherit version;
|
||||
sha256 = "07410e7fb09aab7bdaf5e618de66c3dac84e2e3d628352814dc4c37de321d6ae";
|
||||
};
|
||||
});
|
||||
|
||||
flask = super.flask.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "0.12.4";
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ stdenv, fetchurl, fetchpatch, pkgconfig, gnome-doc-utils, intltool, lib
|
||||
, mono, gtk-sharp-2_0, gnome-sharp, hyena
|
||||
, which, makeWrapper, glib, gnome3, poppler, wrapGAppsHook
|
||||
, which, makeWrapper, glib, gnome2, poppler, wrapGAppsHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
|
||||
--add-flags "$out/lib/pdfmod/PdfMod.exe" \
|
||||
--prefix MONO_GAC_PREFIX : ${gtk-sharp-2_0} \
|
||||
--prefix MONO_GAC_PREFIX : ${gnome-sharp} \
|
||||
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ glib gnome-sharp gnome3.gconf gtk-sharp-2_0 gtk-sharp-2_0.gtk poppler ]}
|
||||
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ glib gnome-sharp gnome2.GConf gtk-sharp-2_0 gtk-sharp-2_0.gtk poppler ]}
|
||||
'';
|
||||
|
||||
dontStrip = true;
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{ fetchurl, stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig
|
||||
, libgnome-keyring3, gdk_pixbuf, cairo, cups, expat, libgpgerror, nspr
|
||||
, nss, xorg, libcap, systemd, libnotify ,libXScrnSaver, gnome3 }:
|
||||
, nss, xorg, libcap, systemd, libnotify ,libXScrnSaver, gnome2 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
name = "simplenote-${pkgver}";
|
||||
pkgver = "1.1.3";
|
||||
@ -19,7 +19,7 @@
|
||||
fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr nss
|
||||
xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
|
||||
xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr
|
||||
xorg.libXcursor libcap systemd libnotify libXScrnSaver gnome3.gconf
|
||||
xorg.libXcursor libcap systemd libnotify libXScrnSaver gnome2.GConf
|
||||
xorg.libxcb
|
||||
];
|
||||
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
{ stdenv, lib, fetchurl, dpkg, gnome3, gtk2, atk, glib, pango, gdk_pixbuf, cairo
|
||||
{ stdenv, lib, fetchurl, dpkg, gnome2, gtk2, atk, glib, pango, gdk_pixbuf, cairo
|
||||
, freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr
|
||||
, libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver
|
||||
, libxcb, makeWrapper, nodejs
|
||||
, nss, nspr, alsaLib, cups, expat, udev, libpulseaudio }:
|
||||
, nss, nspr, alsaLib, cups, expat, systemd, libpulseaudio }:
|
||||
|
||||
let
|
||||
libPath = stdenv.lib.makeLibraryPath [
|
||||
stdenv.cc.cc gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
|
||||
libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb
|
||||
libXrender libX11 libXtst libXScrnSaver gnome3.gconf nss nspr alsaLib cups expat udev libpulseaudio
|
||||
libXrender libX11 libXtst libXScrnSaver gnome2.GConf nss nspr alsaLib cups expat systemd libpulseaudio
|
||||
];
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
, freetype
|
||||
, gdk_pixbuf
|
||||
, glib
|
||||
, gnome3
|
||||
, gnome2
|
||||
, gtk3
|
||||
, libX11
|
||||
, libxcb
|
||||
@ -55,7 +55,7 @@ let
|
||||
freetype.out
|
||||
gdk_pixbuf.out
|
||||
glib.out
|
||||
gnome3.gconf
|
||||
gnome2.GConf
|
||||
gtk3.out
|
||||
libX11.out
|
||||
libXScrnSaver.out
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
, freetype, fontconfig, libXft, libXrender, libxcb, expat
|
||||
, libuuid
|
||||
, gstreamer, gst-plugins-base, libxml2
|
||||
, glib, gtk3, pango, gdk_pixbuf, cairo, atk, at-spi2-atk, gnome3
|
||||
, glib, gtk3, pango, gdk_pixbuf, cairo, atk, at-spi2-atk, gnome2
|
||||
, nss, nspr
|
||||
, patchelf, makeWrapper
|
||||
, proprietaryCodecs ? false, vivaldi-ffmpeg-codecs ? null
|
||||
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
|
||||
libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr
|
||||
atk at-spi2-atk alsaLib dbus cups gtk3 gdk_pixbuf libexif ffmpeg systemd
|
||||
freetype fontconfig libXrender libuuid expat glib nss nspr
|
||||
gstreamer libxml2 gst-plugins-base pango cairo gnome3.gconf
|
||||
gstreamer libxml2 gst-plugins-base pango cairo gnome2.GConf
|
||||
] ++ stdenv.lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs;
|
||||
|
||||
libPath = stdenv.lib.makeLibraryPath buildInputs
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ stdenv, fetchurl, makeDesktopItem, makeWrapper
|
||||
, alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk_pixbuf
|
||||
, glib, gnome3, gtk2, libnotify, libX11, libXcomposite, libXcursor, libXdamage
|
||||
, glib, gnome2, gtk2, libnotify, libX11, libXcomposite, libXcursor, libXdamage
|
||||
, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, nspr, nss, libxcb
|
||||
, pango, systemd, libXScrnSaver, libcxx, libpulseaudio }:
|
||||
|
||||
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
||||
libPath = stdenv.lib.makeLibraryPath [
|
||||
libcxx systemd libpulseaudio
|
||||
stdenv.cc.cc alsaLib atk cairo cups dbus expat fontconfig freetype
|
||||
gdk_pixbuf glib gnome3.gconf gtk2 libnotify libX11 libXcomposite
|
||||
gdk_pixbuf glib gnome2.GConf gtk2 libnotify libX11 libXcomposite
|
||||
libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender
|
||||
libXtst nspr nss libxcb pango systemd libXScrnSaver
|
||||
];
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ stdenv, fetchurl, makeDesktopItem, makeWrapper, autoPatchelfHook
|
||||
, xorg, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig, gtk2
|
||||
, gnome3, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify, xdg_utils }:
|
||||
, gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify, xdg_utils }:
|
||||
|
||||
let
|
||||
bits = if stdenv.system == "x86_64-linux" then "x64"
|
||||
@ -34,7 +34,7 @@ in stdenv.mkDerivation rec {
|
||||
libXrender libX11 libXtst libXScrnSaver
|
||||
]) ++ [
|
||||
gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
|
||||
gnome3.gconf nss nspr alsaLib cups expat stdenv.cc.cc
|
||||
gnome2.GConf nss nspr alsaLib cups expat stdenv.cc.cc
|
||||
];
|
||||
runtimeDependencies = [ udev.lib libnotify ];
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, lib, fetchurl, gnome3, gtk2, pango, atk, cairo, gdk_pixbuf, glib,
|
||||
{ stdenv, lib, fetchurl, gnome2, gtk2, pango, atk, cairo, gdk_pixbuf, glib,
|
||||
freetype, fontconfig, dbus, libX11, xorg, libXi, libXcursor, libXdamage,
|
||||
libXrandr, libXcomposite, libXext, libXfixes, libXrender, libXtst,
|
||||
libXScrnSaver, nss, nspr, alsaLib, cups, expat, udev }:
|
||||
@ -14,7 +14,7 @@ let
|
||||
freetype
|
||||
gdk_pixbuf
|
||||
glib
|
||||
gnome3.gconf
|
||||
gnome2.GConf
|
||||
gtk2
|
||||
pango
|
||||
libX11
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ stdenv, lib, fetchurl, dpkg, wrapGAppsHook
|
||||
, gnome3, gtk3, atk, cairo, pango, gdk_pixbuf, glib, freetype, fontconfig
|
||||
, gnome2, gtk3, atk, cairo, pango, gdk_pixbuf, glib, freetype, fontconfig
|
||||
, dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, libXcomposite
|
||||
, libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsaLib
|
||||
, cups, expat, udev
|
||||
@ -17,7 +17,7 @@ let
|
||||
freetype
|
||||
gdk_pixbuf
|
||||
glib
|
||||
gnome3.gconf
|
||||
gnome2.GConf
|
||||
gtk3
|
||||
pango
|
||||
libX11
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchurl, dpkg, makeWrapper
|
||||
, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk_pixbuf, glib, glibc, gnome3
|
||||
, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk_pixbuf, glib, glibc, gnome2, gnome3
|
||||
, gtk3, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, xorg }:
|
||||
|
||||
let
|
||||
@ -22,7 +22,7 @@ let
|
||||
glibc
|
||||
libsecret
|
||||
|
||||
gnome3.gconf
|
||||
gnome2.GConf
|
||||
gdk_pixbuf
|
||||
gtk3
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ stdenv, fetchurl, dpkg, makeWrapper
|
||||
, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib
|
||||
, gnome3, gtk3, gdk_pixbuf, libnotify, libxcb, nspr, nss, pango
|
||||
, gnome2, gtk3, gdk_pixbuf, libnotify, libxcb, nspr, nss, pango
|
||||
, systemd, xorg }:
|
||||
|
||||
let
|
||||
@ -18,7 +18,7 @@ let
|
||||
fontconfig
|
||||
freetype
|
||||
glib
|
||||
gnome3.gconf
|
||||
gnome2.GConf
|
||||
gdk_pixbuf
|
||||
gtk3
|
||||
pango
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, lib, fetchurl, dpkg, makeDesktopItem, gnome3, gtk2, atk, cairo, pango, gdk_pixbuf, glib
|
||||
{ stdenv, lib, fetchurl, dpkg, makeDesktopItem, gnome2, gtk2, atk, cairo, pango, gdk_pixbuf, glib
|
||||
, freetype, fontconfig, dbus, libnotify, libX11, xorg, libXi, libXcursor, libXdamage
|
||||
, libXrandr, libXcomposite, libXext, libXfixes, libXrender, libXtst, libXScrnSaver
|
||||
, nss, nspr, alsaLib, cups, expat, udev, xdg_utils, hunspell
|
||||
@ -15,7 +15,7 @@ let
|
||||
freetype
|
||||
gdk_pixbuf
|
||||
glib
|
||||
gnome3.gconf
|
||||
gnome2.GConf
|
||||
gtk2
|
||||
pango
|
||||
hunspell
|
||||
@ -93,7 +93,7 @@ in
|
||||
mkdir -p $out/share/applications
|
||||
cp ${desktopItem}/share/applications/* $out/share/applications
|
||||
'';
|
||||
|
||||
|
||||
meta = {
|
||||
description = "A modern, secure messenger";
|
||||
homepage = https://wire.com/;
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ stdenv, fetchurl, dpkg, makeWrapper
|
||||
, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib
|
||||
, gnome3, gtk3, gdk_pixbuf, libnotify, libxcb, nspr, nss, pango
|
||||
, gnome2, gtk3, gdk_pixbuf, libnotify, libxcb, nspr, nss, pango
|
||||
, systemd, xorg, xprintidle-ng }:
|
||||
|
||||
let
|
||||
@ -18,7 +18,7 @@ let
|
||||
fontconfig
|
||||
freetype
|
||||
glib
|
||||
gnome3.gconf
|
||||
gnome2.GConf
|
||||
gdk_pixbuf
|
||||
gtk3
|
||||
pango
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{stdenv, fetchurl, pkgconfig, gettext, perl, perlXMLParser, intltool
|
||||
, libxml2, glib}:
|
||||
|
||||
let version = "1.9"; in
|
||||
let version = "1.10"; in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "shared-mime-info-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://freedesktop.org/~hadess/${name}.tar.xz";
|
||||
sha256 = "10ywzhzg8v1xmb9sz5xbqaci90id38knswigynyl33i29vn360aw";
|
||||
sha256 = "1gxyvwym3xgpmp262gfn8jg5sla6k5hy6m6dmy6grgiq90xsh9f6";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,29 +1,33 @@
|
||||
{ stdenv, fetchurl, pkgconfig, dbus-glib, glib, ORBit2, libxml2
|
||||
, polkit, intltool, dbus, gtk2 ? null, withGtk ? false }:
|
||||
, polkit, intltool }:
|
||||
|
||||
assert withGtk -> (gtk2 != null);
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "gconf-2.32.4";
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gconf-${version}";
|
||||
version = "3.2.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = mirror://gnome/sources/GConf/2.32/GConf-2.32.4.tar.xz;
|
||||
sha256 = "09ch709cb9fniwc4221xgkq0jf0x0lxs814sqig8p2dcll0llvzk";
|
||||
url = "mirror://gnome/sources/GConf/${stdenv.lib.versions.majorMinor version}/GConf-${version}.tar.xz";
|
||||
sha256 = "0k3q9nh53yhc9qxf1zaicz4sk8p3kzq4ndjdsgpaa2db0ccbj4hr";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "man" ];
|
||||
|
||||
buildInputs = [ ORBit2 dbus dbus-glib libxml2 ]
|
||||
buildInputs = [ ORBit2 libxml2 ]
|
||||
# polkit requires pam, which requires shadow.h, which is not available on
|
||||
# darwin
|
||||
++ stdenv.lib.optional (!stdenv.isDarwin) polkit
|
||||
++ stdenv.lib.optional withGtk gtk2;
|
||||
++ stdenv.lib.optional (!stdenv.isDarwin) polkit;
|
||||
|
||||
propagatedBuildInputs = [ glib ];
|
||||
propagatedBuildInputs = [ glib dbus-glib ];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig intltool ];
|
||||
|
||||
configureFlags = stdenv.lib.optional withGtk "--with-gtk=2.0"
|
||||
configureFlags =
|
||||
# fixes the "libgconfbackend-oldxml.so is not portable" error on darwin
|
||||
++ stdenv.lib.optional stdenv.isDarwin [ "--enable-static" ];
|
||||
stdenv.lib.optional stdenv.isDarwin [ "--enable-static" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://projects.gnome.org/gconf/;
|
||||
description = "Deprecated system for storing application preferences";
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,34 +0,0 @@
|
||||
{ stdenv, fetchurl, pkgconfig, dbus-glib, gnome3 ? null, glib, libxml2
|
||||
, intltool, polkit, orbit, python, withGtk ? false }:
|
||||
|
||||
assert withGtk -> (gnome3 != null);
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
versionMajor = "3.2";
|
||||
versionMinor = "6";
|
||||
moduleName = "GConf";
|
||||
|
||||
origName = "${moduleName}-${versionMajor}.${versionMinor}";
|
||||
|
||||
name = "gconf-${versionMajor}.${versionMinor}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${origName}.tar.xz";
|
||||
sha256 = "0k3q9nh53yhc9qxf1zaicz4sk8p3kzq4ndjdsgpaa2db0ccbj4hr";
|
||||
};
|
||||
|
||||
buildInputs = [ libxml2 polkit orbit python ] ++ stdenv.lib.optional withGtk gnome3.gtk;
|
||||
propagatedBuildInputs = [ glib dbus-glib ];
|
||||
nativeBuildInputs = [ pkgconfig intltool ];
|
||||
|
||||
# ToDo: ldap reported as not found but afterwards reported as supported
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://projects.gnome.org/gconf/;
|
||||
description = "A system for storing application preferences";
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -45,10 +45,8 @@ lib.makeScope pkgs.newScope (self: with self; {
|
||||
easytag meld orca rhythmbox shotwell gnome-usage
|
||||
clutter clutter-gst clutter-gtk cogl gtkvnc libdazzle;
|
||||
|
||||
inherit (pkgs.gnome2) ORBit2;
|
||||
libsoup = pkgs.libsoup.override { gnomeSupport = true; };
|
||||
libchamplain = pkgs.libchamplain.override { libsoup = libsoup; };
|
||||
orbit = ORBit2;
|
||||
gnome3 = self // { recurseForDerivations = false; };
|
||||
gtk = gtk3;
|
||||
gtkmm = gtkmm3;
|
||||
@ -80,8 +78,6 @@ lib.makeScope pkgs.newScope (self: with self; {
|
||||
|
||||
evolution-data-server = callPackage ./core/evolution-data-server { };
|
||||
|
||||
gconf = callPackage ./core/gconf { };
|
||||
|
||||
geocode-glib = callPackage ./core/geocode-glib { };
|
||||
|
||||
gcr = callPackage ./core/gcr { }; # ToDo: tests fail
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchurl, fetchpatch, pkgconfig, gnome3, gtk3, libxml2, intltool, itstool, gdb,
|
||||
boost, sqlite, gconf, libgtop, glibmm, gtkmm, vte, gtksourceview,
|
||||
boost, sqlite, libgtop, glibmm, gtkmm, vte, gtksourceview, gsettings-desktop-schemas,
|
||||
gtksourceviewmm, wrapGAppsHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -11,23 +11,34 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "85ab8cf6c4f83262f441cb0952a6147d075c3c53d0687389a3555e946b694ef2";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome3.updateScript { packageName = "nemiver"; attrPath = "gnome3.nemiver"; };
|
||||
};
|
||||
nativeBuildInputs = [ libxml2 intltool itstool pkgconfig wrapGAppsHook ];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
|
||||
|
||||
buildInputs = [ gtk3 libxml2 intltool itstool gdb boost sqlite gconf libgtop
|
||||
glibmm gtkmm vte gtksourceview gtksourceviewmm ];
|
||||
buildInputs = [
|
||||
gtk3 gdb boost sqlite libgtop
|
||||
glibmm gtkmm vte gtksourceview gtksourceviewmm
|
||||
gsettings-desktop-schemas
|
||||
];
|
||||
|
||||
patches = [
|
||||
./bool_slot.patch ./safe_ptr.patch
|
||||
./bool_slot.patch
|
||||
./safe_ptr.patch
|
||||
(fetchpatch {
|
||||
url = https://gitlab.gnome.org/GNOME/nemiver/commit/262cf9657f9c2727a816972b348692adcc666008.patch;
|
||||
sha256 = "03jv6z54b8nzvplplapk4aj206zl1gvnv6iz0mad19g6yvfbw7a7";
|
||||
})
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--enable-gsettings"
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome3.updateScript {
|
||||
packageName = "nemiver";
|
||||
attrPath = "gnome3.nemiver";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://wiki.gnome.org/Apps/Nemiver;
|
||||
description = "Easy to use standalone C/C++ debugger";
|
||||
@ -36,4 +47,3 @@ stdenv.mkDerivation rec {
|
||||
maintainers = [ maintainers.juliendehos ];
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchurl, pkgconfig, gnome3, intltool, itstool, gtk3
|
||||
, wrapGAppsHook, gconf, librsvg, libxml2, desktop-file-utils
|
||||
, wrapGAppsHook, librsvg, libxml2, desktop-file-utils
|
||||
, guile_2_0, libcanberra-gtk3 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -11,16 +11,21 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0rl39psr5xi584310pyrgw36ini4wn7yr2m1q5118w3a3v1dkhzh";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
"--with-card-theme-formats=svg"
|
||||
"--with-platform=gtk-only" # until they remove GConf
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook libxml2 desktop-file-utils ];
|
||||
buildInputs = [ gtk3 librsvg guile_2_0 libcanberra-gtk3 ];
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome3.updateScript { packageName = "aisleriot"; attrPath = "gnome3.aisleriot"; };
|
||||
updateScript = gnome3.updateScript {
|
||||
packageName = "aisleriot";
|
||||
attrPath = "gnome3.aisleriot";
|
||||
};
|
||||
};
|
||||
|
||||
configureFlags = [ "--with-card-theme-formats=svg" ];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ intltool itstool gtk3 wrapGAppsHook gconf
|
||||
librsvg libxml2 desktop-file-utils guile_2_0 libcanberra-gtk3 ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://wiki.gnome.org/Apps/Aisleriot;
|
||||
description = "A collection of patience games written in guile scheme";
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, fetchpatch, pkgconfig, bison, flex, intltool, gtk, libical, dbus-glib
|
||||
{ stdenv, fetchurl, fetchpatch, pkgconfig, bison, flex, intltool, gtk, libical, dbus-glib, tzdata
|
||||
, libnotify, popt, xfce
|
||||
}:
|
||||
|
||||
@ -22,6 +22,14 @@ stdenv.mkDerivation rec {
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/parameters.c --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
|
||||
substituteInPlace src/tz_zoneinfo_read.c --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
|
||||
substituteInPlace tz_convert/tz_convert.c --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
|
||||
'';
|
||||
|
||||
postConfigure = "rm -rf libical"; # ensure pkgs.libical is used instead of one included in the orage sources
|
||||
|
||||
nativeBuildInputs = [ pkgconfig intltool bison flex ];
|
||||
|
||||
buildInputs = [ gtk libical dbus-glib libnotify popt xfce.libxfce4util
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui
|
||||
, libxfce4ui_gtk3, libwnck, exo, garcon, xfconf, libstartup_notification
|
||||
, makeWrapper, xfce4-mixer, hicolor-icon-theme
|
||||
, makeWrapper, xfce4-mixer, hicolor-icon-theme, tzdata
|
||||
, withGtk3 ? false, gtk3, gettext, glib-networking
|
||||
}:
|
||||
let
|
||||
@ -24,6 +24,9 @@ stdenv.mkDerivation rec {
|
||||
for f in $(find . -name \*.sh); do
|
||||
substituteInPlace $f --replace gettext ${gettext}/bin/gettext
|
||||
done
|
||||
substituteInPlace plugins/clock/clock.c \
|
||||
--replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" \
|
||||
--replace "if (!g_file_test (filename, G_FILE_TEST_IS_SYMLINK))" ""
|
||||
'';
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, fetchpatch, mkXfceDerivation, dbus-glib, gtk2, libical, libnotify
|
||||
{ lib, fetchpatch, mkXfceDerivation, dbus-glib, gtk2, libical, libnotify, tzdata
|
||||
, popt, libxfce4ui ? null, xfce4-panel ? null, withPanelPlugin ? true }:
|
||||
|
||||
assert withPanelPlugin -> libxfce4ui != null && xfce4-panel != null;
|
||||
@ -16,6 +16,14 @@ mkXfceDerivation rec {
|
||||
buildInputs = [ dbus-glib gtk2 libical libnotify popt ]
|
||||
++ optionals withPanelPlugin [ libxfce4ui xfce4-panel ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/parameters.c --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
|
||||
substituteInPlace src/tz_zoneinfo_read.c --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
|
||||
substituteInPlace tz_convert/tz_convert.c --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
|
||||
'';
|
||||
|
||||
postConfigure = "rm -rf libical"; # ensure pkgs.libical is used instead of one included in the orage sources
|
||||
|
||||
patches = [
|
||||
# Fix build with libical 3.0
|
||||
(fetchpatch {
|
||||
|
||||
@ -3,11 +3,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "accountsservice-${version}";
|
||||
version = "0.6.49";
|
||||
version = "0.6.50";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.freedesktop.org/software/accountsservice/accountsservice-${version}.tar.xz";
|
||||
sha256 = "032ndvs18gla49dvc9vg35cwczg0wpv2wscp1m3yjfdqdpams7i5";
|
||||
sha256 = "0jn7vg1z4vxnna0hl33hbcb4bb3zpilxc2vyclh24vx4vvsjhn83";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig makeWrapper ];
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, fetchgit, fetchpatch, fixDarwinDylibNames, meson, ninja, pkgconfig, gettext, python3, libxml2, libxslt, docbook_xsl
|
||||
{ stdenv, fetchurl, fetchFromGitLab, fetchpatch, fixDarwinDylibNames, meson, ninja, pkgconfig, gettext, python3, libxml2, libxslt, docbook_xsl
|
||||
, docbook_xml_dtd_43, gtk-doc, glib, libtiff, libjpeg, libpng, libX11, gnome3
|
||||
, jasper, gobjectIntrospection, doCheck ? false, makeWrapper }:
|
||||
|
||||
@ -14,8 +14,10 @@ stdenv.mkDerivation rec {
|
||||
# url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
|
||||
# sha256 = "0d534ysa6n9prd17wwzisq7mj6qkhwh8wcf8qgin1ar3hbs5ry7z";
|
||||
# };
|
||||
src = fetchgit {
|
||||
url = https://gitlab.gnome.org/GNOME/gdk-pixbuf.git;
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "GNOME";
|
||||
repo = "gdk-pixbuf";
|
||||
rev = version;
|
||||
sha256 = "18lwqg63vyap2m1mw049rnb8fm869429xbf7636a2n21gs3d3jwv";
|
||||
};
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "1.8.1";
|
||||
version = "1.8.2";
|
||||
inherit (stdenv.lib) optional optionals optionalString;
|
||||
in
|
||||
|
||||
@ -14,7 +14,7 @@ stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.bz2";
|
||||
sha256 = "0ifzhqbg4p6ka7ps5c7lapix09i9yy4z7achc1gf91dhvn967vgv";
|
||||
sha256 = "0my6m9aqv4a8fc2pjwqx9pfdfh3a9mqvas4si4psi1b1867zi8y8";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
@ -32,7 +32,6 @@ stdenv.mkDerivation rec {
|
||||
"--enable-pc-files"
|
||||
"--enable-symlinks"
|
||||
] ++ lib.optional unicode "--enable-widec"
|
||||
++ lib.optional enableStatic "--enable-static"
|
||||
++ lib.optional (!withCxx) "--without-cxx"
|
||||
++ lib.optional (abiVersion == "5") "--with-abi-version=5"
|
||||
++ lib.optionals hostPlatform.isWindows [
|
||||
@ -113,6 +112,11 @@ stdenv.mkDerivation rec {
|
||||
for statictype in a dll.a la; do
|
||||
if [ -e "$out/lib/lib''${library}$suffix.$statictype" ]; then
|
||||
ln -svf lib''${library}$suffix.$statictype $out/lib/lib$library$newsuffix.$statictype
|
||||
if [ "ncurses" = "$library" ]
|
||||
then
|
||||
# make libtinfo symlinks
|
||||
ln -svf lib''${library}$suffix.$statictype $out/lib/libtinfo$newsuffix.$statictype
|
||||
fi
|
||||
fi
|
||||
done
|
||||
ln -svf ''${library}$suffix.pc $dev/lib/pkgconfig/$library$newsuffix.pc
|
||||
@ -131,7 +135,7 @@ stdenv.mkDerivation rec {
|
||||
moveToOutput "bin/infotocap" "$out"
|
||||
'';
|
||||
|
||||
preFixup = lib.optionalString (!hostPlatform.isCygwin) ''
|
||||
preFixup = lib.optionalString (!hostPlatform.isCygwin && !enableStatic) ''
|
||||
rm "$out"/lib/*.a
|
||||
'';
|
||||
|
||||
|
||||
@ -1,19 +1,19 @@
|
||||
{ stdenv, fetchurl, pkgconfig, libXft, cairo, harfbuzz
|
||||
, libintl, gobjectIntrospection, darwin
|
||||
, libintl, gobjectIntrospection, darwin, fribidi
|
||||
}:
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
let
|
||||
ver_maj = "1.40";
|
||||
ver_min = "14";
|
||||
ver_maj = "1.42";
|
||||
ver_min = "1";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "pango-${ver_maj}.${ver_min}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/pango/${ver_maj}/${name}.tar.xz";
|
||||
sha256 = "90af1beaa7bf9e4c52db29ec251ec4fd0a8f2cc185d521ad1f88d01b3a6a17e3";
|
||||
sha256 = "0cnfgcya3wbs9m8g44cl5ww6wbp6qbw96qvsgkr8ymwqn9b6fnli";
|
||||
};
|
||||
|
||||
outputs = [ "bin" "dev" "out" "devdoc" ];
|
||||
@ -25,17 +25,10 @@ stdenv.mkDerivation rec {
|
||||
CoreGraphics
|
||||
CoreText
|
||||
]);
|
||||
propagatedBuildInputs = [ cairo harfbuzz libXft libintl ];
|
||||
propagatedBuildInputs = [ cairo harfbuzz libXft libintl fribidi ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
doCheck = false; # test-layout fails on 1.40.3 (fails to find font config)
|
||||
# jww (2014-05-05): The tests currently fail on Darwin:
|
||||
#
|
||||
# ERROR:testiter.c:139:iter_char_test: assertion failed: (extents.width == x1 - x0)
|
||||
# .../bin/sh: line 5: 14823 Abort trap: 6 srcdir=. PANGO_RC_FILE=./pangorc ${dir}$tst
|
||||
# FAIL: testiter
|
||||
|
||||
configureFlags = optional stdenv.isDarwin "--without-x";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -9,7 +9,7 @@ with stdenv.lib;
|
||||
assert elem variant [ null "cpp" "pcre16" "pcre32" ];
|
||||
|
||||
let
|
||||
version = "8.41";
|
||||
version = "8.42";
|
||||
pname = if (variant == null) then "pcre"
|
||||
else if (variant == "cpp") then "pcre-cpp"
|
||||
else variant;
|
||||
@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${version}.tar.bz2";
|
||||
sha256 = "0c5m469p5pd7jip621ipq6hbgh7128lzh7xndllfgh77ban7wb76";
|
||||
sha256 = "00ckpzlgyr16bnqx8fawa3afjgqxw5yxgs2l081vw23qi1y4pl1c";
|
||||
};
|
||||
|
||||
outputs = [ "bin" "dev" "out" "doc" "man" ];
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, gfortran, perl, which, coreutils
|
||||
{ stdenv, fetchFromGitHub, fetchpatch, gfortran, perl, which, config, coreutils
|
||||
# Most packages depending on openblas expect integer width to match
|
||||
# pointer width, but some expect to use 32-bit integers always
|
||||
# (for compatibility with reference BLAS).
|
||||
@ -80,10 +80,11 @@ in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "openblas-${version}";
|
||||
version = "0.3.1";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/xianyi/OpenBLAS/archive/v${version}.tar.gz";
|
||||
sha256 = "0czbs2afmcxxij1ivqrm04p0qcksg5fravjifhydvb7k6mpraphz";
|
||||
name = "openblas-${version}.tar.gz";
|
||||
src = fetchFromGitHub {
|
||||
owner = "xianyi";
|
||||
repo = "OpenBLAS";
|
||||
rev = "v${version}";
|
||||
sha256 = "1dkwp4gz1hzpmhzks9y9ipb4c5h0r6c7yff62x3s8x9z6f8knaqc";
|
||||
};
|
||||
|
||||
inherit blas64;
|
||||
@ -117,7 +118,20 @@ stdenv.mkDerivation rec {
|
||||
] ++ stdenv.lib.optional (stdenv.hostPlatform.libc == "musl") "NO_AFFINITY=1"
|
||||
++ mapAttrsToList (var: val: var + "=" + val) config;
|
||||
|
||||
patches = []; # TODO: Remove on next mass-rebuild
|
||||
patches = [
|
||||
# Backport of https://github.com/xianyi/OpenBLAS/pull/1667, which
|
||||
# is causing problems and was already accepted upstream.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/xianyi/OpenBLAS/commit/5f2a3c05cd0e3872be3c5686b9da6b627658eeb7.patch";
|
||||
sha256 = "1qvxhk92likrshw6z6hjqxvkblwzgsbzis2b2f71bsvx9174qfk1";
|
||||
})
|
||||
# Double "MAX_ALLOCATING_THREADS", fix with Go and Octave
|
||||
# https://github.com/xianyi/OpenBLAS/pull/1663 (see also linked issue)
|
||||
(fetchpatch {
|
||||
url = "https://github.com/xianyi/OpenBLAS/commit/a49203b48c4a3d6f86413fc8c4b1fbfaa1946463.patch";
|
||||
sha256 = "0v6kjkbgbw7hli6xkism48wqpkypxmcqvxpx564snll049l2xzq2";
|
||||
})
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
checkTarget = "tests";
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "wayland-protocols-${version}";
|
||||
version = "1.14";
|
||||
version = "1.15";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://wayland.freedesktop.org/releases/${name}.tar.xz";
|
||||
sha256 = "1xknjcfhqvdi1s4iq4kk1q61fg2rar3g8q4vlqarpd324imqjj4n";
|
||||
sha256 = "1qlyf9cllr2p339xxplznh023qcwj5iisp02ikx7ps349dx75fys";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
@ -17,7 +17,6 @@ buildPerlPackage rec {
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
homepage = http://search.cpan.org/dist/DBD-Pg/;
|
||||
description = "DBI PostgreSQL interface";
|
||||
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
|
||||
@ -3,6 +3,8 @@ perl:
|
||||
{ nativeBuildInputs ? [], name, ... } @ attrs:
|
||||
|
||||
perl.stdenv.mkDerivation (
|
||||
(
|
||||
perl.stdenv.lib.recursiveUpdate
|
||||
{
|
||||
outputs = [ "out" "devdoc" ];
|
||||
|
||||
@ -20,9 +22,11 @@ perl.stdenv.mkDerivation (
|
||||
# authors to skip certain tests (or include certain tests) when
|
||||
# the results are not being monitored by a human being."
|
||||
AUTOMATED_TESTING = true;
|
||||
|
||||
meta.homepage = "https://metacpan.org/release/${(builtins.parseDrvName name).name}";
|
||||
}
|
||||
//
|
||||
attrs
|
||||
)
|
||||
//
|
||||
{
|
||||
name = "perl-" + name;
|
||||
|
||||
@ -0,0 +1,17 @@
|
||||
{ lib, buildPythonPackage, fetchPypi }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "backports.ssl_match_hostname";
|
||||
version = "3.5.0.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1wndipik52cyqy0677zdgp90i435pmvwd89cz98lm7ri0y3xjajh";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "The Secure Sockets layer is only actually *secure*";
|
||||
homepage = https://bitbucket.org/brandon/backports.ssl_match_hostname;
|
||||
license = licenses.psfl;
|
||||
};
|
||||
}
|
||||
@ -46,11 +46,6 @@ buildPythonPackage rec {
|
||||
export CVXOPT_FFTW_INC_DIR=${fftw.dev}/include
|
||||
'';
|
||||
|
||||
# https://github.com/cvxopt/cvxopt/issues/122
|
||||
# This is fixed on staging (by #43234, status 2018-07-15), but until that
|
||||
# lands we should disable the tests. Otherwise the 99% of use cases that
|
||||
# should be unaffected by that failure are affected.
|
||||
doCheck = false;
|
||||
checkPhase = ''
|
||||
${python.interpreter} -m unittest discover -s tests
|
||||
'';
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
targetPrefix = lib.optionalString stdenv.isCross
|
||||
(targetPlatform.config + "-");
|
||||
in python3Packages.buildPythonApplication rec {
|
||||
version = "0.46.1";
|
||||
version = "0.47.0";
|
||||
pname = "meson";
|
||||
|
||||
src = python3Packages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1jdxs2mkniy1hpdjc4b4jb95axsjp6j5fzphmm6d4gqmqyykjvqc";
|
||||
sha256 = "1mxsvsw7mg3q4yj8qrkrwv79qwws14qnbihryn2i7504b3r204h6";
|
||||
};
|
||||
|
||||
postFixup = ''
|
||||
|
||||
@ -17,6 +17,7 @@ mesonConfigurePhase() {
|
||||
--includedir=${!outputInclude}/include \
|
||||
--mandir=${!outputMan}/share/man --infodir=${!outputInfo}/share/info \
|
||||
--localedir=${!outputLib}/share/locale \
|
||||
-Dauto_features=disabled \
|
||||
$mesonFlags"
|
||||
|
||||
mesonFlags="${crossMesonFlags+$crossMesonFlags }--buildtype=${mesonBuildType:-release} $mesonFlags"
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ stdenv, config, fetchurl, patchelf, makeWrapper, gtk2, glib, udev, alsaLib, atk
|
||||
, nspr, fontconfig, cairo, pango, nss, freetype, gnome3, gdk_pixbuf, curl, systemd, xorg }:
|
||||
, nspr, fontconfig, cairo, pango, nss, freetype, gnome2, gdk_pixbuf, curl, systemd, xorg }:
|
||||
|
||||
# TODO: use dynamic attributes once Nix 1.7 is out
|
||||
assert ((config.planetary_annihilation or null).url or null) != null;
|
||||
@ -34,7 +34,7 @@ stdenv.mkDerivation {
|
||||
ln -s ${systemd}/lib/libudev.so.1 $out/lib/libudev.so.0
|
||||
|
||||
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/PA"
|
||||
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib xorg.libXdamage xorg.libXfixes gtk2 glib stdenv.glibc.out "$out" xorg.libXext pango udev xorg.libX11 xorg.libXcomposite alsaLib atk nspr fontconfig cairo pango nss freetype gnome3.gconf gdk_pixbuf xorg.libXrender ]}:{stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" "$out/host/CoherentUI_Host"
|
||||
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib xorg.libXdamage xorg.libXfixes gtk2 glib stdenv.glibc.out "$out" xorg.libXext pango udev xorg.libX11 xorg.libXcomposite alsaLib atk nspr fontconfig cairo pango nss freetype gnome2.GConf gdk_pixbuf xorg.libXrender ]}:{stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" "$out/host/CoherentUI_Host"
|
||||
|
||||
wrapProgram $out/PA --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib stdenv.glibc.out xorg.libX11 xorg.libXcursor gtk2 glib curl "$out" ]}:${stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64"
|
||||
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
, enableOpenGL ? false, libGLU_combined ? null
|
||||
|
||||
# GUI toolkits
|
||||
, enableGTK ? true, gtk2 ? null, gnome2 ? null, gnome3 ? null
|
||||
, enableGTK ? true, gtk2 ? null, gnome2 ? null
|
||||
, enableSDL ? false
|
||||
, enableQt ? false, qt4 ? null
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
let
|
||||
let
|
||||
available = x: x != null;
|
||||
|
||||
sound =
|
||||
@ -52,7 +52,7 @@ assert enableCairo -> available cairo;
|
||||
assert enableOpenGL -> available libGLU_combined;
|
||||
|
||||
# GUI toolkits
|
||||
assert enableGTK -> all available [ gtk2 gnome2.gtkglext gnome3.gconf ];
|
||||
assert enableGTK -> all available [ gtk2 gnome2.gtkglext gnome2.GConf ];
|
||||
assert enableSDL -> available SDL;
|
||||
assert enableQt -> available qt4;
|
||||
|
||||
@ -96,7 +96,7 @@ stdenv.mkDerivation rec {
|
||||
++ optional enableJemalloc jemalloc
|
||||
++ optional enableHwAccel libGLU_combined
|
||||
++ optionals enablePlugins [ xulrunner npapi_sdk ]
|
||||
++ optionals enableGTK [ gtk2 gnome2.gtkglext gnome3.gconf ]
|
||||
++ optionals enableGTK [ gtk2 gnome2.gtkglext gnome2.GConf ]
|
||||
++ optionals enableGstreamer [ gst-plugins-base gst-plugins-ugly gst-ffmpeg ];
|
||||
|
||||
configureFlags = with stdenv.lib; [
|
||||
|
||||
@ -1,4 +1,10 @@
|
||||
{ lib, stdenv, fetchurl, ncurses, pkgconfig }:
|
||||
{ lib, stdenv, fetchurl, ncurses, pkgconfig
|
||||
|
||||
# procps is mostly Linux-only. Most commands require a running Linux
|
||||
# system (or very similar like that found in Cygwin). The one
|
||||
# exception is ‘watch’ which is portable enough to run on pretty much
|
||||
# any UNIX-compatible system.
|
||||
, watchOnly ? !(stdenv.isLinux || stdenv.isCygwin) }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "procps-${version}";
|
||||
@ -13,7 +19,8 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [ ncurses ];
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
makeFlags = "usrbin_execdir=$(out)/bin";
|
||||
makeFlags = [ "usrbin_execdir=$(out)/bin" ]
|
||||
++ lib.optionals watchOnly [ "watch" "PKG_LDFLAGS="];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -23,12 +30,17 @@ stdenv.mkDerivation rec {
|
||||
[ "ac_cv_func_malloc_0_nonnull=yes"
|
||||
"ac_cv_func_realloc_0_nonnull=yes" ];
|
||||
|
||||
installPhase = if watchOnly then ''
|
||||
install -m 0755 -D watch $out/bin/watch
|
||||
install -m 0644 -D watch.1 $out/share/man/man1/watch.1
|
||||
'' else null;
|
||||
|
||||
meta = {
|
||||
homepage = https://gitlab.com/procps-ng/procps;
|
||||
description = "Utilities that give information about processes using the /proc filesystem";
|
||||
priority = 10; # less than coreutils, which also provides "kill" and "uptime"
|
||||
license = lib.licenses.gpl2;
|
||||
platforms = lib.platforms.linux ++ lib.platforms.cygwin;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = [ lib.maintainers.typetetris ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
{ stdenv, fetchurl, ncurses }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "watch-0.2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://procps.sourceforge.net/procps-3.2.8.tar.gz;
|
||||
sha256 = "0d8mki0q4yamnkk4533kx8mc0jd879573srxhg6r2fs3lkc6iv8i";
|
||||
};
|
||||
|
||||
buildInputs = [ ncurses ];
|
||||
|
||||
makeFlags = "watch usrbin_execdir=$(out)/bin" +
|
||||
(if stdenv.isDarwin then " PKG_LDFLAGS=" else "");
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
installPhase = "mkdir $out; mkdir -p $out/bin; cp -p watch $out/bin";
|
||||
|
||||
meta = {
|
||||
homepage = https://sourceforge.net/projects/procps/;
|
||||
description = "Utility for watch the output of a given command at intervals";
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
@ -34,7 +34,7 @@ buildPerlPackage {
|
||||
ConfigGitLike DevelStackTrace TreeDAGNode ClassObservable ClassFactory TimeDate ConfigAny
|
||||
CGIFast ClassISA YAML YAMLLibYAML AuthenSASL TextCSV FileFindRulePerl IODigest ]
|
||||
++ stdenv.lib.optionals extraDependencies3
|
||||
[ # dependencies taken from http://search.cpan.org/~alech/Bundle-OpenXPKI-0.06/lib/Bundle/OpenXPKI.pm
|
||||
[ # dependencies taken from https://metacpan.org/pod/release/ALECH/Bundle-OpenXPKI-0.06/lib/Bundle/OpenXPKI.pm
|
||||
AttributeHandlers AttributeParamsValidate AutoLoader BC CGI CPAN CacheCache ClassClassgenclassgen
|
||||
ClassContainer ClassDataInheritable ClassSingleton ConvertASN1 DBDSQLite DBIxHTMLViewLATEST
|
||||
DBFile DataPage DataSpreadPagination DateTimeLocale DateTimeTimeZone DevelPPPort DevelSelfStubber
|
||||
|
||||
@ -220,7 +220,6 @@ isScript() {
|
||||
local fn="$1"
|
||||
local fd
|
||||
local magic
|
||||
if ! [ -x /bin/sh ]; then return 0; fi
|
||||
exec {fd}< "$fn"
|
||||
read -r -n 2 -u "$fd" magic
|
||||
exec {fd}<&-
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, buildPackages, fetchurl, pkgconfig, libuuid, gettext, texinfo }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "e2fsprogs-1.44.2";
|
||||
name = "e2fsprogs-1.44.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/e2fsprogs/${name}.tar.gz";
|
||||
sha256 = "0s3znfy26as63gdbskm6pxh3i1106bpxf2jh9dppd8d9lidmmh75";
|
||||
sha256 = "1gl34i2dy1n7aky9g0jgdybl3ar2zh8i8xnghrcbb5pvws66vbn2";
|
||||
};
|
||||
|
||||
outputs = [ "bin" "dev" "out" "man" "info" ];
|
||||
|
||||
@ -17,7 +17,6 @@ perlPackages.buildPerlPackage rec {
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Perl extension for renaming multiple files";
|
||||
homepage = http://search.cpan.org/~rmbarker;
|
||||
license = licenses.artistic1;
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
};
|
||||
|
||||
@ -7,9 +7,8 @@ buildPerlPackage rec {
|
||||
url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz";
|
||||
sha256 = "d4a2c10aebef663b598ea37f3aa3e3b752acf1fbbb961232c3dbe1155008d1fa";
|
||||
};
|
||||
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://search.cpan.org/~tels/Graph-Easy/bin/graph-easy;
|
||||
description = "Render/convert graphs in/from various formats";
|
||||
license = licenses.gpl1;
|
||||
platforms = platforms.linux;
|
||||
|
||||
@ -12,7 +12,6 @@ buildPerlPackage rec {
|
||||
};
|
||||
meta = with stdenv.lib; {
|
||||
description = "Rename files according to a Perl rewrite expression";
|
||||
homepage = http://search.cpan.org/~pederst/rename-1.9/bin/rename.PL;
|
||||
maintainers = with maintainers; [ mkg ];
|
||||
license = with licenses; [ gpl1Plus ];
|
||||
};
|
||||
|
||||
@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
buildInputs = [ openfortivpn networkmanager ppp libtool libsecret ]
|
||||
++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome-keyring gnome3.gconf gnome3.networkmanagerapplet ];
|
||||
++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome-keyring gnome3.networkmanagerapplet ];
|
||||
|
||||
nativeBuildInputs = [ automake autoconf intltool pkgconfig ];
|
||||
|
||||
|
||||
@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
buildInputs = [ openconnect networkmanager libsecret ]
|
||||
++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome-keyring gnome3.gconf ];
|
||||
++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome-keyring ];
|
||||
|
||||
nativeBuildInputs = [ intltool pkgconfig ];
|
||||
|
||||
|
||||
@ -22,6 +22,16 @@ stdenv.mkDerivation rec {
|
||||
|
||||
installTargets = "install install-lib";
|
||||
|
||||
# Use standardized and equivalent realpath(path, NULL) instead of canonicalize_file_name(path).
|
||||
# This is documented to be equivalent, see `man 3 canonicalize_file_name`.
|
||||
# Fixes w/musl.
|
||||
# Upstream PR: https://github.com/pciutils/pciutils/pull/6
|
||||
postPatch = ''
|
||||
substituteInPlace lib/sysfs.c \
|
||||
--replace "canonicalize_file_name(path)" \
|
||||
"realpath(path, NULL)"
|
||||
'';
|
||||
|
||||
# Get rid of update-pciids as it won't work.
|
||||
postInstall = "rm $out/sbin/update-pciids $out/man/man8/update-pciids.8";
|
||||
|
||||
|
||||
@ -209,6 +209,7 @@ mapAliases ({
|
||||
piwik = matomo; # added 2018-01-16
|
||||
pltScheme = racket; # just to be sure
|
||||
poppler_qt5 = libsForQt5.poppler; # added 2015-12-19
|
||||
procps-ng = procps; # added 2018-06-08
|
||||
prometheus-statsd-bridge = prometheus-statsd-exporter; # added 2017-08-27
|
||||
pulseaudioLight = pulseaudio; # added 2018-04-25
|
||||
qca-qt5 = libsForQt5.qca-qt5; # added 2015-12-19
|
||||
|
||||
@ -1775,7 +1775,8 @@ with pkgs;
|
||||
};
|
||||
|
||||
ibus = callPackage ../tools/inputmethods/ibus {
|
||||
inherit (gnome3) dconf gconf glib;
|
||||
gconf = gnome2.GConf;
|
||||
inherit (gnome3) dconf glib;
|
||||
};
|
||||
|
||||
ibus-qt = callPackage ../tools/inputmethods/ibus/ibus-qt.nix { };
|
||||
@ -12932,7 +12933,7 @@ with pkgs;
|
||||
};
|
||||
|
||||
pulseaudioFull = pulseaudio.override {
|
||||
gconf = gnome3.gconf;
|
||||
gconf = gnome2.GConf;
|
||||
x11Support = true;
|
||||
jackaudioSupport = true;
|
||||
airtunesSupport = true;
|
||||
@ -14293,9 +14294,6 @@ with pkgs;
|
||||
|
||||
procps = if stdenv.isLinux then callPackage ../os-specific/linux/procps-ng { }
|
||||
else unixtools.procps;
|
||||
procps-ng = procps; # TODO: move to aliases.nix
|
||||
|
||||
watch = callPackage ../os-specific/linux/procps/watch.nix { };
|
||||
|
||||
qemu_kvm = lowPrio (qemu.override { hostCpuOnly = true; });
|
||||
|
||||
@ -15368,7 +15366,7 @@ with pkgs;
|
||||
|
||||
bonzomatic = callPackage ../applications/editors/bonzomatic { };
|
||||
|
||||
brackets = callPackage ../applications/editors/brackets { gconf = gnome3.gconf; };
|
||||
brackets = callPackage ../applications/editors/brackets { gconf = gnome2.GConf; };
|
||||
|
||||
notmuch-bower = callPackage ../applications/networking/mailreaders/notmuch-bower { };
|
||||
|
||||
@ -20231,7 +20229,8 @@ with pkgs;
|
||||
mkPlasma5 = import ../desktops/plasma-5;
|
||||
attrs = {
|
||||
inherit libsForQt5 lib fetchurl;
|
||||
inherit (gnome3) gconf gsettings-desktop-schemas;
|
||||
inherit (gnome3) gsettings-desktop-schemas;
|
||||
gconf = gnome2.GConf;
|
||||
};
|
||||
in
|
||||
recurseIntoAttrs (makeOverridable mkPlasma5 attrs);
|
||||
@ -21040,7 +21039,7 @@ with pkgs;
|
||||
cups-zj-58 = callPackage ../misc/cups/drivers/zj-58 { };
|
||||
|
||||
crashplan = callPackage ../applications/backup/crashplan { };
|
||||
crashplansb = callPackage ../applications/backup/crashplan/crashplan-small-business.nix { inherit (gnome3) gconf; };
|
||||
crashplansb = callPackage ../applications/backup/crashplan/crashplan-small-business.nix { gconf = gnome2.GConf; };
|
||||
|
||||
colort = callPackage ../applications/misc/colort { };
|
||||
|
||||
@ -21965,7 +21964,7 @@ with pkgs;
|
||||
unixtools = recurseIntoAttrs (callPackages ./unix-tools.nix { });
|
||||
inherit (unixtools) hexdump ps logger eject umount
|
||||
mount wall hostname more sysctl getconf
|
||||
getent locale killall xxd;
|
||||
getent locale killall xxd watch;
|
||||
|
||||
fts = if hostPlatform.isMusl then netbsd.fts else null;
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -943,34 +943,8 @@ in {
|
||||
|
||||
backports_shutil_get_terminal_size = callPackage ../development/python-modules/backports_shutil_get_terminal_size { };
|
||||
|
||||
backports_ssl_match_hostname_3_4_0_2 = if !(pythonOlder "3.5") then null else self.buildPythonPackage rec {
|
||||
name = "backports.ssl_match_hostname-3.4.0.2";
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "mirror://pypi/b/backports.ssl_match_hostname/backports.ssl_match_hostname-3.4.0.2.tar.gz";
|
||||
sha256 = "07410e7fb09aab7bdaf5e618de66c3dac84e2e3d628352814dc4c37de321d6ae";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "The Secure Sockets layer is only actually *secure*";
|
||||
homepage = https://bitbucket.org/brandon/backports.ssl_match_hostname;
|
||||
};
|
||||
};
|
||||
|
||||
backports_ssl_match_hostname = if !(pythonOlder "3.5") then null else self.buildPythonPackage rec {
|
||||
name = "backports.ssl_match_hostname-${version}";
|
||||
version = "3.5.0.1";
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "mirror://pypi/b/backports.ssl_match_hostname/${name}.tar.gz";
|
||||
sha256 = "1wndipik52cyqy0677zdgp90i435pmvwd89cz98lm7ri0y3xjajh";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "The Secure Sockets layer is only actually *secure*";
|
||||
homepage = https://bitbucket.org/brandon/backports.ssl_match_hostname;
|
||||
};
|
||||
};
|
||||
backports_ssl_match_hostname = if !(pythonOlder "3.5") then null else
|
||||
callPackage ../development/python-modules/backports_ssl_match_hostname { };
|
||||
|
||||
backports_lzma = callPackage ../development/python-modules/backports_lzma { };
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ pkgs, buildEnv, runCommand, hostPlatform, lib }:
|
||||
{ pkgs, buildEnv, runCommand, hostPlatform, lib, stdenv }:
|
||||
|
||||
# These are some unix tools that are commonly included in the /usr/bin
|
||||
# and /usr/sbin directory under more normal distributions. Along with
|
||||
@ -10,35 +10,42 @@
|
||||
# instance, if your program needs to use "ps", just list it as a build
|
||||
# input, not "procps" which requires Linux.
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
version = "1003.1-2008";
|
||||
|
||||
singleBinary = cmd: providers: let
|
||||
provider = "${lib.getBin providers.${hostPlatform.parsed.kernel.name}}/bin/${cmd}";
|
||||
manpage = "${lib.getOutput "man" providers.${hostPlatform.parsed.kernel.name}}/share/man/man1/${cmd}.1.gz";
|
||||
provider = providers.${hostPlatform.parsed.kernel.name};
|
||||
bin = "${getBin provider}/bin/${cmd}";
|
||||
manpage = "${getOutput "man" provider}/share/man/man1/${cmd}.1.gz";
|
||||
in runCommand "${cmd}-${version}" {
|
||||
meta.platforms = map (n: { kernel.name = n; }) (pkgs.lib.attrNames providers);
|
||||
meta.platforms = map (n: { kernel.name = n; }) (attrNames providers);
|
||||
passthru = { inherit provider; };
|
||||
preferLocalBuild = true;
|
||||
} ''
|
||||
if ! [ -x "${provider}" ]; then
|
||||
echo "Cannot find command ${cmd}"
|
||||
if ! [ -x ${bin} ]; then
|
||||
echo Cannot find command ${cmd}
|
||||
exit 1
|
||||
fi
|
||||
|
||||
install -D "${provider}" "$out/bin/${cmd}"
|
||||
mkdir -p $out/bin
|
||||
ln -s ${bin} $out/bin/${cmd}
|
||||
|
||||
if [ -f "${manpage}" ]; then
|
||||
install -D "${manpage}" $out/share/man/man1/${cmd}.1.gz
|
||||
if [ -f ${manpage} ]; then
|
||||
mkdir -p $out/share/man/man1
|
||||
ln -s ${manpage} $out/share/man/man1/${cmd}.1.gz
|
||||
fi
|
||||
'';
|
||||
|
||||
# more is unavailable in darwin
|
||||
# just use less
|
||||
# so we just use less
|
||||
more_compat = runCommand "more-${version}" {} ''
|
||||
mkdir -p $out/bin
|
||||
ln -s ${pkgs.less}/bin/less $out/bin/more
|
||||
'';
|
||||
|
||||
bins = lib.mapAttrs singleBinary {
|
||||
bins = mapAttrs singleBinary {
|
||||
# singular binaries
|
||||
arp = {
|
||||
linux = pkgs.nettools;
|
||||
@ -52,12 +59,12 @@ let
|
||||
linux = pkgs.utillinux;
|
||||
};
|
||||
getconf = {
|
||||
linux = if hostPlatform.libc == "glibc" then lib.getBin pkgs.glibc
|
||||
linux = if hostPlatform.libc == "glibc" then pkgs.glibc
|
||||
else pkgs.netbsd.getconf;
|
||||
darwin = pkgs.darwin.system_cmds;
|
||||
};
|
||||
getent = {
|
||||
linux = if hostPlatform.libc == "glibc" then lib.getBin pkgs.glibc
|
||||
linux = if hostPlatform.libc == "glibc" then pkgs.glibc
|
||||
else pkgs.netbsd.getent;
|
||||
darwin = pkgs.netbsd.getent;
|
||||
};
|
||||
@ -147,6 +154,13 @@ let
|
||||
wall = {
|
||||
linux = pkgs.utillinux;
|
||||
};
|
||||
watch = {
|
||||
linux = pkgs.procps;
|
||||
|
||||
# watch is the only command from procps that builds currently on
|
||||
# Darwin. Unfortunately no other implementations exist currently!
|
||||
darwin = pkgs.callPackage ../os-specific/linux/procps-ng {};
|
||||
};
|
||||
write = {
|
||||
linux = pkgs.utillinux;
|
||||
darwin = pkgs.darwin.basic_cmds;
|
||||
@ -157,15 +171,16 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
makeCompat = name': value: buildEnv {
|
||||
name = name' + "-compat-${version}";
|
||||
paths = value;
|
||||
};
|
||||
makeCompat = pname: paths:
|
||||
buildEnv {
|
||||
name = "${pname}-${version}";
|
||||
inherit paths;
|
||||
};
|
||||
|
||||
# Compatibility derivations
|
||||
# Provided for old usage of these commands.
|
||||
compat = with bins; lib.mapAttrs makeCompat {
|
||||
procps = [ ps sysctl top ];
|
||||
procps = [ ps sysctl top watch ];
|
||||
utillinux = [ fsck fdisk getopt hexdump mount
|
||||
script umount whereis write col ];
|
||||
nettools = [ arp hostname ifconfig netstat route ];
|
||||
|
||||
Loading…
Reference in New Issue
Block a user