public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
Frederik Rietdijk 2018-11-04 11:33:50 +01:00
commit b95b7e4501
11 changed files with 75 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkgs/applications/networking/instant-messengers/slack-term/default.nix Normal file
View File

@ -0,0 +1,23 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
# https://github.com/erroneousboat/slack-term
name = "slack-term-${version}";
version = "0.4.1";
goPackagePath = "github.com/erroneousboat/slack-term";
src = fetchFromGitHub {
owner = "erroneousboat";
repo = "slack-term";
rev = "v${version}";
sha256 = "1340bq7h31fxykxbxpn6hv7n2hmjf20f8vg5gan9pjf5jaa6kfza";
};
meta = with stdenv.lib; {
description = "Slack client for your terminal";
homepage = https://github.com/erroneousboat/slack-term;
license = licenses.mit;
maintainers = with maintainers; [ dtzWill ];
};
}

1
pkgs/applications/science/logic/coq/default.nix
View File

@ -25,6 +25,7 @@ let
"8.8.0" = "13a4fka22hdxsjk11mgjb9ffzplfxyxp1sg5v1c8nk1grxlscgw8";
"8.8.1" = "1hlf58gwazywbmfa48219amid38vqdl94yz21i11b4map6jfwhbk";
"8.8.2" = "1lip3xja924dm6qblisk1bk0x8ai24s5xxqxphbdxj6djglj68fd";
"8.9+beta1" = "1yxv2klqal3mh6symi3gc6gv3xm684zlld2c0b6ijhjmp865cin8";
}."${version}";
coq-version = builtins.substring 0 3 version;
ideFlags = if buildIde then "-lablgtkdir ${ocamlPackages.lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else "";

4
pkgs/development/interpreters/python/mk-python-derivation.nix
View File

