Merge master into staging

This commit is contained in:
Frederik Rietdijk 2018-05-30 17:54:53 +02:00
commit da3495673a
51 changed files with 2608 additions and 10741 deletions

View file

@ -3536,6 +3536,11 @@
github = "sleexyz";
name = "Sean Lee";
};
smaret = {
email = "sebastien.maret@icloud.com";
github = "smaret";
name = "Sébastien Maret";
};
smironov = {
email = "grrwlf@gmail.com";
github = "grwlf";

View file

@ -1,6 +1,6 @@
{
x86_64-linux = "/nix/store/z6avpvg24f6d1br2sr6qlphsq3h4d91v-nix-2.0.2";
i686-linux = "/nix/store/cdqjyb9srhwkc4gqbknnap7y31lws4yq-nix-2.0.2";
aarch64-linux = "/nix/store/fbgaa3fb2am30klwv4lls44njwqh487a-nix-2.0.2";
x86_64-darwin = "/nix/store/hs8mxsvdhm95dxgx943d74fws01j2zj3-nix-2.0.2";
x86_64-linux = "/nix/store/8d9zsq17v8f7lgbc5ca6gv438gk1ydqm-nix-2.0.3";
i686-linux = "/nix/store/7k7ca4ck24yqinbr9nyl5z2wmcx4l81g-nix-2.0.3";
aarch64-linux = "/nix/store/ckmrh426n1swlq9h4d53hvrxjc72avzp-nix-2.0.3";
x86_64-darwin = "/nix/store/2jp9d9qns3372hkx4k523hc1bbzkr4yp-nix-2.0.3";
}

View file

@ -27,6 +27,7 @@ let
forwarders { ${concatMapStrings (entry: " ${entry}; ") cfg.forwarders} };
directory "/var/run/named";
pid-file "/var/run/named/named.pid";
${cfg.extraOptions}
};
${cfg.extraConfig}
@ -141,6 +142,15 @@ in
";
};
extraOptions = mkOption {
type = types.lines;
default = "";
description = ''
Extra lines to be added verbatim to the options section of the
generated named configuration file.
'';
};
configFile = mkOption {
type = types.path;
default = confFile;

View file

@ -65,6 +65,10 @@ let
XauthPath=${pkgs.xorg.xauth}/bin/xauth
DisplayCommand=${Xsetup}
DisplayStopCommand=${Xstop}
EnableHidpi=${if cfg.enableHidpi then "true" else "false"}
[Wayland]
EnableHidpi=${if cfg.enableHidpi then "true" else "false"}
${optionalString cfg.autoLogin.enable ''
[Autologin]
@ -95,6 +99,17 @@ in
'';
};
enableHidpi = mkOption {
type = types.bool;
default = true;
description = ''
Whether to enable automatic HiDPI mode.
</para>
<para>
Versions up to 0.17 are broken so this only works from 0.18 onwards.
'';
};
extraConfig = mkOption {
type = types.lines;
default = "";

View file

@ -248,6 +248,7 @@ in rec {
tests.avahi = callTest tests/avahi.nix {};
tests.beegfs = callTest tests/beegfs.nix {};
tests.bittorrent = callTest tests/bittorrent.nix {};
tests.bind = callTest tests/bind.nix {};
tests.blivet = callTest tests/blivet.nix {};
tests.boot = callSubTests tests/boot.nix {};
tests.boot-stage1 = callTest tests/boot-stage1.nix {};

27
nixos/tests/bind.nix Normal file
View file

@ -0,0 +1,27 @@
import ./make-test.nix {
name = "bind";
machine = { pkgs, lib, ... }: {
services.bind.enable = true;
services.bind.extraOptions = "empty-zones-enable no;";
services.bind.zones = lib.singleton {
name = ".";
file = pkgs.writeText "root.zone" ''
$TTL 3600
. IN SOA ns.example.org. admin.example.org. ( 1 3h 1h 1w 1d )
. IN NS ns.example.org.
ns.example.org. IN A 192.168.0.1
ns.example.org. IN AAAA abcd::1
1.0.168.192.in-addr.arpa IN PTR ns.example.org.
'';
};
};
testScript = ''
$machine->waitForUnit('bind.service');
$machine->waitForOpenPort(53);
$machine->succeed('host 192.168.0.1 127.0.0.1 | grep -qF ns.example.org');
'';
}

View file

@ -8,8 +8,11 @@ in stdenv.mkDerivation rec {
url = "http://zakalwe.fi/uade/uade2/uade-${version}.tar.bz2";
sha256 = "04nn5li7xy4g5ysyjjngmv5d3ibxppkbb86m10vrvadzxdd4w69v";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ which libao ];
nativeBuildInputs = [ pkgconfig which ];
buildInputs = [ libao ];
enableParallelBuilding = true;
hardeningDisable = [ "format" ];
meta = with stdenv.lib; {
description = "Plays old Amiga tunes through UAE emulation and cloned m68k-assembler Eagleplayer API";

View file

@ -1,14 +1,14 @@
{ stdenv, lib, fetchurl, dpkg, gtk2, atk, glib, pango, gdk_pixbuf, cairo
{ stdenv, lib, fetchurl, dpkg, gnome3, gtk2, atk, glib, pango, gdk_pixbuf, cairo
, freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr
, libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver
, libxcb, makeWrapper, nodejs
, GConf, nss, nspr, alsaLib, cups, expat, libudev, libpulseaudio }:
, nss, nspr, alsaLib, cups, expat, libudev, libpulseaudio }:
let
libPath = stdenv.lib.makeLibraryPath [
stdenv.cc.cc gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb
libXrender libX11 libXtst libXScrnSaver GConf nss nspr alsaLib cups expat libudev libpulseaudio
libXrender libX11 libXtst libXScrnSaver gnome3.gconf nss nspr alsaLib cups expat libudev libpulseaudio
];
in
stdenv.mkDerivation rec {

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "vcal-${version}";
version = "2.7";
version = "2.8";
src = fetchurl {
url = "http://waynemorrison.com/software/vcal";
sha256 = "0fknrlad7vb84ngh242xjaq96vkids85ksnxaflk2cr9wcwxfmix";
sha256 = "0jrm0jzqxb1xjp24hwbzlxsh22gjssay9gj4zszljzdm68r5afvc";
};
nativeBuildInputs = [ perl ]; # for pod2man
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
substitute ${src} $out/bin/vcal \
--replace /usr/bin/perl ${perl}/bin/perl
chmod 0755 $out/bin/*
pod2man -n vcal ${src} > $out/share/man/man1/vcal.1
pod2man --name=vcal --release=${version} ${src} > $out/share/man/man1/vcal.1
runHook postInstall
'';
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Parser for VCalendar and ICalendar files, usable from the command line";
homepage = http://waynemorrison.com/software/;
license = licenses.unfree; # "These are made publicly available for personal use."
license = licenses.asl20;
maintainers = with maintainers; [ peterhoeg ];
};
}

View file

@ -1,20 +1,27 @@
{ mkDerivation, lib, fetchurl, pkgconfig, which
{ mkDerivation, lib, fetchFromGitHub, autoreconfHook, perl, pkgconfig, which
, libtool, openssl, qtbase, qttools }:
mkDerivation rec {
name = "xca-${version}";
version = "1.4.1";
version = "2.0.1";
src = fetchurl {
url = "mirror://sourceforge/xca/${name}.tar.gz";
sha256 = "11niik2m4yswkp71hrdh54z5kgkvdg8y0b6wdqbrn6vy1n8gz63q";
src = fetchFromGitHub {
owner = "chris2511";
repo = "xca";
rev = "RELEASE.${version}";
sha256 = "0906xnmqzd9q5irxzm19361vhzig9yqsmf6wsc3rggniix5bk3a8";
};
enableParallelBuilding = true;
postPatch = ''
substituteInPlace doc/code2html \
--replace /usr/bin/perl ${perl}/bin/perl
'';
buildInputs = [ libtool openssl qtbase qttools ];
nativeBuildInputs = [ pkgconfig which ];
nativeBuildInputs = [ autoreconfHook pkgconfig which ];
enableParallelBuilding = true;
configureFlags = [ "CXXFLAGS=-std=c++11" ];

View file

@ -1,13 +1,11 @@
{ callPackage, fetchgit }:
{ callPackage, fetchurl }:
callPackage ./build.nix {
version = "4.8.9";
# TODO: for next version, prefer the unpatched tarball for the stable/default gambit.
git-version = "4.8.9-8-g793679bd";
git-version = "4.8.9";
SRC = fetchgit {
url = "https://github.com/feeley/gambit.git";
rev = "dd54a71dfc0bd09813592f1645d755867a02195d";
sha256 = "120kg73k39gshrwas8a3xcrxgnq1c7ww92wgy4d3mmrwy3j9nzzc";
SRC = fetchurl {
url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.8/source/gambit-v4_8_9-devel.tgz";
sha256 = "1gwzz1ag9hlv266nvfq1bhwzrps3f2yghhffasjjqy8i8xwnry5p";
};
}

View file

@ -1,11 +1,11 @@
{ callPackage, fetchgit }:
callPackage ./build.nix {
version = "unstable-2018-03-26";
git-version = "4.8.9-8-g793679bd";
version = "unstable-2018-05-30";
git-version = "4.8.9-54-gffe8841b";
SRC = fetchgit {
url = "https://github.com/feeley/gambit.git";
rev = "793679bd57eb6275cb06e6570b05f4a78df61bf9";
sha256 = "0bippvmrc8vcaa6ka3mhzfgkagb6a1616g7nxk0i0wapxai5cngj";
rev = "ffe8841b56330eb86fd794b16dc7f83914ecc7c5";
sha256 = "1xzkwa2f6zazybbgd5zynhr36krayhr29vsbras5ld63hkrxrp7q";
};
}

View file

@ -1,12 +1,12 @@
{ callPackage, fetchgit, gambit-unstable }:
callPackage ./build.nix {
version = "unstable-2018-04-03";
git-version = "0.13-DEV-357-ge61318dc";
version = "unstable-2018-05-12";
git-version = "0.13-DEV-437-gaefdb47f";
GAMBIT = gambit-unstable;
SRC = fetchgit {
url = "https://github.com/vyzo/gerbil.git";
rev = "e61318dcaa3a9c843e2cf259e67851f240e4beda";
sha256 = "1xd7yxiramifdxgp6b3s24z6nkkmy5h4a6pkchvy4w358qv1vqin";
rev = "aefdb47f3d1ceaa735fd5c3dcaac2aeb0d4d2436";
sha256 = "0xhsilm5kix5lsmykv273npp1gk6dgx9axh266mimwh7j0nxf7ms";
};
}

View file

@ -161,6 +161,8 @@ stdenv.mkDerivation rec {
# that in turn causes GHCi to abort
stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
hardeningDisable = [ "format" ];
postInstall = ''
# Install the bash completion file.
install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc

View file

@ -2,7 +2,7 @@
, buildPlatform, hostPlatform, targetPlatform
# build-tools
, bootPkgs, alex, happy
, bootPkgs, alex, happy, hscolour
, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4
, libffi, libiconv ? null, ncurses
@ -152,7 +152,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
perl autoconf automake m4 python3
ghc alex happy
ghc alex happy hscolour
];
# For building runtime libs

View file

@ -0,0 +1,210 @@
{ stdenv, targetPackages
, buildPlatform, hostPlatform, targetPlatform
# build-tools
, bootPkgs, alex, happy, hscolour
, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4
, libffi, libiconv ? null, ncurses
, useLLVM ? !targetPlatform.isx86
, # LLVM is conceptually a run-time-only depedendency, but for
# non-x86, we need LLVM to bootstrap later stages, so it becomes a
# build-time dependency too.
buildLlvmPackages, llvmPackages
, # If enabled, GHC will be built with the GPL-free but slower integer-simple
# library instead of the faster but GPLed integer-gmp library.
enableIntegerSimple ? false, gmp ? null
, # If enabled, use -fPIC when compiling static libs.
enableRelocatedStaticLibs ? targetPlatform != hostPlatform
, # Whether to build dynamic libs for the standard library (on the target
# platform). Static libs are always built.
enableShared ? !targetPlatform.isWindows && !targetPlatform.useAndroidPrebuilt
, # Whetherto build terminfo.
enableTerminfo ? !targetPlatform.isWindows
, # What flavour to build. An empty string indicates no
# specific flavour and falls back to ghc default values.
ghcFlavour ? stdenv.lib.optionalString (targetPlatform != hostPlatform) "perf-cross"
}:
assert !enableIntegerSimple -> gmp != null;
let
inherit (bootPkgs) ghc;
# TODO(@Ericson2314) Make unconditional
targetPrefix = stdenv.lib.optionalString
(targetPlatform != hostPlatform)
"${targetPlatform.config}-";
buildMK = ''
BuildFlavour = ${ghcFlavour}
ifneq \"\$(BuildFlavour)\" \"\"
include mk/flavours/\$(BuildFlavour).mk
endif
DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
'' + stdenv.lib.optionalString enableIntegerSimple ''
INTEGER_LIBRARY = integer-simple
'' + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
Stage1Only = YES
HADDOCK_DOCS = NO
BUILD_SPHINX_HTML = NO
BUILD_SPHINX_PDF = NO
'' + stdenv.lib.optionalString enableRelocatedStaticLibs ''
GhcLibHcOpts += -fPIC
GhcRtsHcOpts += -fPIC
'' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
EXTRA_CC_OPTS += -std=gnu99
'';
# Splicer will pull out correct variations
libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ]
++ stdenv.lib.optional (!enableIntegerSimple) gmp
++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
toolsForTarget =
if hostPlatform == buildPlatform then
[ targetPackages.stdenv.cc ] ++ stdenv.lib.optional useLLVM llvmPackages.llvm
else assert targetPlatform == hostPlatform; # build != host == target
[ stdenv.cc ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm;
targetCC = builtins.head toolsForTarget;
in
stdenv.mkDerivation rec {
version = "8.4.3";
name = "${targetPrefix}ghc-${version}";
src = fetchurl {
url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz";
sha256 = "1mk046vb561j75saz05rghhbkps46ym5aci4264dwc2qk3dayixf";
};
enableParallelBuilding = true;
outputs = [ "out" "doc" ];
patches = [(fetchpatch {
url = "https://git.haskell.org/hsc2hs.git/patch/738f3666c878ee9e79c3d5e819ef8b3460288edf";
sha256 = "0plzsbfaq6vb1023lsarrjglwgr9chld4q3m99rcfzx0yx5mibp3";
extraPrefix = "utils/hsc2hs/";
stripLen = 1;
})]
++ stdenv.lib.optional stdenv.isDarwin ./backport-dylib-command-size-limit.patch;
postPatch = "patchShebangs .";
# GHC is a bit confused on its cross terminology.
preConfigure = ''
for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do
export "''${env#TARGET_}=''${!env}"
done
# GHC is a bit confused on its cross terminology, as these would normally be
# the *host* tools.
export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
# Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}"
export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib"
export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf"
export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip"
echo -n "${buildMK}" > mk/build.mk
sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
'' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
'' + stdenv.lib.optionalString stdenv.isDarwin ''
export NIX_LDFLAGS+=" -no_dtrace_dof"
'';
# TODO(@Ericson2314): Always pass "--target" and always prefix.
configurePlatforms = [ "build" "host" ]
++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
# `--with` flags for libraries needed for RTS linker
configureFlags = [
"--datadir=$doc/share/doc/ghc"
"--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
] ++ stdenv.lib.optional (targetPlatform == hostPlatform && ! enableIntegerSimple) [
"--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib"
] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
"--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
"--enable-bootstrap-with-devel-snapshot"
] ++ stdenv.lib.optionals (targetPlatform.isAarch32) [
"CFLAGS=-fuse-ld=gold"
"CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
"CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
] ++ stdenv.lib.optionals (targetPlatform.isDarwin && targetPlatform.isAarch64) [
# fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/
"--disable-large-address-space"
];
# Make sure we never relax`$PATH` and hooks support for compatability.
strictDeps = true;
nativeBuildInputs = [
perl autoconf automake m4 python3
ghc alex happy hscolour
];
# For building runtime libs
depsBuildTarget = toolsForTarget;
buildInputs = libDeps hostPlatform;
propagatedBuildInputs = [ targetPackages.stdenv.cc ]
++ stdenv.lib.optional useLLVM llvmPackages.llvm;
depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform);
depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform);
# required, because otherwise all symbols from HSffi.o are stripped, and
# that in turn causes GHCi to abort
stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
checkTarget = "test";
hardeningDisable = [ "format" ];
postInstall = ''
for bin in "$out"/lib/${name}/bin/*; do
isELF "$bin" || continue
paxmark m "$bin"
done
# Install the bash completion file.
install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc
# Patch scripts to include "readelf" and "cat" in $PATH.
for i in "$out/bin/"*; do
test ! -h $i || continue
egrep --quiet '^#!' <(head -n 1 $i) || continue
sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
done
'';
passthru = {
inherit bootPkgs targetPrefix;
inherit llvmPackages;
# Our Cabal compiler name
haskellCompilerName = "ghc-8.4.3";
};
meta = {
homepage = http://haskell.org/ghc;
description = "The Glasgow Haskell Compiler";
maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
inherit (ghc.meta) license platforms;
};
}

View file

@ -2,7 +2,7 @@
, buildPlatform, hostPlatform, targetPlatform
# build-tools
, bootPkgs, alex, happy
, bootPkgs, alex, happy, hscolour
, autoconf, automake, coreutils, fetchgit, perl, python3, m4
, libffi, libiconv ? null, ncurses
@ -150,7 +150,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
perl autoconf automake m4 python3
ghc alex happy
ghc alex happy hscolour
];
# For building runtime libs
@ -168,6 +168,8 @@ stdenv.mkDerivation rec {
# that in turn causes GHCi to abort
stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
hardeningDisable = [ "format" ];
checkTarget = "test";
postInstall = ''

View file

@ -3,13 +3,13 @@
stdenv.mkDerivation ( rec {
name = "ponyc-${version}";
version = "0.21.3";
version = "0.22.2";
src = fetchFromGitHub {
owner = "ponylang";
repo = "ponyc";
rev = version;
sha256 = "0cdp6wbpirl3jnlqkm0hbxyz67v00nwhi4hvk4sq2g74f36j2bnm";
sha256 = "1sw038mci4174zn8n3b4p511bdwjb3hwrv5gyzbv477nna1y9lvn";
};
buildInputs = [ llvm makeWrapper which ];

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "pony-stable-${version}";
version = "0.1.1";
version = "0.1.2";
src = fetchFromGitHub {
owner = "ponylang";
repo = "pony-stable";
rev = version;
sha256 = "0v4039iijjv93m89s3dsikcbp1y0hml6g1agj44s6w2g4m8kiiw3";
sha256 = "1g0508r66qjx857cb1cycq98b0gw7s1zn1l7bplyj1psk8mqh7kz";
};
buildInputs = [ ponyc ];
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
description = "A simple dependency manager for the Pony language.";
homepage = https://www.ponylang.org;
license = stdenv.lib.licenses.bsd2;
maintainers = with stdenv.lib.maintainers; [ dipinhora kamilchm ];
maintainers = with stdenv.lib.maintainers; [ dipinhora kamilchm patternspandemic ];
platforms = stdenv.lib.platforms.unix;
};
}

View file

@ -658,6 +658,7 @@ self: super: {
# Need newer versions of their dependencies than the ones we have in LTS-11.x.
cabal2nix = super.cabal2nix.overrideScope (self: super: { hpack = self.hpack_0_28_2; hackage-db = self.hackage-db_2_0_1; });
dbus-hslogger = super.dbus-hslogger.overrideScope (self: super: { dbus = self.dbus_1_0_1; });
graphviz = (addBuildTool super.graphviz pkgs.graphviz).overrideScope (self: super: { wl-pprint-text = self.wl-pprint-text_1_2_0_0; base-compat = self.base-compat_0_10_1; });
status-notifier-item = super.status-notifier-item.overrideScope (self: super: { dbus = self.dbus_1_0_1; });
# https://github.com/bos/configurator/issues/22
@ -783,9 +784,6 @@ self: super: {
# Still needed as HUnit < 1.5
lifted-base = doJailbreak super.lifted-base;
# https://github.com/aslatter/parsec/issues/68
parsec = doJailbreak super.parsec;
# Don't depend on chell-quickcheck, which doesn't compile due to restricting
# QuickCheck to versions ">=2.3 && <2.9".
system-filepath = dontCheck super.system-filepath;
@ -803,7 +801,7 @@ self: super: {
# https://github.com/haskell/fgl/issues/60
# Needed for QuickCheck < 2.10
fgl = doJailbreak super.fgl;
fgl = dontCheck super.fgl;
fgl-arbitrary = doJailbreak super.fgl-arbitrary;
# The tests spuriously fail
@ -893,13 +891,12 @@ self: super: {
attoparsec = dontCheck super.attoparsec; # 1 out of 67 tests fails
int-cast = doJailbreak super.int-cast;
nix-derivation = doJailbreak super.nix-derivation;
graphviz = doJailbreak super.graphviz;
# Needs QuickCheck <2.10, HUnit <1.6 and base <4.10
pointfree = doJailbreak super.pointfree;
# Needs tasty-quickcheck ==0.8.*, which we don't have.
cryptohash-sha256 = doJailbreak super.cryptohash-sha256;
cryptohash-sha256 = dontCheck super.cryptohash-sha256;
cryptohash-sha1 = doJailbreak super.cryptohash-sha1;
cryptohash-md5 = doJailbreak super.cryptohash-md5;
text-short = doJailbreak super.text-short;

View file

@ -41,8 +41,8 @@ self: super: {
prePatch = "sed -i -e 's/process.*< 1.5,/process,/g' Cabal.cabal";
});
# jailbreak-cabal doesn't seem to work right with the native Cabal version.
jailbreak-cabal = pkgs.haskell.packages.ghc802.jailbreak-cabal;
# Build with the latest Cabal version, which works best albeit not perfectly.
jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_2_2_0_1; };
# https://github.com/bmillwood/applicative-quoters/issues/6
applicative-quoters = appendPatch super.applicative-quoters (pkgs.fetchpatch {

View file

@ -290,14 +290,6 @@ self: super: {
jailbreak = true;
});
jailbreak-cabal = super.jailbreak-cabal.override {
## • No instance for (Semigroup CDialect)
## arising from the superclasses of an instance declaration
## • In the instance declaration for Monoid CDialect
## Undo the override in `configuration-common.nix`: GHC 8.4 bumps Cabal to 2.1:
Cabal = self.Cabal;
};
kan-extensions = overrideCabal super.kan-extensions (drv: {
## Setup: Encountered missing dependencies:
## free ==4.*
@ -413,7 +405,7 @@ self: super: {
# Older versions don't compile.
base-compat = self.base-compat_0_10_1;
brick = self.brick_0_37;
brick = self.brick_0_37_1;
dhall = self.dhall_1_13_0;
dhall_1_13_0 = doJailbreak super.dhall_1_13_0; # support ansi-terminal 0.8.x
HaTeX = self.HaTeX_3_19_0_0;

View file

@ -38,7 +38,7 @@ core-packages:
- ghcjs-base-0
default-package-overrides:
# LTS Haskell 11.10
# LTS Haskell 11.11
- abstract-deque ==0.3
- abstract-deque-tests ==0.3
- abstract-par ==0.3.3
@ -1755,8 +1755,8 @@ default-package-overrides:
- say ==0.1.0.0
- sbp ==2.3.16
- sbv ==7.5
- scalendar ==1.2.0
- SCalendar ==1.1.0
- scalendar ==1.2.0
- scalpel ==0.5.1
- scalpel-core ==0.5.1
- scanner ==0.2

File diff suppressed because it is too large Load diff

View file

@ -84,6 +84,10 @@ stdenv.mkDerivation rec {
installFlags = "prefix=$(out)";
# Workaround for https://github.com/NixOS/nixpkgs/issues/40397
# Remove after update to binutils 2.31
dontStrip = true;
inherit atk cairo gdk_pixbuf librsvg pango;
inherit (gnome3) glib gtk3 gtksourceview libgda libpeas vte;
inherit (gst_all_1) gstreamer;

View file

@ -89,6 +89,8 @@ stdenv.mkDerivation rec {
${pythonEnv.interpreter} ./test.py
'';
hardeningDisable = [ "fortify" ];
meta = {
homepage = http://www.nsnam.org;
license = stdenv.lib.licenses.gpl3;

View file

@ -1,4 +1,4 @@
{ stdenv, buildPythonPackage, fetchPypi
{ stdenv, buildPythonPackage, fetchPypi, isPy27, pythonAtLeast
, coverage, nose, pbkdf2 }:
buildPythonPackage rec {
@ -16,6 +16,10 @@ buildPythonPackage rec {
# TODO: tests fail: TypeError: object of type 'NoneType' has no len()
doCheck = false;
# Python >=2.7.15, >=3.6.5 are incompatible:
# https://bitbucket.org/dholth/cryptacular/issues/11
disabled = isPy27 || pythonAtLeast "3.6";
meta = with stdenv.lib; {
maintainers = with maintainers; [ domenkozar ];
};

View file

@ -19,6 +19,11 @@ buildPythonPackage rec {
checkInputs = [ nose mock ];
# v0.20.0 tests are nondeterministic:
# test_send_batch_metrics: https://hydra.nixos.org/build/74920933
# test_timed_decorator_threaded: https://hydra.nixos.org/build/74328993
doCheck = false;
meta = with lib; {
description = "The Datadog Python library";
license = licenses.bsd3;

View file

@ -0,0 +1,28 @@
{ lib
, fetchPypi
, buildPythonPackage
, astropy }:
buildPythonPackage rec {
pname = "radio_beam";
version = "0.2";
doCheck = false; # the tests requires several pytest plugins that are not in nixpkgs
src = fetchPypi {
inherit pname version;
sha256 = "0gbnwnk89n8z0xwn41rc7wpr0fwrzkvxficyki3dyqbxq7y3qfrv";
};
propagatedBuildInputs = [ astropy ];
meta = {
description = "Tools for Beam IO and Manipulation";
homepage = http://radio-astro-tools.github.io;
license = lib.licenses.bsd3;
platforms = lib.platforms.all;
maintainers = with lib.maintainers; [ smaret ];
};
}

View file

@ -14,6 +14,11 @@ buildPythonPackage rec {
checkInputs = [ nose ];
# Some tests are nondeterministic. (`grep sleep -r tests`)
# test_timeout_schedule_action_cancel: https://hydra.nixos.org/build/74954646
# test_new_thread_scheduler_timeout: https://hydra.nixos.org/build/74949851
doCheck = false;
meta = {
homepage = https://github.com/ReactiveX/RxPY;
description = "Reactive Extensions for Python";

View file

@ -0,0 +1,30 @@
{ lib
, fetchPypi
, buildPythonPackage
, astropy
, radio_beam
, pytest }:
buildPythonPackage rec {
pname = "spectral-cube";
version = "0.4.3";
doCheck = false; # the tests requires several pytest plugins that are not in nixpkgs
src = fetchPypi {
inherit pname version;
sha256 = "057g3mzlg5cy4wg2hh3p6gssn93rs6i7pswzhldvcq4k8m8hsl3b";
};
propagatedBuildInputs = [ astropy radio_beam pytest ];
meta = {
description = "Library for reading and analyzing astrophysical spectral data cubes";
homepage = http://radio-astro-tools.github.io;
license = lib.licenses.bsd3;
platforms = lib.platforms.all;
maintainers = with lib.maintainers; [ smaret ];
};
}

View file

@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, cmake, libpfm, zlib, pkgconfig, python2Packages, which, procps, gdb, capnproto }:
stdenv.mkDerivation rec {
version = "5.1.0";
version = "5.2.0";
name = "rr-${version}";
src = fetchFromGitHub {
owner = "mozilla";
repo = "rr";
rev = version;
sha256 = "16v08irycb295jjw5yrcjdagvkgcgg4hl5qz215hrw1ff4g7sazy";
sha256 = "19jsnm8n2smalx2z60x9d8f6g4kdm7zghwyjfvwcxnslk1vn9dkc";
};
postPatch = ''

View file

@ -8,8 +8,8 @@ mkDerivation {
src = fetchFromGitHub {
owner = "haskell-CI";
repo = "haskell-ci";
rev = "b65ea5b35c59d1e7d0f89ff4e21840dc0e2ec3a0";
sha256 = "0qgsll772x24nnkarj30mplmvvwzz5vn5aadn5xzkcn77g5jiqmg";
rev = "a0d76bc5dde3b1cc790a32f84b9ce084e7596f1e";
sha256 = "1wrn9f5rz0nafcwisima6rp18v3a2kjgsyq2wj7vhinqwx9z72r4";
};
isLibrary = true;
isExecutable = true;

View file

@ -5,7 +5,7 @@ let
in
buildNodejs {
inherit enableNpm;
version = "10.0.0";
sha256 = "0l5bx2j4f2ij19kx14my7g7k37j3fn9qpjvbisjvhpbm42810fg2";
version = "10.3.0";
sha256 = "0c8zcwi7r7nnmk29lprdmvil693x5svy3nzbaaqywmg6x2yyk46b";
patches = lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ./no-xcodebuild.patch ];
}

View file

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "wesnoth";
version = "1.14.1";
version = "1.14.2";
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2";
sha256 = "1mzrnbv71b4s41c5x8clhb53l8lidiwzny1hl828228pvys5bxkb";
sha256 = "1xhnhxjc8zjv89xmrbffa54fa4ybw6x0p34k14n9lrz1y18vaar8";
};
nativeBuildInputs = [ cmake pkgconfig ];

View file

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "conntrack-tools-${version}";
version = "1.4.4";
version = "1.4.5";
src = fetchurl {
url = "http://www.netfilter.org/projects/conntrack-tools/files/${name}.tar.bz2";
sha256 = "0v5spmlcw5n6va8z34f82vcpynadb0b54pnjazgpadf0qkyg9jmp";
sha256 = "0qm4m78hr6a4fbmnkw5nyjm1pzzhydzx0nz7f96iv1c4fsfdkiin";
};
buildInputs = [

View file

@ -3,13 +3,13 @@
with stdenv.lib;
buildLinux (args // rec {
version = "4.14.44";
version = "4.14.46";
# branchVersion needs to be x.y
extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version)));
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1r68dvcyidnmr4d49rq58lidy32fijz08xzymxjwmxi5mzk5dcrf";
sha256 = "0cpnfsxf2ici3yfn1bxix6219fri2s3ld19hpf00z9im8x91px4h";
};
} // (args.argsOverride or {}))

View file

@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
version = "4.16.12";
version = "4.16.13";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "078if7mmlq4csv0d7x7rpsc8zs7m6rpz75h6878r0d2silsphw2n";
sha256 = "1qzj5mbkxkrpmnwws8vdz292gp863kybrgr9bvgs7v28plx7n2kg";
};
} // (args.argsOverride or {}))

View file

@ -1,11 +1,11 @@
{ stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
version = "4.4.133";
version = "4.4.134";
extraMeta.branch = "4.4";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0vhg23i49s4k8lbsrs8y6rvqjld84qgifmim5qcrndr6yj68fmk0";
sha256 = "14gvkpdm3wbdfifnkrlk8b3i2isb439prqrzzlvjh88h582x4y20";
};
} // (args.argsOverride or {}))

View file

@ -1,11 +1,11 @@
{ stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
version = "4.9.103";
version = "4.9.104";
extraMeta.branch = "4.9";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1n4kqa0yf5svg8jk647h4awz3ygq696yi0agnmbz0alxnynffsij";
sha256 = "13f30b7z9sp9h1kwjahla194k7ji46z3pr706caapn71npn55abv";
};
} // (args.argsOverride or {}))

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "thttpd-${version}";
version = "2.28";
version = "2.29";
src = fetchurl {
url = "http://acme.com/software/thttpd/${name}.tar.gz";
sha256 = "0a03w7wg994dizdb37pf4kd9s5lf2q414721jfqnrqpdshlzjll5";
sha256 = "15x3h4b49wgfywn82i3wwbf38mdns94mbi4ma9xiwsrjv93rzh4r";
};
prePatch = ''

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "stunnel-${version}";
version = "5.45";
version = "5.46";
src = fetchurl {
url = "https://www.stunnel.org/downloads/${name}.tar.gz";
sha256 = "1qrfb418skdcm7b3v30ixng1ng907f4rfv54zvgz8jwakf1l90jl";
sha256 = "1iw4gap9ysag8iww2ik029scmdllk7jdzcpnnbj7hgbl526b9akn";
# please use the contents of "https://www.stunnel.org/downloads/${name}.tar.gz.sha256",
# not the output of `nix-prefetch-url`
};

View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchgit, fetchFromGitHub, makeWrapper, git
, python3, sshfs-fuse, torsocks, sshuttle, conntrack_tools }:
, python3, sshfs-fuse, torsocks, sshuttle, conntrack-tools }:
let
sshuttle-telepresence = lib.overrideDerivation sshuttle (p: {
@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
cp cli/telepresence $out/libexec/telepresence
makeWrapper $out/libexec/telepresence $out/bin/telepresence \
--prefix PATH : ${lib.makeBinPath [python3 sshfs-fuse torsocks conntrack_tools sshuttle-telepresence]}
--prefix PATH : ${lib.makeBinPath [python3 sshfs-fuse torsocks conntrack-tools sshuttle-telepresence]}
'';
meta = {

View file

@ -133,10 +133,10 @@ in rec {
}) // { perl-bindings = nixStable; };
nixStable = (common rec {
name = "nix-2.0.2";
name = "nix-2.0.3";
src = fetchurl {
url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
sha256 = "2d2984410f73d759485526e594ce41b9819fafa4676f4f85a93dbdd5352a1435";
sha256 = "4f2f1d624cecac3baf7a026f89e08cf3d01bd6983cc7812bca4178092e436660";
};
}) // { perl-bindings = perl-bindings { nix = nixStable; }; };

View file

@ -0,0 +1,25 @@
{ stdenv, python3Packages, xpdf, imagemagick, tesseract }:
python3Packages.buildPythonPackage rec {
pname = "invoice2data";
version = "0.2.93";
src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "1phz0a8jxg074k0im7shrrdfvdps7bn1fa4zwcf8q3sa2iig26l4";
};
makeWrapperArgs = ["--prefix" "PATH" ":" "${stdenv.lib.makeBinPath [ imagemagick xpdf tesseract ]}" ];
propagatedBuildInputs = with python3Packages; [ unidecode dateparser pyyaml pillow chardet pdfminer ];
# Tests fails even when ran manually on my ubuntu machine !!
doCheck = false;
meta = with stdenv.lib; {
description = "Data extractor for PDF invoices";
homepage = https://github.com/invoice-x/invoice2data;
license = licenses.mit;
maintainers = with maintainers; [ psyanticy ];
};
}

View file

@ -56,6 +56,7 @@ mapAliases (rec {
clawsMail = claws-mail; # added 2016-04-29
clutter_gtk = clutter-gtk; # added 2018-02-25
conkerorWrapper = conkeror; # added 2015-01
conntrack_tools = conntrack-tools; # added 2018-05
cool-old-term = cool-retro-term; # added 2015-01-31
cupsBjnp = cups-bjnp; # added 2016-01-02
cups_filters = cups-filters; # added 2016-08

View file

@ -3099,6 +3099,8 @@ with pkgs;
intecture-cli = callPackage ../tools/admin/intecture/cli.nix { };
invoice2data = callPackage ../tools/text/invoice2data { };
iodine = callPackage ../tools/networking/iodine { };
ioping = callPackage ../tools/system/ioping { };
@ -13175,7 +13177,7 @@ with pkgs;
pulseSupport = config.pulseaudio or false;
} // config.conky or {});
conntrack_tools = callPackage ../os-specific/linux/conntrack-tools { };
conntrack-tools = callPackage ../os-specific/linux/conntrack-tools { };
coredns = callPackage ../servers/dns/coredns { };
@ -18098,7 +18100,7 @@ with pkgs;
terminator = callPackage ../applications/misc/terminator { };
terminus = callPackage ../applications/misc/terminus { inherit (gnome2) GConf; };
terminus = callPackage ../applications/misc/terminus { };
lxterminal = callPackage ../applications/misc/lxterminal {
vte = gnome3.vte;

View file

@ -69,13 +69,19 @@ in rec {
};
ghc842 = callPackage ../development/compilers/ghc/8.4.2.nix rec {
bootPkgs = packages.ghc821Binary;
inherit (bootPkgs) alex happy;
inherit (bootPkgs) alex happy hscolour;
buildLlvmPackages = buildPackages.llvmPackages_5;
llvmPackages = pkgs.llvmPackages_5;
};
ghc843 = callPackage ../development/compilers/ghc/8.4.3.nix rec {
bootPkgs = packages.ghc821Binary;
inherit (bootPkgs) alex happy hscolour;
buildLlvmPackages = buildPackages.llvmPackages_5;
llvmPackages = pkgs.llvmPackages_5;
};
ghcHEAD = callPackage ../development/compilers/ghc/head.nix rec {
bootPkgs = packages.ghc821Binary;
inherit (bootPkgs) alex happy;
inherit (bootPkgs) alex happy hscolour;
buildLlvmPackages = buildPackages.llvmPackages_5;
llvmPackages = pkgs.llvmPackages_5;
};
@ -151,6 +157,11 @@ in rec {
ghc = bh.compiler.ghc842;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.4.x.nix { };
};
ghc843 = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghc843;
ghc = bh.compiler.ghc843;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.4.x.nix { };
};
ghcHEAD = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghcHEAD;
ghc = bh.compiler.ghcHEAD;

View file

@ -16941,6 +16941,11 @@ EOF
sha256 = "0v8ziaam2r637v94ra4dbjw6jzxz99gs5x4i585kgag1v204yb9b";
};
checkPhase = ''
# The tests assume that test_xmlast does not run before test_pyPEG2.
python -m unittest pypeg2.test.test_pyPEG2 pypeg2.test.test_xmlast
'';
#https://bitbucket.org/fdik/pypeg/issues/36/test-failures-on-py35
doCheck = !isPy3k;
@ -18149,6 +18154,11 @@ EOF
pyogg = callPackage ../development/python-modules/pyogg { };
rubymarshal = callPackage ../development/python-modules/rubymarshal { };
radio_beam = callPackage ../development/python-modules/radio_beam { };
spectral-cube = callPackage ../development/python-modules/spectral-cube { };
});
in fix' (extends overrides packages)