diff options
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix | 11 | ||||
-rw-r--r-- | pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix | 4 | ||||
-rw-r--r-- | pkgs/build-support/trivial-builders.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/tinycc/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/python-modules/hypothesis.nix | 1 | ||||
-rw-r--r-- | pkgs/development/python-modules/simplejson/default.nix | 28 | ||||
-rw-r--r-- | pkgs/development/tools/analysis/cppcheck/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/misc/moreutils/default.nix | 13 | ||||
-rw-r--r-- | pkgs/tools/misc/pick/default.nix | 8 | ||||
-rw-r--r-- | pkgs/tools/security/cfssl/default.nix | 23 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 25 |
13 files changed, 86 insertions, 43 deletions
diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 4443c8480663..2c9661c36fa5 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -87,12 +87,18 @@ let srcs = { "x86_64-linux" = fetchurl { - url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"; + urls = [ + "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz" + "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" + ]; sha256 = "0jn98arczlgjigpmql1qg5b7izabv4zy4mji6vvcg3b8g1ma108r"; }; "i686-linux" = fetchurl { - url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"; + urls = [ + "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz" + "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" + ]; sha256 = "0micxgkbys0py4bj6csbc8xz4gq0x5v2zirgi38krnm5x5riqj3w"; }; }; @@ -105,6 +111,7 @@ stdenv.mkDerivation rec { src = srcs."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}"); preferLocalBuild = true; + allowSubstitutes = false; desktopItem = makeDesktopItem { name = "torbrowser"; diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix index d1996b72154d..d38529e92e60 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "git-annex-remote-rclone-${version}"; - version = "0.4"; + version = "0.5"; rev = "v${version}"; src = fetchFromGitHub { inherit rev; owner = "DanielDent"; repo = "git-annex-remote-rclone"; - sha256 = "1myk307hqm8dlxhkmwr347rdd28niv5h0gyrxm30y77zlly30ddk"; + sha256 = "1353b6q3lnxhpdfy9yd2af65v7aypdhyvgn7ziksmsrbi12lb74i"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index 1529869aa331..4debd9636396 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -71,7 +71,7 @@ rec { '' mkdir -p $out for i in $paths; do - ${lndir}/bin/lndir $i $out + ${lndir}/bin/lndir -silent $i $out done ${postBuild} ''; diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix index dfbbaa4d4310..fcad6045dbfb 100644 --- a/pkgs/development/compilers/tinycc/default.nix +++ b/pkgs/development/compilers/tinycc/default.nix @@ -2,10 +2,10 @@ with stdenv.lib; let - date = "20170225"; + date = "20170527"; version = "0.9.27pre-${date}"; - rev = "bb93064d7857d887b674999c9b4152b44a628f9a"; - sha256 = "12wcahj1x4qy9ia931i23lvwkqjmyhaks3wipnzvbnlnc2b03kpr"; + rev = "53c5fc2246270e0242903de0152a9a5d40f3d679"; + sha256 = "0z5ayz0kdn5xqm84k730hmd7r9cq0zxxf45g5phgqppdfajrmswz"; in stdenv.mkDerivation rec { diff --git a/pkgs/development/python-modules/hypothesis.nix b/pkgs/development/python-modules/hypothesis.nix index 0927c703fbfd..b9f95d1a0313 100644 --- a/pkgs/development/python-modules/hypothesis.nix +++ b/pkgs/development/python-modules/hypothesis.nix @@ -28,6 +28,7 @@ buildPythonPackage rec { # https://github.com/DRMacIver/hypothesis/issues/300 checkPhase = '' + rm tox.ini # This file changes how py.test runs and breaks it py.test tests/cover ''; diff --git a/pkgs/development/python-modules/simplejson/default.nix b/pkgs/development/python-modules/simplejson/default.nix new file mode 100644 index 000000000000..983d17655215 --- /dev/null +++ b/pkgs/development/python-modules/simplejson/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "simplejson"; + version = "3.10.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "953be622e88323c6f43fad61ffd05bebe73b9fd9863a46d68b052d2aa7d71ce2"; + }; + + meta = { + description = "A simple, fast, extensible JSON encoder/decoder for Python"; + longDescription = '' + simplejson is compatible with Python 2.4 and later with no + external dependencies. It covers the full JSON specification + for both encoding and decoding, with unicode support. By + default, encoding is done in an encoding neutral fashion (plain + ASCII with \uXXXX escapes for unicode characters). + ''; + homepage = http://code.google.com/p/simplejson/; + license = lib.licenses.mit; + }; +} \ No newline at end of file diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix index a394105faf4b..ce9ca76a43b2 100644 --- a/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/pkgs/development/tools/analysis/cppcheck/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "cppcheck"; - version = "1.78"; + version = "1.79"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/${pname}/${name}.tar.bz2"; - sha256 = "1cc60y2vjq4g88183jkan91ybzqy0n6p5ncs8z5rh6rjsvvrc9p4"; + sha256 = "0vgh4zx191d7mcmiilkhcbd9jkspfkppl7l4y5451walvs9vd19b"; }; buildInputs = [ pcre ]; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix index 2d25e6bf4304..c53f766cb7d3 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { isIbusEngine = true; description = "m17n engine for ibus"; - homepage = https://github.com.com/ibus/ibus-m17n; + homepage = https://github.com/ibus/ibus-m17n; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ ericsagnes ]; diff --git a/pkgs/tools/misc/moreutils/default.nix b/pkgs/tools/misc/moreutils/default.nix index a232028976dc..51ac3249fed8 100644 --- a/pkgs/tools/misc/moreutils/default.nix +++ b/pkgs/tools/misc/moreutils/default.nix @@ -1,13 +1,14 @@ -{ stdenv, fetchurl, libxml2, libxslt, docbook-xsl, docbook_xml_dtd_44, perl, IPCRun, TimeDate, TimeDuration, makeWrapper }: +{ stdenv, fetchgit, libxml2, libxslt, docbook-xsl, docbook_xml_dtd_44, perl, IPCRun, TimeDate, TimeDuration, makeWrapper }: with stdenv.lib; stdenv.mkDerivation rec { name = "moreutils-${version}"; - version = "0.59"; + version = "0.61"; - src = fetchurl { - url = "http://ftp.de.debian.org/debian/pool/main/m/moreutils/moreutils_${version}.orig.tar.gz"; - sha256 = "1d6ik3j4lwp90vb93p7yv60k6vk2chz448d1z9xrmxvv371i33m4"; + src = fetchgit { + url = "git://git.joeyh.name/moreutils"; + rev = "refs/tags/${version}"; + sha256 = "1qvwlq0a2zs7qkjqc9c842979axkjfdr7nic1gsm4zc6jd72y7pr"; }; preBuild = '' @@ -25,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "Growing collection of the unix tools that nobody thought to write long ago when unix was young"; homepage = https://joeyh.name/code/moreutils/; - maintainers = with maintainers; [ koral ]; + maintainers = with maintainers; [ koral pSub ]; platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/pick/default.nix b/pkgs/tools/misc/pick/default.nix index a407a85d1a20..075949f47e1a 100644 --- a/pkgs/tools/misc/pick/default.nix +++ b/pkgs/tools/misc/pick/default.nix @@ -2,19 +2,23 @@ stdenv.mkDerivation rec { name = "pick-${version}"; - version = "1.4.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "thoughtbot"; repo = "pick"; rev = "v${version}"; - sha256 = "113if0jh7svwrwrxhrsbi7h1whfr5707v2ny4dc9kk2sjbv6b9pg"; + sha256 = "0iw3yqwg8j0pg56xx52xwn7n95vxlqbqh71zrc934v4mq971qlhd"; }; buildInputs = [ ncurses ]; nativeBuildInputs = [ autoreconfHook ]; + postPatch = '' + sed -i -e 's/\[curses]/\[ncurses]/g' configure.ac + ''; + meta = with stdenv.lib; { inherit (src.meta) homepage; description = "Fuzzy text selection utility"; diff --git a/pkgs/tools/security/cfssl/default.nix b/pkgs/tools/security/cfssl/default.nix new file mode 100644 index 000000000000..91a5fa4bdd24 --- /dev/null +++ b/pkgs/tools/security/cfssl/default.nix @@ -0,0 +1,23 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub, pkgs }: + +buildGoPackage rec { + name = "cfssl-${version}"; + version = "20170527"; + + goPackagePath = "github.com/cloudflare/cfssl"; + + src = fetchFromGitHub { + owner = "cloudflare"; + repo = "cfssl"; + rev = "114dc9691ec7bf3dac49d5953eccf7d91a0e0904"; + sha256 = "1ijq43mrzrf1gkgj5ssxq7sgy6sd4rl706dzqkq9krqv5f6kwhj1"; + }; + + meta = with stdenv.lib; { + homepage = https://cfssl.org/; + description = "Cloudflare's PKI and TLS toolkit"; + platforms = platforms.linux; + license = licenses.bsd2; + maintainers = with maintainers; [ mbrgm ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9cd3199a1d5a..b08a42198e1a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1386,6 +1386,8 @@ with pkgs; c14 = callPackage ../applications/networking/c14 { }; + cfssl = callPackage ../tools/security/cfssl { }; + checkbashisms = callPackage ../development/tools/misc/checkbashisms { }; clamav = callPackage ../tools/security/clamav { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3732556bfad2..3f5b20a62d62 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -22775,30 +22775,7 @@ in { }; }; - simplejson = buildPythonPackage (rec { - name = "simplejson-3.8.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/simplejson/${name}.tar.gz"; - sha256 = "14r4l4rcsyf87p2j4ycsbb017n4vzxfmv285rq2gny4w47rwi2j2"; - }; - - meta = { - description = "A simple, fast, extensible JSON encoder/decoder for Python"; - - longDescription = '' - simplejson is compatible with Python 2.4 and later with no - external dependencies. It covers the full JSON specification - for both encoding and decoding, with unicode support. By - default, encoding is done in an encoding neutral fashion (plain - ASCII with \uXXXX escapes for unicode characters). - ''; - - homepage = http://code.google.com/p/simplejson/; - - license = licenses.mit; - }; - }); + simplejson = callPackage ../development/python-modules/simplejson { }; simpleldap = buildPythonPackage rec { version = "0.8"; |