@ -101,6 +101,10 @@ toPythonModule (python.stdenv.mkDerivation (builtins.removeAttrs attrs [
${python.interpreter} ${./catch_conflicts}/catch_conflicts.py
'' + attrs.postFixup or '''';
# Print fewer warnings so we have less noise in our logs
# The amount of warnings also caused builds to be terminated.
PYTHONWARNINGS="once";
meta = {
# default to python's platforms
platforms = python.meta.platforms;

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

@ -33,7 +33,7 @@ if isPyPy then null else buildPythonPackage rec {
doCheck = !stdenv.hostPlatform.isMusl; # TODO: Investigate
checkPhase = ''
py.test
py.test -k "not test_char_pointer_conversion"
'';
meta = with stdenv.lib; {

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

@ -24,7 +24,8 @@ buildPythonPackage rec {
checkPhase = ''
runHook preCheck
$out/bin/py.test -x testing/
# Re-enable warnings because the test suite relies on it.
PYTHONWARNINGS= $out/bin/py.test -x testing/
runHook postCheck
'';

8
pkgs/development/tools/build-managers/meson/default.nix
View File

@ -1,4 +1,4 @@
{ lib, python3Packages, stdenv, writeTextDir, substituteAll }:
{ lib, python3Packages, stdenv, writeTextDir, substituteAll, fetchpatch }:
python3Packages.buildPythonApplication rec {
version = "0.46.1";
@ -41,6 +41,12 @@ python3Packages.buildPythonApplication rec {
src = ./fix-rpath.patch;
inherit (builtins) storeDir;
})
# Support Python 3.7. This is part of 0.47 and 0.48.1.
(fetchpatch {
url = https://github.com/mesonbuild/meson/commit/a87496addd9160300837aa50193f4798c6f1d251.patch;
sha256 = "1jfn9dgib5bc8frcd65cxn3fzhp19bpbjadxjkqzbjk1v4hdbl88";
})
];
setupHook = ./setup-hook.sh;

4
pkgs/os-specific/linux/ati-drivers/default.nix
View File

@ -61,8 +61,8 @@ stdenv.mkDerivation rec {
src = fetchurl {
url =
"https://www2.ati.com/drivers/linux/radeon-crimson-15.12-15.302-151217a-297685e.zip";
sha256 = "0n0ynqmjkjp5dl5q07as7ps3rlyyn63hq4mlwgd7c7v82ky2skvh";
curlOpts = "--referer http://support.amd.com/en-us/download/desktop?os=Linux+x86_64";
sha256 = "704f2dfc14681f76dae3b4120c87b1ded33cf43d5a1d800b6de5ca292bb61e58";
curlOpts = "--referer https://www.amd.com/en/support";
};
hardeningDisable = [ "pic" "format" ];

25
pkgs/os-specific/linux/systemd/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, fetchpatch, pkgconfig, intltool, gperf, libcap, kmod
{ stdenv, lib, fetchFromGitHub, fetchpatch, fetchurl, pkgconfig, intltool, gperf, libcap, kmod
, xz, pam, acl, libuuid, m4, utillinux, libffi
, glib, kbd, libxslt, coreutils, libgcrypt, libgpgerror, libidn2, libapparmor
, audit, lz4, bzip2, libmicrohttpd, pcre2
@ -18,7 +18,7 @@ let
pythonLxmlEnv = buildPackages.python3Packages.python.withPackages ( ps: with ps; [ python3Packages.lxml ]);
in stdenv.mkDerivation rec {
version = "239.20181031";
version = "239";
name = "systemd-${version}";
# When updating, use https://github.com/systemd/systemd-stable tree, not the development one!
@ -26,10 +26,26 @@ in stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "NixOS";
repo = "systemd";
rev = "nixos-v${version}";
sha256 = "1rzl0iqrpa4ajvama5k3cb3yc7893c55kzcxkl3cyavpdzsw5505";
rev = "31859ddd35fc3fa82a583744caa836d356c31d7f";
sha256 = "1xci0491j95vdjgs397n618zii3sgwnvanirkblqqw6bcvcjvir1";
};
prePatch = let
# Upstream's maintenance branches are still too intrusive:
# https://github.com/systemd/systemd-stable/tree/v239-stable
patches-deb = 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.
name = "systemd-debian-patches.tar.xz";
url = mirror://debian/pool/main/s/systemd/systemd_239-11~bpo9+1.debian.tar.xz;
sha256 = "136f6p4jbi4z94mf4g099dfcacwka8jwhza0wxxw2q5l5q3xiysh";
};
# Note that we skip debian-specific patches, i.e. ./debian/patches/debian/*
in ''
tar xf ${patches-deb}
patches="$patches $(cat debian/patches/series | grep -v '^debian/' | sed 's|^|debian/patches/|')"
'';
outputs = [ "out" "lib" "man" "dev" ];
nativeBuildInputs =
@ -91,7 +107,6 @@ in stdenv.mkDerivation rec {
"-Dsulogin-path=${utillinux}/bin/sulogin"
"-Dmount-path=${utillinux}/bin/mount"
"-Dumount-path=${utillinux}/bin/umount"
"-Ddns-over-tls=false"
];
preConfigure = ''

13
pkgs/stdenv/generic/make-derivation.nix
View File

@ -12,9 +12,7 @@ rec {
# * https://nixos.org/nix/manual/#ssec-derivation
# Explanation about derivations in general
mkDerivation =
{ name ? if attrs ? pname && attrs ? version
then "${attrs.pname}-${attrs.version}"
else ""
{ name ? ""
# These types of dependencies are all exhaustively documented in
# the "Specifying Dependencies" section of the "Standard
@ -67,8 +65,6 @@ rec {
, pos ? # position used in error messages and for meta.position
(if attrs.meta.description or null != null
then builtins.unsafeGetAttrPos "description" attrs.meta
else if attrs.version or null != null
then builtins.unsafeGetAttrPos "version" attrs
else builtins.unsafeGetAttrPos "name" attrs)
, separateDebugInfo ? false
, outputs ? [ "out" ]
@ -82,13 +78,6 @@ rec {
, ... } @ attrs:
# Check that the name is consistent with pname and version:
assert lib.assertMsg
(lib.lists.all (name: builtins.hasAttr name attrs) ["name" "pname" "version"]
-> lib.strings.hasSuffix "${attrs.pname}-${attrs.version}" attrs.name)
("mkDerivation: `name` (\"${attrs.name}\") must be consistent " +
"with `pname-version` \"${attrs.pname}-${attrs.version}\"");
let
# TODO(@oxij, @Ericson2314): This is here to keep the old semantics, remove when
# no package has `doCheck = true`.

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

@ -17235,6 +17235,8 @@ with pkgs;
slack-cli = callPackage ../tools/networking/slack-cli { };
slack-term = callPackage ../applications/networking/instant-messengers/slack-term { };
singularity = callPackage ../applications/virtualization/singularity { };
spectmorph = callPackage ../applications/audio/spectmorph { };
@ -21359,13 +21361,14 @@ with pkgs;
boogie = dotnetPackages.Boogie;
inherit (callPackage ./coq-packages.nix {
inherit (ocaml-ng) ocamlPackages_4_02
ocamlPackages_4_05
;
inherit (ocaml-ng) ocamlPackages_4_05;
}) mkCoqPackages
coq_8_5 coq_8_6 coq_8_7 coq_8_8
coqPackages_8_5 coqPackages_8_6 coqPackages_8_7 coqPackages_8_8
coqPackages coq
coqPackages_8_5 coq_8_5
coqPackages_8_6 coq_8_6
coqPackages_8_7 coq_8_7
coqPackages_8_8 coq_8_8
coqPackages_8_9 coq_8_9
coqPackages coq
;
coq2html = callPackage ../applications/science/logic/coq2html {

10
pkgs/top-level/coq-packages.nix
View File

@ -1,8 +1,4 @@
{ lib, callPackage, newScope, recurseIntoAttrs
, gnumake3
, ocamlPackages_4_02
, ocamlPackages_4_05
}:
{ lib, callPackage, newScope, recurseIntoAttrs, ocamlPackages_4_05 }:
let
mkCoqPackages' = self: coq:
@ -70,11 +66,15 @@ in rec {
coq_8_8 = callPackage ../applications/science/logic/coq {
version = "8.8.2";
};
coq_8_9 = callPackage ../applications/science/logic/coq {
version = "8.9+beta1";
};
coqPackages_8_5 = mkCoqPackages coq_8_5;
coqPackages_8_6 = mkCoqPackages coq_8_6;
coqPackages_8_7 = mkCoqPackages coq_8_7;
coqPackages_8_8 = mkCoqPackages coq_8_8;
coqPackages_8_9 = mkCoqPackages coq_8_9;
coqPackages = coqPackages_8_8;
coq = coqPackages.coq;