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

Merge remote-tracking branch 'upstream/master' into staging

Browse Source 
Conflicts:
	pkgs/applications/misc/pytrainer/default.nix
	pkgs/development/tools/pew/default.nix
	pkgs/tools/misc/you-get/default.nix
This commit is contained in:
Tuomas Tynkkynen
2018-02-28 20:52:49 +02:00
parent ad17db3562 f1dd205c4e
commit 34f95d92a2
261 changed files with 3045 additions and 2049 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/admin/nxproxy/default.nix
View File

@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
name = "nxproxy-${version}";
version = "3.5.0.32";
version = "3.5.0.33";
src = fetchurl {
sha256 = "02n5bdc1jsq999agb4w6dmdj5l2wlln2lka84qz6rpswwc59zaxm";
sha256 = "17qjsd6v2ldpfmyjrkdnlq4qk05hz5l6qs54g8h0glzq43w28f74";
url = "http://code.x2go.org/releases/source/nx-libs/nx-libs-${version}-lite.tar.gz";
};

4
pkgs/tools/admin/sec/default.nix
View File

@@ -1,11 +1,11 @@
{ fetchurl, perl, stdenv }:
stdenv.mkDerivation rec {
name = "sec-2.7.7";
name = "sec-2.7.12";
src = fetchurl {
url = "mirror://sourceforge/simple-evcorr/${name}.tar.gz";
sha256 = "116nn8fg24nwcimm8gcfp52bsgh1ckrspjr8sk4i0arvpl3d12m9";
sha256 = "0f5a2nkd5cmg1rziizz2gmgdwb5dz99x9pbxw30p384rjh79zcaa";
};
buildInputs = [ perl ];