Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a29ea58ae550
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: dabdd7b32959
Choose a head ref

Commits on Sep 11, 2018

  1. pythonPackages.khard: zsh autocompletion

    'cos that's cool
    teto committed Sep 11, 2018

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    14d9857 View commit details
  2. gitAndTools.git-extras: install zsh completion

    because there are so many freaking commands !
    teto committed Sep 11, 2018
    Copy the full SHA
    d30c970 View commit details
  3. Copy the full SHA
    525f425 View commit details

Commits on Sep 16, 2018

  1. arcanist: 20170323 -> 20180916

    eliasp committed Sep 16, 2018
    Copy the full SHA
    a78f6dd View commit details

Commits on Sep 19, 2018

  1. postfix: add -DUSE_LDAP_SASL in CCARGS to support bind=sasl.

    Julien Moutinho committed Sep 19, 2018
    Copy the full SHA
    6c4480b View commit details
  2. Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    vdemeester Vincent Demeester
    Copy the full SHA
    20b0954 View commit details

Commits on Sep 20, 2018

  1. yubico-piv-tool: 1.6.1 -> 1.6.2

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/yubico-piv-tool/versions
    r-ryantm committed Sep 20, 2018
    Copy the full SHA
    b8e2d28 View commit details
  2. tortoisehg: 4.7 -> 4.7.1

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/tortoisehg/versions
    r-ryantm committed Sep 20, 2018
    Copy the full SHA
    6100592 View commit details
  3. xercesc: 3.2.1 -> 3.2.2

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/xerces-c/versions
    r-ryantm committed Sep 20, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    etu Elis Hirwing
    Copy the full SHA
    3772826 View commit details
  4. woeusb: 3.2.2 -> 3.2.9

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/woeusb/versions
    r-ryantm committed Sep 20, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    etu Elis Hirwing
    Copy the full SHA
    6c6cd16 View commit details
  5. sg3_utils: 1.42 -> 1.44

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/sg3_utils/versions
    r-ryantm committed Sep 20, 2018
    Copy the full SHA
    39a5ac1 View commit details
  6. lnav: 0.8.3 -> 0.8.4

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/lnav/versions
    r-ryantm committed Sep 20, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    dywedir Vlad M.
    Copy the full SHA
    8e3ec2b View commit details

Commits on Sep 28, 2018

  1. Copy the full SHA
    a054f26 View commit details
  2. browsh: 1.4.10 -> 1.4.13

    kalbasit committed Sep 28, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    fa46ce3 View commit details
  3. kubetail: 1.6.1 -> 1.6.4

    kalbasit committed Sep 28, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    18681d9 View commit details

