diff options
Diffstat (limited to 'pkgs')
29 files changed, 426 insertions, 232 deletions
diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix b/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix index 9e29bb9c4a6e..fd580ae9270c 100644 --- a/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix +++ b/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix @@ -18,16 +18,11 @@ stdenv.mkDerivation (rec { -e "s|^\(\(DEST_\)\?PREFIX\)=.*$|\1=$out|g ; \ s|/sbin/install-info|install-info|g" - - sed -i "bin/proofgeneral" -e's/which/type -p/g' - # @image{ProofGeneral} fails, so remove it. sed -i '94d' doc/PG-adapting.texi sed -i '96d' doc/ProofGeneral.texi ''; - patches = [ ./pg.patch ]; - preBuild = '' make clean; ''; diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/pg.patch b/pkgs/applications/editors/emacs-modes/proofgeneral/pg.patch deleted file mode 100644 index 704e4b6c8c7a..000000000000 --- a/pkgs/applications/editors/emacs-modes/proofgeneral/pg.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -r c7d8bfff4c0a bin/proofgeneral ---- a/bin/proofgeneral Sat Sep 27 02:25:15 2014 +0100 -+++ b/bin/proofgeneral Sat Sep 27 02:28:16 2014 +0100 -@@ -73,11 +73,7 @@ - - # Try to find Proof General directory - if [ -z "$PGHOME" ] || [ ! -d "$PGHOME" ]; then -- # default relative to this script, otherwise PGHOMEDEFAULT -- MYDIR="`readlink --canonicalize "$0" | sed -ne 's,/bin/proofgeneral$,,p'`" -- if [ -d "$MYDIR/generic" ]; then -- PGHOME="$MYDIR" -- elif [ -d "$PGHOMEDEFAULT" ]; then -+ if [ -d "$PGHOMEDEFAULT" ]; then - PGHOME="$PGHOMEDEFAULT" - else - echo "Cannot find the Proof General lisp files: Set PGHOME or use --pghome." diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix index 668044f5efb8..2f2ce79bcb18 100644 --- a/pkgs/applications/networking/mailreaders/astroid/default.nix +++ b/pkgs/applications/networking/mailreaders/astroid/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "astroid-${version}"; - version = "0.8"; + version = "0.9.1"; src = fetchFromGitHub { owner = "astroidmail"; repo = "astroid"; rev = "v${version}"; - sha256 = "1gjrdls1mz8y8bca7s8l965l0m7s2sb6g7a90gy848admjsyav7h"; + sha256 = "0ha2jd3fvc54amh0x8f58s9ac4r8xgyhvkwd4jvs0h4mfh6cg496"; }; nativeBuildInputs = [ scons pkgconfig wrapGAppsHook ]; diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 9faa9d8feb8a..fd3655ce9e92 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -46,6 +46,37 @@ self = stdenv.mkDerivation { (mapc (lambda (arg) (when (file-directory-p (concat arg "/lib/coq/${coq-version}/user-contrib")) (setenv "COQPATH" (concat (getenv "COQPATH") ":" arg "/lib/coq/${coq-version}/user-contrib")))) '(${stdenv.lib.concatStringsSep " " (map (pkg: "\"${pkg}\"") pkgs)})) + ; TODO Abstract this pattern from here and nixBufferBuilders.withPackages! + (defvar nixpkgs--coq-buffer-count 0) + (when (eq nixpkgs--coq-buffer-count 0) + (make-variable-buffer-local 'nixpkgs--is-nixpkgs-coq-buffer) + (defun nixpkgs--coq-inherit (buf) + (inherit-local-inherit-child buf) + (with-current-buffer buf + (setq nixpkgs--coq-buffer-count (1+ nixpkgs--coq-buffer-count)) + (add-hook 'kill-buffer-hook 'nixpkgs--decrement-coq-buffer-count nil t)) + buf) + ; When generating a scomint buffer, do inherit-local inheritance and make it a nixpkgs-coq buffer + (defun nixpkgs--around-scomint-make (orig &rest r) + (if nixpkgs--is-nixpkgs-coq-buffer + (progn + (advice-add 'get-buffer-create :filter-return #'nixpkgs--coq-inherit) + (apply orig r) + (advice-remove 'get-buffer-create #'nixpkgs--coq-inherit)) + (apply orig r))) + (advice-add 'scomint-make :around #'nixpkgs--around-scomint-make) + ; When we have no more coq buffers, tear down the buffer handling + (defun nixpkgs--decrement-coq-buffer-count () + (setq nixpkgs--coq-buffer-count (1- nixpkgs--coq-buffer-count)) + (when (eq nixpkgs--coq-buffer-count 0) + (advice-remove 'scomint-make #'nixpkgs--around-scomint-make) + (fmakunbound 'nixpkgs--around-scomint-make) + (fmakunbound 'nixpkgs--coq-inherit) + (fmakunbound 'nixpkgs--decrement-coq-buffer-count)))) + (setq nixpkgs--coq-buffer-count (1+ nixpkgs--coq-buffer-count)) + (add-hook 'kill-buffer-hook 'nixpkgs--decrement-coq-buffer-count nil t) + (setq nixpkgs--is-nixpkgs-coq-buffer t) + (inherit-local 'nixpkgs--is-nixpkgs-coq-buffer) ''; }; diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index fb3434e74587..f7037ee668c7 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -26,13 +26,13 @@ let optional = stdenv.lib.optional; in stdenv.mkDerivation rec { name = "obs-studio-${version}"; - version = "18.0.2"; + version = "19.0.2"; src = fetchFromGitHub { owner = "jp9000"; repo = "obs-studio"; - rev = "2bf9d548"; - sha256 = "036l29m3dlqadvaazj0nmgi2lcji8zckdvx3gjrx1kp96yd5myqd"; + rev = "${version}"; + sha256 = "0sawpk2yr52frdm4pkvahc11i1s1jlm7i07crhkxa8342sdc70ab"; }; patches = [ ./find-xcb.patch ]; diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index a47e740be95b..c80abd5f3a07 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -14,13 +14,13 @@ let else throw "Unsupported system!"; in stdenv.mkDerivation rec { name = "aws-sdk-cpp-${version}"; - version = "1.0.60"; + version = "1.0.127"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-sdk-cpp"; rev = version; - sha256 = "0k6jv70l4xhkf2rna6zaxkxgd7xh7cc1ghzska637h5d2v6h8nzk"; + sha256 = "1p06rkvi6mm4jylk5j7gji2c52qbls3i0yqg3hgs9iys4nd1p14r"; }; # FIXME: might be nice to put different APIs in different outputs diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix index 559caf8928b8..7bcfcef5788d 100644 --- a/pkgs/development/libraries/libopus/default.nix +++ b/pkgs/development/libraries/libopus/default.nix @@ -2,23 +2,16 @@ , fixedPoint ? false, withCustomModes ? true }: let - version = "1.1.3"; + version = "1.1.4"; in stdenv.mkDerivation rec { name = "libopus-${version}"; src = fetchurl { url = "http://downloads.xiph.org/releases/opus/opus-${version}.tar.gz"; - sha256 = "0cxnd7pjxbgh6l3cbzsw29phpr5cq28fikfhjlp1hc3y5s0gxdjq"; + sha256 = "14l6kpapmcnvl7p9hrmbqcnzj13zfzyppyc9a5kd4788h2rvc8li"; }; - patches = [ - (fetchpatch { # CVE-2017-0381 - url = "https://github.com/xiph/opus/commit/79e8f527b0344b0897a65be35e77f7885bd99409.patch"; - sha256 = "0clm4ixqkaj0a6i5rhaqfv3nnxyk33b2b8xlm7vyfd0y8kbh996q"; - }) - ]; - outputs = [ "out" "dev" ]; configureFlags = stdenv.lib.optional fixedPoint "--enable-fixed-point" diff --git a/pkgs/development/python-modules/flake8/default.nix b/pkgs/development/python-modules/flake8/default.nix new file mode 100644 index 000000000000..aec715328f9b --- /dev/null +++ b/pkgs/development/python-modules/flake8/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildPythonPackage, fetchPypi, pythonOlder +, mock, pytest, pytestrunner +, configparser, enum34, mccabe, pycodestyle, pyflakes +}: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "flake8"; + version = "3.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "04izn1q1lgbr408l9b3vkxqmpi6mq47bxwc0iwypb02mrxns41xr"; + }; + + buildInputs = [ pytest mock pytestrunner ]; + propagatedBuildInputs = [ pyflakes pycodestyle mccabe ] + ++ stdenv.lib.optionals (pythonOlder "3.4") [ enum34 ] + ++ stdenv.lib.optionals (pythonOlder "3.2") [ configparser ]; + + meta = with stdenv.lib; { + description = "Code checking using pep8 and pyflakes"; + homepage = http://pypi.python.org/pypi/flake8; + license = licenses.mit; + maintainers = with maintainers; [ garbas ]; + }; +} diff --git a/pkgs/development/python-modules/libsoundtouch/default.nix b/pkgs/development/python-modules/libsoundtouch/default.nix index 132f5edf518d..745f83fe5081 100644 --- a/pkgs/development/python-modules/libsoundtouch/default.nix +++ b/pkgs/development/python-modules/libsoundtouch/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "libsoundtouch"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "CharlesBlonde"; repo = "libsoundtouch"; - rev = "7c8f943298bcae5f0c25ad7be7469de51373cdbd"; - sha256 = "1a9mdy09n4bjx6nang7wfn2nq87dg2s18px4yqsj53mn5kjf44n0"; + rev = "875074b7a23734021974345b3dc297918e453aa2"; + sha256 = "1psd556j4x77hjxahxxgdgnq2mcd769whvnf0gmwf3jy2svfkqlg"; }; postPatch = lib.optionalString (! (pythonOlder "3.4")) '' diff --git a/pkgs/development/python-modules/mccabe/default.nix b/pkgs/development/python-modules/mccabe/default.nix new file mode 100644 index 000000000000..472bba26eb65 --- /dev/null +++ b/pkgs/development/python-modules/mccabe/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi, pytest, pytestrunner }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "mccabe"; + version = "0.6.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "07w3p1qm44hgxf3vvwz84kswpsx6s7kvaibzrsx5dzm0hli1i3fx"; + }; + + buildInputs = [ pytest pytestrunner ]; + + meta = with stdenv.lib; { + description = "McCabe checker, plugin for flake8"; + homepage = "https://github.com/flintwork/mccabe"; + license = licenses.mit; + maintainers = with maintainers; [ garbas ]; + }; +} diff --git a/pkgs/development/python-modules/pyflakes/default.nix b/pkgs/development/python-modules/pyflakes/default.nix new file mode 100644 index 000000000000..fbb0de6f0ced --- /dev/null +++ b/pkgs/development/python-modules/pyflakes/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPyPy, unittest2 }: + +buildPythonPackage rec { + pname = "pyflakes"; + version = "1.5.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1x1pcca4a24k4pw8x1c77sgi58cg1wl2k38mp8a25k608pzls3da"; + }; + + buildInputs = [ unittest2 ]; + + doCheck = !isPyPy; + + meta = with stdenv.lib; { + homepage = https://launchpad.net/pyflakes; + description = "A simple program which checks Python source files for errors"; + license = licenses.mit; + maintainers = with maintainers; [ garbas ]; + }; +} diff --git a/pkgs/development/tools/build-managers/pants/default.nix b/pkgs/development/tools/build-managers/pants/default.nix new file mode 100644 index 000000000000..80ac3c60608f --- /dev/null +++ b/pkgs/development/tools/build-managers/pants/default.nix @@ -0,0 +1,95 @@ +{ stdenv, pythonPackages }: + +with stdenv.lib; +with pythonPackages; + +let + # Get rid of this when pants 1.3.0 is released and make 0.5 the default + pathspec = buildPythonApplication rec { + pname = "pathspec"; + version = "0.3.4"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0a37yrr2jhlg8aiynxivh2xqani7l9j725qxzrm7cm7m4rfcl1bn"; + }; + + meta = { + description = "Utility library for gitignore-style pattern matching of file paths"; + homepage = "https://github.com/cpburnz/python-path-specification"; + license = licenses.mpl20; + maintainers = with maintainers; [ copumpkin ]; + }; + }; +in { + pants = + pythonPackages.buildPythonPackage rec { + pname = "pantsbuild.pants"; + version = "1.2.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1bnzhhd2acwk7ckv56xzg2d9vxacl3k5bh13bsjxymnq3spm962w"; + }; + + prePatch = '' + sed -E -i "s/'([[:alnum:].-]+)[=><][^']*'/'\\1'/g" setup.py + ''; + + # Unnecessary, and causes some really weird behavior around .class files, which + # this package bundles. See https://github.com/NixOS/nixpkgs/issues/22520. + dontStrip = true; + + propagatedBuildInputs = [ + ansicolors beautifulsoup4 cffi coverage docutils fasteners futures + isort lmdb markdown mock packaging pathspec pep8 pex psutil pyflakes + pygments pystache pytestcov pytest pywatchman requests scandir + setproctitle setuptools six thrift wheel twitter-common-dirutil + twitter-common-confluence twitter-common-collections + ]; + + meta = { + description = "A build system for software projects in a variety of languages"; + homepage = "http://www.pantsbuild.org/"; + license = licenses.asl20; + maintainers = with maintainers; [ copumpkin ]; + platforms = platforms.unix; + }; + }; + + pants13-pre = buildPythonApplication rec { + pname = "pantsbuild.pants"; + version = "1.3.0rc2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1d3i0jwhn94b96b3lwwxd10007hnxw6dw1azmwv3hhwq713gwnpi"; + }; + + prePatch = '' + sed -E -i "s/'([[:alnum:].-]+)[=><][[:digit:]=><.,]*'/'\\1'/g" setup.py + ''; + + # Unnecessary, and causes some really weird behavior around .class files, which + # this package bundles. See https://github.com/NixOS/nixpkgs/issues/22520. + dontStrip = true; + + propagatedBuildInputs = [ + twitter-common-collections setproctitle setuptools six ansicolors + packaging pathspec scandir twitter-common-dirutil psutil requests + pystache pex docutils markdown pygments twitter-common-confluence + fasteners coverage pywatchman futures cffi + ]; + + meta = { + description = "A build system for software projects in a variety of languages"; + homepage = "http://www.pantsbuild.org/"; + license = licenses.asl20; + maintainers = with maintainers; [ copumpkin ]; + platforms = platforms.unix; + }; + }; +} diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index a520db2c3645..2c1a81350124 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jenkins-${version}"; - version = "2.61"; + version = "2.62"; src = fetchurl { url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war"; - sha256 = "1h5im8158h403n5sj1xyhmq40pdq2pmbh7gqv3sv74mc3rjaffj5"; + sha256 = "1dqmvbl5sa82zsc03ns5i7ppjmdlg3pyk676xjxyr0p5ccbqlxxh"; }; buildCommand = '' diff --git a/pkgs/games/banner/default.nix b/pkgs/games/banner/default.nix index eb3692b05ab0..5699dbb72700 100644 --- a/pkgs/games/banner/default.nix +++ b/pkgs/games/banner/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "banner-1.3.3"; + name = "banner-1.3.4"; src = fetchurl { url = "http://software.cedar-solutions.com/ftp/software/${name}.tar.gz"; - sha256 = "1njbgba0gzvrmdkvfjgrnvj0i80yi8k7mpkgyxaj07bmv9kc3h5v"; + sha256 = "04q5ribr0r9s8waky3nk356l0qdhfxw15ipz7lsfgv1fxq3qk6bz"; }; meta = with stdenv.lib; { diff --git a/pkgs/games/eternity-engine/default.nix b/pkgs/games/eternity-engine/default.nix index 7091b900b7e6..453afe9e985b 100644 --- a/pkgs/games/eternity-engine/default.nix +++ b/pkgs/games/eternity-engine/default.nix @@ -1,19 +1,25 @@ -{ stdenv, cmake, mesa, SDL, SDL_mixer, SDL_net, fetchurl }: +{ stdenv, cmake, mesa_noglu, SDL, SDL_mixer, SDL_net, fetchFromGitHub, makeWrapper }: stdenv.mkDerivation rec { - name = "eternity-engine-3.40.46"; - src = fetchurl { - url = https://github.com/team-eternity/eternity/archive/3.40.46.tar.gz; - sha256 = "0jq8q0agw7lgab9q2h8wcaakvg913l9j3a6ss0hn9661plkw2yb4"; + name = "eternity-engine-${version}"; + version = "3.42.02"; + src = fetchFromGitHub { + owner = "team-eternity"; + repo = "eternity"; + rev = "${version}"; + sha256 = "00kpq4k23hjmzjaymw3sdda7mqk8fjq6dzf7fmdal9fm7lfmj41k"; }; - buildInputs = [ stdenv cmake mesa SDL SDL_mixer SDL_net ]; + nativeBuildInputs = [ cmake makeWrapper ]; + buildInputs = [ mesa_noglu SDL SDL_mixer SDL_net ]; enableParallelBuilding = true; installPhase = '' - mkdir -p $out/bin - cp source/eternity $out/bin + install -Dm755 source/eternity $out/lib/eternity/eternity + cp -r $src/base $out/lib/eternity/base + mkdir $out/bin + makeWrapper $out/lib/eternity/eternity $out/bin/eternity ''; meta = { diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix index b485c8063527..6e1a98bf258a 100644 --- a/pkgs/games/gzdoom/default.nix +++ b/pkgs/games/gzdoom/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "gzdoom-${version}"; - version = "2.3.2"; + version = "3.0.1"; src = fetchFromGitHub { owner = "coelckers"; repo = "gzdoom"; rev = "g${version}"; - sha256 = "1ys7wl4ygvm2lm49qjpql6c5i8gydmbg4f436bcpkywf5srr6xrd"; + sha256 = "0s0hl7pa2gr3cm884q7np5naybhv4hqhbfd3s45a8hdf72n6c9cm"; }; nativeBuildInputs = [ cmake makeWrapper ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { sed -i \ -e "s@/usr/share/sounds/sf2/@${soundfont-fluid}/share/soundfonts/@g" \ -e "s@FluidR3_GM.sf2@FluidR3_GM2-2.sf2@g" \ - src/sound/music_fluidsynth_mididevice.cpp + src/sound/mididevices/music_fluidsynth_mididevice.cpp ''; installPhase = '' @@ -42,8 +42,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://github.com/coelckers/gzdoom"; description = "A Doom source port based on ZDoom. It features an OpenGL renderer and lots of new features"; - # Doom source license, MAME license - license = licenses.unfreeRedistributable; + license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ lassulus ]; }; diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 2321187c96be..f783828f0319 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.12-rc1"; - modDirVersion = "4.12.0-rc1"; + version = "4.12-rc2"; + modDirVersion = "4.12.0-rc2"; extraMeta.branch = "4.12"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "13xyiqn7xv8ryqrfsx8b18qm1zj0qkfz92mdh611nqhhdlw7gcpk"; + sha256 = "18p68ig9irblbxbg68jz766158bxr81824q91mnf372i5z9irj9w"; }; features.iwlwifi = true; diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 32b7694ba34b..798d00b0be13 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -45,10 +45,15 @@ let ''; fishPreInitHooks = '' - # source nixos environment if we're a login shell + # source nixos environment + # note that this is required: + # 1. For all shells, not just login shells (mosh needs this as do some other command-line utilities) + # 2. Before the shell is initialized, so that config snippets can find the commands they use on the PATH builtin status --is-login + or test -z "$__fish_nixos_env_preinit_sourced" -a -z "$ETC_PROFILE_SOURCED" -a -z "$ETC_ZSHENV_SOURCED" and test -f /etc/fish/nixos-env-preinit.fish and source /etc/fish/nixos-env-preinit.fish + and set -gx __fish_nixos_env_preinit_sourced 1 test -n "$NIX_PROFILES" and begin diff --git a/pkgs/tools/misc/bibtool/default.nix b/pkgs/tools/misc/bibtool/default.nix index f60007341582..5e8a8c56b0a7 100644 --- a/pkgs/tools/misc/bibtool/default.nix +++ b/pkgs/tools/misc/bibtool/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "bibtool-${version}"; - version = "2.57"; + version = "2.67"; src = fetchurl { url = "http://www.gerd-neugebauer.de/software/TeX/BibTool/BibTool-${version}.tar.gz"; - sha256 = "1g3yqywnbg04imkcqx7ypq0din81vcgq90k2xlqih69blbqpfb5y"; + sha256 = "116pv532mz0q954y5b7c6zipnamc05f0x7g5x1b674jsjxh42v2v"; }; # Perl for running test suite. @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tool for manipulating BibTeX bibliographies"; homepage = http://www.gerd-neugebauer.de/software/TeX/BibTool/index.en.html; - license = licenses.gpl1; + license = licenses.gpl2; platforms = platforms.all; maintainers = [ maintainers.rycee ]; }; diff --git a/pkgs/tools/misc/fwup/default.nix b/pkgs/tools/misc/fwup/default.nix index 5d2b96d3261a..8937de88c38d 100644 --- a/pkgs/tools/misc/fwup/default.nix +++ b/pkgs/tools/misc/fwup/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "fwup-${version}"; - version = "0.14.2"; + version = "0.14.3"; src = fetchFromGitHub { owner = "fhunleth"; repo = "fwup"; rev = "v${version}"; - sha256 = "0ddyiprq4qnqpdhh48bivl8c5yrh21p4r99qs0d1rjiwx5h9p21l"; + sha256 = "15sjpxw1llpipshriivpha6470lkvhcgs5wh5mlaabjbvrgxygqh"; }; doCheck = true; diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix index 1f003f67df6d..8e37b85275d1 100644 --- a/pkgs/tools/networking/aria2/default.nix +++ b/pkgs/tools/networking/aria2/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "aria2-${version}"; - version = "1.31.0"; + version = "1.32.0"; src = fetchFromGitHub { owner = "aria2"; repo = "aria2"; rev = "release-${version}"; - sha256 = "0d7z4bss1plkvlw5kfwzivxryrh13zi58ii3vf8q4csaz4yqhcjy"; + sha256 = "098ahj7nyf5c70221aq5q3aqllb94frz9lzig8rkhqfsa4mmslg5"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; diff --git a/pkgs/tools/networking/hss/default.nix b/pkgs/tools/networking/hss/default.nix new file mode 100644 index 000000000000..cfc9986b0db8 --- /dev/null +++ b/pkgs/tools/networking/hss/default.nix @@ -0,0 +1,34 @@ +{ lib, buildRubyGem, ruby, openssh }: + +# Example ~/.hss.yml +#--- +#patterns: +# - note: Basic test +# example: g -> github +# short: '^g$' +# long: 'git@github.com' + +buildRubyGem rec { + name = "hss-${version}"; + inherit ruby; + gemName = "hss"; + version = "1.0.1"; + sha256 = "0hdfpxxqsh6gisn8mm0knsl1aig9fir0h2x9sirk3gr36qbz5xa4"; + + postInstall = '' + substituteInPlace $GEM_HOME/gems/${gemName}-${version}/bin/hss \ + --replace \ + "'ssh'" \ + "'${openssh}/bin/ssh'" + ''; + + meta = with lib; { + description = '' + A SSH helper that uses regex and fancy expansion to dynamically manage SSH shortcuts. + ''; + homepage = https://github.com/akerl/hss; + license = licenses.mit; + maintainers = with maintainers; [ nixy ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/package-management/nixops/unstable.nix b/pkgs/tools/package-management/nixops/unstable.nix index d951b2ba0a5e..681cc3d883c8 100644 --- a/pkgs/tools/package-management/nixops/unstable.nix +++ b/pkgs/tools/package-management/nixops/unstable.nix @@ -1,10 +1,10 @@ { callPackage, fetchurl }: callPackage ./generic.nix (rec { - version = "2017-05-15"; + version = "2017-05-22"; src = fetchurl { # Sadly hydra doesn't offer download links - url = "https://static.domenkozar.com/nixops-tarball-1.5.1pre2165_b2fdc43.tar.bz2"; - sha256 = "1x8jiskxynx0rzw356sz406bi2vl0vjs7747sbacq0bp1jlnpb2n"; + url = "https://static.domenkozar.com/nixops-1.5.1pre2169_8f4a67c.tar.bz2"; + sha256 = "0rma5npgkhlknmvm8z0ps54dsr07za1f32p6d6na3nis784h0slw"; }; }) diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index b8e0ebaa9bbe..50782f176702 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - name = "sudo-1.8.19p2"; + name = "sudo-1.8.20"; src = fetchurl { urls = [ "ftp://ftp.sudo.ws/pub/sudo/${name}.tar.gz" "ftp://ftp.sudo.ws/pub/sudo/OLD/${name}.tar.gz" ]; - sha256 = "1q2j3b1xqw66kdd5h8a6j62cz7xhk1qp1dx4rz59xm9agkk1hzi3"; + sha256 = "1q70f2wqbpgq828xmfzidbhyll5p08qbj7f3p2sw2v4whpdbi5wy"; }; configureFlags = [ diff --git a/pkgs/tools/text/xml/basex/default.nix b/pkgs/tools/text/xml/basex/default.nix index b7ff365fad52..4a7a478a12ac 100644 --- a/pkgs/tools/text/xml/basex/default.nix +++ b/pkgs/tools/text/xml/basex/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, unzip, jre, coreutils, makeDesktopItem }: stdenv.mkDerivation rec { - name = "basex-8.3.1"; + name = "basex-${version}"; + version = "8.6.4"; src = fetchurl { - url = "http://files.basex.org/releases/8.3.1/BaseX831.zip"; - sha256 = "08ba0qvfaa1560hy0nsiq9y6slgdj46j9rdssigf2vvkc5ngkgg0"; + url = "http://files.basex.org/releases/${version}/BaseX864.zip"; + sha256 = "14320hfw53m0zl1v4377p0vcjvdnwfpa4gkj2y2wlrplma76y0w7"; }; buildInputs = [ unzip jre ]; diff --git a/pkgs/tools/virtualization/cloud-init/add-nixos-support.patch b/pkgs/tools/virtualization/cloud-init/add-nixos-support.patch new file mode 100644 index 000000000000..00cb7d070c64 --- /dev/null +++ b/pkgs/tools/virtualization/cloud-init/add-nixos-support.patch @@ -0,0 +1,113 @@ +diff -ruN cloud-init-0.7.6.orig/cloudinit/distros/__init__.py cloud-init-0.7.6/cloudinit/distros/__init__.py +--- cloud-init-0.7.6.orig/cloudinit/distros/__init__.py 2014-10-10 15:26:25.000000000 +0000 ++++ cloud-init-0.7.6/cloudinit/distros/__init__.py 2016-06-08 07:51:45.230357099 +0000 +@@ -43,6 +43,7 @@ + 'freebsd': ['freebsd'], + 'suse': ['sles'], + 'arch': ['arch'], ++ 'nixos': ['nixos'], + } + + LOG = logging.getLogger(__name__) +diff -ruN cloud-init-0.7.6.orig/cloudinit/distros/nixos.py cloud-init-0.7.6/cloudinit/distros/nixos.py +--- cloud-init-0.7.6.orig/cloudinit/distros/nixos.py 1970-01-01 00:00:00.000000000 +0000 ++++ cloud-init-0.7.6/cloudinit/distros/nixos.py 2016-06-08 07:50:58.602616595 +0000 +@@ -0,0 +1,98 @@ ++# vi: ts=4 expandtab ++# ++# Copyright (C) 2012 Canonical Ltd. ++# Copyright (C) 2012 Hewlett-Packard Development Company, L.P. ++# Copyright (C) 2012 Yahoo! Inc. ++# ++# Author: Scott Moser <scott.moser@canonical.com> ++# Author: Juerg Haefliger <juerg.haefliger@hp.com> ++# Author: Joshua Harlow <harlowja@yahoo-inc.com> ++# ++# This program is free software: you can redistribute it and/or modify ++# it under the terms of the GNU General Public License version 3, as ++# published by the Free Software Foundation. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program. If not, see <http://www.gnu.org/licenses/>. ++ ++from cloudinit import distros ++from cloudinit import helpers ++from cloudinit import log as logging ++from cloudinit import util ++ ++from cloudinit.distros.parsers.hostname import HostnameConf ++ ++LOG = logging.getLogger(__name__) ++ ++class Distro(distros.Distro): ++ ++ def __init__(self, name, cfg, paths): ++ distros.Distro.__init__(self, name, cfg, paths) ++ # This will be used to restrict certain ++ # calls from repeatly happening (when they ++ # should only happen say once per instance...) ++ self._runner = helpers.Runners(paths) ++ self.osfamily = 'nixos' ++ ++ def _select_hostname(self, hostname, fqdn): ++ # Prefer the short hostname over the long ++ # fully qualified domain name ++ if not hostname: ++ return fqdn ++ return hostname ++ ++ def _write_hostname(self, your_hostname, out_fn): ++ conf = None ++ try: ++ # Try to update the previous one ++ # so lets see if we can read it first. ++ conf = self._read_hostname_conf(out_fn) ++ except IOError: ++ pass ++ if not conf: ++ conf = HostnameConf('') ++ conf.set_hostname(your_hostname) ++ util.write_file(out_fn, str(conf), 0644) ++ ++ def _read_system_hostname(self): ++ sys_hostname = self._read_hostname(self.hostname_conf_fn) ++ return (self.hostname_conf_fn, sys_hostname) ++ ++ def _read_hostname_conf(self, filename): ++ conf = HostnameConf(util.load_file(filename)) ++ conf.parse() ++ return conf ++ ++ def _read_hostname(self, filename, default=None): ++ hostname = None ++ try: ++ conf = self._read_hostname_conf(filename) ++ hostname = conf.hostname ++ except IOError: ++ pass ++ if not hostname: ++ return default ++ return hostname ++ ++ def _write_network(self, settings): ++ raise NotImplementedError() ++ ++ def apply_locale(self, locale, out_fn=None): ++ raise NotImplementedError() ++ ++ def install_packages(self, pkglist): ++ raise NotImplementedError() ++ ++ def package_command(self, command, args=None, pkgs=None): ++ raise NotImplementedError() ++ ++ def set_timezone(self, tz): ++ raise NotImplementedError() ++ ++ def update_package_sources(self): ++ raise NotImplementedError() diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix index c038ca7c1bbe..94dae1e47faa 100644 --- a/pkgs/tools/virtualization/cloud-init/default.nix +++ b/pkgs/tools/virtualization/cloud-init/default.nix @@ -1,6 +1,6 @@ -{ lib, pythonPackages, fetchurl }: +{ lib, pythonPackages, fetchurl, kmod, systemd, cloud-utils }: -let version = "0.7.6"; +let version = "0.7.9"; in pythonPackages.buildPythonApplication rec { name = "cloud-init-${version}"; @@ -8,10 +8,11 @@ in pythonPackages.buildPythonApplication rec { src = fetchurl { url = "https://launchpad.net/cloud-init/trunk/${version}/+download/cloud-init-${version}.tar.gz"; - sha256 = "1mry5zdkfaq952kn1i06wiggc66cqgfp6qgnlpk0mr7nnwpd53wy"; + sha256 = "0wnl76pdcj754pl99wxx76hkir1s61x0bg0lh27sdgdxy45vivbn"; }; - patchPhase = '' + patches = [ ./add-nixos-support.patch ]; + prePatch = '' patchShebangs ./tools substituteInPlace setup.py \ @@ -19,15 +20,18 @@ in pythonPackages.buildPythonApplication rec { --replace /etc $out/etc \ --replace /lib/systemd $out/lib/systemd \ --replace 'self.init_system = ""' 'self.init_system = "systemd"' + + substituteInPlace cloudinit/config/cc_growpart.py \ + --replace 'util.subp(["growpart"' 'util.subp(["${cloud-utils}/bin/growpart"' ''; propagatedBuildInputs = with pythonPackages; [ cheetah jinja2 prettytable - oauth pyserial configobj pyyaml argparse requests jsonpatch ]; + oauthlib pyserial configobj pyyaml argparse requests jsonpatch ]; meta = { homepage = http://cloudinit.readthedocs.org; description = "Provides configuration and customization of cloud instance"; - maintainers = [ lib.maintainers.madjar ]; + maintainers = [ lib.maintainers.madjar lib.maintainers.phile314 ]; platforms = lib.platforms.all; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index da54dd8be130..e96a50e14659 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6937,6 +6937,8 @@ with pkgs; pahole = callPackage ../development/tools/misc/pahole {}; + inherit (callPackages ../development/tools/build-managers/pants {}) pants pants13-pre; + parse-cli-bin = callPackage ../development/tools/parse-cli-bin { }; patchelf = callPackage ../development/tools/misc/patchelf { }; @@ -18819,4 +18821,6 @@ with pkgs; xib2nib = callPackage ../development/tools/xib2nib {}; linode-cli = callPackage ../tools/virtualization/linode-cli { }; + + hss = callPackage ../tools/networking/hss {}; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c0b63fb4b412..e6bd20ba2b7b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4253,11 +4253,11 @@ in { sha256 = "01h3lrf6d98j07iakifi81qjszh6faa37ibx7ylva1vsqbwx2hgi"; }; - # On i686-linux and Python 2.x this test fails because the result is "3L" - # instead of "3", so let's fix it in-place. + # With Python 2.x on i686-linux or 32-bit ARM this test fails because the + # result is "3L" instead of "3", so let's fix it in-place. # # Upstream issue: https://github.com/cython/cython/issues/1548 - postPatch = optionalString (stdenv.isi686 && !isPy3k) '' + postPatch = optionalString ((stdenv.isi686 || stdenv.isArm) && !isPy3k) '' sed -i -e 's/\(>>> *\)\(verify_resolution_GH1533()\)/\1int(\2)/' \ tests/run/cpdef_enums.pyx ''; @@ -8285,93 +8285,9 @@ in { }; }; - pants = let - # Get rid of this when pants 1.3.0 is released and make 0.5 the default - pathspec = buildPythonPackage rec { - pname = "pathspec"; - version = "0.3.4"; - name = "${pname}-${version}"; - - src = self.fetchPypi { - inherit pname version; - sha256 = "0a37yrr2jhlg8aiynxivh2xqani7l9j725qxzrm7cm7m4rfcl1bn"; - }; - - meta = { - description = "Utility library for gitignore-style pattern matching of file paths"; - homepage = "https://github.com/cpburnz/python-path-specification"; - license = licenses.mpl20; - maintainers = with maintainers; [ copumpkin ]; - }; - }; - in buildPythonPackage rec { - pname = "pantsbuild.pants"; - version = "1.2.1"; - name = "${pname}-${version}"; - - src = self.fetchPypi { - inherit pname version; - sha256 = "1bnzhhd2acwk7ckv56xzg2d9vxacl3k5bh13bsjxymnq3spm962w"; - }; - - prePatch = '' - sed -E -i "s/'([[:alnum:].-]+)[=><][^']*'/'\\1'/g" setup.py - ''; - - # Unnecessary, and causes some really weird behavior around .class files, which - # this package bundles. See https://github.com/NixOS/nixpkgs/issues/22520. - dontStrip = true; - - propagatedBuildInputs = with self; [ - ansicolors beautifulsoup4 cffi coverage docutils fasteners futures - isort lmdb markdown mock packaging pathspec pep8 pex psutil pyflakes - pygments pystache pytestcov pytest pywatchman requests scandir - setproctitle setuptools six thrift wheel twitter-common-dirutil - twitter-common-confluence twitter-common-collections - ]; - - meta = { - description = "A build system for software projects in a variety of languages"; - homepage = "http://www.pantsbuild.org/"; - license = licenses.asl20; - maintainers = with maintainers; [ copumpkin ]; - platforms = platforms.unix; - }; - }; - - pants13-pre = buildPythonPackage rec { - pname = "pantsbuild.pants"; - version = "1.3.0.dev19"; - name = "${pname}-${version}"; - - src = self.fetchPypi { - inherit pname version; - sha256 = "07gxx8kzkcx3pm2qd5sz2xb3nw9khvbapiqdzgjvzbvai2gsd5qq"; - }; - - prePatch = '' - sed -E -i "s/'([[:alnum:].-]+)[=><][[:digit:]=><.,]*'/'\\1'/g" setup.py - ''; - - # Unnecessary, and causes some really weird behavior around .class files, which - # this package bundles. See https://github.com/NixOS/nixpkgs/issues/22520. - dontStrip = true; - - propagatedBuildInputs = with self; [ - twitter-common-collections setproctitle setuptools six ansicolors - packaging pathspec scandir twitter-common-dirutil psutil requests - pystache pex docutils markdown pygments twitter-common-confluence - fasteners coverage pywatchman futures cffi - ]; - - meta = { - description = "A build system for software projects in a variety of languages"; - homepage = "http://www.pantsbuild.org/"; - license = licenses.asl20; - maintainers = with maintainers; [ copumpkin ]; - platforms = platforms.unix; - }; - }; + # These used to be here but were moved to all-packages, but I'll leave them around for a while. + pants = stdenv.lib.warn "Please refer to pants from the top level rather than from pythonPackages. This attribute will disappear by 2017-08-22." pkgs.pants; + pants13-pre = stdenv.lib.warn "Please refer to pants13-pre from the top level rather than from pythonPackages. This attribute will disappear by 2017-08-22." pkgs.pants13-pre; paperwork-backend = buildPythonPackage rec { name = "paperwork-backend-${version}"; @@ -11030,27 +10946,7 @@ in { }; }; - flake8 = buildPythonPackage rec { - name = "flake8-${version}"; - version = "3.2.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/f/flake8/${name}.tar.gz"; - sha256 = "c7c460b5aff3a2063c798a77af18ec70af3941d35a22e2e76965e3c0e0b36055"; - }; - - buildInputs = with self; [ pytest mock pytestrunner ]; - propagatedBuildInputs = with self; [ pyflakes pycodestyle mccabe ] - ++ optionals (pythonOlder "3.4") [ enum34 ] - ++ optionals (pythonOlder "3.2") [ configparser ]; - - meta = { - description = "Code checking using pep8 and pyflakes"; - homepage = http://pypi.python.org/pypi/flake8; - license = licenses.mit; - maintainers = with maintainers; [ garbas ]; - }; - }; + flake8 = callPackage ../development/python-modules/flake8 { }; flake8-blind-except = callPackage ../development/python-modules/flake8-blind-except { }; @@ -13917,23 +13813,7 @@ in { }; - mccabe = buildPythonPackage (rec { - name = "mccabe-0.5.3"; - - src = pkgs.fetchurl { - url = "mirror://pypi/m/mccabe/${name}.tar.gz"; - sha256 = "16293af41e7242031afd73896fef6458f4cad38201d21e28f344fff50ae1c25e"; - }; - - buildInputs = with self; [ pytestrunner pytest ]; - - meta = { - description = "McCabe checker, plugin for flake8"; - homepage = "https://github.com/flintwork/mccabe"; - license = licenses.mit; - maintainers = with maintainers; [ garbas ]; - }; - }); + mccabe = callPackage ../development/python-modules/mccabe { }; mechanize = buildPythonPackage (rec { name = "mechanize-0.2.5"; @@ -19752,28 +19632,7 @@ in { }; }; - pyflakes = buildPythonPackage rec { - pname = "pyflakes"; - version = "1.3.0"; - name = "${pname}-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "a4f93317c97a9d9ed71d6ecfe08b68e3de9fea3f4d94dcd1d9d83ccbf929bc31"; - }; - - buildInputs = with self; [ unittest2 ]; - - doCheck = !isPyPy; - force-rebuild = 1; # fix transient test suite error at http://hydra.nixos.org/build/45083762 - - meta = { - homepage = https://launchpad.net/pyflakes; - description = "A simple program which checks Python source files for errors"; - license = licenses.mit; - maintainers = with maintainers; [ garbas ]; - }; - }; + pyflakes = callPackage ../development/python-modules/pyflakes { }; pyftgl = buildPythonPackage rec { name = "pyftgl-0.4b"; |