diff options
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/backup/crashplan/default.nix | 8 | ||||
-rw-r--r-- | pkgs/applications/misc/calibre/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/networking/irc/irssi/default.nix | 10 | ||||
-rw-r--r-- | pkgs/applications/networking/owncloud-client/default.nix | 10 | ||||
-rw-r--r-- | pkgs/applications/science/logic/picosat/default.nix | 10 | ||||
-rw-r--r-- | pkgs/applications/video/kodi/plugins.nix | 6 | ||||
-rw-r--r-- | pkgs/development/interpreters/elixir/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/tools/erlang/rebar3-nix-bootstrap/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/tools/misc/distcc/default.nix | 5 | ||||
-rw-r--r-- | pkgs/servers/http/mini-httpd/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/admin/salt/default.nix | 51 | ||||
-rw-r--r-- | pkgs/tools/admin/salt/fix-libcrypto-loading.patch | 11 | ||||
-rw-r--r-- | pkgs/tools/admin/salt/testing.nix | 24 | ||||
-rw-r--r-- | pkgs/top-level/go-packages.nix | 8 | ||||
-rw-r--r-- | pkgs/top-level/perl-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/rust-packages.nix | 6 |
17 files changed, 130 insertions, 37 deletions
diff --git a/pkgs/applications/backup/crashplan/default.nix b/pkgs/applications/backup/crashplan/default.nix index e89de9b4c6aa..b9566e9c535f 100644 --- a/pkgs/applications/backup/crashplan/default.nix +++ b/pkgs/applications/backup/crashplan/default.nix @@ -1,13 +1,15 @@ { stdenv, fetchurl, makeWrapper, jre, cpio, gawk, gnugrep, gnused, procps, swt, gtk2, glib, libXtst }: -let version = "4.6.0"; +let + version = "4.6.0"; + rev = "2"; #tracks unversioned changes that occur on download.code42.com from time to time in stdenv.mkDerivation rec { - name = "crashplan-${version}"; + name = "crashplan-${version}-r${rev}"; crashPlanArchive = fetchurl { url = "https://download.code42.com/installs/linux/install/CrashPlan/CrashPlan_${version}_Linux.tgz"; - sha256 = "0h9zk6i1pdvl101c8l4v4x6i7q4wkmkqp2dkm0lq7ha96lrvac47"; + sha256 = "13rmmdj048r8k4v7ig4i6pnvwyzc1vasfgksf070bx6ksklgbq47"; }; srcs = [ crashPlanArchive ]; diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index e66f260af969..bae4c83fb2b3 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "2.53.0"; + version = "2.54.0"; name = "calibre-${version}"; src = fetchurl { url = "http://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "0rvfh39a6j5r398p6xzrbzvhxapm1iyhc0d46xk5fwa52kscadhz"; + sha256 = "1r2cxnqiqnx51gbw283z8lz58i9zpvbf0a5ncrg5b2i9bphdiq79"; }; inherit python; diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix index 8c26bf8d10e9..d6b57b6cb0d7 100644 --- a/pkgs/applications/networking/irc/irssi/default.nix +++ b/pkgs/applications/networking/irc/irssi/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl, libintlOrEmpty }: stdenv.mkDerivation rec { - name = "irssi-0.8.17"; + + version = "0.8.19"; + name = "irssi-${version}"; src = fetchurl { - urls = [ "https://distfiles.macports.org/irssi/${name}.tar.bz2" - "http://irssi.org/files/${name}.tar.bz2" - ]; - sha256 = "01v82q2pfiimx6lh271kdvgp8hl4pahc3srg04fqzxgdsb5015iw"; + urls = [ "https://github.com/irssi/irssi/releases/download/${version}/${name}.tar.gz" ]; + sha256 = "0ny8dry1b8siyc5glaxcwzng0d2mxnwxk74v64f8xplqhrvlnkzy"; }; buildInputs = [ pkgconfig ncurses glib openssl perl libintlOrEmpty ]; diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix index 5841fe7c512e..8963f8dc01d0 100644 --- a/pkgs/applications/networking/owncloud-client/default.nix +++ b/pkgs/applications/networking/owncloud-client/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, cmake, qt4, pkgconfig, neon, qtkeychain, sqlite }: +{ stdenv, fetchurl, cmake, qt4, pkgconfig, qtkeychain, sqlite }: stdenv.mkDerivation rec { name = "owncloud-client" + "-" + version; - version = "1.7.1"; + version = "2.1.1"; src = fetchurl { - url = "https://download.owncloud.com/desktop/stable/mirall-${version}.tar.bz2"; - sha256 = "0n9gv97jqval7xjyix2lkywvmvvfv052s0bd1i8kybdl9rwca6yf"; + url = "https://download.owncloud.com/desktop/stable/owncloudclient-${version}.tar.xz"; + sha256 = "4e7cfeb72ec565392e7968f352c4a7f0ef2988cc577ebdfd668a3887d320b1cb"; }; buildInputs = - [ cmake qt4 pkgconfig neon qtkeychain sqlite]; + [ cmake qt4 pkgconfig qtkeychain sqlite]; #configurePhase = '' # mkdir build diff --git a/pkgs/applications/science/logic/picosat/default.nix b/pkgs/applications/science/logic/picosat/default.nix index fb5acc64c4dc..070664980dcc 100644 --- a/pkgs/applications/science/logic/picosat/default.nix +++ b/pkgs/applications/science/logic/picosat/default.nix @@ -2,20 +2,18 @@ stdenv.mkDerivation rec { name = "picosat-${version}"; - version = "960"; + version = "965"; src = fetchurl { url = "http://fmv.jku.at/picosat/${name}.tar.gz"; - sha256 = "05z8cfjk84mkna5ryqlq2jiksjifg3jhlgbijaq36sbn0i51iczd"; + sha256 = "0m578rpa5rdn08d10kr4lbsdwp4402hpavrz6n7n53xs517rn5hm"; }; - dontAddPrefix = true; - configureFlags = "--shared"; + configurePhase = "./configure.sh --shared --trace"; installPhase = '' mkdir -p $out/bin $out/lib $out/include/picosat - cp picomus "$out"/bin - cp picosat "$out"/bin + cp picomus picomcs picosat picogcnf "$out"/bin cp libpicosat.a "$out"/lib cp libpicosat.so "$out"/lib diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix index 0ad638dd7054..bb826011e25d 100644 --- a/pkgs/applications/video/kodi/plugins.nix +++ b/pkgs/applications/video/kodi/plugins.nix @@ -142,14 +142,14 @@ in plugin = "svtplay"; namespace = "plugin.video.svtplay"; - version = "4.0.23"; + version = "4.0.24"; src = fetchFromGitHub { name = plugin + "-" + version + ".tar.gz"; owner = "nilzen"; repo = "xbmc-" + plugin; - rev = "80b6d241adb046c105ceb63d637da3f7f3684f1a"; - sha256 = "1236kanzl4dra78whpwic1r5iifaj3f27qycia9jr54z01id083s"; + rev = "e66e2af6529e3ffd030ad486c849894a9ffdeb45"; + sha256 = "01nq6gac83q6ayhqcj1whvk58pzrm1haw801s321f4vc8gswag56"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix index 3977b32bad70..a9854c7c4934 100644 --- a/pkgs/development/interpreters/elixir/default.nix +++ b/pkgs/development/interpreters/elixir/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "elixir-${version}"; - version = "1.2.3"; + version = "1.2.4"; src = fetchurl { url = "https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz"; - sha256 = "09s8469830s4070i0m04fxdhqimkdyc5k9jylm5vpfz9l3z4wvl8"; + sha256 = "16759ff84d08b480b7e5499716e663b2fffd26e20cf2863de5613bc7bb05c817"; }; buildInputs = [ erlang rebar makeWrapper ]; diff --git a/pkgs/development/tools/erlang/rebar3-nix-bootstrap/default.nix b/pkgs/development/tools/erlang/rebar3-nix-bootstrap/default.nix index 39ec59e849f2..ed38d573abf1 100644 --- a/pkgs/development/tools/erlang/rebar3-nix-bootstrap/default.nix +++ b/pkgs/development/tools/erlang/rebar3-nix-bootstrap/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Shim command to help bootstrap a rebar3 project on Nix"; license = stdenv.lib.licenses.asl20; - homepage = "https://github.com/erl-nix/rebar3-nix-bootstrap"; + homepage = "https://github.com/erlang-nix/rebar3-nix-bootstrap"; maintainers = with stdenv.lib.maintainers; [ ericbmerritt ]; }; } diff --git a/pkgs/development/tools/misc/distcc/default.nix b/pkgs/development/tools/misc/distcc/default.nix index cf9d7a019204..ed3ad45c463a 100644 --- a/pkgs/development/tools/misc/distcc/default.nix +++ b/pkgs/development/tools/misc/distcc/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, popt, avahi, pkgconfig, python, gtk, runCommand, gcc, autoconf, automake, which, procps +{ stdenv, fetchFromGitHub, popt, avahi, pkgconfig, python, gtk, runCommand +, gcc, autoconf, automake, which, procps, libiberty_static , sysconfDir ? "" # set this parameter to override the default value $out/etc , static ? false }: @@ -15,7 +16,7 @@ let sha256 = "1vj31wcdas8wy52hy6749mlrca9v6ynycdiigx5ay8pnya9z73c6"; }; - buildInputs = [popt avahi pkgconfig python gtk autoconf automake pkgconfig which procps]; + buildInputs = [popt avahi pkgconfig python gtk autoconf automake pkgconfig which procps libiberty_static]; preConfigure = '' export CPATH=$(ls -d ${gcc.cc}/lib/gcc/*/${gcc.cc.version}/plugin/include) diff --git a/pkgs/servers/http/mini-httpd/default.nix b/pkgs/servers/http/mini-httpd/default.nix index 4cba9bc06687..5425ffb919f4 100644 --- a/pkgs/servers/http/mini-httpd/default.nix +++ b/pkgs/servers/http/mini-httpd/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1x4b6x40ymbaamqqq9p97lc0mnah4q7bza04fjs35c8agpm19zir"; }; + configureFlagsArray = [ "CFLAGS=-ansi" ]; + buildInputs = [ boost ]; enableParallelBuilding = true; diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix new file mode 100644 index 000000000000..254b7b9374eb --- /dev/null +++ b/pkgs/tools/admin/salt/default.nix @@ -0,0 +1,51 @@ +{ + stdenv, fetchurl, pythonPackages, openssl, + + # Many Salt modules require various Python modules to be installed, + # passing them in this array enables Salt to find them. + extraInputs ? [] +}: + +pythonPackages.buildPythonApplication rec { + name = "salt-${version}"; + version = "2015.8.8"; + + disabled = pythonPackages.isPy3k; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/s/salt/${name}.tar.gz"; + sha256 = "1xcfcs50pyammb60myph4f8bi2r6iwkxwsnnhrjwvkv2ymxwxv5j"; + }; + + propagatedBuildInputs = with pythonPackages; [ + futures + jinja2 + markupsafe + msgpack + pycrypto + pyyaml + pyzmq + requests + salttesting + tornado + ] ++ extraInputs; + + patches = [ ./fix-libcrypto-loading.patch ]; + + postPatch = '' + substituteInPlace "salt/utils/rsax931.py" \ + --subst-var-by "libcrypto" "${openssl}/lib/libcrypto.so" + ''; + + # The tests fail due to socket path length limits at the very least; + # possibly there are more issues but I didn't leave the test suite running + # as is it rather long. + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://saltstack.com/; + description = "Portable, distributed, remote execution and configuration management system"; + maintainers = with maintainers; [ aneeshusa ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/tools/admin/salt/fix-libcrypto-loading.patch b/pkgs/tools/admin/salt/fix-libcrypto-loading.patch new file mode 100644 index 000000000000..c5cc1bde5d07 --- /dev/null +++ b/pkgs/tools/admin/salt/fix-libcrypto-loading.patch @@ -0,0 +1,11 @@ +diff --git a/salt/utils/rsax931.py b/salt/utils/rsax931.py +index 9eb1f4a..d764f7a 100644 +--- a/salt/utils/rsax931.py ++++ b/salt/utils/rsax931.py +@@ -36,7 +36,7 @@ def _load_libcrypto(): + 'libcrypto.so*')) + lib = lib[0] if len(lib) > 0 else None + if lib: +- return cdll.LoadLibrary(lib) ++ return cdll.LoadLibrary('@libcrypto@') + raise OSError('Cannot locate OpenSSL libcrypto') diff --git a/pkgs/tools/admin/salt/testing.nix b/pkgs/tools/admin/salt/testing.nix new file mode 100644 index 000000000000..8c65defcab58 --- /dev/null +++ b/pkgs/tools/admin/salt/testing.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, pythonPackages }: + +pythonPackages.buildPythonApplication rec { + name = "SaltTesting-${version}"; + version = "2015.7.10"; + + disabled = pythonPackages.isPy3k; + + propagatedBuildInputs = with pythonPackages; [ + six + ]; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/S/SaltTesting/${name}.tar.gz"; + sha256 = "0p0y8kb77pis18rcig1kf9dnns4bnfa3mr91q40lq4mw63l1b34h"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/saltstack/salt-testing; + description = "Common testing tools used in the Salt Stack projects"; + maintainers = with maintainers; [ aneeshusa ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 5735aac8ad1a..2639cc4ac7ac 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -3832,12 +3832,12 @@ let subPackages = [ "./" ]; }; - godep = buildFromGitHub { - rev = "5598a9815350896a2cdf9f4f1d0a3003ab9677fb"; - version = "2015-10-15"; + godep = buildFromGitHub rec { + version = "60"; + rev = "v${version}"; owner = "tools"; repo = "godep"; - sha256 = "0zc1ah5cvaqa3zw0ska89a40x445vwl1ixz8v42xi3zicx16ibwz"; + sha256 = "1v05185ikfcb3sz9ygcwm9x8la77i27ml1bg9fs6vvahjzyr0rif"; }; color = buildFromGitHub { diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5568d45e7cfb..3a257dab37c9 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13331,7 +13331,7 @@ let self = _self // overrides; _self = with self; { }; propagatedBuildInputs = [ LWP ConfigGeneral NetIP TermReadKey Perl5lib - CryptSSLeay CSSDOM ]; + CryptSSLeay CSSDOM LWPProtocolHttps ]; meta = { homepage = http://validator.w3.org/checklink; description = "A tool to check links and anchors in Web pages or full Web sites"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 24279c41088d..e3b903471147 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20299,6 +20299,10 @@ in modules // { }; }; + salt = callPackage ../tools/admin/salt {}; + + salttesting = callPackage ../tools/admin/salt/testing.nix {}; + sandboxlib = buildPythonPackage rec { name = "sandboxlib-${version}"; version = "0.31"; diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix index 2b3b98dba63d..a829445d7b56 100644 --- a/pkgs/top-level/rust-packages.nix +++ b/pkgs/top-level/rust-packages.nix @@ -7,15 +7,15 @@ { runCommand, fetchFromGitHub, git }: let - version = "2016-03-22"; - rev = "f28cdedb698cf76f513fb4514b5ed2892ec89b2f"; + version = "2016-04-02"; + rev = "b705d049d78f96bc27c58ccec7902e65d90826bd"; src = fetchFromGitHub { inherit rev; owner = "rust-lang"; repo = "crates.io-index"; - sha256 = "05j43pgdlf554y9r781xdc5la55anwiq6k7vml9icak699ywfxqq"; + sha256 = "1aspn79i1rw9migw7j0m12ghdq9cqhq8n2vzxy6hy1l728j3ykdp"; }; in |