Commits on Sep 29, 2018

  1. isync: add zlib dep for compression support

    (cherry picked from commit f26f2c8b6f755708a8bfa7aa4f56c52a2c751df6)
    dtzWill committed Sep 29, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    0a15643 View commit details
  2. Merge pull request #47022 from r-ryantm/auto-update/lnav

    lnav: 0.8.3 -> 0.8.4
    matthewbauer authored Sep 29, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    f98e14c View commit details
  3. Merge pull request #46929 from r-ryantm/auto-update/yubico-piv-tool

    yubico-piv-tool: 1.6.1 -> 1.6.2
    matthewbauer authored Sep 29, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    10abac9 View commit details
  4. Merge pull request #46932 from r-ryantm/auto-update/tortoisehg

    tortoisehg: 4.7 -> 4.7.1
    matthewbauer authored Sep 29, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    e6acc69 View commit details
  5. Merge pull request #46936 from r-ryantm/auto-update/xerces-c

    xercesc: 3.2.1 -> 3.2.2
    matthewbauer authored Sep 29, 2018
    Copy the full SHA
    44d0df8 View commit details
  6. Merge pull request #46937 from r-ryantm/auto-update/woeusb

    woeusb: 3.2.2 -> 3.2.9
    matthewbauer authored Sep 29, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    eaf843e View commit details
  7. Merge pull request #46528 from markuskowa/pdsh-fix

    pdsh: set default module to ssh, remove obsolete fixes
    matthewbauer authored Sep 29, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    a87c16b View commit details
  8. Merge pull request #46519 from teto/git_extra_zsh_completion

    gitAndTools.git-extras: install zsh completion
    matthewbauer authored Sep 29, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    61d7b93 View commit details
  9. Merge pull request #46515 from teto/khard_completion

    pythonPackages.khard: zsh autocompletion
    matthewbauer authored Sep 29, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    923c2e5 View commit details
  10. Merge pull request #46896 from aanderse/perlPackages.NetSCP

    perlPackages.NetSCP & perlPackages.NetSSH: init at 0.08 & 0.09
    matthewbauer authored Sep 29, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    ec2b76b View commit details
  11. Merge pull request #46883 from ju1m/postfix

    postfix: add -DUSE_LDAP_SASL in CCARGS to support bind=sasl.
    matthewbauer authored Sep 29, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    a4721b8 View commit details
  12. Merge pull request #46962 from r-ryantm/auto-update/sg3_utils

    sg3_utils: 1.42 -> 1.44
    matthewbauer authored Sep 29, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    c46b9c2 View commit details
  13. Merge pull request #46755 from eliasp/bump-development/tools/misc/arc…

    …anist-20170323→20180916
    
    arcanist: 20170323 -> 20180916
    matthewbauer authored Sep 29, 2018
    Copy the full SHA
    1fe9ab5 View commit details
  14. Merge pull request #47508 from dtzWill/fix/isync-zlib

    isync: add zlib dep for compression support
    xeji authored Sep 29, 2018
    Copy the full SHA
    abd222f View commit details
  15. notmuch-bower: 2017-09-27 -> 0.8.1 (#47510)

    0.8.1 was released Mar 31, 2018, so lets move this up to stable.
    dtzWill authored and xeji committed Sep 29, 2018
    Copy the full SHA
    f51a495 View commit details
  16. Merge pull request #47502 from kalbasit/nixpkgs_update-kubetail

    kubetail: 1.6.1 -> 1.6.4
    nlewo authored Sep 29, 2018
    Copy the full SHA
    6db3e92 View commit details
  17. Merge pull request #47501 from kalbasit/nixpkgs_update-browsh

    browsh: 1.4.10 -> 1.4.13
    srhb authored Sep 29, 2018
    Copy the full SHA
    b7069ec View commit details
  18. Merge pull request #47491 from tomberek/gnuradio_bump

    gnuradio: 3.7.13.3 -> 3.7.13.4
    srhb authored Sep 29, 2018
    Copy the full SHA
    c0706bf View commit details
  19. Copy the full SHA
    a108b86 View commit details
  20. mozilla-plugins/trezor: remove applications/networking/browsers/mozil…

    …la-plugins/trezor
    
    trezor-mozilla-plugin is no longer maintained software
    
    package pkgs/servers/trezord should be used instead
    prusnak committed Sep 29, 2018
    Copy the full SHA
    62b1599 View commit details
  21. Merge pull request #47485 from prusnak/remove-mozilla-plugins-trezor

    mozilla-plugins/trezor: remove applications/networking/browsers/mozilla-plugins/trezor
    Mic92 authored Sep 29, 2018
    Copy the full SHA
    c527619 View commit details
  22. wireguard-tools: Fix build

    aneeshusa committed Sep 29, 2018
    Copy the full SHA
    ce36f63 View commit details
  23. Merge pull request #47520 from aneeshusa/wireguard-tools-fix-build

    wireguard-tools: Fix build
    Mic92 authored Sep 29, 2018
    Copy the full SHA
    dabdd7b View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/misc/gnuradio/default.nix
Original file line number Diff line number Diff line change
@@ -26,13 +26,13 @@

stdenv.mkDerivation rec {
name = "gnuradio-${version}";
version = "3.7.13.3";
version = "3.7.13.4";

src = fetchFromGitHub {
owner = "gnuradio";
repo = "gnuradio";
rev = "v${version}";
sha256 = "1qpa53axqavdv2ykby7rwh7xmhvv964xq1d7rcvbwkry7dngrbib";
sha256 = "0ybfn2zfr9lc1bi3c794l4bzpj8y6vas9c4rbcj4nqlx0zf3p8fn";
fetchSubmodules = true;
};

4 changes: 4 additions & 0 deletions pkgs/applications/misc/khard/default.nix
Original file line number Diff line number Diff line change
@@ -40,6 +40,10 @@ in with python.pkgs; buildPythonApplication rec {
unidecode
];

postInstall = ''
install -D misc/zsh/_khard $out/share/zsh/site-functions/
'';

# Fails; but there are no tests anyway.
doCheck = false;

4 changes: 2 additions & 2 deletions pkgs/applications/networking/browsers/browsh/default.nix
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{ stdenv, buildGoPackage, fetchurl, fetchFromGitHub, go-bindata }:

let
version = "1.4.10";
version = "1.4.13";

# TODO: must build the extension instead of downloading it. But since it's
# literally an asset that is indifferent regardless of the platform, this
# might be just enough.
webext = fetchurl {
url = "https://github.com/browsh-org/browsh/releases/download/v${version}/browsh-${version}-an.fx.xpi";
sha256 = "0rgwzv1qahqy52q7zz4dklnwx7w4x3gj92ka8n0ypgf9fjjnmqas";
sha256 = "11477z7mva8lwfxsrfxckvgqkxrjhc80czra8cqhpakf0fih1a4g";
};

in buildGoPackage rec {
3 changes: 1 addition & 2 deletions pkgs/applications/networking/browsers/firefox/wrapper.nix
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
, flashplayer, hal-flash
, MPlayerPlugin, ffmpeg, xorg, libpulseaudio, libcanberra-gtk2
, jrePlugin, icedtea_web
, trezor-bridge, bluejeans, djview4, adobe-reader
, bluejeans, djview4, adobe-reader
, google_talk_plugin, fribid, gnome3/*.gnome-shell*/
, esteidfirefoxplugin
, browserpass, chrome-gnome-shell, uget-integrator, plasma-browser-integration, bukubrow
@@ -55,7 +55,6 @@ let
++ lib.optional (cfg.enableGoogleTalkPlugin or false) google_talk_plugin
++ lib.optional (cfg.enableFriBIDPlugin or false) fribid
++ lib.optional (cfg.enableGnomeExtensions or false) gnome3.gnome-shell
++ lib.optional (cfg.enableTrezor or false) trezor-bridge
++ lib.optional (cfg.enableBluejeans or false) bluejeans
++ lib.optional (cfg.enableAdobeReader or false) adobe-reader
++ lib.optional (cfg.enableEsteid or false) esteidfirefoxplugin

This file was deleted.

4 changes: 2 additions & 2 deletions pkgs/applications/networking/cluster/kubetail/default.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
name = "kubetail-${version}";
version = "1.6.1";
version = "1.6.4";

src = fetchFromGitHub {
owner = "johanhaleby";
repo = "kubetail";
rev = "${version}";
sha256 = "10ql1kdsmyrk73jb6f5saf2q38znm0vdihscj3c9n0qhyhk9blpl";
sha256 = "13y3g27z2v4jx1cvphcwl0a5xshm6vcqcxasid5sbg6cpwc2xc66";
};

installPhase = ''
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
name = "notmuch-bower-${version}";
version = "2017-09-27";
version = "0.8.1";

src = fetchFromGitHub {
owner = "wangp";
repo = "bower";
rev = "e4918ed581984bf2813f51f007a0aaaa7fa0da7f";
sha256 = "13np5yharjik1pp23cfgffi0g0ikl6pl5sqqyy0ki7gk7gyy913i";
rev = version;
sha256 = "0rdjip6jq7qlfn640ci81m9vfgcn4q5vaj72zp3bria8m55a56rf";
};

nativeBuildInputs = [ gawk mercury pandoc ];
Original file line number Diff line number Diff line change
@@ -13,6 +13,10 @@ stdenv.mkDerivation rec {

installFlags = [ "DESTDIR=$(out) PREFIX=" ];

postInstall = ''
install -D etc/git-extras-completion.zsh $out/share/zsh/site-functions/_git_extras
'';

meta = with stdenv.lib; {
homepage = https://github.com/tj/git-extras;
description = "GIT utilities -- repo summary, repl, changelog population, author commit percentages and more";
4 changes: 2 additions & 2 deletions pkgs/applications/version-management/tortoisehg/default.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

python2Packages.buildPythonApplication rec {
name = "tortoisehg-${version}";
version = "4.7";
version = "4.7.1";

src = fetchurl {
url = "https://bitbucket.org/tortoisehg/targz/downloads/${name}.tar.gz";
sha256 = "1s99dmz8izsyj5mpnqlx9dasw8ar2lr68r3m1wyafzbqlqmbjbqm";
sha256 = "0x7hz4v882xy2r3k43fbndkq1kqwl3rl1zjmi8pxgpf05qcn950d";
};

pythonPath = with python2Packages; [ pyqt4 mercurial qscintilla iniparse ];
4 changes: 2 additions & 2 deletions pkgs/development/libraries/xercesc/default.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
name = "xerces-c-${version}";
version = "3.2.1";
version = "3.2.2";

src = fetchurl {
url = "mirror://apache/xerces/c/3/sources/${name}.tar.gz";
sha256 = "18045nyjkr2hygkjc43pi2fmz6qcbn9p00kf42my3aa4i0mn1m3d";
sha256 = "04q4c460wqzyzmprjm22igcm1d52xr20ajxnhr33nv95mbw92qfx";
};

meta = {
35 changes: 35 additions & 0 deletions pkgs/development/python-modules/glances/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{ buildPythonPackage, fetchFromGitHub, isPyPy, lib
, psutil, setuptools, bottle, batinfo, pysnmp
, hddtemp
, unittest2
}:

buildPythonPackage rec {
name = "glances-${version}";
version = "3.0.2";
disabled = isPyPy;

src = fetchFromGitHub {
owner = "nicolargo";
repo = "glances";
rev = "v${version}";
sha256 = "1jkjblfk4gbr00j7lny7ajiizzqnp0p1yhzfi14074gwk38z0q14";
};

# Requires access to /sys/class/power_supply
doCheck = false;

buildInputs = [ unittest2 ];
propagatedBuildInputs = [ psutil setuptools bottle batinfo pysnmp hddtemp ];

preConfigure = ''
sed -i 's/data_files\.append((conf_path/data_files.append(("etc\/glances"/' setup.py;
'';

meta = with lib; {
homepage = https://nicolargo.github.io/glances/;
description = "Cross-platform curses-based monitoring tool";
license = licenses.lgpl3;
maintainers = with maintainers; [ primeos koral ];
};
}
10 changes: 5 additions & 5 deletions pkgs/development/tools/misc/arcanist/default.nix
Original file line number Diff line number Diff line change
@@ -4,19 +4,19 @@ let
libphutil = fetchFromGitHub {
owner = "phacility";
repo = "libphutil";
rev = "01b33af6f4d570b34ad791cd5ccaa3ea7f77dcb9";
sha256 = "0glrxlj4cr2821pdc2yy2m5bss4yr1zx3sdgw3r5d8hbfz361nx7";
rev = "3215e4e291ed4468faeed4542d47a571b5bc559a";
sha256 = "0bbinaxny0j4iniz2grf0s9cysbl3x24yc32f3jra9mwsgh2v2zj";
};
arcanist = fetchFromGitHub {
owner = "phacility";
repo = "arcanist";
rev = "3b6b523c2b236e3724a1e115f126cb6fd05fa128";
sha256 = "1pr2izwj446rf2v6x6v2wsj7iwnaxq3xg3qqipybyf1xpqfmh5q8";
rev = "2650e8627a20e1bfe334a4a2b787f44ef5d6ebc5";
sha256 = "0x0xxiar202ypbgxh19swzjil546bbp8li4k5yrpvab55y8ymkd4";
};
in
stdenv.mkDerivation rec {
name = "arcanist-${version}";
version = "20170323";
version = "20180916";

src = [ arcanist libphutil ];
buildInputs = [ php makeWrapper flex ];
2 changes: 1 addition & 1 deletion pkgs/servers/mail/postfix/default.nix
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ let
] ++ lib.optional withPgSQL "-DHAS_PGSQL"
++ lib.optionals withMySQL [ "-DHAS_MYSQL" "-I${mysql.connector-c}/include/mysql" "-L${mysql.connector-c}/lib/mysql" ]
++ lib.optional withSQLite "-DHAS_SQLITE"
++ lib.optional withLDAP "-DHAS_LDAP");
++ lib.optionals withLDAP ["-DHAS_LDAP" "-DUSE_LDAP_SASL"]);
auxlibs = lib.concatStringsSep " " ([
"-ldb" "-lnsl" "-lresolv" "-lsasl2" "-lcrypto" "-lssl"
] ++ lib.optional withPgSQL "-lpq"
4 changes: 2 additions & 2 deletions pkgs/tools/misc/lnav/default.nix
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
owner = "tstack";
repo = "lnav";
rev = "v${meta.version}";
sha256 = "0hq9ri6a18z682gihxlbh1rndka0v6brkdqsyfsgh4c2fgib4fb7";
sha256 = "0wzzny0sgrq1ga9qw9nr8ly4j3vy4agszma73902dsw2rwf17j6y";
inherit name;
};

@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
'';
downloadPage = "https://github.com/tstack/lnav/releases";
license = licenses.bsd2;
version = "0.8.3";
version = "0.8.4";
maintainers = [ maintainers.dochang ];
platforms = platforms.unix;
};
4 changes: 2 additions & 2 deletions pkgs/tools/misc/woeusb/default.nix
Original file line number Diff line number Diff line change
@@ -3,14 +3,14 @@
, wxGTK30 }:

stdenv.mkDerivation rec {
version = "3.2.2";
version = "3.2.9";
name = "woeusb-${version}";

src = fetchFromGitHub {
owner = "slacka";
repo = "WoeUSB";
rev = "v${version}";
sha256 = "08spc7r5zgn483y7jmnlqi5417p6h1v6izyx10jnk39md6lv8pb3";
sha256 = "1h2msp45slcd2s5jgw7ma9r7pl7schrvifw3kp53skxfpyax4j35";
};

buildInputs = [ wxGTK30 autoreconfHook makeWrapper ];
4 changes: 2 additions & 2 deletions pkgs/tools/misc/yubico-piv-tool/default.nix
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, openssl, pcsclite, check }:

stdenv.mkDerivation rec {
name = "yubico-piv-tool-1.6.1";
name = "yubico-piv-tool-1.6.2";

src = fetchurl {
url = "https://developers.yubico.com/yubico-piv-tool/Releases/${name}.tar.gz";
sha256 = "10xgdc51xvszkxmsvqnbjs8ixxz7rfnfahh3wn8glllynmszbhwi";
sha256 = "06r3vxgj7qrk8si7khjy696sm45h3w9d0rrrj0hyswalqzavqqga";
};

nativeBuildInputs = [ pkgconfig ];
4 changes: 2 additions & 2 deletions pkgs/tools/networking/isync/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ fetchurl, stdenv, openssl, pkgconfig, db, cyrus_sasl, perl }:
{ fetchurl, stdenv, openssl, pkgconfig, db, zlib, cyrus_sasl, perl }:

stdenv.mkDerivation rec {
name = "isync-1.3.0";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
};

nativeBuildInputs = [ pkgconfig perl ];
buildInputs = [ openssl db cyrus_sasl ];
buildInputs = [ openssl db cyrus_sasl zlib ];

meta = with stdenv.lib; {
homepage = http://isync.sourceforge.net/;
11 changes: 3 additions & 8 deletions pkgs/tools/networking/pdsh/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, perl, readline, rsh, ssh, pam }:
{ stdenv, fetchurl, perl, readline, rsh, ssh }:

stdenv.mkDerivation rec {
name = "pdsh-2.33";
@@ -8,12 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "0bwlkl9inj66iwvafg00pi3sk9n673phdi0kcc59y9nn55s0hs3k";
};

buildInputs = [perl readline ssh pam];

/* pdsh uses pthread_cancel(), which requires libgcc_s.so.1 to be
loadable at run-time. Adding the flag below ensures that the
library can be found. Obviously, though, this is a hack. */
NIX_LDFLAGS="-lgcc_s";
buildInputs = [ perl readline ssh ];

preConfigure = ''
configureFlagsArray=(
@@ -22,11 +17,11 @@ stdenv.mkDerivation rec {
"--with-machines=/etc/pdsh/machines"
${if readline == null then "--without-readline" else "--with-readline"}
${if ssh == null then "--without-ssh" else "--with-ssh"}
${if pam == null then "--without-pam" else "--with-pam"}
${if rsh == false then "--without-rsh" else "--with-rsh"}
"--with-dshgroups"
"--with-xcpu"
"--disable-debug"
'--with-rcmd-rank-list=ssh,krb4,exec,xcpu,rsh'
)
'';

4 changes: 2 additions & 2 deletions pkgs/tools/networking/wireguard-tools/default.nix
Original file line number Diff line number Diff line change
@@ -13,8 +13,8 @@ stdenv.mkDerivation rec {

sourceRoot = "source/src/tools";

nativeBuildInputs = [ (optional stdenv.isDarwin makeWrapper) ];
buildInputs = [ (optional stdenv.isLinux libmnl) ];
nativeBuildInputs = optional stdenv.isDarwin makeWrapper;
buildInputs = optional stdenv.isLinux libmnl;

makeFlags = [
"DESTDIR=$(out)"
4 changes: 2 additions & 2 deletions pkgs/tools/system/sg3_utils/default.nix
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:

stdenv.mkDerivation rec {
name = "sg3_utils-1.42";
name = "sg3_utils-1.44";

src = fetchurl {
url = "http://sg.danny.cz/sg/p/${name}.tgz";
sha256 = "1wwy7iiz1lvc32c777yd4vp0c0dqfdlm5jrsm3aa62xx141pmjqx";
sha256 = "0yxfbkd48mbzipwmggcvpq60zybsb6anrca878si26z7496nibld";
};

meta = with stdenv.lib; {
2 changes: 0 additions & 2 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
@@ -19040,8 +19040,6 @@ with pkgs;

treesheets = callPackage ../applications/office/treesheets { wxGTK = wxGTK31; };

trezor-bridge = callPackage ../applications/networking/browsers/mozilla-plugins/trezor { };

tribler = callPackage ../applications/networking/p2p/tribler { };

trojita = libsForQt5.callPackage ../applications/networking/mailreaders/trojita { };
Loading