Merge master into staging

This commit is contained in:
Frederik Rietdijk 2018-05-29 17:23:42 +02:00
commit 85032a052d
137 changed files with 743 additions and 334 deletions

9
.github/CODEOWNERS vendored
View file

@ -45,10 +45,11 @@
/nixos/modules/installer/tools/nixos-option.sh @nbp
# Python-related code and docs
/pkgs/top-level/python-packages.nix @FRidh
/pkgs/development/interpreters/python @FRidh
/pkgs/development/python-modules @FRidh
/doc/languages-frameworks/python.md @FRidh
/maintainers/scripts/update-python-libraries @FRidh
/pkgs/top-level/python-packages.nix @FRidh
/pkgs/development/interpreters/python @FRidh
/pkgs/development/python-modules @FRidh
/doc/languages-frameworks/python.md @FRidh
# Haskell
/pkgs/development/compilers/ghc @peti

View file

@ -906,7 +906,7 @@ in {
${optionalString (cfg.etcd.keyFile != null)
"--etcd-keyfile=${cfg.etcd.keyFile}"} \
--insecure-port=${toString cfg.apiserver.port} \
--bind-address=0.0.0.0 \
--bind-address=${toString cfg.apiserver.address} \
${optionalString (cfg.apiserver.advertiseAddress != null)
"--advertise-address=${cfg.apiserver.advertiseAddress}"} \
--allow-privileged=${boolToString cfg.apiserver.allowPrivileged}\

View file

@ -6,7 +6,7 @@
services.udev.packages = [ pkgs.mdadm ];
boot.initrd.availableKernelModules = [ "md_mod" "raid0" "raid1" "raid456" ];
boot.initrd.availableKernelModules = [ "md_mod" "raid0" "raid1" "raid10" "raid456" ];
boot.initrd.extraUdevRulesCommands = ''
cp -v ${pkgs.mdadm}/lib/udev/rules.d/*.rules $out/

View file

@ -56,7 +56,7 @@ let
});
in
buildFHSUserEnv {
name = "mist-${stdenv.lib.getVersion mist}";
inherit name;
targetPkgs = pkgs: with pkgs; [
mist

View file

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, pkgconfig, cairomm, cmake, lv2, libpthreadstubs, libXdmcp, libXft, ntk, pcre, fftwFloat, zita-resampler }:
stdenv.mkDerivation rec {
name = "infamousPlugins-v${version}";
name = "infamousPlugins-${version}";
version = "0.2.04";
src = fetchFromGitHub {

View file

@ -1,7 +1,7 @@
{ stdenv, fetchurl, fftwSinglePrec, libxslt, lv2, pkgconfig }:
stdenv.mkDerivation rec {
name = "swh-lv2-v${version}";
name = "swh-lv2-${version}";
version = "1.0.16";
src = fetchurl {

View file

@ -0,0 +1,136 @@
{ stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d
, pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif
, libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux
, alsaLib, cairo, acl, gpm, AppKit, CoreWLAN, Kerberos, GSS, ImageIO
, withX ? !stdenv.isDarwin
, withGTK2 ? false, gtk2 ? null
, withGTK3 ? true, gtk3 ? null, gsettings-desktop-schemas ? null
, withXwidgets ? false, webkitgtk24x-gtk3 ? null, wrapGAppsHook ? null, glib-networking ? null
, withCsrc ? true
, srcRepo ? false, autoconf ? null, automake ? null, texinfo ? null
}:
assert (libXft != null) -> libpng != null; # probably a bug
assert stdenv.isDarwin -> libXaw != null; # fails to link otherwise
assert withGTK2 -> withX || stdenv.isDarwin;
assert withGTK3 -> withX || stdenv.isDarwin;
assert withGTK2 -> !withGTK3 && gtk2 != null;
assert withGTK3 -> !withGTK2 && gtk3 != null;
assert withXwidgets -> withGTK3 && webkitgtk24x-gtk3 != null;
let
toolkit =
if withGTK2 then "gtk2"
else if withGTK3 then "gtk3"
else "lucid";
in
stdenv.mkDerivation rec {
name = "emacs-${version}${versionModifier}";
version = "25.3";
versionModifier = "";
src = fetchurl {
url = "mirror://gnu/emacs/${name}.tar.xz";
sha256 = "02y00y9q42g1iqgz5qhmsja75hwxd88yrn9zp14lanay0zkwafi5";
};
enableParallelBuilding = true;
patches = lib.optionals stdenv.isDarwin [
./at-fdcwd.patch
# Backport of the fix to
# https://lists.gnu.org/archive/html/bug-gnu-emacs/2017-04/msg00201.html
# Should be removed when switching to Emacs 26.1
(fetchurl {
url = "https://gist.githubusercontent.com/aaronjensen/f45894ddf431ecbff78b1bcf533d3e6b/raw/6a5cd7f57341aba673234348d8b0d2e776f86719/Emacs-25-OS-X-use-vfork.patch";
sha256 = "1nlsxiaynswqhy99jf4mw9x0sndhwcrwy8713kq1l3xqv9dbrzgj";
})
];
nativeBuildInputs = [ pkgconfig ]
++ lib.optionals srcRepo [ autoconf automake texinfo ]
++ lib.optional (withX && (withGTK3 || withXwidgets)) wrapGAppsHook;
buildInputs =
[ ncurses gconf libxml2 gnutls alsaLib acl gpm gettext ]
++ lib.optionals stdenv.isLinux [ dbus libselinux ]
++ lib.optionals withX
[ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft
imagemagick gconf ]
++ lib.optional (withX && withGTK2) gtk2
++ lib.optionals (withX && withGTK3) [ gtk3 gsettings-desktop-schemas ]
++ lib.optional (stdenv.isDarwin && withX) cairo
++ lib.optionals (withX && withXwidgets) [ webkitgtk24x-gtk3 glib-networking ];
propagatedBuildInputs = lib.optionals stdenv.isDarwin [ AppKit GSS ImageIO ];
hardeningDisable = [ "format" ];
configureFlags = [ "--with-modules" ] ++
(if stdenv.isDarwin
then [ "--with-ns" "--disable-ns-self-contained" ]
else if withX
then [ "--with-x-toolkit=${toolkit}" "--with-xft" ]
else [ "--with-x=no" "--with-xpm=no" "--with-jpeg=no" "--with-png=no"
"--with-gif=no" "--with-tiff=no" ])
++ lib.optional withXwidgets "--with-xwidgets";
preConfigure = lib.optionalString srcRepo ''
./autogen.sh
'' + ''
substituteInPlace lisp/international/mule-cmds.el \
--replace /usr/share/locale ${gettext}/share/locale
for makefile_in in $(find . -name Makefile.in -print); do
substituteInPlace $makefile_in --replace /bin/pwd pwd
done
'';
installTargets = "tags install";
postInstall = ''
mkdir -p $out/share/emacs/site-lisp
cp ${./site-start.el} $out/share/emacs/site-lisp/site-start.el
$out/bin/emacs --batch -f batch-byte-compile $out/share/emacs/site-lisp/site-start.el
rm -rf $out/var
rm -rf $out/share/emacs/${version}/site-lisp
'' + lib.optionalString withCsrc ''
for srcdir in src lisp lwlib ; do
dstdir=$out/share/emacs/${version}/$srcdir
mkdir -p $dstdir
find $srcdir -name "*.[chm]" -exec cp {} $dstdir \;
cp $srcdir/TAGS $dstdir
echo '((nil . ((tags-file-name . "TAGS"))))' > $dstdir/.dir-locals.el
done
'' + lib.optionalString stdenv.isDarwin ''
mkdir -p $out/Applications
mv nextstep/Emacs.app $out/Applications
'';
meta = with stdenv.lib; {
description = "The extensible, customizable GNU text editor";
homepage = http://www.gnu.org/software/emacs/;
license = licenses.gpl3Plus;
maintainers = with maintainers; [ chaoflow lovek323 peti the-kenny jwiegley ];
platforms = platforms.all;
longDescription = ''
GNU Emacs is an extensible, customizable text editorand more. At its
core is an interpreter for Emacs Lisp, a dialect of the Lisp
programming language with extensions to support text editing.
The features of GNU Emacs include: content-sensitive editing modes,
including syntax coloring, for a wide variety of file types including
plain text, source code, and HTML; complete built-in documentation,
including a tutorial for new users; full Unicode support for nearly all
human languages and their scripts; highly customizable, using Emacs
Lisp code or a graphical interface; a large number of extensions that
add other functionality, including a project planner, mail and news
reader, debugger interface, calendar, and more. Many of these
extensions are distributed with GNU Emacs; others are available
separately.
'';
};
}

View file

@ -8,8 +8,8 @@ diff -ru -x '*~' emacs-25.3/src/Makefile.in emacs-25.3-new/src/Makefile.in
ifeq ($(CANNOT_DUMP),yes)
ln -f temacs$(EXEEXT) $@
else
- LC_ALL=C $(RUN_TEMACS) -batch -l loadup dump
+ env -i LC_ALL=C $(RUN_TEMACS) -batch -l loadup dump
- LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup dump
+ env -i LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup dump
ifneq ($(PAXCTL_dumped),)
$(PAXCTL_dumped) $@
endif

View file

@ -26,30 +26,26 @@ let
in
stdenv.mkDerivation rec {
name = "emacs-${version}${versionModifier}";
version = "25.3";
version = "26.1";
versionModifier = "";
src = fetchurl {
url = "mirror://gnu/emacs/${name}.tar.xz";
sha256 = "02y00y9q42g1iqgz5qhmsja75hwxd88yrn9zp14lanay0zkwafi5";
sha256 = "0b6k1wq44rc8gkvxhi1bbjxbz3cwg29qbq8mklq2az6p1hjgrx0w";
};
enableParallelBuilding = true;
patches = [
./clean-env.patch
] ++ lib.optionals stdenv.isDarwin [
./at-fdcwd.patch
# Backport of the fix to
# https://lists.gnu.org/archive/html/bug-gnu-emacs/2017-04/msg00201.html
# Should be removed when switching to Emacs 26.1
(fetchurl {
url = "https://gist.githubusercontent.com/aaronjensen/f45894ddf431ecbff78b1bcf533d3e6b/raw/6a5cd7f57341aba673234348d8b0d2e776f86719/Emacs-25-OS-X-use-vfork.patch";
sha256 = "1nlsxiaynswqhy99jf4mw9x0sndhwcrwy8713kq1l3xqv9dbrzgj";
})
];
postPatch = lib.optionalString srcRepo ''
rm -fr .git
'';
CFLAGS = "-DMAC_OS_X_VERSION_MAX_ALLOWED=101200";
nativeBuildInputs = [ pkgconfig ]
++ lib.optionals srcRepo [ autoconf automake texinfo ]
++ lib.optional (withX && (withGTK3 || withXwidgets)) wrapGAppsHook;

View file

@ -1,11 +1,11 @@
{ stdenv, zlib, fetchFromGitHub, python3Packages }:
python3Packages.buildPythonApplication rec {
name = "manuskript";
pname = "manuskript";
version = "0.3.0";
src = fetchFromGitHub {
repo = name;
repo = pname;
owner = "olivierkes";
rev = version;
sha256 = "0bqxc4a8kyi6xz1zs0dp85wxl9h4v8lzc6073bbcsn1zg4y59ys7";
@ -19,15 +19,15 @@ python3Packages.buildPythonApplication rec {
patchPhase = ''
substituteInPlace manuskript/ui/welcome.py \
--replace sample-projects $out/share/${name}/sample-projects
--replace sample-projects $out/share/${pname}/sample-projects
'';
buildPhase = '''';
installPhase = ''
mkdir -p $out/share/${name}
mkdir -p $out/share/${pname}
cp -av bin/ i18n/ libs/ manuskript/ resources/ icons/ $out
cp -r sample-projects/ $out/share/${name}
cp -r sample-projects/ $out/share/${pname}
'';
doCheck = false;

View file

@ -4,13 +4,13 @@ with stdenv.lib;
pythonPackages.buildPythonPackage rec {
name = "neovim-remote-${version}";
version = "v1.8.6";
version = "1.8.6";
disabled = !pythonPackages.isPy3k;
src = fetchFromGitHub {
owner = "mhinz";
repo = "neovim-remote";
rev = version;
rev = "v${version}";
sha256 = "0x01zpmxi37jr7j2az2bd8902h7zhkpg6kpvc8xmll9f7703zz2l";
};

View file

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
name = "wxHexEditor-${version}";
version = "v0.24";
version = "0.24";
src = fetchFromGitHub {
repo = "wxHexEditor";
owner = "EUA";
rev = version;
rev = "v${version}";
sha256 = "08xnhaif8syv1fa0k6lc3jm7yg2k50b02lyds8w0jyzh4xi5crqj";
};

View file

@ -8,8 +8,8 @@ let
yiEnv = haskellPackages.ghcWithPackages
(self: [ self.yi ] ++ extraPackages self);
in
stdenv.mkDerivation {
name = "yi-custom";
stdenv.mkDerivation rec {
name = "yi-custom-${version}";
version = "0.0.0.1";
unpackPhase = "true";
nativeBuildInputs = [ makeWrapper ];

View file

@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
name = "avocode-${version}";
version = "2.26.1";
version = "2.26.4";
src = fetchurl {
url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip";
sha256 = "0npwwz5m4klswc32fs82icpqqfx9v4786sksiwykj75dsznyv3x8";
sha256 = "0qbir023zyd53ly6y8zcm3kbhbhjjpclcgp9d0mqb5lc9zajxv12";
};
libPath = stdenv.lib.makeLibraryPath (with xorg; with gnome2; [

View file

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
version = "0.97.3.20170622";
src = fetchgit {
url = git://git.gnome.org/dia;
url = https://gitlab.gnome.org/GNOME/dia.git;
rev = "b86085dfe2b048a2d37d587adf8ceba6fb8bc43c";
sha256 = "1fyxfrzdcs6blxhkw3bcgkksaf3byrsj4cbyrqgb4869k3ynap96";
};

View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, openexr, libpng12, libjpeg }:
stdenv.mkDerivation rec {
name = "exrtools";
name = "exrtools-${version}";
version = "0.4";
src = fetchurl {
url = "http://scanline.ca/exrtools/${name}-${version}.tar.gz";
url = "http://scanline.ca/exrtools/${name}.tar.gz";
sha256 = "0jpkskqs1yjiighab4s91jy0c0qxcscwadfn94xy2mm2bx2qwp4z";
};

View file

@ -1,12 +1,12 @@
{ stdenv, fetchurl, pkgconfig
{ stdenv, lib, fetchurl, pkgconfig
}:
stdenv.mkDerivation rec {
name = "gnuclad";
name = "gnuclad-${version}";
version = "0.2.4";
src = fetchurl {
url = "https://launchpad.net/gnuclad/trunk/0.2/+download/${name}-${version}.tar.gz";
url = "https://launchpad.net/gnuclad/trunk/${lib.versions.majorMinor version}/+download/${name}.tar.gz";
sha256 = "0ka2kscpjff7gflsargv3r9fdaxhkf3nym9mfaln3pnq6q7fwdki";
};

View file

@ -64,6 +64,9 @@ stdenv.mkDerivation rec {
rm "$out/share/icons/hicolor/icon-theme.cache"
'';
# 0.92.3 complains about an invalid conversion from const char * to char *
NIX_CFLAGS_COMPILE = " -fpermissive ";
meta = with lib; {
license = "GPL";
homepage = https://www.inkscape.org;

View file

@ -4,7 +4,7 @@ let
py = python27Packages;
in
stdenv.mkDerivation rec {
name = "cura-lulzbot";
name = "cura-lulzbot-${version}";
version = "15.02.1-1.03-5064";
src =

View file

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "girara-${version}";
version = "0.2.9";
version = "0.3.0";
src = fetchurl {
url = "http://pwmt.org/projects/girara/download/${name}.tar.xz";
sha256 = "0lkxrfna818wkkr2f6mdzf15y5z8xl1b9592ylmzjbqsqya3w7x8";
sha256 = "18j1gv8pi4cpndvnap88pcfacdz3lnw6pxmw7dvzm359y1gzllmp";
};
nativeBuildInputs = [ meson ninja pkgconfig gettext ];

View file

@ -1,14 +1,14 @@
{stdenv, fetchFromGitHub, python}:
stdenv.mkDerivation rec {
version = "3.5";
version = "3.6";
name = "googler-${version}";
src = fetchFromGitHub {
owner = "jarun";
repo = "googler";
rev = "v${version}";
sha256 = "0z5cngg1kr3b484zddqlg9yn7crbmnd78pdb8vzd32mkp3fahcxa";
sha256 = "1j1755b9mfmkqkgjrlsi4wr82352pqc9rfyalammqn6qrm3v3lb6";
};
propagatedBuildInputs = [ python ];

View file

@ -0,0 +1,36 @@
{ fetchurl, stdenv, dpkg, makeWrapper, openssl }:
stdenv.mkDerivation rec {
version = "8.2";
name = "minergate-cli-${version}";
src = fetchurl {
url = "https://minergate.com/download/ubuntu-cli";
sha256 = "393c5ba236f6f92c449496fcda9509f4bfd3887422df98ffa59b3072124a99d8";
};
nativeBuildInputs = [ dpkg makeWrapper ];
phases = [ "installPhase" ];
installPhase = ''
dpkg-deb -x $src $out
pgm=$out/opt/minergate-cli/minergate-cli
interpreter=${stdenv.glibc}/lib/ld-linux-x86-64.so.2
patchelf --set-interpreter "$interpreter" $pgm
wrapProgram $pgm --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ openssl stdenv.cc.cc ]}
rm $out/usr/bin/minergate-cli
mkdir -p $out/bin
ln -s $pgm $out/bin
'';
meta = with stdenv.lib; {
description = "Minergate CPU/GPU console client mining software";
homepage = https://www.minergate.com/;
license = licenses.unfree;
maintainers = with maintainers; [ bfortz ];
platforms = [ "x86_64-linux" ];
};
}

View file

@ -1,15 +1,14 @@
{ stdenv, fetchgit, electron } :
stdenv.mkDerivation rec {
name = "nix-tour";
name = "nix-tour-${version}";
version = "0.0.1";
buildInputs = [ electron ];
version = "v0.0.1";
src = fetchgit {
url = "https://github.com/nixcloud/tour_of_nix";
rev = "refs/tags/${version}";
rev = "v${version}";
sha256 = "09b1vxli4zv1nhqnj6c0vrrl51gaira94i8l7ww96fixqxjgdwvb";
};
@ -34,4 +33,4 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ qknight ];
};
}
}

View file

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "xmrig-proxy-${version}";
version = "2.5.2";
version = "2.6.2";
src = fetchFromGitHub {
owner = "xmrig";
repo = "xmrig-proxy";
rev = "v${version}";
sha256 = "1x10mrr58lc207zppzkjnhwah83kpxrqpa3idv01lyasv8mfkxzc";
sha256 = "1yfbdgyd37r5vb2g8jz4i92hxang3hbiig5y4507v9hr75jvfivh";
};
nativeBuildInputs = [ cmake ];

View file

@ -1,10 +1,10 @@
{ fetchurl, stdenv, libXrandr}:
stdenv.mkDerivation rec {
version = "v0.01";
version = "0.01";
name = "xrandr-invert-colors-${version}";
src = fetchurl {
url = "https://github.com/zoltanp/xrandr-invert-colors/archive/${version}.tar.gz";
url = "https://github.com/zoltanp/xrandr-invert-colors/archive/v${version}.tar.gz";
sha256 = "1z4hxn56rlflvqanb8ncqa1xqawnda85b1b37w6r2iqs8rw52d75";
};

View file

@ -5,7 +5,8 @@
# but Python 2 + packages during runtime.
stdenv.mkDerivation rec {
name = "uzbl-v0.9.0";
name = "uzbl-${version}";
version = "0.9.0";
meta = with stdenv.lib; {
description = "Tiny externally controllable webkit browser";
@ -16,8 +17,8 @@ stdenv.mkDerivation rec {
};
src = fetchurl {
name = "${name}.tar.gz";
url = "https://github.com/uzbl/uzbl/archive/v0.9.0.tar.gz";
name = "uzbl-v${version}.tar.gz";
url = "https://github.com/uzbl/uzbl/archive/v${version}.tar.gz";
sha256 = "0iskhv653fdm5raiidimh9fzlsw28zjqx7b5n3fl1wgbj6yz074k";
};

View file

@ -3,7 +3,7 @@
buildGoPackage rec {
name = "coyim-${version}";
version = "v0.3.7_1";
version = "0.3.7_1";
goPackagePath = "github.com/twstrike/coyim";

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, makeDesktopItem, makeWrapper, autoPatchelfHook
, xorg, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig
, xorg, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig, gtk2
, gnome3, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify, xdg_utils }:
let
@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {
libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes
libXrender libX11 libXtst libXScrnSaver
]) ++ [
gnome3.gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
gnome3.gconf nss nspr alsaLib cups expat stdenv.cc.cc
];
runtimeDependencies = [ udev.lib libnotify ];

View file

@ -9,7 +9,7 @@ let
in
stdenv.mkDerivation rec {
name = "salut-a-toi";
name = "salut-a-toi-${version}";
version = "0.6.1";
pname = "sat-${version}";

View file

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, dpkg, gnome3, atk, cairo, pango, gdk_pixbuf, glib, freetype,
{ stdenv, lib, fetchurl, dpkg, gnome3, gtk2, 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
@ -16,7 +16,7 @@ let
gdk_pixbuf
glib
gnome3.gconf
gnome3.gtk2
gtk2
pango
libX11
libXScrnSaver

View file

@ -74,6 +74,7 @@ stdenv.mkDerivation rec {
rm *.so.* *.so
rm QtWebEngineProcess
rm qt.conf
rm -r platforms # contains libqxcb.so
# Install files.
mkdir -p $out/lib/teamspeak
@ -91,7 +92,7 @@ stdenv.mkDerivation rec {
wrapProgram $out/bin/ts3client \
--set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
--set QT_PLUGIN_PATH "$out/lib/teamspeak/platforms" \
--set QT_PLUGIN_PATH "${qtbase}/${qtbase.qtPluginPrefix}" \
--set NIX_REDIRECTS /usr/share/X11/xkb=${xkeyboard_config}/share/X11/xkb
'';

View file

@ -117,7 +117,7 @@ in if configure == null then weechat else
ln -s $plugin $out/plugins
done
'';
in (writeScriptBin "weechat" ''
in (writeScriptBin weechat.name ''
#!${stdenv.shell}
export WEECHAT_EXTRA_LIBDIR=${pluginsDir}
${lib.concatMapStringsSep "\n" (p: lib.optionalString (p ? extraEnv) p.extraEnv) plugins}

View file

@ -12,7 +12,7 @@ assert withQt -> !withGtk && qt5 != null;
with stdenv.lib;
let
version = "2.4.6";
version = "2.4.7";
variant = if withGtk then "gtk" else if withQt then "qt" else "cli";
in stdenv.mkDerivation {
@ -20,7 +20,7 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "http://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz";
sha256 = "1znmjg40pf81ks9lnm6ilx0cy32xan5g19gbqkkhj35whb95z5lf";
sha256 = "0i2ggkkx7fphsk7kv9kygsf5pcaf4vgnqgi8mj1rrf2gfdl3rjsy";
};
cmakeFlags = [

View file

@ -0,0 +1,71 @@
{ stdenv
, fetchFromGitHub
, meson
, ninja
, pkgconfig
, granite
, vala_0_40
, gnome3
, libxml2
, gettext
, gobjectIntrospection
, appstream-glib
, desktop-file-utils
, magic-wormhole
, wrapGAppsHook }:
let
pname = "Transporter";
version = "1.3.3";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "bleakgrey";
repo = pname;
rev = version;
sha256 = "19zb2yqmyyhk5vgh6p278b76shlq0r8ykk1ks8zzr187nr5lf5k1";
};
nativeBuildInputs = [
appstream-glib
desktop-file-utils
gettext
gobjectIntrospection # For setup hook
libxml2
meson
ninja
pkgconfig
vala_0_40
wrapGAppsHook
];
buildInputs = with gnome3; [
defaultIconTheme # If I omit this there's no icons in KDE
glib
granite
gsettings_desktop_schemas
gtk3
libgee
magic-wormhole
];
prePatch = ''
# The paths were hardcoded
substituteInPlace ./src/WormholeInterface.vala \
--replace /bin/wormhole ${magic-wormhole}/bin/wormhole
'';
postPatch = ''
chmod +x ./meson/post_install.py
patchShebangs ./meson/post_install.py
'';
meta = with stdenv.lib; {
description = "Simple magic-wormhole client";
homepage = https://github.com/bleakgrey/Transporter;
license = licenses.gpl3;
maintainers = with maintainers; [ worldofpeace ];
platforms = platforms.linux;
};
}

View file

@ -16,7 +16,7 @@ in stdenv.mkDerivation {
name = "planner-${version}";
src = fetchgit {
url = "https://git.gnome.org/browse/planner";
url = https://gitlab.gnome.org/GNOME/planner.git;
rev = "6a79647e5711b2b8d7435cacc3452e643d2f05e6";
sha256 = "18k40s0f665qclrzvkgyfqmvjk0nqdc8aj3m8n4ky85di4qbqlwd";
};

View file

@ -3,7 +3,7 @@
with stdenv.lib;
stdenv.mkDerivation {
name = "gwyddion";
name = "gwyddion-${version}";
version = "2.48";
src = fetchurl {
url = "http://sourceforge.net/projects/gwyddion/files/gwyddion/2.48/gwyddion-2.48.tar.xz";

View file

@ -0,0 +1,36 @@
{ stdenv, fetchFromGitHub, smlnj }:
stdenv.mkDerivation rec {
pname = "celf";
pversion = "2013-07-25";
name = "${pname}-${pversion}";
src = fetchFromGitHub {
owner = "clf";
repo = pname;
rev = "d61d95900ab316468ae850fa34a2fe9488bc5b59";
sha256 = "0slrwcxglp0sdbp6wr65cdkl5wcap2i0fqxbwqfi1q3cpb6ph6hq";
};
buildInputs = [ smlnj ];
# (can also build with MLton)
buildPhase = ''
export SMLNJ_HOME=${smlnj}
sml < main-export.sml
'';
installPhase = ''
mkdir -p $out/bin
cp .heap* $out/bin/
./.mkexec ${smlnj}/bin/sml $out/bin celf
'';
meta = with stdenv.lib; {
description = "Linear logic programming system";
homepage = http://github.com/clf/celf;
license = licenses.gpl3;
maintainers = with maintainers; [ bcdarwin ];
platforms = platforms.unix;
};
}

View file

@ -15,7 +15,7 @@ let
inherit (stdenv.lib) optional;
in
stdenv.mkDerivation {
name = "ripser";
name = "ripser-${version}";
version = "1.0";
src = fetchFromGitHub {

View file

@ -14,18 +14,17 @@ with stdenv.lib;
let
optionOnOff = option: "${if option then "on" else "off"}";
urlVersion = replaceStrings ["."] ["_"];
in
stdenv.mkDerivation rec {
name = "simgrid-${version}";
version = "3.17";
version = "3.19.1";
src = fetchFromGitHub {
owner = "simgrid";
repo = "simgrid";
rev = "v${urlVersion version}";
sha256 = "0ffs9w141qhw571jsa9sch1cnr332vs4sgj6dsiij2mc24m6wpb4";
rev = "v${version}";
sha256 = "0vpgcp40xv20hcpslx5wz2mf2phaq41f7x8yr0bm7mknqd3zwxih";
};
nativeBuildInputs = [ cmake perl elfutils python3 boost valgrind ]

View file

@ -1,12 +1,13 @@
{ stdenv, fetchgit, cmake, qtbase }:
{ stdenv, fetchFromGitHub, cmake, qtbase }:
stdenv.mkDerivation rec {
name = "qgit-2.7";
name = "qgit-2.8";
src = fetchgit {
url = "http://repo.or.cz/qgit4/redivivus.git";
src = fetchFromGitHub {
owner = "tibirna";
repo = "qgit";
rev = name;
sha256 = "0c0zxykpgkxb8gpgzz5i6b8nrzg7cdxikvpg678x7gsnxhlwjv3a";
sha256 = "01l6mz2f333x3zbfr68mizwpsh6sdsnadcavpasidiych1m5ry8f";
};
buildInputs = [ qtbase ];

View file

@ -28,10 +28,11 @@ let
'';
in stdenv.mkDerivation rec {
name = "dvd-slideshow";
name = "dvd-slideshow-${version}";
version = "0.8.4-2";
src = fetchurl {
url = "mirror://sourceforge/dvd-slideshow/files/${name}-${version}.tar.gz";
url = "mirror://sourceforge/dvd-slideshow/files/${name}.tar.gz";
sha256 = "17c09aqvippiji2sd0pcxjg3nb1mnh9k5nia4gn5lhcvngjcp1q5";
};

View file

@ -77,7 +77,7 @@ let
# Lightworks expects some files in /usr/share/lightworks
in buildFHSUserEnv rec {
name = "lightworks-${stdenv.lib.getVersion lightworks}";
name = lightworks.name;
targetPkgs = pkgs: [
lightworks

View file

@ -368,7 +368,6 @@ rec {
# MySQL mirrors
mysql = [
http://mysql.mirrors.pair.com/Downloads/
http://cdn.mysql.com/Downloads/
];

View file

@ -22,5 +22,6 @@ stdenv.mkDerivation rec {
homepage = https://www.kernel.org/doc/man-pages/;
repositories.git = http://git.kernel.org/pub/scm/docs/man-pages/man-pages;
platforms = with platforms; unix;
priority = 30; # if a package comes with its own man page, prefer it
};
}

View file

@ -1,47 +1,59 @@
{ stdenv, fetchzip, fetchFromGitHub, optipng, cairo, unzip, pythonPackages, pkgconfig, pngquant, which, imagemagick }:
rec {
# 18MB
noto-fonts = let version = "2017-10-24-phase3-second-cleanup"; in fetchzip {
name = "noto-fonts-${version}";
url = "https://github.com/googlei18n/noto-fonts/archive/v${version}.zip";
postFetch = ''
unzip $downloadedFile
mkdir -p $out/share/fonts/noto
cp noto-fonts-*/hinted/*.ttf $out/share/fonts/noto
# Also copy unhinted & alpha fonts for better glyph coverage,
# if they don't have a hinted version
# (see https://groups.google.com/d/msg/noto-font/ZJSkZta4n5Y/tZBnLcPdbS0J)
cp -n noto-fonts-*/unhinted/*.ttf $out/share/fonts/noto
cp -n noto-fonts-*/alpha/*.ttf $out/share/fonts/noto
'';
sha256 = "013l816cq9svdji266sccscm9sf9pfn472gq9lnqkzlwaxx9qrrl";
meta = with stdenv.lib; {
inherit version;
description = "Beautiful and free fonts for many languages";
homepage = https://www.google.com/get/noto/;
longDescription =
''
When text is rendered by a computer, sometimes characters are displayed as
tofu. They are little boxes to indicate your device doesnt have a font to
display the text.
Google has been developing a font family called Noto, which aims to support all
languages with a harmonious look and feel. Noto is Googles answer to tofu. The
name noto is to convey the idea that Googles goal is to see no more tofu.
Noto has multiple styles and weights, and freely available to all.
This package also includes the Arimo, Cousine, and Tinos fonts.
let
mkNoto = { name, weights, sha256, }:
let version = "2017-10-24-phase3-second-cleanup"; in
fetchzip {
name = "${name}-${version}";
inherit sha256;
url = "https://github.com/googlei18n/noto-fonts/archive/v${version}.zip";
postFetch = ''
unzip $downloadedFile
mkdir -p $out/share/fonts/noto
# Also copy unhinted & alpha fonts for better glyph coverage,
# if they don't have a hinted version
# (see https://groups.google.com/d/msg/noto-font/ZJSkZta4n5Y/tZBnLcPdbS0J)
for ttf in noto-fonts-*/{hinted,unhinted,alpha}/*-${weights}.ttf
do
cp -n "$ttf" -t "$out/share/fonts/noto"
done
'';
license = licenses.asl20;
platforms = platforms.all;
maintainers = with maintainers; [ mathnerd314 ];
meta = with stdenv.lib; {
inherit version;
description = "Beautiful and free fonts for many languages";
homepage = https://www.google.com/get/noto/;
longDescription =
''
When text is rendered by a computer, sometimes characters are
displayed as tofu. They are little boxes to indicate your device
doesnt have a font to display the text.
Google has been developing a font family called Noto, which aims to
support all languages with a harmonious look and feel. Noto is
Googles answer to tofu. The name noto is to convey the idea that
Googles goal is to see no more tofu. Noto has multiple styles and
weights, and freely available to all.
This package also includes the Arimo, Cousine, and Tinos fonts.
'';
license = licenses.asl20;
platforms = platforms.all;
maintainers = with maintainers; [ mathnerd314 ];
};
};
in
rec {
noto-fonts = mkNoto {
name = "noto-fonts";
weights = "{Regular,Bold,Light,Italic,BoldItalic,LightItalic}";
sha256 = "1dmarbsfank6xzzx31h5jdv6n99rzblqyb1iqjkpll6dl3627pnb";
};
noto-fonts-extra = mkNoto {
name = "noto-fonts-extra";
weights = "{Black,Condensed,Extra,Medium,Semi,Thin}*";
sha256 = "1lih49bqmsmblczvbl7qb1bhn0bq8v5xkr991b3gjghpdkx584bc";
};
# 89MB
noto-fonts-cjk = let version = "1.004"; in fetchzip {
name = "noto-fonts-cjk-${version}";
@ -74,7 +86,6 @@ rec {
maintainers = with maintainers; [ mathnerd314 ];
};
};
# 12MB
noto-fonts-emoji = let version = "2017-09-13-design-refresh"; in stdenv.mkDerivation {
name = "noto-fonts-emoji-${version}";

View file

@ -16,12 +16,12 @@ stdenv.mkDerivation rec {
patches = optionals stdenv.isDarwin [
(fetchpatch {
name = "change-igemacintegration-to-gtkosxapplication.patch";
url = "https://git.gnome.org/browse/gtksourceview/patch/?id=e88357c5f210a8796104505c090fb6a04c213902";
url = "https://gitlab.gnome.org/GNOME/gtksourceview/commit/e88357c5f210a8796104505c090fb6a04c213902.patch";
sha256 = "0h5q79q9dqbg46zcyay71xn1pm4aji925gjd5j93v4wqn41wj5m7";
})
(fetchpatch {
name = "update-to-gtk-mac-integration-2.0-api.patch";
url = "https://git.gnome.org/browse/gtksourceview/patch/?id=ab46e552e1d0dae73f72adac8d578e40bdadaf95";
url = "https://gitlab.gnome.org/GNOME/gtksourceview/commit/ab46e552e1d0dae73f72adac8d578e40bdadaf95.patch";
sha256 = "0qzrbv4hpa0v8qbmpi2vp575n13lkrvp3cgllwrd2pslw1v9q3aj";
})
];

View file

@ -18,12 +18,12 @@ in stdenv.mkDerivation rec {
# fixed in upstream version 0.32.2
(fetchpatch{
name = "CVE-2012-2738-1.patch";
url = https://git.gnome.org/browse/vte/patch/?id=feeee4b5832b17641e505b7083e0d299fdae318e;
url = https://gitlab.gnome.org/GNOME/vte/commit/feeee4b5832b17641e505b7083e0d299fdae318e.patch;
sha256 = "1455i6zxcx4rj2cz639s8qdc04z2nshprwl7k00mcsw49gv3hk5n";
})
(fetchpatch{
name = "CVE-2012-2738-2.patch";
url = https://git.gnome.org/browse/vte/patch/?id=98ce2f265f986fb88c38d508286bb5e3716b9e74;
url = https://gitlab.gnome.org/GNOME/vte/commit/98ce2f265f986fb88c38d508286bb5e3716b9e74.patch;
sha256 = "0n24vw49h89w085ggq23iwlnnb6ajllfh2dg4vsar21d82jxc0sn";
})
];

View file

@ -13,12 +13,12 @@ in stdenv.mkDerivation rec {
patches = [
(fetchpatch {
name = "CVE-2017-7960.patch";
url = "https://git.gnome.org/browse/libcroco/patch/?id=898e3a8c8c0314d2e6b106809a8e3e93cf9d4394";
url = https://gitlab.gnome.org/GNOME/libcroco/commit/898e3a8c8c0314d2e6b106809a8e3e93cf9d4394.patch;
sha256 = "1xjwdqijxf4b7mhdp3kkgnb6c14y0bn3b3gg79kyrm82x696d94l";
})
(fetchpatch {
name = "CVE-2017-7961.patch";
url = "https://git.gnome.org/browse/libcroco/patch/?id=9ad72875e9f08e4c519ef63d44cdbd94aa9504f7";
url = https://gitlab.gnome.org/GNOME/libcroco/commit/9ad72875e9f08e4c519ef63d44cdbd94aa9504f7.patch;
sha256 = "0zakd72ynzjgzskwyvqglqiznsb93j1bkvc1lgyrzgv9rwrbwv9s";
})
];
@ -39,7 +39,7 @@ in stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "GNOME CSS2 parsing and manipulation toolkit";
homepage = https://git.gnome.org/browse/libcroco;
homepage = https://gitlab.gnome.org/GNOME/libcroco;
license = licenses.lgpl2;
platforms = platforms.unix;
};

View file

@ -52,7 +52,7 @@ let
hitori gnome-taquin
];
inherit (pkgs) atk glib gobjectIntrospection gtk2 webkitgtk gtk3 gtkmm3 libcanberra-gtk2
inherit (pkgs) atk glib gobjectIntrospection webkitgtk gtk3 gtkmm3
libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceview4
easytag meld orca rhythmbox shotwell gnome-usage
clutter clutter-gst clutter-gtk cogl gtkvnc libdazzle;
@ -421,7 +421,6 @@ let
gnome_themes_standard = gnome-themes-standard; # added 2018-02-25
gnome-tweak-tool = gnome-tweaks; # added 2018-03-21
gsettings_desktop_schemas = gsettings-desktop-schemas; # added 2018-02-25
libcanberra_gtk2 = libcanberra-gtk2; # added 2018-02-25
libgames-support = libgnome-games-support; # added 2018-03-14
libgnome_keyring = libgnome-keyring; # added 2018-02-25
inherit (pkgs) rarian; # added 2018-04-25

View file

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
patches = [
./bool_slot.patch ./safe_ptr.patch
(fetchpatch {
url = "https://git.gnome.org/browse/nemiver/patch/src/persp/dbgperspective/nmv-dbg-perspective.cc?id=262cf9657f9c2727a816972b348692adcc666008";
url = https://gitlab.gnome.org/GNOME/nemiver/commit/262cf9657f9c2727a816972b348692adcc666008.patch;
sha256 = "03jv6z54b8nzvplplapk4aj206zl1gvnv6iz0mad19g6yvfbw7a7";
})
];

View file

@ -81,6 +81,8 @@ stdenv.mkDerivation rec {
ln -s "$out"/bin/"${CCL_RUNTIME}" "$out"/bin/ccl
'';
hardeningDisable = [ "format" ];
meta = with stdenv.lib; {
description = "Clozure Common Lisp";
homepage = https://ccl.clozure.com/;

View file

@ -28,11 +28,11 @@ let
};
in
stdenv.mkDerivation rec {
name = "eli";
name = "eli-${version}";
version = "4.8.1";
src = fetchurl {
url = "mirror://sourceforge/project/eli-project/Eli/Eli%20${version}/eli-${version}.tar.bz2";
url = "mirror://sourceforge/project/eli-project/Eli/Eli%20${version}/${name}.tar.bz2";
sha256="1vran8583hbwrr5dciji4zkhz3f88w4mn8n9sdpr6zw0plpf1whj";
};

View file

@ -162,6 +162,8 @@ stdenv.mkDerivation rec {
# that in turn causes GHCi to abort
stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
hardeningDisable = [ "format" ];
postInstall = ''
for bin in "$out"/lib/${name}/bin/*; do
isELF "$bin" || continue

View file

@ -172,6 +172,8 @@ stdenv.mkDerivation rec {
checkTarget = "test";
hardeningDisable = [ "format" ];
postInstall = ''
for bin in "$out"/lib/${name}/bin/*; do
isELF "$bin" || continue

View file

@ -448,6 +448,9 @@ self: super: {
rematch = dontCheck super.rematch; # https://github.com/tcrayford/rematch/issues/5
rematch-text = dontCheck super.rematch-text; # https://github.com/tcrayford/rematch/issues/6
# Should not appear in nixpkgs yet (broken anyway)
yarn2nix = throw "yarn2nix is not yet packaged for nixpkgs. See https://github.com/Profpatsch/yarn2nix#yarn2nix";
# no haddock since this is an umbrella package.
cloud-haskell = dontHaddock super.cloud-haskell;

View file

@ -35,7 +35,7 @@ in
, enableStaticLibraries ? !hostPlatform.isWindows
, enableHsc2hsViaAsm ? hostPlatform.isWindows && stdenv.lib.versionAtLeast ghc.version "8.4"
, extraLibraries ? [], librarySystemDepends ? [], executableSystemDepends ? []
, homepage ? "http://hackage.haskell.org/package/${pname}"
, homepage ? "https://hackage.haskell.org/package/${pname}"
, platforms ? with stdenv.lib.platforms; unix ++ windows # GHC can cross-compile
, hydraPlatforms ? null
, hyperlinkSource ? true

View file

@ -6,11 +6,11 @@ rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "3" "3" "";
jruby = stdenv.mkDerivation rec {
name = "jruby-${version}";
version = "9.1.17.0";
version = "9.2.0.0";
src = fetchurl {
url = "https://s3.amazonaws.com/jruby.org/downloads/${version}/jruby-bin-${version}.tar.gz";
sha256 = "1mfzs3mcpx8gmzidilzhpsxhgbblsflq35ww199m46pgiyzzf8ka";
sha256 = "1106s1vmcm36gm3vrl1sjrrr2wj6splgik1zrfb7c2y9bzm8swa2";
};
buildInputs = [ makeWrapper ];

View file

@ -348,8 +348,8 @@ in {
};
php71 = generic {
version = "7.1.17";
sha256 = "1kyvg1dvn2zddlc7apl8c74wlwz45rxx10fr1s4z6l1cannf6971";
version = "7.1.18";
sha256 = "13mz8baknpydswjgqzfqqqjv426x4pnc04rfv2k33s7d2makf3jq";
};
php72 = generic {

View file

@ -1,7 +1,7 @@
{ stdenv, stdenv_32bit, pkgsi686Linux, fetchFromGitHub, fetchurl }:
stdenv.mkDerivation rec {
name = "red-v${version}";
name = "red-${version}";
version = "0.6.3";
src = fetchFromGitHub {
rev = "6a43c767fa2e85d668b83f749158a18e62c30f70";

View file

@ -8,6 +8,12 @@ stdenv.mkDerivation rec {
sha256 = "0czccp4fcpf2ykp16xcrzdfmnircz1ynhls334q374xknd5747d2";
};
# fails 1 out of 1 tests with "BAD GLOBAL SYMBOLS" on i686
# which can also be fixed with
# hardeningDisable = stdenv.lib.optional stdenv.isi686 "pic";
# but it's better to disable tests than loose ASLR on i686
doCheck = !stdenv.isi686;
meta = {
description = "ATSC A/52 stream decoder";
homepage = http://liba52.sourceforge.net/;

View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, cmake, pcre, zlib, python, openssl }:
stdenv.mkDerivation rec {
name = "cppcms";
name = "cppcms-${version}";
version = "1.0.5";
src = fetchurl {
url = "mirror://sourceforge/cppcms/${name}-${version}.tar.bz2";
url = "mirror://sourceforge/cppcms/${name}.tar.bz2";
sha256 = "0r8qyp102sq4lw8xhrjhan0dnslhsmxj4zs9jzlw75yagfbqbdl4";
};

View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, cmake, sqlite, mysql, postgresql, unixODBC }:
stdenv.mkDerivation rec {
name = "cppdb";
name = "cppdb-${version}";
version = "0.3.1";
src = fetchurl {
url = "mirror://sourceforge/cppcms/${name}-${version}.tar.bz2";
url = "mirror://sourceforge/cppcms/${name}.tar.bz2";
sha256 = "0blr1casmxickic84dxzfmn3lm7wrsl4aa2abvpq93rdfddfy3nn";
};

View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, cmake }:
stdenv.mkDerivation rec {
name = "ctpp2";
name = "ctpp2-${version}";
version = "2.8.3";
src = fetchurl {
url = "http://ctpp.havoc.ru/download/ctpp2-${version}.tar.gz";
url = "http://ctpp.havoc.ru/download/${name}.tar.gz";
sha256 = "1z22zfw9lb86z4hcan9hlvji49c9b7vznh7gjm95gnvsh43zsgx8";
};

View file

@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "2.2.1";
name = "cxxtools";
name = "cxxtools-${version}";
src = fetchurl {
url = "http://www.tntnet.org/download/${name}-${version}.tar.gz";
url = "http://www.tntnet.org/download/${name}.tar.gz";
sha256 = "0hp3qkyhidxkdf8qgkwrnqq5bpahink55mf0yz23rjd7rpbbdswc";
};

View file

@ -1,13 +1,14 @@
{ stdenv, autoreconfHook, pkgconfig, fetchFromGitHub, dbus, dleyna-core, glib }:
stdenv.mkDerivation rec {
name = "dleyna-connector-dbus";
pname = "dleyna-connector-dbus";
name = "${pname}-${version}";
version = "0.3.0";
src = fetchFromGitHub {
owner = "01org";
repo = name;
rev = "${version}";
repo = pname;
rev = version;
sha256 = "0vziq5gwjm79yl2swch2mz6ias20nvfddf5cqgk9zbg25cb9m117";
};

View file

@ -1,12 +1,13 @@
{ stdenv, autoreconfHook, pkgconfig, fetchFromGitHub, gupnp }:
stdenv.mkDerivation rec {
name = "dleyna-core";
pname = "dleyna-core";
name = "${pname}-${version}";
version = "0.6.0";
src = fetchFromGitHub {
owner = "01org";
repo = name;
repo = pname;
rev = "v${version}";
sha256 = "1x5vj5zfk95avyg6g3nf6gar250cfrgla2ixj2ifn8pcick2d9vq";
};

View file

@ -1,13 +1,14 @@
{ stdenv, autoreconfHook, pkgconfig, fetchFromGitHub, dleyna-connector-dbus, dleyna-core, gssdp, gupnp, gupnp-av, gupnp-dlna, libsoup, makeWrapper }:
stdenv.mkDerivation rec {
name = "dleyna-renderer";
pname = "dleyna-renderer";
name = "${pname}-${version}";
version = "0.6.0";
src = fetchFromGitHub {
owner = "01org";
repo = name;
rev = "${version}";
repo = pname;
rev = version;
sha256 = "0jy54aq8hgrvzchrvfzqaj4pcn0cfhafl9bv8a9p6j82yjk4pvpp";
};

View file

@ -1,13 +1,14 @@
{ stdenv, autoreconfHook, makeWrapper, pkgconfig, fetchFromGitHub, dleyna-core, dleyna-connector-dbus, gssdp, gupnp, gupnp-av, gupnp-dlna, libsoup }:
stdenv.mkDerivation rec {
name = "dleyna-server";
pname = "dleyna-server";
name = "${pname}-${version}";
version = "0.6.0";
src = fetchFromGitHub {
owner = "01org";
repo = name;
rev = "${version}";
repo = pname;
rev = version;
sha256 = "13a2i6ms27s46yxdvlh2zm7pim7jmr5cylnygzbliz53g3gxxl3j";
};

View file

@ -4,16 +4,17 @@ stdenv.mkDerivation rec {
name = "${pname}-${version}";
version = "1.6.0";
pname = "enchant";
src = fetchurl {
url = "http://www.abisource.com/downloads/${pname}/${version}/${name}.tar.gz";
sha256 = "0zq9yw1xzk8k9s6x83n1f9srzcwdavzazn3haln4nhp9wxxrxb1g";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [aspell glib hunspell hspell];
buildInputs = [ aspell glib hunspell hspell ];
meta = {
description = "Generic spell checking library";
homepage = http://www.abisource.com/enchant;
platforms = stdenv.lib.platforms.unix;
};

View file

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, libtool, autoconf, automake }:
stdenv.mkDerivation rec {
version = "v0.99.4";
version = "0.99.4";
name = "fastjson-${version}";
src = fetchFromGitHub {
repo = "libfastjson";

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchgit, fetchpatch, meson, ninja, pkgconfig, gettext, python3, libxml2, libxslt, docbook_xsl
{ stdenv, fetchurl, fetchgit, 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 }:
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
# sha256 = "0d534ysa6n9prd17wwzisq7mj6qkhwh8wcf8qgin1ar3hbs5ry7z";
# };
src = fetchgit {
url = https://git.gnome.org/browse/gdk-pixbuf;
url = https://gitlab.gnome.org/GNOME/gdk-pixbuf.git;
rev = version;
sha256 = "18lwqg63vyap2m1mw049rnb8fm869429xbf7636a2n21gs3d3jwv";
};
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
# Add missing test file bug753605-atsize.jpg
(fetchpatch {
url = https://git.gnome.org/browse/gdk-pixbuf/patch/?id=87f8f4bf01dfb9982c1ef991e4060a5e19fdb7a7;
url = https://gitlab.gnome.org/GNOME/gdk-pixbuf/commit/87f8f4bf01dfb9982c1ef991e4060a5e19fdb7a7.patch;
sha256 = "1slzywwnrzfx3zjzdsxrvp4g2q4skmv50pdfmyccp41j7bfyb2j0";
})
@ -53,7 +53,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
meson ninja pkgconfig gettext python3 libxml2 libxslt docbook_xsl docbook_xml_dtd_43
gtk-doc gobjectIntrospection makeWrapper
];
]
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
propagatedBuildInputs = [ glib libtiff libjpeg libpng jasper ];
@ -81,6 +82,13 @@ stdenv.mkDerivation rec {
$dev/bin/gdk-pixbuf-query-loaders --update-cache
'';
# The fixDarwinDylibNames hook doesn't patch binaries.
preFixup = stdenv.lib.optionalString stdenv.isDarwin ''
for f in $out/bin/* $dev/bin/*; do
install_name_tool -change "@rpath/libgdk_pixbuf-2.0.0.dylib" "$out/lib/libgdk_pixbuf-2.0.0.dylib" $f
done
'';
# The tests take an excessive amount of time (> 1.5 hours) and memory (> 6 GB).
inherit doCheck;

View file

@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
patches = [
# Use GNUTLS system trust for certificates
(fetchpatch {
url = https://git.gnome.org/browse/glib-networking/patch/?id=f1c8feee014007cc913b71357acb609f8d1200df;
url = https://gitlab.gnome.org/GNOME/glib-networking/commit/f1c8feee014007cc913b71357acb609f8d1200df.patch;
sha256 = "1rbxqsrcb5if3xs2d18pqzd9xnjysdj715ijc41n5w326fsawg7i";
})
];

View file

@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
version = "1.9.0";
name = "libbladeRF-v${version}";
name = "libbladeRF-${version}";
src = fetchFromGitHub {
owner = "Nuand";

View file

@ -22,6 +22,8 @@ stdenv.mkDerivation rec {
patchFlags = "-p0";
hardeningDisable = [ "format" ];
buildInputs =
[ pkgconfig glib cairo fontconfig libtiff giflib
libjpeg libpng libXrender libexif

View file

@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Library to use HTTPSEverywhere in desktop applications";
homepage = https://git.gnome.org/browse/libhttpseverywhere;
homepage = https://gitlab.gnome.org/GNOME/libhttpseverywhere;
license = licenses.lgpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ sternenseemann ] ++ gnome3.maintainers;

View file

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, cmake, ninja, pkgconfig, libiconv, libintlOrEmpty
{ stdenv, lib, fetchurl, cmake, ninja, pkgconfig, libiconv, libintl
, zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg
, withData ? true, poppler_data
, qt5Support ? false, qtbase ? null
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
buildInputs = [ libiconv ] ++ libintlOrEmpty ++ lib.optional withData poppler_data;
buildInputs = [ libiconv libintl ] ++ lib.optional withData poppler_data;
# TODO: reduce propagation to necessary libs
propagatedBuildInputs = with lib;
@ -32,6 +32,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ninja pkgconfig ];
# Not sure when and how to pass it. It seems an upstream bug anyway.
CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11";
cmakeFlags = [
(mkFlag true "XPDF_HEADERS")
(mkFlag (!minimal) "GLIB")

View file

@ -4,8 +4,6 @@ qtModule {
name = "qtlocation";
qtInputs = [ qtbase qtmultimedia ];
outputs = [ "bin" "out" "dev" ];
# Linking with -lclipper fails with parallel build enabled
enableParallelBuilding = false;
qmakeFlags = stdenv.lib.optional stdenv.isDarwin [
# boost uses std::auto_ptr which has been disabled in clang with libcxx
# This flag re-enables this feature

View file

@ -2,13 +2,13 @@
with stdenv.lib; stdenv.mkDerivation rec {
name = "tbb-${version}";
version = "2018_U1";
version = "2018_U3";
src = fetchFromGitHub {
owner = "01org";
repo = "tbb";
rev = version;
sha256 = "1lygz07va6hsv2vlx9zwz5d2n81rxsdhmh0pqxgj8n1bvb1rp0qw";
sha256 = "137hb03ms93v4svjq038z6clfh41y8iq7wcif8n92xz2wzaap006";
};
makeFlags = concatStringsSep " " (

View file

@ -21,8 +21,11 @@ in stdenv.mkDerivation {
# Use CC, CXX, and LD from environment
./2.6.2-cxx.patch
];
preConfigure = "export LD=${if stdenv.isDarwin then "clang++" else "g++"}";
hardeningDisable = [ "format" ];
NIX_CFLAGS_COMPILE =
stdenv.lib.optional stdenv.isDarwin "-mmacosx-version-min=10.9";

View file

@ -1,10 +1,11 @@
{ stdenv, fetchurl, cxxtools, postgresql, mysql, sqlite, zlib, openssl }:
stdenv.mkDerivation rec {
name = "tntdb-${version}";
version = "1.3";
name = "tntdb";
src = fetchurl {
url = "http://www.tntnet.org/download/tntdb-${version}.tar.gz";
url = "http://www.tntnet.org/download/${name}.tar.gz";
sha256 = "0js79dbvkic30bzw1pf26m64vs2ssw2sbj55w1dc0sy69dlv4fh9";
};

View file

@ -1,10 +1,11 @@
{ stdenv, fetchurl, cxxtools, zlib, openssl, zip }:
stdenv.mkDerivation rec {
name = "tntnet-${version}";
version = "2.2.1";
name = "tntnet";
src = fetchurl {
url = "http://www.tntnet.org/download/tntnet-${version}.tar.gz";
url = "http://www.tntnet.org/download/${name}.tar.gz";
sha256 = "08bmak9mpbamwwl3h9p8x5qzwqlm9g3jh70y0ml5hk7hiv870cf8";
};

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, automake, autoconf, libtool, gtk-doc
{ stdenv, fetchFromGitHub, autoreconfHook, libtool
, pkgconfig, glib, systemd, libgudev, vala }:
stdenv.mkDerivation rec {
@ -6,21 +6,27 @@ stdenv.mkDerivation rec {
version = "0.11.3";
src = fetchFromGitHub {
owner = "martinpitt";
repo = "umockdev";
rev = version;
sha256 ="1z101yw7clxz39im3y435s3rj1gna3kp0fkj9wd62vxqvk68lhik";
owner = "martinpitt";
repo = "umockdev";
rev = version;
sha256 = "1z101yw7clxz39im3y435s3rj1gna3kp0fkj9wd62vxqvk68lhik";
};
buildInputs = [ glib systemd libgudev ];
nativeBuildInputs = [ automake autoconf libtool gtk-doc pkgconfig vala ];
# autoreconfHook complains if we try to build the documentation
postPatch = ''
echo 'EXTRA_DIST =' > docs/gtk-doc.make
'';
preConfigure = "NOCONFIGURE=1 ./autogen.sh";
buildInputs = [ glib systemd libgudev ];
nativeBuildInputs = [ autoreconfHook libtool pkgconfig vala ];
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "Mock hardware devices for creating unit tests";
license = licenses.lgpl2;
maintainers = [ maintainers.ndowens ];
maintainers = with maintainers; [ ndowens ];
platforms = with platforms; linux;
};
}

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, boost, sqlite }:
{ stdenv, fetchurl, boost, sqlite, zlib }:
stdenv.mkDerivation rec {
name = "vsqlite-${version}";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "17fkj0d2jh0xkjpcayhs1xvbnh1d69f026i7vs1zqnbiwbkpz237";
};
buildInputs = [ boost sqlite ];
buildInputs = [ boost sqlite zlib ];
prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
substituteInPlace Makefile.in \

View file

@ -0,0 +1,25 @@
{ stdenv, fetchFromGitHub, ocaml, findlib }:
stdenv.mkDerivation rec {
version = "2.0.0-rc2";
name = "ocaml${ocaml.version}-opam-file-format-${version}";
src = fetchFromGitHub {
owner = "ocaml";
repo = "opam-file-format";
rev = "${version}";
sha256 = "05g0pikmifmfkwyws5x82fglgsz3d317yfn6nrz7zmpn22cirvir";
};
buildInputs = [ ocaml findlib ];
installFlags = [ "LIBDIR=$(OCAMLFIND_DESTDIR)" ];
meta = {
description = "Parser and printer for the opam file syntax";
license = stdenv.lib.licenses.lgpl21;
maintainers = [ stdenv.lib.maintainers.vbgl ];
inherit (src.meta) homepage;
inherit (ocaml.meta) platforms;
};
}

View file

@ -1,7 +1,7 @@
{ buildPythonPackage, fetchFromGitHub, isPy3k, lxml, html5lib, nose, stdenv }:
buildPythonPackage rec {
version = "v0.1.2";
version = "0.1.2";
pname = "htmltreediff";
disabled = isPy3k;
@ -9,7 +9,7 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "christian-oudard";
repo = pname;
rev = version;
rev = "v${version}";
sha256 = "16mqp2jyznrw1mgd3qzybq28h2k5wz7vmmz1m6xpgscazyjhvvd1";
};

View file

@ -3,7 +3,7 @@
}:
buildPythonPackage rec {
name = "moinmoin";
pname = "moinmoin";
version = "1.9.9";
# SyntaxError in setup.py

View file

@ -3,13 +3,13 @@
}:
buildPythonPackage rec {
version = "v4.10.0";
version = "4.10.0";
pname = "mt940";
src = fetchFromGitHub {
owner = "WoLpH";
repo = pname;
rev = version;
rev = "v${version}";
sha256 = "1dsf2di8rr0iw2vaz6dppalby3y7i8x2bl0qjqvaiqacjxxvwj65";
};

View file

@ -2,13 +2,12 @@
buildPythonPackage rec {
pname = "podcats";
version = "v0.5.0";
name = "${pname}-${version}";
version = "0.5.0";
src = fetchFromGitHub {
owner = "jakubroztocil";
repo = "podcats";
rev = version;
rev = "v${version}";
sha256 = "0zjdgry5n209rv19kj9yaxy7c7zq5gxr488izrgs4sc75vdzz8xc";
};

View file

@ -3,10 +3,10 @@
buildPythonPackage rec {
pname = "PyXML";
version = "0.8.4";
name = "${pname}-${pname}";
format = "other";
src = fetchurl {
url = "mirror://sourceforge/pyxml/${name}.tar.gz";
url = "mirror://sourceforge/pyxml/${pname}-${pname}.tar.gz";
sha256 = "04wc8i7cdkibhrldy6j65qp5l75zjxf5lx6qxdxfdf2gb3wndawz";
};

View file

@ -77,6 +77,8 @@ stdenv.mkDerivation rec {
configureFlags="--parallel=''${NIX_BUILD_CORES:-1} $configureFlags"
'';
hardeningDisable = [ "format" ];
meta = {
homepage = https://cmake.org;
description = "Cross-Platform Makefile Generator";

View file

@ -1,9 +1,6 @@
{ stdenv, fetchurl, autoreconfHook, pkgconfig, perl, python, libxml2Python, libxslt, which
, docbook_xml_dtd_43, docbook_xsl, gnome-doc-utils, dblatex, gettext, itstool }:
let
pythonEnv = python.withPackages (ps: with ps; [ six ]);
in
, docbook_xml_dtd_43, docbook_xsl, gnome-doc-utils, dblatex, gettext, itstool
}:
stdenv.mkDerivation rec {
name = "gtk-doc-${version}";
@ -22,11 +19,17 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook ];
buildInputs =
[ pkgconfig perl pythonEnv libxml2Python libxslt docbook_xml_dtd_43 docbook_xsl
gnome-doc-utils dblatex gettext which itstool
];
[ pkgconfig perl python libxml2Python libxslt docbook_xml_dtd_43 docbook_xsl
gnome-doc-utils dblatex gettext which itstool
];
configureFlags = "--disable-scrollkeeper";
configureFlags = [ "--disable-scrollkeeper" ];
# Make six available for binaries, python.withPackages creates a wrapper
# but scripts are not allowed in shebangs so we link it into sys.path.
postInstall = ''
ln -s ${python.pkgs.six}/lib/python2.7/site-packages/* $out/share/gtk-doc/python/
'';
doCheck = false; # requires a lot of stuff
doInstallCheck = false; # fails

View file

@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
name = "gnome-desktop-testing-${version}";
src = fetchgit {
url = https://git.gnome.org/browse/gnome-desktop-testing;
url = https://gitlab.gnome.org/GNOME/gnome-desktop-testing.git;
rev = "v${version}";
sha256 = "1bcd8v101ynsv2p5swh30hnajjf6z8dxzd89h9racp847hgjgyxc";
};

View file

@ -2,7 +2,8 @@
stdenv.mkDerivation rec
{
name = "ocsigen-i18n";
pname = "ocsigen-i18n";
name = "${pname}-${version}";
version = "3.1.0";
buildInputs = with ocamlPackages; [ ocaml findlib ];
@ -16,7 +17,7 @@ stdenv.mkDerivation rec
'';
src = fetchurl {
url = "https://github.com/besport/${name}/archive/${version}.tar.gz";
url = "https://github.com/besport/${pname}/archive/${version}.tar.gz";
sha256 = "0cw0mmr67wx03j4279z7ldxwb01smkqz9rbklx5lafrj5sf99178";
};

View file

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "11-dev";
name = "physlock-v${version}";
name = "physlock-${version}";
src = fetchFromGitHub {
owner = "muennich";
repo = "physlock";

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "adapta-gtk-theme-${version}";
version = "3.93.1.16";
version = "3.93.1.18";
src = fetchFromGitHub {
owner = "adapta-project";
repo = "adapta-gtk-theme";
rev = version;
sha256 = "11jjzhqvx74iq12682ymsnms99izwl5hys1anb9l0fl6jy0dh2xx";
sha256 = "1jaayfj2h0miaalmgk0i26py4b6750iq3kis2jnm54g2gxyw3ipw";
};
preferLocalBuild = true;

View file

@ -1,13 +1,13 @@
{ stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args:
buildLinux (args // rec {
version = "4.17-rc6";
modDirVersion = "4.17.0-rc6";
version = "4.17-rc7";
modDirVersion = "4.17.0-rc7";
extraMeta.branch = "4.17";
src = fetchurl {
url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
sha256 = "16x8bwhaj35fqhl773qxwabs1rhl3ayapizjsqyzn92pggsgy6p8";
sha256 = "0kibvll2h4wvfbfxral7jsjajaijw0jb0scpjascwh66d7cxbbbr";
};
# Should the testing kernels ever be built on Hydra?

View file

@ -31,6 +31,8 @@ stdenv.mkDerivation {
makeFlags = ["prefix=$(out)" "WERROR=0"] ++ kernel.makeFlags;
hardeningDisable = [ "format" ];
# perf refers both to newt and slang
nativeBuildInputs = [
asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "mcelog-${version}";
version = "157";
version = "158";
src = fetchFromGitHub {
owner = "andikleen";
repo = "mcelog";
rev = "v${version}";
sha256 = "1965axyfizv2jg412a4wrrghgswwvvgymk7mbwaraw3xl9p21wgv";
sha256 = "0hiyj626fv4awzqgf4wnxjkr68cfcllqpibw0ncnpkvk9rn96rqp";
};
postPatch = ''

View file

@ -62,15 +62,15 @@ in
assert kernel != null;
{
splStable = common {
version = "0.7.8";
sha256 = "0ypyy7ij280n7rly6ifrvna9k55gxwdx9a7lalf4r1ka714379fi";
patches = [ ./install_prefix-0.7.8.patch ];
version = "0.7.9";
sha256 = "0540m1dv9jvrzk9kw61glg0h0cwj976mr9zb42y3nh17k47ywff0";
patches = [ ./install_prefix-0.7.9.patch ];
};
splUnstable = common {
version = "2018-04-10";
rev = "9125f8f5bdb36bfbd2d816d30b6b29b9f89ae3d8";
sha256 = "00zrbca906rzjd62m4khiw3sdv8x18dapcmvkyaawripwvzc4iri";
version = "2018-05-07";
rev = "1149b62d20b7ed9d8ae25d5da7a06213d79b7602";
sha256 = "07qlx7l23y696gzyy7ynly7n1141w66y21gkmxiia2xwldj8klkx";
patches = [ ./install_prefix.patch ];
};

View file

@ -112,18 +112,6 @@ index 581083e..0c35fb7 100644
+kerneldir = @prefix@/libexec/spl/include/sys/fs
kernel_HEADERS = $(KERNEL_H)
endif
diff --git a/include/sys/sysevent/Makefile.am b/include/sys/sysevent/Makefile.am
index 63d9af3..de1aa18 100644
--- a/include/sys/sysevent/Makefile.am
+++ b/include/sys/sysevent/Makefile.am
@@ -8,6 +8,6 @@ USER_H =
EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
if CONFIG_KERNEL
-kerneldir = @prefix@/src/spl-$(VERSION)/include/sys/sysevent
+kerneldir = @prefix@/libexec/spl/include/sys/sysevent
kernel_HEADERS = $(KERNEL_H)
endif
diff --git a/include/util/Makefile.am b/include/util/Makefile.am
index e2bf09f..3f5d6ce 100644
--- a/include/util/Makefile.am

Some files were not shown because too many files have changed in this diff Show more