Merge master into staging-next
This commit is contained in:
commit
322f87137c
|
@ -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,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 = ''
|
||||
|
|
|
@ -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`.
|
||||
|
|
|
@ -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 { };
|
||||
|
|
Loading…
Reference in a new issue