mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-21 05:00:16 +00:00
Merge staging-next into master
This commit is contained in:
Frederik Rietdijk
GitHub
commit
2c5f92a723
|
|
@ -236,6 +236,26 @@ rec {
|
|||
in lenContent >= lenSuffix &&
|
||||
substring (lenContent - lenSuffix) lenContent content == suffix;
|
||||
|
||||
/* Determine whether a string contains the given infix
|
||||
|
||||
Type: hasInfix :: string -> string -> bool
|
||||
|
||||
Example:
|
||||
hasInfix "bc" "abcd"
|
||||
=> true
|
||||
hasInfix "ab" "abcd"
|
||||
=> true
|
||||
hasInfix "cd" "abcd"
|
||||
=> true
|
||||
hasInfix "foo" "abcd"
|
||||
=> false
|
||||
*/
|
||||
hasInfix = infix: content:
|
||||
let
|
||||
drop = x: substring 1 (stringLength x) x;
|
||||
in hasPrefix infix content
|
||||
|| content != "" && hasInfix infix (drop content);
|
||||
|
||||
/* Convert a string to a list of characters (i.e. singleton strings).
|
||||
This allows you to, e.g., map a function over each character. However,
|
||||
note that this will likely be horribly inefficient; Nix is not a
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
let
|
||||
version = "0.11.1";
|
||||
name = "mist";
|
||||
pname = "mist";
|
||||
|
||||
throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
|
||||
|
||||
|
|
@ -26,7 +26,7 @@ let
|
|||
};
|
||||
|
||||
mist = stdenv.lib.appendToName "unwrapped" (stdenv.mkDerivation {
|
||||
inherit name version meta;
|
||||
inherit pname version meta;
|
||||
|
||||
src = {
|
||||
i686-linux = fetchurl {
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.9.0";
|
||||
name = "cadence";
|
||||
pname = "cadence";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/falkTX/Cadence/archive/v${version}.tar.gz";
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "fluidsynth-${version}";
|
||||
version = "1.1.11";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FluidSynth";
|
||||
repo = "fluidsynth";
|
||||
rev = "v${version}";
|
||||
sha256 = "0n75jq3xgq46hfmjkaaxz3gic77shs4fzajq40c8gk043i84xbdh";
|
||||
sha256 = "1mqyym5qkh8xd1rqj3yhfxbw5dxjcrljb6nkfqzvcarlv4h6rjn7";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig cmake ];
|
||||
|
|
|
|||
|
|
@ -3,8 +3,9 @@
|
|||
, libzip, rtaudio, rtmidi, speex }:
|
||||
|
||||
let
|
||||
glfw-git = glfw.overrideAttrs (oldAttrs: {
|
||||
name = "glfw-git-20180529";
|
||||
glfw-git = glfw.overrideAttrs (oldAttrs: rec {
|
||||
name = "glfw-git-${version}";
|
||||
version = "unstable-2018-05-29";
|
||||
src = fetchFromGitHub {
|
||||
owner = "glfw";
|
||||
repo = "glfw";
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
name = "vimiv";
|
||||
pname = "vimiv";
|
||||
version = "0.7.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@ stdenv.mkDerivation rec {
|
|||
let
|
||||
mupdf_modded = mupdf.overrideAttrs (attrs: {
|
||||
name = "mupdf-1.10a";
|
||||
version = "1.10a";
|
||||
src = fetchurl {
|
||||
url = "https://mupdf.com/downloads/archive/mupdf-1.10a-source.tar.gz";
|
||||
sha256 = "0dm8wcs8i29aibzkqkrn8kcnk4q0kd1v66pg48h5c3qqp4v1zk5a";
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "4.1.5.2";
|
||||
name = "omegat";
|
||||
pname = "omegat";
|
||||
|
||||
src = fetchurl { # their zip has repeated files or something, so no fetchzip
|
||||
url = mirror://sourceforge/project/omegat/OmegaT%20-%20Latest/OmegaT%204.1.5%20update%202/OmegaT_4.1.5_02_Beta_Without_JRE.zip;
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ stdenv, fetchurl, imake, gccmakedep, xlibsWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.2.sakura.5";
|
||||
vname = "1.2.5";
|
||||
name = "oneko-${vname}";
|
||||
version_name = "1.2.sakura.5";
|
||||
version = "1.2.5";
|
||||
name = "oneko-${version}";
|
||||
src = fetchurl {
|
||||
url = "http://www.daidouji.com/oneko/distfiles/oneko-${version}.tar.gz";
|
||||
url = "http://www.daidouji.com/oneko/distfiles/oneko-${version_name}.tar.gz";
|
||||
sha256 = "2c2e05f1241e9b76f54475b5577cd4fb6670de058218d04a741a04ebd4a2b22f";
|
||||
};
|
||||
nativeBuildInputs = [ imake gccmakedep ];
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@ let rpath = lib.makeLibraryPath [
|
|||
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "brave-${version}";
|
||||
pname = "brave";
|
||||
version = "0.56.15";
|
||||
|
||||
src = fetchurl {
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{ stdenv, fetchurl, fetchpatch }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "dnh3.3.2";
|
||||
name = "enhanced-ctorrent";
|
||||
version = "3.3.2";
|
||||
pname = "enhanced-ctorrent-dhn";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.rahul.net/dholmes/ctorrent/ctorrent-dnh3.3.2.tar.gz";
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
, curl, pkgconfig }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "http-getter";
|
||||
version = "20180606";
|
||||
pname = "http-getter";
|
||||
version = "unstable-2018-06-06";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tohojo";
|
||||
|
|
|
|||
|
|
@ -9,12 +9,11 @@ let
|
|||
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "salut-a-toi-${version}";
|
||||
pname = "salut-a-toi";
|
||||
version = "0.6.1";
|
||||
pname = "sat-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://ftp.goffi.org/sat/${pname}.tar.bz2";
|
||||
url = "ftp://ftp.goffi.org/sat/sat-${version}.tar.bz2";
|
||||
sha256 = "0kn9403n8fpzl0hsb9kkzicsmzq2fjl627l31yykbqzc4nsr780d";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -12,14 +12,14 @@
|
|||
with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "remmina-${version}";
|
||||
version = "1.2.32";
|
||||
pname = "remmina";
|
||||
version = "1.2.32.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "Remmina";
|
||||
repo = "Remmina";
|
||||
rev = "v${version}";
|
||||
sha256 = "15szv1xs6drxq6qyksmxcfdz516ja4zm52r4yf6hwij3fgl8qdpw";
|
||||
sha256 = "1b77gs68j5j4nlv69vl81d0kp2623ysvshq7495y6hq5wgi5l3gc";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ninja pkgconfig wrapGAppsHook ];
|
||||
|
|
|
|||
|
|
@ -5,8 +5,6 @@ stdenv.mkDerivation rec {
|
|||
pname = "bookworm";
|
||||
version = "unstable-2018-11-19";
|
||||
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "babluboy";
|
||||
repo = pname;
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
let
|
||||
#xhtml2pdf specifically requires version "1.0b10" of html5lib
|
||||
html5 = html5lib.overrideAttrs( oldAttrs: rec{
|
||||
name = "${oldAttrs.pname}-${version}";
|
||||
version = "1.0b10";
|
||||
src = oldAttrs.src.override {
|
||||
inherit version;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ stdenv, callPackage, fetchurl, fetchFromGitHub, unzip
|
||||
, cmake, kodiPlain, libcec_platform, tinyxml
|
||||
, steam, libusb, pcre-cpp, jsoncpp, libhdhomerun, zlib }:
|
||||
, steam, libusb, pcre-cpp, jsoncpp, libhdhomerun, zlib
|
||||
, python2Packages }:
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
|
|
@ -180,26 +181,6 @@ let self = rec {
|
|||
// (mkController "ps")
|
||||
// (mkController "snes");
|
||||
|
||||
exodus = mkKodiPlugin rec {
|
||||
|
||||
plugin = "exodus";
|
||||
namespace = "plugin.video.exodus";
|
||||
version = "3.1.13";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://offshoregit.com/${plugin}/${namespace}/${namespace}-${version}.zip";
|
||||
sha256 = "1zyay7cinljxmpzngzlrr4pnk2a7z9wwfdcsk6a4p416iglyggdj";
|
||||
};
|
||||
|
||||
buildInputs = [ unzip ];
|
||||
|
||||
meta = {
|
||||
description = "A streaming plugin for Kodi";
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ edwtjo ];
|
||||
};
|
||||
};
|
||||
|
||||
hyper-launcher = let
|
||||
pname = "hyper-launcher";
|
||||
version = "1.5.2";
|
||||
|
|
@ -251,6 +232,25 @@ let self = rec {
|
|||
|
||||
};
|
||||
|
||||
simpleplugin = mkKodiPlugin rec {
|
||||
plugin = "simpleplugin";
|
||||
namespace = "script.module.simpleplugin";
|
||||
version = "2.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "romanvm";
|
||||
repo = namespace;
|
||||
rev = "v.${version}";
|
||||
sha256 = "0myar8dqjigb75pcc8zx3i5z79p1ifgphgb82s5syqywk0zaxm3j";
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = src.meta.homepage;
|
||||
description = "Simpleplugin API";
|
||||
license = licenses.gpl3;
|
||||
};
|
||||
};
|
||||
|
||||
svtplay = mkKodiPlugin rec {
|
||||
|
||||
plugin = "svtplay";
|
||||
|
|
@ -443,4 +443,31 @@ let self = rec {
|
|||
};
|
||||
};
|
||||
|
||||
yatp = python2Packages.toPythonModule (mkKodiPlugin rec {
|
||||
plugin = "yatp";
|
||||
namespace = "plugin.video.yatp";
|
||||
version = "3.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "romanvm";
|
||||
repo = "kodi.yatp";
|
||||
rev = "v.${version}";
|
||||
sha256 = "12g1f57sx7dy6wy7ljl7siz2qs1kxcmijcg7xx2xpvmq61x9qa2d";
|
||||
};
|
||||
|
||||
patches = [ ./yatp/dont-monkey.patch ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
simpleplugin
|
||||
python2Packages.requests
|
||||
python2Packages.libtorrentRasterbar
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = src.meta.homepage;
|
||||
description = "Yet Another Torrent Player: libtorrent-based torrent streaming for Kodi";
|
||||
license = licenses.gpl3;
|
||||
};
|
||||
});
|
||||
|
||||
}; in self
|
||||
|
|
|
|||
29
pkgs/applications/video/kodi/yatp/dont-monkey.patch
Normal file
29
pkgs/applications/video/kodi/yatp/dont-monkey.patch
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
diff --git a/plugin.video.yatp/server.py b/plugin.video.yatp/server.py
|
||||
index 1adcbb5..488b72c 100644
|
||||
--- a/plugin.video.yatp/server.py
|
||||
+++ b/plugin.video.yatp/server.py
|
||||
@@ -20,24 +20,8 @@ addon = Addon()
|
||||
_ = addon.initialize_gettext()
|
||||
addon.log_notice('Starting Torrent Server...')
|
||||
|
||||
-# A monkey-patch to set the necessary librorrent version
|
||||
-librorrent_addon = Addon('script.module.libtorrent')
|
||||
-orig_custom_version = librorrent_addon.get_setting('custom_version', False)
|
||||
-orig_set_version = librorrent_addon.get_setting('set_version', False)
|
||||
-librorrent_addon.set_setting('custom_version', 'true')
|
||||
-if addon.libtorrent_version == '1.0.9':
|
||||
- librorrent_addon.set_setting('set_version', '4')
|
||||
-elif addon.libtorrent_version == '1.1.0':
|
||||
- librorrent_addon.set_setting('set_version', '5')
|
||||
-elif addon.libtorrent_version == '1.1.1':
|
||||
- librorrent_addon.set_setting('set_version', '6')
|
||||
-else:
|
||||
- librorrent_addon.set_setting('set_version', '0')
|
||||
-
|
||||
from libs.server import wsgi_app
|
||||
|
||||
-librorrent_addon.set_setting('custom_version', orig_custom_version)
|
||||
-librorrent_addon.set_setting('set_version', orig_set_version)
|
||||
# ======
|
||||
|
||||
if addon.enable_limits:
|
||||
|
|
@ -16,7 +16,8 @@ rec {
|
|||
} :
|
||||
let
|
||||
docker-runc = runc.overrideAttrs (oldAttrs: rec {
|
||||
name = "docker-runc";
|
||||
name = "docker-runc-${version}";
|
||||
inherit version;
|
||||
src = fetchFromGitHub {
|
||||
owner = "docker";
|
||||
repo = "runc";
|
||||
|
|
@ -28,7 +29,8 @@ rec {
|
|||
});
|
||||
|
||||
docker-containerd = (containerd.override { inherit go; }).overrideAttrs (oldAttrs: rec {
|
||||
name = "docker-containerd";
|
||||
name = "docker-containerd-${version}";
|
||||
inherit version;
|
||||
src = fetchFromGitHub {
|
||||
owner = "docker";
|
||||
repo = "containerd";
|
||||
|
|
@ -42,7 +44,8 @@ rec {
|
|||
});
|
||||
|
||||
docker-tini = tini.overrideAttrs (oldAttrs: rec {
|
||||
name = "docker-init";
|
||||
name = "docker-init-${version}";
|
||||
inherit version;
|
||||
src = fetchFromGitHub {
|
||||
owner = "krallin";
|
||||
repo = "tini";
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ if md5 != "" then
|
|||
throw "fetchegg does not support md5 anymore, please use sha256"
|
||||
else
|
||||
stdenvNoCC.mkDerivation {
|
||||
name = "chicken-${name}-export";
|
||||
name = "chicken-${name}-export-${version}";
|
||||
builder = ./builder.sh;
|
||||
nativeBuildInputs = [ chicken ];
|
||||
|
||||
|
|
|
|||
|
|
@ -13,23 +13,23 @@ auditTmpdir() {
|
|||
local dir="$1"
|
||||
[ -e "$dir" ] || return 0
|
||||
|
||||
header "checking for references to $TMPDIR in $dir..."
|
||||
header "checking for references to $TMPDIR/ in $dir..."
|
||||
|
||||
local i
|
||||
while IFS= read -r -d $'\0' i; do
|
||||
if [[ "$i" =~ .build-id ]]; then continue; fi
|
||||
|
||||
if isELF "$i"; then
|
||||
if patchelf --print-rpath "$i" | grep -q -F "$TMPDIR"; then
|
||||
echo "RPATH of binary $i contains a forbidden reference to $TMPDIR"
|
||||
if patchelf --print-rpath "$i" | grep -q -F "$TMPDIR/"; then
|
||||
echo "RPATH of binary $i contains a forbidden reference to $TMPDIR/"
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
if isScript "$i"; then
|
||||
if [ -e "$(dirname "$i")/.$(basename "$i")-wrapped" ]; then
|
||||
if grep -q -F "$TMPDIR" "$i"; then
|
||||
echo "wrapper script $i contains a forbidden reference to $TMPDIR"
|
||||
if grep -q -F "$TMPDIR/" "$i"; then
|
||||
echo "wrapper script $i contains a forbidden reference to $TMPDIR/"
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ makeWrapper() {
|
|||
|
||||
mkdir -p "$(dirname "$wrapper")"
|
||||
|
||||
echo "#! $SHELL -e" > "$wrapper"
|
||||
echo "#! @shell@ -e" > "$wrapper"
|
||||
|
||||
params=("$@")
|
||||
for ((n = 2; n < ${#params[*]}; n += 1)); do
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ stdenv, fetchurl, gnome3, meson, ninja, pkgconfig, gtk3, intltool, glib
|
||||
, udev, itstool, libxml2, wrapGAppsHook, libnotify, libcanberra-gtk3, gobjectIntrospection
|
||||
, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }:
|
||||
, gtk-doc, docbook_xsl, docbook_xml_dtd_43, python3 }:
|
||||
|
||||
let
|
||||
pname = "gnome-bluetooth";
|
||||
|
|
@ -18,7 +18,7 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [
|
||||
meson ninja intltool itstool pkgconfig libxml2 wrapGAppsHook gobjectIntrospection
|
||||
gtk-doc docbook_xsl docbook_xml_dtd_43
|
||||
gtk-doc docbook_xsl docbook_xml_dtd_43 python3
|
||||
];
|
||||
buildInputs = [
|
||||
glib gtk3 udev libnotify libcanberra-gtk3
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ fetchurl, stdenv, substituteAll, meson, ninja, pkgconfig, gnome3, glib, gtk, gsettings-desktop-schemas
|
||||
, gnome-desktop, dbus, json-glib, libICE, xmlto, docbook_xsl, docbook_xml_dtd_412
|
||||
, gnome-desktop, dbus, json-glib, libICE, xmlto, docbook_xsl, docbook_xml_dtd_412, python3
|
||||
, libxslt, gettext, makeWrapper, systemd, xorg, epoxy }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [
|
||||
meson ninja pkgconfig gettext makeWrapper
|
||||
xmlto libxslt docbook_xsl docbook_xml_dtd_412
|
||||
xmlto libxslt docbook_xsl docbook_xml_dtd_412 python3
|
||||
dbus # for DTD
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ fetchurl, substituteAll, stdenv, meson, ninja, pkgconfig, gnome3, perl, gettext, glib, libnotify, lcms2, libXtst
|
||||
, libxkbfile, libpulseaudio, alsaLib, libcanberra-gtk3, upower, colord, libgweather, polkit
|
||||
, geoclue2, librsvg, xf86_input_wacom, udev, libgudev, libwacom, libxslt, libxml2, networkmanager
|
||||
, docbook_xsl, wrapGAppsHook, ibus, xkeyboard_config, tzdata, nss }:
|
||||
, docbook_xsl, wrapGAppsHook, python3, ibus, xkeyboard_config, tzdata, nss }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gnome-settings-daemon-${version}";
|
||||
|
|
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
|||
# fatal error: gio/gunixfdlist.h: No such file or directory
|
||||
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkgconfig perl gettext libxml2 libxslt docbook_xsl wrapGAppsHook ];
|
||||
nativeBuildInputs = [ meson ninja pkgconfig perl gettext libxml2 libxslt docbook_xsl wrapGAppsHook python3 ];
|
||||
|
||||
buildInputs = with gnome3; [
|
||||
ibus gtk glib gsettings-desktop-schemas networkmanager
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{stdenv, writeText, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "hex-registry";
|
||||
pname = "hex-registry";
|
||||
rev = "11d7a24e9f53f52490ce255a6248e71128e73aa1";
|
||||
version = "20180712.${rev}";
|
||||
version = "unstable-2018-07-12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit rev;
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@ let
|
|||
};
|
||||
|
||||
pkg = self: stdenv.mkDerivation rec {
|
||||
name = "hex";
|
||||
version = "v0.17.1";
|
||||
pname = "hex";
|
||||
version = "0.17.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hexpm";
|
||||
repo = "hex";
|
||||
rev = "${version}";
|
||||
rev = "v${version}";
|
||||
sha256 = "1s4asar1mcavzj3w37jcz243ka0z5jm0r42yws3h4aagawxxg02z";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -177,7 +177,7 @@ stdenv.mkDerivation ({
|
|||
|
||||
inherit patches;
|
||||
|
||||
hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";
|
||||
hardeningDisable = [ "format" "pie" ];
|
||||
|
||||
outputs = [ "out" "lib" "man" "info" ];
|
||||
setOutputFlags = false;
|
||||
|
|
|
|||
|
|
@ -185,7 +185,7 @@ stdenv.mkDerivation ({
|
|||
|
||||
inherit patches;
|
||||
|
||||
hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";
|
||||
hardeningDisable = [ "format" "pie" ];
|
||||
|
||||
outputs = if langJava || langGo then ["out" "man" "info"]
|
||||
else [ "out" "lib" "man" "info" ];
|
||||
|
|
|
|||
|
|
@ -178,7 +178,7 @@ stdenv.mkDerivation ({
|
|||
|
||||
libc_dev = stdenv.cc.libc_dev;
|
||||
|
||||
hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";
|
||||
hardeningDisable = [ "format" "pie" ];
|
||||
|
||||
# This should kill all the stdinc frameworks that gcc and friends like to
|
||||
# insert into default search paths.
|
||||
|
|
|
|||
|
|
@ -178,7 +178,7 @@ stdenv.mkDerivation ({
|
|||
|
||||
libc_dev = stdenv.cc.libc_dev;
|
||||
|
||||
hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";
|
||||
hardeningDisable = [ "format" "pie" ];
|
||||
|
||||
# This should kill all the stdinc frameworks that gcc and friends like to
|
||||
# insert into default search paths.
|
||||
|
|
|
|||
|
|
@ -149,7 +149,7 @@ stdenv.mkDerivation ({
|
|||
|
||||
libc_dev = stdenv.cc.libc_dev;
|
||||
|
||||
hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";
|
||||
hardeningDisable = [ "format" "pie" ];
|
||||
|
||||
# This should kill all the stdinc frameworks that gcc and friends like to
|
||||
# insert into default search paths.
|
||||
|
|
|
|||
|
|
@ -143,7 +143,7 @@ stdenv.mkDerivation ({
|
|||
|
||||
libc_dev = stdenv.cc.libc_dev;
|
||||
|
||||
hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";
|
||||
hardeningDisable = [ "format" "pie" ];
|
||||
|
||||
# This should kill all the stdinc frameworks that gcc and friends like to
|
||||
# insert into default search paths.
|
||||
|
|
|
|||
|
|
@ -137,7 +137,7 @@ stdenv.mkDerivation ({
|
|||
|
||||
libc_dev = stdenv.cc.libc_dev;
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
hardeningDisable = [ "format" "pie" ];
|
||||
|
||||
postPatch =
|
||||
if targetPlatform != hostPlatform || stdenv.cc.libc != null then
|
||||
|
|
|
|||
|
|
@ -22,13 +22,13 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "go-${version}";
|
||||
version = "1.11";
|
||||
version = "1.11.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "golang";
|
||||
repo = "go";
|
||||
rev = "go${version}";
|
||||
sha256 = "1k18d6rkijlgzn1zw4wphzcv6a6w9hb1msgrsh1102jb18644f2q";
|
||||
sha256 = "0pk7pxfm3ij2ksdrg49jz501fr1d103zr4mjjwv821if9g279jc9";
|
||||
};
|
||||
|
||||
GOCACHE = "off";
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ in rec {
|
|||
|
||||
mx = stdenv.mkDerivation rec {
|
||||
version = "5.192.0";
|
||||
name = "mx";
|
||||
pname = "mx";
|
||||
src = fetchFromGitHub {
|
||||
owner = "graalvm";
|
||||
repo = "mx";
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "nasm-${version}";
|
||||
version = "2.13.03";
|
||||
version = "2.14";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.nasm.us/pub/nasm/releasebuilds/${version}/${name}.tar.bz2";
|
||||
sha256 = "04bh736zfj3xy5ihh1whshpjxsisv7hqkz954clzdw6kg93qdv33";
|
||||
sha256 = "0i678zbm1ljn5jwia7gj1n503izwvzlh55xzm4i0qgfmr8kzsg6l";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ perl ];
|
||||
|
|
|
|||
|
|
@ -3,16 +3,16 @@
|
|||
let
|
||||
# Note: the version MUST be one version prior to the version we're
|
||||
# building
|
||||
version = "1.29.2";
|
||||
version = "1.30.0";
|
||||
|
||||
# fetch hashes by running `print-hashes.sh 1.29.2`
|
||||
# fetch hashes by running `print-hashes.sh 1.30.0`
|
||||
hashes = {
|
||||
i686-unknown-linux-gnu = "fd67338c32348fc0cf09dd066975acc221e062fdc3b052912baef93b39a0b27e";
|
||||
x86_64-unknown-linux-gnu = "e9809825c546969a9609ff94b2793c9107d7d9bed67d557ed9969e673137e8d8";
|
||||
armv7-unknown-linux-gnueabihf = "943ee757d96be97baccb84b0c2a5da368f8f3adf082805b0f0323240e80975c0";
|
||||
aarch64-unknown-linux-gnu = "e11461015ca7106ef8ebf00859842bf4be518ee170226cb8eedaaa666946509f";
|
||||
i686-apple-darwin = "aadec39efcbc476e00722b527dcc587003ab05194efd06ba1b91c1e0f7512d3f";
|
||||
x86_64-apple-darwin = "63f54e3013406b39fcb5b84bcf5e8ce85860d0b97a1e156700e467bf5fb5d5f2";
|
||||
i686-unknown-linux-gnu = "4ceb0e3011d96504587abb7edfdea9c1b4b7cb2c4488cc4a25adc2f3b6a88b21";
|
||||
x86_64-unknown-linux-gnu = "f620e3125cc505c842150bd873c0603432b6cee984cdae8b226cf92c8aa1a80f";
|
||||
armv7-unknown-linux-gnueabihf = "63991f6769ca8db693562c34ac25473e9d4f9f214d6ee98917891be469d69cfd";
|
||||
aarch64-unknown-linux-gnu = "9690c7c50eba5a8461184ee4138b4c284bad31ccc4aa1f2ddeec58b253e6363e";
|
||||
i686-apple-darwin = "b8e5ac31f0a192a58b0e98ff88c47035a2882598946352fa5a86c28ede079230";
|
||||
x86_64-apple-darwin = "07008d90932712282bc599f1e9a226e97879c758dc1f935e6e2675e45694cc1b";
|
||||
};
|
||||
|
||||
platform =
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
let
|
||||
rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {}));
|
||||
version = "1.30.0";
|
||||
version = "1.30.1";
|
||||
cargoVersion = "1.30.0";
|
||||
src = fetchurl {
|
||||
url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz";
|
||||
sha256 = "1vh8q5i273xyjvpipqisny11iz0xfgz30cgjr7068nx5rhzsh2yd";
|
||||
sha256 = "0aavdc1lqv0cjzbqwl5n59yd0bqdlhn0zas61ljf38yrvc18k8rn";
|
||||
};
|
||||
in rec {
|
||||
rustc = callPackage ./rustc.nix {
|
||||
|
|
@ -29,7 +29,7 @@ in rec {
|
|||
./patches/disable-test-inherit-env.patch
|
||||
];
|
||||
|
||||
forceBundledLLVM = true;
|
||||
withBundledLLVM = false;
|
||||
|
||||
configureFlags = [ "--release-channel=stable" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{ stdenv, targetPackages
|
||||
{ stdenv, targetPackages, removeReferencesTo
|
||||
, fetchurl, fetchgit, fetchzip, file, python2, tzdata, ps
|
||||
, llvm, jemalloc, ncurses, darwin, rustPlatform, git, cmake, curl
|
||||
, which, libffi, gdb
|
||||
, version
|
||||
, forceBundledLLVM ? false
|
||||
, withBundledLLVM ? false
|
||||
, src
|
||||
, configureFlags ? []
|
||||
, patches
|
||||
|
|
@ -20,6 +20,8 @@ let
|
|||
|
||||
llvmShared = llvm.override { enableSharedLibraries = true; };
|
||||
|
||||
prefixedJemalloc = jemalloc.override { stripPrefix = false; };
|
||||
|
||||
target = builtins.replaceStrings [" "] [","] (builtins.toString targets);
|
||||
in
|
||||
|
||||
|
|
@ -40,7 +42,11 @@ stdenv.mkDerivation {
|
|||
# See https://github.com/NixOS/nixpkgs/pull/34227
|
||||
stripDebugList = if stdenv.isDarwin then [ "bin" ] else null;
|
||||
|
||||
NIX_LDFLAGS = optionalString stdenv.isDarwin "-rpath ${llvmShared}/lib";
|
||||
NIX_LDFLAGS =
|
||||
# when linking stage1 libstd: cc: undefined reference to `__cxa_begin_catch'
|
||||
optional (stdenv.isLinux && !withBundledLLVM) "--push-state --as-needed -lstdc++ --pop-state"
|
||||
++ optional (stdenv.isDarwin && !withBundledLLVM) "-lc++"
|
||||
++ optional stdenv.isDarwin "-rpath ${llvmShared}/lib";
|
||||
|
||||
# Enable nightly features in stable compiles (used for
|
||||
# bootstrapping, see https://github.com/rust-lang/rust/pull/37265).
|
||||
|
|
@ -54,13 +60,12 @@ stdenv.mkDerivation {
|
|||
# We need rust to build rust. If we don't provide it, configure will try to download it.
|
||||
# Reference: https://github.com/rust-lang/rust/blob/master/src/bootstrap/configure.py
|
||||
configureFlags = configureFlags
|
||||
++ [ "--enable-local-rust" "--local-rust-root=${rustPlatform.rust.rustc}" "--enable-rpath" ]
|
||||
++ [ "--enable-vendor" ]
|
||||
# ++ [ "--jemalloc-root=${jemalloc}/lib"
|
||||
++ [ "--default-linker=${targetPackages.stdenv.cc}/bin/cc" ]
|
||||
++ optional (!forceBundledLLVM) [ "--enable-llvm-link-shared" ]
|
||||
++ optional (targets != []) "--target=${target}"
|
||||
++ optional (!forceBundledLLVM) "--llvm-root=${llvmShared}";
|
||||
++ [ "--enable-local-rust" "--local-rust-root=${rustPlatform.rust.rustc}" "--enable-rpath"
|
||||
"--enable-vendor"
|
||||
"--jemalloc-root=${prefixedJemalloc}/lib"
|
||||
"--default-linker=${targetPackages.stdenv.cc}/bin/cc" ]
|
||||
++ optional (!withBundledLLVM) [ "--enable-llvm-link-shared" "--llvm-root=${llvmShared}" ]
|
||||
++ optional (targets != []) "--target=${target}";
|
||||
|
||||
# The bootstrap.py will generated a Makefile that then executes the build.
|
||||
# The BOOTSTRAP_ARGS used by this Makefile must include all flags to pass
|
||||
|
|
@ -79,29 +84,13 @@ stdenv.mkDerivation {
|
|||
postPatch = ''
|
||||
patchShebangs src/etc
|
||||
|
||||
# Fix dynamic linking against llvm
|
||||
#${optionalString (!forceBundledLLVM) ''sed -i 's/, kind = \\"static\\"//g' src/etc/mklldeps.py''}
|
||||
${optionalString (!withBundledLLVM) ''rm -rf src/llvm''}
|
||||
rm -rf src/jemalloc
|
||||
|
||||
# Fix the configure script to not require curl as we won't use it
|
||||
sed -i configure \
|
||||
-e '/probe_need CFG_CURL curl/d'
|
||||
|
||||
# Fix the use of jemalloc prefixes which our jemalloc doesn't have
|
||||
# TODO: reenable if we can figure out how to get our jemalloc to work
|
||||
#[ -f src/liballoc_jemalloc/lib.rs ] && sed -i 's,je_,,g' src/liballoc_jemalloc/lib.rs
|
||||
#[ -f src/liballoc/heap.rs ] && sed -i 's,je_,,g' src/liballoc/heap.rs # Remove for 1.4.0+
|
||||
|
||||
# Disable fragile tests.
|
||||
rm -vr src/test/run-make-fulldeps/linker-output-non-utf8 || true
|
||||
rm -vr src/test/run-make-fulldeps/issue-26092 || true
|
||||
|
||||
# Remove test targeted at LLVM 3.9 - https://github.com/rust-lang/rust/issues/36835
|
||||
rm -vr src/test/ui/run-pass/issue-36023.rs || true
|
||||
|
||||
# Disable test getting stuck on hydra - possible fix:
|
||||
# https://reviews.llvm.org/rL281650
|
||||
rm -vr src/test/ui/run-pass/issue-36474.rs || true
|
||||
|
||||
# On Hydra: `TcpListener::bind(&addr)`: Address already in use (os error 98)'
|
||||
sed '/^ *fn fast_rebind()/i#[ignore]' -i src/libstd/net/tcp.rs
|
||||
|
||||
|
|
@ -137,14 +126,14 @@ stdenv.mkDerivation {
|
|||
# ps is needed for one of the test cases
|
||||
nativeBuildInputs =
|
||||
[ file python2 ps rustPlatform.rust.rustc git cmake
|
||||
which libffi
|
||||
which libffi removeReferencesTo
|
||||
]
|
||||
# Only needed for the debuginfo tests
|
||||
++ optional (!stdenv.isDarwin) gdb;
|
||||
|
||||
buildInputs = [ ncurses ] ++ targetToolchains
|
||||
buildInputs = targetToolchains
|
||||
++ optional stdenv.isDarwin Security
|
||||
++ optional (!forceBundledLLVM) llvmShared;
|
||||
++ optional (!withBundledLLVM) llvmShared;
|
||||
|
||||
outputs = [ "out" "man" "doc" ];
|
||||
setOutputFlags = false;
|
||||
|
|
@ -165,6 +154,12 @@ stdenv.mkDerivation {
|
|||
|
||||
inherit doCheck;
|
||||
|
||||
# remove references to llvm-config in lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends/librustc_codegen_llvm-llvm.so
|
||||
# and thus a transitive dependency on ncurses
|
||||
postInstall = ''
|
||||
find $out/lib -name "*.so" -type f -exec remove-references-to -t ${llvmShared} '{}' '+'
|
||||
'';
|
||||
|
||||
configurePlatforms = [];
|
||||
|
||||
# https://github.com/NixOS/nixpkgs/pull/21742#issuecomment-272305764
|
||||
|
|
|
|||
|
|
@ -60,9 +60,7 @@ stdenv.mkDerivation rec {
|
|||
cf-private
|
||||
];
|
||||
|
||||
# /build/SDL2-2.0.7/src/video/wayland/SDL_waylandevents.c:41:10: fatal error:
|
||||
# pointer-constraints-unstable-v1-client-protocol.h: No such file or directory
|
||||
enableParallelBuilding = false;
|
||||
enableParallelBuilding = true;
|
||||
|
||||
configureFlags = [
|
||||
"--disable-oss"
|
||||
|
|
|
|||
|
|
@ -1,29 +0,0 @@
|
|||
{stdenv, fetchurl, fetchpatch, cmake}:
|
||||
|
||||
let
|
||||
version = "3.3.5";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "eigen-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://bitbucket.org/eigen/eigen/get/${version}.tar.gz";
|
||||
name = "eigen-${version}.tar.gz";
|
||||
sha256 = "13p60x6k61zq2y2in7g4fy5p55cr5dbmj3zvw10zcazxraxbcm04";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./include-dir.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "C++ template library for linear algebra: vectors, matrices, and related algorithms";
|
||||
license = licenses.lgpl3Plus;
|
||||
homepage = http://eigen.tuxfamily.org ;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with stdenv.lib.maintainers; [ sander raskin ];
|
||||
inherit version;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
{stdenv, fetchurl, cmake}:
|
||||
{stdenv, fetchurl, fetchpatch, cmake}:
|
||||
|
||||
let
|
||||
version = "3.2.10";
|
||||
version = "3.3.5";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "eigen-${version}";
|
||||
|
|
@ -9,17 +9,15 @@ stdenv.mkDerivation {
|
|||
src = fetchurl {
|
||||
url = "https://bitbucket.org/eigen/eigen/get/${version}.tar.gz";
|
||||
name = "eigen-${version}.tar.gz";
|
||||
sha256 = "00l52y7m276gh8wjkqqcxz6x687azrm7a70s3iraxnpy9bxa9y04";
|
||||
sha256 = "13p60x6k61zq2y2in7g4fy5p55cr5dbmj3zvw10zcazxraxbcm04";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./include-dir.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
doCheck = false; # a couple of tests fail with "Child aborted"
|
||||
|
||||
postInstall = ''
|
||||
sed -e '/Cflags:/s@''${prefix}/@@' -i "$out"/share/pkgconfig/eigen3.pc
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "C++ template library for linear algebra: vectors, matrices, and related algorithms";
|
||||
license = licenses.lgpl3Plus;
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ let
|
|||
in
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
name = "elf-header";
|
||||
pname = "elf-header";
|
||||
inherit (libc) version;
|
||||
|
||||
src = null;
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
version = "1.6.0";
|
||||
version = "1.6.1";
|
||||
pname = "enchant";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.abisource.com/downloads/${pname}/${version}/${name}.tar.gz";
|
||||
sha256 = "0zq9yw1xzk8k9s6x83n1f9srzcwdavzazn3haln4nhp9wxxrxb1g";
|
||||
url = "https://github.com/AbiWord/${pname}/releases/download/${pname}-1-6-1/${name}.tar.gz";
|
||||
sha256 = "1xg3m7mniyqyff8qv46jbfwgchb6di6qxdjnd5sfir7jzv0dkw5y";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
|
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Generic spell checking library";
|
||||
homepage = http://www.abisource.com/enchant;
|
||||
homepage = https://abiword.github.io/enchant;
|
||||
platforms = platforms.unix;
|
||||
license = licenses.lgpl21;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{ stdenv, lib, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gdbm-1.18";
|
||||
# FIXME: remove on update to > 1.18
|
||||
name = "gdbm-1.18.1";
|
||||
# FIXME: remove on update to > 1.18.1
|
||||
NIX_CFLAGS_COMPILE = if stdenv.cc.isClang then "-Wno-error=return-type" else null;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/gdbm/${name}.tar.gz";
|
||||
sha256 = "1kimnv12bzjjhaqk4c8w2j6chdj9c6bg21lchaf7abcyfss2r0mq";
|
||||
sha256 = "1p4ibds6z3ccy65lkmd6lm7js0kwifvl53r0fd759fjxgr917rl6";
|
||||
};
|
||||
|
||||
doCheck = true; # not cross;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, fetchpatch, meson, ninja, pkgconfig, glib, gettext, gnutls, p11-kit, libproxy, gnome3
|
||||
{ stdenv, fetchurl, fetchpatch, meson, ninja, pkgconfig, glib, gettext, python3, gnutls, p11-kit, libproxy, gnome3
|
||||
, gsettings-desktop-schemas }:
|
||||
|
||||
let
|
||||
|
|
@ -30,7 +30,10 @@ stdenv.mkDerivation rec {
|
|||
patchShebangs meson_post_install.py
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkgconfig gettext ];
|
||||
nativeBuildInputs = [
|
||||
meson ninja pkgconfig gettext
|
||||
python3 # install_script
|
||||
];
|
||||
propagatedBuildInputs = [ glib gnutls p11-kit libproxy gsettings-desktop-schemas ];
|
||||
|
||||
doCheck = false; # tests need to access the certificates (among other things)
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gnu-efi-${version}";
|
||||
version = "3.0.8";
|
||||
version = "3.0.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/gnu-efi/${name}.tar.bz2";
|
||||
sha256 = "08mpw8s79azip9jbzm6msq0999pnkqzd82axydrcyyynm276s03n";
|
||||
sha256 = "1w3p4aqlc5j93q44la7dc8cr3hky20zvsd0h0k2lyzhwmrzfl5b7";
|
||||
};
|
||||
|
||||
buildInputs = [ pciutils ];
|
||||
|
|
|
|||
|
|
@ -6,16 +6,15 @@
|
|||
let
|
||||
unwrapped = stdenv.mkDerivation rec {
|
||||
pname = "gsignond";
|
||||
version = "39022c86ddb5062a10fb0503ad9d81a8e532d527";
|
||||
version = "unstable-2018-10-04";
|
||||
|
||||
name = "${pname}-2018-10-04";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "accounts-sso";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
rev = "39022c86ddb5062a10fb0503ad9d81a8e532d527";
|
||||
sha256 = "1gw8vbj3j6wxqy759z97arm8lnqhmraw9s2frv3ar6crnfhlidff";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ stdenv, fetchurl, ncurses, readline, autoreconfHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.6.2";
|
||||
version = "1.7.0";
|
||||
name = "hunspell-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/hunspell/hunspell/archive/v${version}.tar.gz";
|
||||
sha256 = "1i7lsv2cm0713ia3j5wjkcrhpfp3lqpjpwp4d3v18n7ycaqcxn9w";
|
||||
sha256 = "12mwwqz6qkx7q1lg9vpjiiwh4fk4c8xs6g6g0xa2ia0hp5pbh9xv";
|
||||
};
|
||||
|
||||
outputs = [ "bin" "dev" "out" "man" ];
|
||||
|
|
|
|||
|
|
@ -3,12 +3,12 @@
|
|||
flex, yacc, zlib, libxml2 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "igraph";
|
||||
pname = "igraph";
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "igraph";
|
||||
repo = name;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1wsy0r511gk069il6iqjs27q8cjvqz20gf0a7inybx1bw84845z8";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,6 +1,13 @@
|
|||
{ stdenv, fetchurl, version, sha256, ... }@args:
|
||||
{ version, sha256 }:
|
||||
{ stdenv, fetchurl,
|
||||
# By default, jemalloc puts a je_ prefix onto all its symbols on OSX, which
|
||||
# then stops downstream builds (mariadb in particular) from detecting it. This
|
||||
# option should remove the prefix and give us a working jemalloc.
|
||||
# Causes segfaults with some software (ex. rustc), but defaults to true for backward
|
||||
# compatibility. Ignored on non OSX.
|
||||
stripPrefix ? true }:
|
||||
|
||||
stdenv.mkDerivation (rec {
|
||||
stdenv.mkDerivation rec {
|
||||
name = "jemalloc-${version}";
|
||||
inherit version;
|
||||
|
||||
|
|
@ -9,10 +16,8 @@ stdenv.mkDerivation (rec {
|
|||
inherit sha256;
|
||||
};
|
||||
|
||||
# By default, jemalloc puts a je_ prefix onto all its symbols on OSX, which
|
||||
# then stops downstream builds (mariadb in particular) from detecting it. This
|
||||
# option should remove the prefix and give us a working jemalloc.
|
||||
configureFlags = stdenv.lib.optional stdenv.isDarwin "--with-jemalloc-prefix=";
|
||||
# see the comment on stripPrefix
|
||||
configureFlags = stdenv.lib.optional (stdenv.isDarwin && stripPrefix) "--with-jemalloc-prefix=";
|
||||
doCheck = true;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
@ -28,4 +33,4 @@ stdenv.mkDerivation (rec {
|
|||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ wkennington ];
|
||||
};
|
||||
} // (builtins.removeAttrs args [ "stdenv" "fetchurl" "version" "sha256" ]))
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,4 @@
|
|||
{ stdenv, fetchurl, fetchpatch }:
|
||||
import ./common.nix {
|
||||
inherit stdenv fetchurl;
|
||||
version = "5.1.0";
|
||||
sha256 = "0s3jpcyhzia8d4k0xyc67is78kg416p9yc3c2f9w6fhhqqffd5jk";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,4 @@
|
|||
{ stdenv, fetchurl }:
|
||||
import ./common.nix {
|
||||
inherit stdenv fetchurl;
|
||||
version = "4.5.0";
|
||||
sha256 = "10373xhpc10pgmai9fkc1z0rs029qlcb3c0qfnvkbwdlcibdh2cl";
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,36 +0,0 @@
|
|||
From fa7438a0ff4033e4741c807394a9af6207940d71 Mon Sep 17 00:00:00 2001
|
||||
From: Joerg Sonnenberger <joerg@bec.de>
|
||||
Date: Tue, 5 Sep 2017 18:12:19 +0200
|
||||
Subject: [PATCH] Do something sensible for empty strings to make fuzzers
|
||||
happy.
|
||||
|
||||
---
|
||||
libarchive/archive_read_support_format_xar.c | 8 +++++++-
|
||||
1 file changed, 7 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/libarchive/archive_read_support_format_xar.c b/libarchive/archive_read_support_format_xar.c
|
||||
index 7a22beb9d..93eeacc5e 100644
|
||||
--- a/libarchive/archive_read_support_format_xar.c
|
||||
+++ b/libarchive/archive_read_support_format_xar.c
|
||||
@@ -1040,6 +1040,9 @@ atol10(const char *p, size_t char_cnt)
|
||||
uint64_t l;
|
||||
int digit;
|
||||
|
||||
+ if (char_cnt == 0)
|
||||
+ return (0);
|
||||
+
|
||||
l = 0;
|
||||
digit = *p - '0';
|
||||
while (digit >= 0 && digit < 10 && char_cnt-- > 0) {
|
||||
@@ -1054,7 +1057,10 @@ atol8(const char *p, size_t char_cnt)
|
||||
{
|
||||
int64_t l;
|
||||
int digit;
|
||||
-
|
||||
+
|
||||
+ if (char_cnt == 0)
|
||||
+ return (0);
|
||||
+
|
||||
l = 0;
|
||||
while (char_cnt-- > 0) {
|
||||
if (*p >= '0' && *p <= '7')
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
From 5562545b5562f6d12a4ef991fae158bf4ccf92b6 Mon Sep 17 00:00:00 2001
|
||||
From: Joerg Sonnenberger <joerg@bec.de>
|
||||
Date: Sat, 9 Sep 2017 17:47:32 +0200
|
||||
Subject: [PATCH] Avoid a read off-by-one error for UTF16 names in RAR
|
||||
archives.
|
||||
|
||||
Reported-By: OSS-Fuzz issue 573
|
||||
---
|
||||
libarchive/archive_read_support_format_rar.c | 6 +++++-
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/libarchive/archive_read_support_format_rar.c b/libarchive/archive_read_support_format_rar.c
|
||||
index cbb14c32d..751de6979 100644
|
||||
--- a/libarchive/archive_read_support_format_rar.c
|
||||
+++ b/libarchive/archive_read_support_format_rar.c
|
||||
@@ -1496,7 +1496,11 @@ read_header(struct archive_read *a, struct archive_entry *entry,
|
||||
return (ARCHIVE_FATAL);
|
||||
}
|
||||
filename[filename_size++] = '\0';
|
||||
- filename[filename_size++] = '\0';
|
||||
+ /*
|
||||
+ * Do not increment filename_size here as the computations below
|
||||
+ * add the space for the terminating NUL explicitly.
|
||||
+ */
|
||||
+ filename[filename_size] = '\0';
|
||||
|
||||
/* Decoded unicode form is UTF-16BE, so we have to update a string
|
||||
* conversion object for it. */
|
||||
|
|
@ -10,24 +10,13 @@ assert xarSupport -> libxml2 != null;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libarchive-${version}";
|
||||
version = "3.3.2";
|
||||
version = "3.3.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}/downloads/${name}.tar.gz";
|
||||
sha256 = "1km0mzfl6in7l5vz9kl09a88ajx562rw93ng9h2jqavrailvsbgd";
|
||||
sha256 = "0bhfncid058p7n1n8v29l6wxm3mhdqfassscihbsxfwz3iwb2zms";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./CVE-2017-14166.patch
|
||||
./CVE-2017-14502.patch
|
||||
|
||||
# LibreSSL patch; this is from upstream, and can be removed when the next release is made.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/libarchive/libarchive/commit/5da00ad75b09e262774ec3675bbe4d5a4502a852.patch";
|
||||
sha256 = "0np1i9r6mfxmbksj7mmf5abpnmlmg63704p9z3ihjh2rnq596c1v";
|
||||
})
|
||||
];
|
||||
|
||||
outputs = [ "out" "lib" "dev" ];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
|
|
|||
|
|
@ -27,12 +27,7 @@ stdenv.mkDerivation rec {
|
|||
++ stdenv.lib.optional stdenv.isDarwin gettext
|
||||
++ stdenv.lib.optional enableCapabilities libcap;
|
||||
|
||||
preConfigure = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
|
||||
# This is intentional: gpg-error-config is a shell script that will work during the build
|
||||
mkdir -p "$NIX_BUILD_TOP"/bin
|
||||
ln -s ${libgpgerror.dev}/bin/gpg-error-config "$NIX_BUILD_TOP/bin"
|
||||
export PATH="$NIX_BUILD_TOP/bin:$PATH"
|
||||
'';
|
||||
configureFlags = [ "--with-libgpg-error-prefix=${libgpgerror.dev}" ];
|
||||
|
||||
# Make sure libraries are correct for .pc and .la files
|
||||
# Also make sure includes are fixed for callers who don't use libgpgcrypt-config
|
||||
|
|
|
|||
|
|
@ -16,11 +16,11 @@ in
|
|||
with stdenv.lib;
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libinput-${version}";
|
||||
version = "1.12.2";
|
||||
version = "1.12.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.freedesktop.org/software/libinput/${name}.tar.xz";
|
||||
sha256 = "1w8wkh03j5zdgbamyj7wv2f6k76kd0w4z04abxxf5b0mnplrb6vb";
|
||||
sha256 = "0mg2zqbjcgj0aq7d9nwawvyhx43vakilahrc83hrfyif3a3gyrpj";
|
||||
};
|
||||
|
||||
outputs = [ "bin" "out" "dev" ];
|
||||
|
|
@ -29,13 +29,10 @@ stdenv.mkDerivation rec {
|
|||
(mkFlag documentationSupport "documentation")
|
||||
(mkFlag eventGUISupport "debug-gui")
|
||||
(mkFlag testsSupport "tests")
|
||||
"--libexecdir=${placeholder "bin"}/libexec"
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
mesonFlags="$mesonFlags --libexecdir=$bin/libexec"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkgconfig meson ninja ]
|
||||
nativeBuildInputs = [ pkgconfig meson ninja python3Packages.python ]
|
||||
++ optionals documentationSupport [ doxygen graphviz ]
|
||||
++ optionals testsSupport [ check valgrind python3Packages.pyparsing ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, gettext, libgpgerror }:
|
||||
{ buildPackages, stdenv, fetchurl, gettext, libgpgerror }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libksba-1.3.5";
|
||||
|
|
@ -12,6 +12,9 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [ gettext ];
|
||||
propagatedBuildInputs = [ libgpgerror ];
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
|
||||
configureFlags = [ "--with-libgpg-error-prefix=${libgpgerror.dev}" ];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $dev/bin
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libmicrohttpd-${version}";
|
||||
version = "0.9.59";
|
||||
version = "0.9.60";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/libmicrohttpd/${name}.tar.gz";
|
||||
sha256 = "0g4jgnv43yddr9yxrqg11632rip0lg5c53gmy5wy3c0i1dywv74v";
|
||||
sha256 = "0wf457bqbdvx53clk4dg2620p83vk4757l7lrpvmxrd9jlzms3nd";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" "info" ];
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
, fixedPoint ? false, withCustomModes ? true }:
|
||||
|
||||
let
|
||||
version = "1.2.1";
|
||||
version = "1.3";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libopus-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://archive.mozilla.org/pub/opus/opus-${version}.tar.gz";
|
||||
sha256 = "0ch7yzgg4bn1g36bpjsfrgs4n19c84d7wpdida6yzifrrhwx7byg";
|
||||
sha256 = "0l651n19h0vhc0sn6w2c95hgqks1i8m4b3j04ncaznzjznp6jgag";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
|
|
|||
|
|
@ -3,20 +3,20 @@
|
|||
assert zlib != null;
|
||||
|
||||
let
|
||||
patchVersion = "1.6.34";
|
||||
patchVersion = "1.6.35";
|
||||
patch_src = fetchurl {
|
||||
url = "mirror://sourceforge/libpng-apng/libpng-${patchVersion}-apng.patch.gz";
|
||||
sha256 = "1ha4npf9mfrzp0srg8a5amks5ww84xzfpjbsj8k3yjjpai798qg6";
|
||||
sha256 = "011fq5wgyz07pfrqs9albixbiksx3agx5nkcf3535gbvhlwv5khq";
|
||||
};
|
||||
whenPatched = stdenv.lib.optionalString apngSupport;
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "libpng" + whenPatched "-apng" + "-${version}";
|
||||
version = "1.6.34";
|
||||
version = "1.6.35";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/libpng/libpng-${version}.tar.xz";
|
||||
sha256 = "1xjr0v34fyjgnhvaa1zixcpx5yvxcg4zwvfh0fyklfyfj86rc7ig";
|
||||
sha256 = "1mxwjf5cdzk7g0y51gl9w3f0j5ypcls05i89kgnifjaqr742x493";
|
||||
};
|
||||
postPatch = whenPatched "gunzip < ${patch_src} | patch -Np1";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ stdenv, fetchFromGitHub, cmake, openssl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libsignal-protocol-c";
|
||||
pname = "libsignal-protocol-c";
|
||||
version = "2.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
|
|
|||
|
|
@ -2,15 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libsignon-glib";
|
||||
version = "3639a2e90447e4640a03a44972560afe8f61aa48";
|
||||
|
||||
name = "${pname}-2018-10-24";
|
||||
version = "unstable-2018-10-24";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" "py" ];
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://gitlab.com/accounts-sso/${pname}";
|
||||
rev = version;
|
||||
rev = "3639a2e90447e4640a03a44972560afe8f61aa48";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "1cq19zbsx4c57dc5gp3shp8lzcr1hw2ynylpn1nkvfyyrx80m60w";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,28 +1,22 @@
|
|||
{ stdenv, fetchurl, pkgconfig, zlib, libjpeg, xz }:
|
||||
{ stdenv
|
||||
, fetchurl
|
||||
|
||||
, pkgconfig
|
||||
|
||||
, zlib
|
||||
, libjpeg
|
||||
, xz
|
||||
}:
|
||||
|
||||
let
|
||||
version = "4.0.9";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
version = "4.0.10";
|
||||
name = "libtiff-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.osgeo.org/libtiff/tiff-${version}.tar.gz";
|
||||
sha256 = "1kfg4q01r4mqn7dj63ifhi6pmqzbf4xax6ni6kkk81ri5kndwyvf";
|
||||
sha256 = "1r4np635gr6zlc0bic38dzvxia6iqzcrary4n1ylarzpr8fd2lic";
|
||||
};
|
||||
|
||||
prePatch = let
|
||||
debian = fetchurl {
|
||||
# When the URL disappears, it typically means that Debian has new patches
|
||||
# (probably security) and updating to new tarball will apply them as well.
|
||||
url = http://http.debian.net/debian/pool/main/t/tiff/tiff_4.0.9-6.debian.tar.xz;
|
||||
sha256 = "10yk5npchxscgsnd7ihd3bbbw2fxkl7ni0plm43c9q4nwp6ms52f";
|
||||
};
|
||||
in ''
|
||||
tar xf ${debian}
|
||||
patches="$patches $(sed 's|^|debian/patches/|' < debian/patches/series)"
|
||||
'';
|
||||
|
||||
outputs = [ "bin" "dev" "out" "man" "doc" ];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{ stdenv, lib, fetchpatch, fetchFromGitHub, autoconf, automake, libtool, pkgconfig }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.23.1";
|
||||
version = "1.23.2";
|
||||
name = "libuv-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libuv";
|
||||
repo = "libuv";
|
||||
rev = "v${version}";
|
||||
sha256 = "14h8dcyx81sbckbgmqhagncyz8s6z6qzpx0fy8p79whq5hb3f4jg";
|
||||
sha256 = "1xfggj0mbbshj7zyccnfw7wyk42qfg4ng3l4aslw014mg8gaskv7";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "01org";
|
||||
repo = "libva-utils";
|
||||
rev = version;
|
||||
sha256 = "113wdmi4r0qligizj9zmd4a8ml1996x9g2zp2i4pmhb8frv9m8j2";
|
||||
sha256 = "0k5v72prcq462x780j9vpqf4ckrpqf536z6say81wpna0l0qbd98";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig ];
|
||||
|
|
|
|||
|
|
@ -6,14 +6,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libva-${lib.optionalString minimal "minimal-"}${version}";
|
||||
version = "2.1.0";
|
||||
version = "2.3.0";
|
||||
|
||||
# update libva-utils and vaapiIntel as well
|
||||
src = fetchFromGitHub {
|
||||
owner = "01org";
|
||||
repo = "libva";
|
||||
rev = version;
|
||||
sha256 = "1a60lrgr65hx9b2qp0gjky1298c4d4zp3ap6vnmmz850sxx5rm8w";
|
||||
sha256 = "0zip22b5qwyjygsmrmjq62hdpl9z77d84h5hni8cn6xz5cmbw29z";
|
||||
};
|
||||
|
||||
outputs = [ "dev" "out" ];
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libxl";
|
||||
pname = "libxl";
|
||||
version = "3.8.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.libxl.com/download/${name}-lin-${version}.tar.gz";
|
||||
url = "http://www.libxl.com/download/${pname}-lin-${version}.tar.gz";
|
||||
sha256 = "1zdbahhyhr70s8hygwp43j9z4zmglyrr782hkcm1078yvkr2f2fm";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ let
|
|||
in
|
||||
|
||||
let
|
||||
version = "18.2.4";
|
||||
version = "18.2.5";
|
||||
branch = head (splitString "." version);
|
||||
in
|
||||
|
||||
|
|
@ -81,7 +81,7 @@ let self = stdenv.mkDerivation {
|
|||
"ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
|
||||
"https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
|
||||
];
|
||||
sha256 = "0knbr6nl7qk5bijz6p7yqr8fc806gvmz9p6jlnvdaxkqnpmil7b2";
|
||||
sha256 = "0wrbdk988mh42bbpicf5knx5pdqs3xp05s71alqkbr9j523k4b5i";
|
||||
};
|
||||
|
||||
prePatch = "patchShebangs .";
|
||||
|
|
|
|||
|
|
@ -12,17 +12,18 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "6.1";
|
||||
version = "6.1-20181027";
|
||||
name = "ncurses-${version}" + lib.optionalString (abiVersion == "5") "-abi5-compat";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/ncurses/ncurses-${version}.tar.gz";
|
||||
sha256 = "05qdmbmrrn88ii9f66rkcmcyzp1kb1ymkx7g040lfkd1nkp7w1da";
|
||||
urls = [
|
||||
"https://invisible-mirror.net/archives/ncurses/current/ncurses-${version}.tgz"
|
||||
"ftp://ftp.invisible-island.net/ncurses/current/ncurses-${version}.tgz"
|
||||
];
|
||||
sha256 = "1xn6wpi22jc61158w4ifq6s1fvilhmsy1in2srn3plk8pm0d4902";
|
||||
};
|
||||
|
||||
# The patch st-0.7.patch needs to be removed, if ncurses is upgraded in the future.
|
||||
# It is necessary for the 6.1 version of ncurses.
|
||||
patches = [ ./st-0.7.patch ] ++ lib.optional (!stdenv.cc.isClang) ./clang.patch;
|
||||
patches = lib.optional (!stdenv.cc.isClang) ./clang.patch;
|
||||
|
||||
outputs = [ "out" "dev" "man" ];
|
||||
setOutputFlags = false; # some aren't supported
|
||||
|
|
@ -32,6 +33,7 @@ stdenv.mkDerivation rec {
|
|||
"--without-debug"
|
||||
"--enable-pc-files"
|
||||
"--enable-symlinks"
|
||||
"--with-manpage-format=normal"
|
||||
] ++ lib.optional unicode "--enable-widec"
|
||||
++ lib.optional (!withCxx) "--without-cxx"
|
||||
++ lib.optional (abiVersion == "5") "--with-abi-version=5"
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
diff --git a/misc/terminfo.src b/misc/terminfo.src
|
||||
index 84f4810..ac300a7 100644
|
||||
--- a/misc/terminfo.src
|
||||
+++ b/misc/terminfo.src
|
||||
@@ -6260,7 +6260,7 @@ st-0.7|simpleterm 0.7,
|
||||
%=%t3%e%p1%d%;m,
|
||||
sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|
|
||||
%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p7%t;8%;m,
|
||||
- Ss=\E]52;%p1%s;%p2%s\007, kDN3=\E[1;3B, kDN5=\E[1;5B,
|
||||
+ Ms=\E]52;%p1%s;%p2%s\007, kDN3=\E[1;3B, kDN5=\E[1;5B,
|
||||
kLFT3=\E[1;3D, kLFT5=\E[1;5D, kNXT3=\E[6;3~,
|
||||
kNXT5=\E[6;5~, kPRV3=\E[5;3~, kPRV5=\E[5;5~,
|
||||
kRIT3=\E[1;3C, kRIT5=\E[1;5C, kUP3=\E[1;3A, kUP5=\E[1;5A,
|
||||
|
|
@ -8,11 +8,11 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "nss-${version}";
|
||||
version = "3.39";
|
||||
version = "3.40";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/security/nss/releases/NSS_3_39_RTM/src/${name}.tar.gz";
|
||||
sha256 = "0jw6qlfl2g47hhx056nvnj6h92bk3sn46hy3ig61a911dzblvrkb";
|
||||
url = "mirror://mozilla/security/nss/releases/NSS_3_40_RTM/src/${name}.tar.gz";
|
||||
sha256 = "1p9jidi3nysirf3lhkrqkjjrf2cw3y2wz2jgjvsjn1ysidxhhqh5";
|
||||
};
|
||||
|
||||
buildInputs = [ perl zlib sqlite ]
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "sqlite-analyzer-${version}";
|
||||
version = "3.24.0";
|
||||
version = "3.25.3";
|
||||
|
||||
src = assert version == sqlite.version; fetchurl {
|
||||
url = "https://sqlite.org/2018/sqlite-src-${archiveVersion version}.zip";
|
||||
sha256 = "19ck2sg13i6ga5vapxak42jn6050vpfid0zrmah7jh32mksh58vj";
|
||||
sha256 = "08b4fs9mrah5gxl1865smlqs2ba6g7k7d6pfa084i6d78342p4n7";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
|
|
|||
|
|
@ -10,12 +10,12 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "sqlite-${version}";
|
||||
version = "3.24.0";
|
||||
version = "3.25.3";
|
||||
|
||||
# NB! Make sure to update analyzer.nix src (in the same directory).
|
||||
src = fetchurl {
|
||||
url = "https://sqlite.org/2018/sqlite-autoconf-${archiveVersion version}.tar.gz";
|
||||
sha256 = "0jmprv2vpggzhy7ma4ynmv1jzn3pfiwzkld0kkg6hvgvqs44xlfr";
|
||||
sha256 = "1pgkja0d13qp5p79ik9kh9lm5y79cwyxwwfc80cr8a1rw5xzksq0";
|
||||
};
|
||||
|
||||
outputs = [ "bin" "dev" "out" ];
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "intel-vaapi-driver-${version}";
|
||||
inherit (libva) version;
|
||||
version = "2.2.0"; # generally try to match libva version, but not required
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "intel-vaapi-driver";
|
||||
rev = version;
|
||||
sha256 = "15ag4al9h6b8f8sw1zpighyhsmr5qfqp1882q7r3gsh5g4cnj763";
|
||||
sha256 = "1z8iqnswias2gph61yzyal53456y71ff98f21cs17hw4qjfkwa6k";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, cmake, yasm
|
||||
{ stdenv, fetchurl, fetchpatch, cmake, yasm
|
||||
, debugSupport ? false # Run-time sanity checks (debugging)
|
||||
, highbitdepthSupport ? false # false=8bits per channel, true=10/12bits per channel
|
||||
, werrorSupport ? false # Warnings as errors
|
||||
|
|
@ -16,19 +16,28 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "x265-${version}";
|
||||
version = "2.7";
|
||||
version = "2.9";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"http://get.videolan.org/x265/x265_${version}.tar.gz"
|
||||
"https://github.com/videolan/x265/archive/${version}.tar.gz"
|
||||
"https://get.videolan.org/x265/x265_${version}.tar.gz"
|
||||
"ftp://ftp.videolan.org/pub/videolan/x265/x265_${version}.tar.gz"
|
||||
];
|
||||
sha256 = "18llni1m8kfvdwy5bp950z6gyd0nijmvi3hzd6gd8vpy5yk5zrym";
|
||||
sha256 = "090hp4216isis8q5gb7bwzia8rfyzni54z21jnwm97x3hiy6ibpb";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
patchPhase = ''
|
||||
patches = [
|
||||
# Fix issue #442 (linking issue on non-x86 platforms)
|
||||
# Applies on v2.9 only, this should be removed at next update
|
||||
(fetchpatch {
|
||||
url = "https://bitbucket.org/multicoreware/x265/commits/471726d3a0462739ff8e3518eb1a1e8a01de4e8d/raw";
|
||||
sha256 = "0mj8lb8ng8lrhzjavap06vjhqf6j0r3sn76c6rhs3012f86lv928";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
sed -i 's/unknown/${version}/g' source/cmake/version.cmake
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ stdenv, fetchFromGitHub, premake5, doxygen, libsodium, mbedtls }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "yojimbo";
|
||||
pname = "yojimbo";
|
||||
version = "1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ stdenv, buildPythonPackage, isPy3k, fetchPypi, nose }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "Metaphone";
|
||||
pname = "metaphone";
|
||||
version = "0.6";
|
||||
name = "metaphone-${version}";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
pname = "Metaphone";
|
||||
inherit version;
|
||||
sha256 = "09ysaczwh2rlsqq9j5fz7m4pq2fs0axp5vvivrpfrdvclvffl2xd";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
patches = [
|
||||
(substituteAll {
|
||||
src = ./setup.patch;
|
||||
version = "3${stdenv.lib.versions.minor python.version}";
|
||||
version_ = "3${stdenv.lib.versions.minor python.version}";
|
||||
})
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -3,9 +3,9 @@
|
|||
@@ -39,7 +39,7 @@
|
||||
if '3' in l[2:]:
|
||||
return l.replace('libboost', 'boost')
|
||||
|
||||
|
||||
-libboost = get_libboost_name()
|
||||
+libboost = 'boost_python@version@'
|
||||
|
||||
+libboost = 'boost_python@version_@'
|
||||
|
||||
setup(
|
||||
name='py3exiv2',
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
name = "pyinputevent";
|
||||
pname = "pyinputevent";
|
||||
version = "2016-10-18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
name = "pymaging";
|
||||
pname = "pymaging";
|
||||
version = "unstable-2016-11-16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
name = "pymaging-png";
|
||||
pname = "pymaging-png";
|
||||
version = "unstable-2016-11-16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@
|
|||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
name = "qutip";
|
||||
pname = "qutip";
|
||||
version = "2.2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://qutip.googlecode.com/files/QuTiP-2.2.0.tar.gz";
|
||||
url = "https://qutip.googlecode.com/files/QuTiP-${version}.tar.gz";
|
||||
sha256 = "a26a639d74b2754b3a1e329d91300e587e8c399d8a81d8f18a4a74c6d6f02ba3";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
name = "rbtools";
|
||||
pname = "rbtools";
|
||||
version = "0.7.2";
|
||||
disabled = isPy3k;
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
name = "repocheck";
|
||||
pname = "repocheck";
|
||||
version = "2015-08-05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
|
|
|||
|
|
@ -11,8 +11,6 @@ buildPythonPackage rec {
|
|||
sha256 = "ec22d826a36ed72a7358ff3fe56cbd4ba69dd7a6718ffd450ff0e9df7a47ce6a";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
nativeBuildInputs = [ pytest ];
|
||||
propagatedBuildInputs = [ urllib3 idna chardet certifi ];
|
||||
# sadly, tests require networking
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
name = "Snapper-GUI";
|
||||
pname = "Snapper-GUI";
|
||||
version = "0.1";
|
||||
|
||||
src = fetchgit {
|
||||
|
|
|
|||
|
|
@ -25,10 +25,11 @@
|
|||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "Sphinx";
|
||||
pname = "sphinx";
|
||||
version = "1.7.9";
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
pname = "Sphinx";
|
||||
inherit version;
|
||||
sha256 = "217a7705adcb573da5bbe1e0f5cab4fa0bd89fd9342c9159121746f593c2d5a4";
|
||||
};
|
||||
LC_ALL = "en_US.UTF-8";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{ lib
|
||||
, fetchPypi
|
||||
, fetchpatch
|
||||
, buildPythonPackage
|
||||
, pytest
|
||||
, mock
|
||||
|
|
@ -9,13 +10,23 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "SQLAlchemy";
|
||||
version = "1.2.12";
|
||||
version = "1.2.13";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "c5951d9ef1d5404ed04bae5a16b60a0779087378928f997a294d1229c6ca4d3e";
|
||||
sha256 = "84412de3794acee05630e7788f25e80e81f78eb4837e7b71d0499129f660486a";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fix for failing doc tests
|
||||
# https://bitbucket.org/zzzeek/sqlalchemy/issues/4370/sqlite-325x-docs-tutorialrst-doctests-fail
|
||||
(fetchpatch {
|
||||
name = "doc-test-fixes.patch";
|
||||
url = https://bitbucket.org/zzzeek/sqlalchemy/commits/63279a69e2b9277df5e97ace161fa3a1bb4f29cd/raw;
|
||||
sha256 = "1x25aj5hqmgjdak4hllya0rf0srr937k1hwaxb24i9ban607hjri";
|
||||
})
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytest
|
||||
mock
|
||||
|
|
@ -32,4 +43,4 @@ buildPythonPackage rec {
|
|||
description = "A Python SQL toolkit and Object Relational Mapper";
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
}:
|
||||
|
||||
buildPythonPackage {
|
||||
name = "svg2tikz";
|
||||
pname = "svg2tikz";
|
||||
version = "1.0.0";
|
||||
disabled = ! isPy27;
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
name = "urwidtrees";
|
||||
pname = "urwidtrees";
|
||||
version = "1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
buildPythonPackage rec {
|
||||
pname = "waitress-django";
|
||||
version = "0.0.0";
|
||||
name = pname;
|
||||
|
||||
src = ./.;
|
||||
pythonPath = [ django_1_8 waitress ];
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ let
|
|||
v8 = v8_3_16_14;
|
||||
|
||||
rainbow_rake = buildRubyGem {
|
||||
name = "rake";
|
||||
pname = "rake";
|
||||
gemName = "rake";
|
||||
source.sha256 = "01j8fc9bqjnrsxbppncai05h43315vmz9fwg28qdsgcjw9ck1d7n";
|
||||
type = "gem";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, fetchzip
|
||||
, lib
|
||||
, callPackage
|
||||
|
|
@ -70,8 +71,8 @@ let
|
|||
yaramod = fetchFromGitHub {
|
||||
owner = "avast-tl";
|
||||
repo = "yaramod";
|
||||
rev = "v2.1.2";
|
||||
sha256 = "1rpyqzkrqvk721hf75wb7aasw5mzp9wz4j89p0x1l9p5x1b3maz3";
|
||||
rev = "v2.2.2";
|
||||
sha256 = "0cq9h4h686q9ybamisbl797g6xjy211s3cq83nixkwkigmz48ccp";
|
||||
};
|
||||
jsoncpp = fetchFromGitHub {
|
||||
owner = "open-source-parsers";
|
||||
|
|
@ -181,6 +182,20 @@ in stdenv.mkDerivation rec {
|
|||
(yaramod // { dep_name = "yaramod"; })
|
||||
];
|
||||
|
||||
# Use newer yaramod to fix w/bison 3.2+
|
||||
patches = [
|
||||
# 2.1.2 -> 2.2.1
|
||||
(fetchpatch {
|
||||
url = https://github.com/avast-tl/retdec/commit/c9d23da1c6e23c149ed684c6becd3f3828fb4a55.patch;
|
||||
sha256 = "0hdq634f72fihdy10nx2ajbps561w03dfdsy5r35afv9fapla6mv";
|
||||
})
|
||||
# 2.2.1 -> 2.2.2
|
||||
(fetchpatch {
|
||||
url = https://github.com/avast-tl/retdec/commit/fb85f00754b5d13b781385651db557741679721e.patch;
|
||||
sha256 = "0a8mwmwb39pr5ag3q11nv81ncdk51shndqrkm92shqrmdq14va52";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = (lib.concatMapStrings patchDep external_deps) + ''
|
||||
# install retdec-support
|
||||
echo "Checking version of retdec-support"
|
||||
|
|
|
|||
|
|
@ -0,0 +1,41 @@
|
|||
From 7820fc268fae4353118b6355f1d4b9e1b7eeebec Mon Sep 17 00:00:00 2001
|
||||
From: Philippe Waroquiers <philippe.waroquiers@skynet.be>
|
||||
Date: Sun, 28 Oct 2018 18:35:11 +0100
|
||||
Subject: [PATCH 1/1] Fix dependencies between libcoregrind*.a and
|
||||
*m_main.o/*m_libcsetjmp.o
|
||||
|
||||
The primary and secondary coregrind libraries must be updated
|
||||
when m_main.c or m_libcsetjmp.c are changed.
|
||||
|
||||
A dependency was missing between libcoregrind*.a and libnolto_coregrind*.a,
|
||||
and so tools were not relinked when m_main.c or m_libcsetjmp.c were
|
||||
changed.
|
||||
---
|
||||
coregrind/Makefile.am | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am
|
||||
index 914a270..8de1996 100644
|
||||
--- a/coregrind/Makefile.am
|
||||
+++ b/coregrind/Makefile.am
|
||||
@@ -511,6 +511,8 @@ libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_CFLAGS += \
|
||||
endif
|
||||
libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_LIBADD = \
|
||||
$(libnolto_coregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_OBJECTS)
|
||||
+libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_DEPENDENCIES = \
|
||||
+ libnolto_coregrind-@VGCONF_ARCH_PRI@-@VGCONF_OS@.a
|
||||
|
||||
if VGCONF_HAVE_PLATFORM_SEC
|
||||
libcoregrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_a_SOURCES = \
|
||||
@@ -531,6 +533,8 @@ libcoregrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_a_CFLAGS += \
|
||||
endif
|
||||
libcoregrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_a_LIBADD = \
|
||||
$(libnolto_coregrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_a_OBJECTS)
|
||||
+libcoregrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_a_DEPENDENCIES = \
|
||||
+ libnolto_coregrind-@VGCONF_ARCH_SEC@-@VGCONF_OS@.a
|
||||
endif
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
--
|
||||
2.9.3
|
||||
|
||||
|
|
@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "19ds42jwd89zrsjb94g7gizkkzipn8xik3xykrpcqxylxyzi2z03";
|
||||
};
|
||||
|
||||
patches = [ ./coregrind-makefile-race.patch ];
|
||||
|
||||
outputs = [ "out" "dev" "man" "doc" ];
|
||||
|
||||
hardeningDisable = [ "stackprotector" ];
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- a/mesonbuild/coredata.py
|
||||
+++ b/mesonbuild/coredata.py
|
||||
@@ -282,18 +282,13 @@
|
||||
@@ -298,18 +298,13 @@
|
||||
'''
|
||||
if option.endswith('dir') and os.path.isabs(value) and \
|
||||
option not in builtin_dir_noprefix_options:
|
||||
|
|
@ -22,4 +22,4 @@
|
|||
+ value = value[skip:]
|
||||
return value
|
||||
|
||||
def init_builtins(self, options):
|
||||
def init_builtins(self):
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue