diff options
| -rw-r--r-- | .github/ISSUE_TEMPLATE.md | 16 | ||||
| -rw-r--r-- | nixos/doc/manual/installation/installing-usb.xml | 16 | ||||
| -rw-r--r-- | pkgs/applications/editors/atom/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/misc/albert/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/development/compilers/abc/default.nix | 38 | ||||
| -rw-r--r-- | pkgs/development/interpreters/erlang/R17.nix | 8 | ||||
| -rw-r--r-- | pkgs/development/python-modules/sphinx-fix-tests-with-pygments-2.1.patch | 63 | ||||
| -rw-r--r-- | pkgs/tools/misc/bandwidth/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 30 | ||||
| -rw-r--r-- | pkgs/top-level/go-packages.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 57 |
11 files changed, 116 insertions, 144 deletions
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 327959fe7a3c..5d99147051f1 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,17 +1,13 @@ -## Basic info +## Issue description -To make sure that we are on the same page: -* Kernel: (run `uname -a`) -* System: (NixOS: `nixos-version`, Ubuntu/Fedora: `lsb_release -a`, ...) -* Nix version: (run `nix-env --version`) -* Nixpkgs version: (run `nix-instantiate --eval '<nixpkgs>' -A lib.nixpkgsVersion`) -## Describe your issue here +### Steps to reproduce -### Expected result -### Actual result -### Steps to reproduce +## Technical details +* System: (NixOS: `nixos-version`, Ubuntu/Fedora: `lsb_release -a`, ...) +* Nix version: (run `nix-env --version`) +* Nixpkgs version: (run `nix-instantiate --eval '<nixpkgs>' -A lib.nixpkgsVersion`) diff --git a/nixos/doc/manual/installation/installing-usb.xml b/nixos/doc/manual/installation/installing-usb.xml index 5def6e8753fe..a4b5dafbed16 100644 --- a/nixos/doc/manual/installation/installing-usb.xml +++ b/nixos/doc/manual/installation/installing-usb.xml @@ -7,10 +7,18 @@ <title>Booting from a USB Drive</title> <para>For systems without CD drive, the NixOS live CD can be booted from -a USB stick. For non-UEFI installations, -<link xlink:href="http://unetbootin.sourceforge.net/">unetbootin</link> -will work. For UEFI installations, you should mount the ISO, copy its contents -verbatim to your drive, then either: +a USB stick. You can use the <command>dd</command> utility to write the image: +<command>dd if=<replaceable>path-to-image</replaceable> +of=<replaceable>/dev/sdb</replaceable></command>. Be careful about specifying the +correct drive; you can use the <command>lsblk</command> command to get a list of +block devices.</para> + +<para>The <command>dd</command> utility will write the image verbatim to the drive, +making it the recommended option for both UEFI and non-UEFI installations. For +non-UEFI installations, you can alternatively use +<link xlink:href="http://unetbootin.sourceforge.net/">unetbootin</link>. If you +cannot use <command>dd</command> for a UEFI installation, you can also mount the +ISO, copy its contents verbatim to your drive, then either: <itemizedlist> <listitem> diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index c6083a89f6c0..33813ca3a660 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -16,11 +16,11 @@ let }; in stdenv.mkDerivation rec { name = "atom-${version}"; - version = "1.6.1"; + version = "1.6.2"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "0g31kw4daysjp4iz1rxlh64hnqxbn561k41n908pxgc7kjwbl2hj"; + sha256 = "1kl2pc0smacn4lgk5wwlaiw03rm8b0763vaisgp843p35zzsbc9n"; name = "${name}.deb"; }; diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix index b6c0feede6cd..5e6931ce78e2 100644 --- a/pkgs/applications/misc/albert/default.nix +++ b/pkgs/applications/misc/albert/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitHub, qtbase, qtx11extras, makeQtWrapper, muparser, cmake }: +{ stdenv, fetchFromGitHub, qtbase, qtsvg, qtx11extras, makeQtWrapper, muparser, cmake }: stdenv.mkDerivation rec { name = "albert-${version}"; - version = "0.8.0"; + version = "0.8.7.2"; src = fetchFromGitHub { owner = "manuelschneid3r"; repo = "albert"; rev = "v${version}"; - sha256 = "0lzj1gbcc5sp2x1c0d3s21y55kcnnn4dmy8d205mrgnyavjrak7n"; + sha256 = "04k6cawil6kqkmsilq5mpjy8lwgk0g08s0v23d5a83calpq3ljpc"; }; - buildInputs = [ cmake qtbase qtx11extras muparser makeQtWrapper ]; + buildInputs = [ cmake qtbase qtsvg qtx11extras muparser makeQtWrapper ]; fixupPhase = '' wrapQtProgram $out/bin/albert diff --git a/pkgs/development/compilers/abc/default.nix b/pkgs/development/compilers/abc/default.nix index 1a71b808827e..1340e8b5c1a0 100644 --- a/pkgs/development/compilers/abc/default.nix +++ b/pkgs/development/compilers/abc/default.nix @@ -1,23 +1,6 @@ -{stdenv, fetchurl, javaCup, jre, apacheAnt, patches} : - -let { - body = - stdenv.mkDerivation { - name = "abc-1.2.0"; - builder = ./builder.sh; - - src = fetchurl { - url = http://abc.comlab.ox.ac.uk/dists/1.2.0/files/abc-1.2.0-src.tar.gz; - md5 = "aef9e8eac860f904f2a841e18770dc47"; - }; - - inherit apacheAnt polyglot soot javaCup xact jasmin jre javabdd paddle jedd patches; - - meta = { - description = "The AspectBench Compiler for AspectJ"; - }; - }; +{stdenv, fetchurl, javaCup, jre, apacheAnt}: +let soot = import ./soot { inherit stdenv fetchurl apacheAnt polyglot jasmin; @@ -76,4 +59,21 @@ let { md5 = "9810ad8762101ea691a895f0a6b7a5c3"; }; }; +in + +stdenv.mkDerivation { + name = "abc-1.2.0"; + builder = ./builder.sh; + + src = fetchurl { + url = http://abc.comlab.ox.ac.uk/dists/1.2.0/files/abc-1.2.0-src.tar.gz; + md5 = "aef9e8eac860f904f2a841e18770dc47"; + }; + + inherit apacheAnt polyglot soot javaCup xact jasmin jre javabdd paddle jedd; + patches = []; + + meta = { + description = "The AspectBench Compiler for AspectJ"; + }; } diff --git a/pkgs/development/interpreters/erlang/R17.nix b/pkgs/development/interpreters/erlang/R17.nix index e06b2741d35c..8096ca555a44 100644 --- a/pkgs/development/interpreters/erlang/R17.nix +++ b/pkgs/development/interpreters/erlang/R17.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, perl, gnum4, ncurses, openssl , gnused, gawk, makeWrapper +, Carbon, Cocoa , odbcSupport ? false, unixODBC ? null , wxSupport ? true, mesa ? null, wxGTK ? null, xorg ? null, wxmac ? null , javacSupport ? false, openjdk ? null @@ -27,9 +28,10 @@ stdenv.mkDerivation rec { buildInputs = [ perl gnum4 ncurses openssl makeWrapper - ] ++ optional wxSupport (if stdenv.isDarwin then [ wxmac ] else [ mesa wxGTK xorg.libX11 ]) - ++ optional odbcSupport [ unixODBC ] - ++ optional javacSupport [ openjdk ]; + ] ++ optionals wxSupport (if stdenv.isDarwin then [ wxmac ] else [ mesa wxGTK xorg.libX11 ]) + ++ optional odbcSupport unixODBC + ++ optional javacSupport openjdk + ++ stdenv.lib.optionals stdenv.isDarwin [ Carbon Cocoa ]; patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure ''; diff --git a/pkgs/development/python-modules/sphinx-fix-tests-with-pygments-2.1.patch b/pkgs/development/python-modules/sphinx-fix-tests-with-pygments-2.1.patch deleted file mode 100644 index 5aa4af873cd5..000000000000 --- a/pkgs/development/python-modules/sphinx-fix-tests-with-pygments-2.1.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 5574aba60ed76f2bae947722122ac4d71ab8ed5a Mon Sep 17 00:00:00 2001 -From: Takeshi KOMIYA <i.tkomiya@gmail.com> -Date: Mon, 18 Jan 2016 12:38:02 +0900 -Subject: [PATCH] Fix tests are broken with pygments-2.1 - ---- - tests/test_build_html.py | 2 +- - tests/test_intl.py | 10 ++++++---- - 2 files changed, 7 insertions(+), 5 deletions(-) - -diff --git a/tests/test_build_html.py b/tests/test_build_html.py -index e330761..17ea089 100644 ---- a/tests/test_build_html.py -+++ b/tests/test_build_html.py -@@ -82,7 +82,7 @@ def checker(nodes): - (".//a[@href='_downloads/img1.png']", ''), - (".//pre", u'"quotes"'), - (".//pre", u"'included'"), -- (".//pre/span[@class='s']", u'üöä'), -+ (".//pre/span[@class='s2']", u'üöä'), - (".//div[@class='inc-pyobj1 highlight-text']//pre", - r'^class Foo:\n pass\n\s*$'), - (".//div[@class='inc-pyobj2 highlight-text']//pre", -diff --git a/tests/test_intl.py b/tests/test_intl.py -index 4c665d4..b24ec65 100644 ---- a/tests/test_intl.py -+++ b/tests/test_intl.py -@@ -694,14 +694,15 @@ def test_additional_targets_should_not_be_translated(app, status, warning): - yield assert_count(expected_expr, result, 1) - - # C code block with lang should not be translated but be *C* highlighted -- expected_expr = """<span class="cp">#include <stdio.h></span>""" -+ expected_expr = ("""<span class="cp">#include</span> """ -+ """<span class="cpf"><stdio.h></span>""") - yield assert_count(expected_expr, result, 1) - - # doctest block should not be translated but be highlighted - expected_expr = ( - """<span class="gp">>>> </span>""" - """<span class="kn">import</span> <span class="nn">sys</span> """ -- """<span class="c"># sys importing</span>""") -+ """<span class="c1"># sys importing</span>""") - yield assert_count(expected_expr, result, 1) - - ## raw.txt -@@ -754,14 +755,15 @@ def test_additional_targets_should_be_translated(app, status, warning): - yield assert_count(expected_expr, result, 1) - - # C code block with lang should be translated and be *C* highlighted -- expected_expr = """<span class="cp">#include <STDIO.H></span>""" -+ expected_expr = ("""<span class="cp">#include</span> """ -+ """<span class="cpf"><STDIO.H></span>""") - yield assert_count(expected_expr, result, 1) - - # doctest block should not be translated but be highlighted - expected_expr = ( - """<span class="gp">>>> </span>""" - """<span class="kn">import</span> <span class="nn">sys</span> """ -- """<span class="c"># SYS IMPORTING</span>""") -+ """<span class="c1"># SYS IMPORTING</span>""") - yield assert_count(expected_expr, result, 1) - - ## raw.txt diff --git a/pkgs/tools/misc/bandwidth/default.nix b/pkgs/tools/misc/bandwidth/default.nix index ff5e47336d3c..853c619859d4 100644 --- a/pkgs/tools/misc/bandwidth/default.nix +++ b/pkgs/tools/misc/bandwidth/default.nix @@ -10,11 +10,13 @@ let else null; in stdenv.mkDerivation rec { - name = "bandwidth-1.1b"; + name = "bandwidth-${version}"; + version = "1.2.0"; src = fetchurl { - url = "http://zsmith.co/archives/${name}.tar.gz"; - sha256 = "01c3ca0x3rh65j1s2g6cg5xr9fvm0lp2wpmv71vhz55xwqqqmiz8"; + url = "https://mutineer.org/file.php?id=ee10698c6a675ece26f08ddb5e6001323d6305c1&p=bandwidth"; + name = "${name}.tar.gz"; + sha256 = "1jq6a4n77gcx68bkr8l79agsmgv8saw9nv183297gnah1g67nvw6"; }; buildInputs = [ nasm ]; @@ -30,9 +32,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://zsmith.co/bandwidth.html; - description = "and artificial benchmark for identifying weaknesses in the memory subsystem"; + description = "Artificial benchmark for identifying weaknesses in the memory subsystem"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; + maintainers = with maintainers; [ nckx wkennington ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2f583ac5cdec..ae800662444a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1067,6 +1067,7 @@ in mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc { inherit (pythonPackages) gyp; + protobuf = protobuf.override { stdenv = clangStdenv; }; }; table = callPackage ../tools/inputmethods/ibus-engines/ibus-table { @@ -1426,6 +1427,7 @@ in mozc = callPackage ../tools/inputmethods/fcitx-engines/fcitx-mozc { inherit (pythonPackages) gyp; + protobuf = protobuf.override { stdenv = clangStdenv; }; }; table-other = callPackage ../tools/inputmethods/fcitx-engines/fcitx-table-other { }; @@ -3922,14 +3924,7 @@ in ### DEVELOPMENT / COMPILERS - abc = - abcPatchable []; - - abcPatchable = patches : - callPackage ../development/compilers/abc/default.nix { - inherit patches; - javaCup = callPackage ../development/libraries/java/cup { }; - }; + abc = callPackage ../development/compilers/abc/default.nix { }; aldor = callPackage ../development/compilers/aldor { }; @@ -5231,10 +5226,21 @@ in erlangR16 = callPackage ../development/interpreters/erlang/R16.nix { }; erlangR16_odbc = callPackage ../development/interpreters/erlang/R16.nix { odbcSupport = true; }; - erlangR17 = callPackage ../development/interpreters/erlang/R17.nix { }; - erlangR17_odbc = callPackage ../development/interpreters/erlang/R17.nix { odbcSupport = true; }; - erlangR17_javac = callPackage ../development/interpreters/erlang/R17.nix { javacSupport = true; }; - erlangR17_odbc_javac = callPackage ../development/interpreters/erlang/R17.nix { javacSupport = true; odbcSupport = true; }; + erlangR17 = callPackage ../development/interpreters/erlang/R17.nix { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; + }; + erlangR17_odbc = callPackage ../development/interpreters/erlang/R17.nix { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; + odbcSupport = true; + }; + erlangR17_javac = callPackage ../development/interpreters/erlang/R17.nix { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; + javacSupport = true; + }; + erlangR17_odbc_javac = callPackage ../development/interpreters/erlang/R17.nix { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; + javacSupport = true; odbcSupport = true; + }; erlangR18 = callPackage ../development/interpreters/erlang/R18.nix { inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; }; 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/python-packages.nix b/pkgs/top-level/python-packages.nix index e39a23b58d16..24279c41088d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -785,7 +785,7 @@ in modules // { url = "http://devel.ag-projects.com/repositories/${pname}"; rev = "release-${version}"; sha256 = "19dszv44py8qrq0jcjdycxpa7z2p8hi3ijq9gnqdsazbbjzf9svn"; - }; + }; buildInputs = with self; [ zope_interface ]; }; @@ -5386,7 +5386,7 @@ in modules // { url = "http://devel.ag-projects.com/repositories/${pname}"; rev = "release-${version}"; sha256 = "1zxhpq8i4jwsk7wmfncqfm211hqikj3hp38cfv509924bi76wak8"; - }; + }; propagatedBuildInputs = with self; [ greenlet ]; @@ -6115,6 +6115,23 @@ in modules // { }; }; + imagesize = buildPythonPackage rec { + name = "imagesize-${version}"; + version = "0.7.0"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/i/imagesize/${name}.tar.gz"; + sha256 = "0msgz4ncp2nb5nbsxnf8kvxsl6nhwvc3b46ik097fvznl3y10gdv"; + }; + + meta = { + description = "Getting image size from png/jpeg/jpeg2000/gif file"; + homepage = https://github.com/shibukawa/imagesize_py; + license = with licenses; [ mit ]; + }; + + }; + imread = buildPythonPackage rec { name = "python-imread-${version}"; version = "0.5.1"; @@ -8918,11 +8935,11 @@ in modules // { flake8 = buildPythonPackage rec { name = "flake8-${version}"; - version = "2.5.1"; + version = "2.5.4"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/f/flake8/${name}.tar.gz"; - sha256 = "448aed48b0671fe6062f47b98c3081f3a4b36fbe99ddb8ac2a3be6e6cb135603"; + sha256 = "0bs9cz4fr99r2rwig1b8jwaadl1nan7kgpdzqwj0bwbckwbmh7nc"; }; buildInputs = with self; [ nose mock ]; @@ -11648,11 +11665,11 @@ in modules // { mccabe = buildPythonPackage (rec { - name = "mccabe-0.3"; + name = "mccabe-0.4.0"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/m/mccabe/${name}.tar.gz"; - sha256 = "3d8ca9bf65c5014f469180544d1dd5bb5b9df709aad6304f9c2e4370ae0a7b7c"; + sha256 = "0yr08a36h8lqlif10l4xcikbbig7q8f41gqywir7rrvnv3mi4aws"; }; # See https://github.com/flintwork/mccabe/issues/31 @@ -11664,6 +11681,8 @@ in modules // { }}" test_mccabe.py ''; + buildInputs = with self; [ pytestrunner pytest ]; + meta = { description = "McCabe checker, plugin for flake8"; homepage = "https://github.com/flintwork/mccabe"; @@ -12225,8 +12244,8 @@ in modules // { url = "http://devel.ag-projects.com/repositories/${pname}"; rev = "release-${version}"; sha256 = "0jqvvssbwzq7bwqn3wrjfnpj8zb558mynn2visnlrcma6b57yhwd"; - }; - + }; + propagatedBuildInputs = with self; [ eventlib application gnutls ]; }; @@ -16916,12 +16935,12 @@ in modules // { }; pygments = buildPythonPackage rec { - version = "2.1.1"; + version = "2.1.3"; name = "Pygments-${version}"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/P/Pygments/${name}.tar.gz"; - sha256 = "06y0b7xh9h3r0wbxl41ccnnnw8dxfz48zj8x09y4rranbfldkxrd"; + sha256 = "10axnp2wpjnq9g8wg53fx0c70dfxqrz498jyz8mrdx9a3flwir48"; }; propagatedBuildInputs = with self; [ docutils ]; @@ -18126,11 +18145,11 @@ in modules // { pytz = buildPythonPackage rec { name = "pytz-${version}"; - version = "2015.7"; + version = "2016.3"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/pytz/${name}.tar.gz"; - sha256 = "99266ef30a37e43932deec2b7ca73e83c8dbc3b9ff703ec73eca6b1dae6befea"; + sha256 = "1a3hjclyylc4m1v1dn04b38wm2vl649ijdswpg0d8m8n0lcxlj9l"; }; meta = { @@ -20515,14 +20534,16 @@ in modules // { sphinx = buildPythonPackage (rec { - name = "Sphinx-1.3.4"; + name = "Sphinx-1.3.6"; + + # 1.4 is broken + # https://github.com/sphinx-doc/sphinx/issues/2394 src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/S/Sphinx/${name}.tar.gz"; - sha256 = "0mw06q7bzzjylgwh0wnnaxmwc95hx8w95as4vcgpan579brw7b4a"; + sha256 = "12pzlfkjjlwgvsj56k0y809jpx5mgcs9548k1l4kdbr028ifjfqb"; }; - patches = [ ../development/python-modules/sphinx-fix-tests-with-pygments-2.1.patch ]; LC_ALL = "en_US.UTF-8"; checkPhase = '' PYTHON=${python.executable} make test @@ -20555,11 +20576,11 @@ in modules // { }; sphinx_rtd_theme = buildPythonPackage (rec { - name = "sphinx_rtd_theme-0.1.8"; + name = "sphinx_rtd_theme-0.1.9"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/s/sphinx_rtd_theme/${name}.tar.gz"; - sha256 = "12mnb7qscr07mllmyyqfpx37778sr21m8663b4fivnk17bnk7xkl"; + sha256 = "18d0r63w7jpdrk4q5qy26n08vdlmnj9sar93akwjphyambw4cf17"; }; postPatch = '' @@ -20765,7 +20786,7 @@ in modules // { src = pkgs.fetchFromGitHub { repo = "sqlalchemy-imageattach"; - owner = "crosspop"; + owner = "crosspop"; rev = "${version}"; sha256 = "1pqf7vk4lsvnhw169cqfyk0iz5f8n45470mdslklpi38z2fax9p0"; }; |