From 1bedd3b597c9626e8bdccbbe2bc9ddfd411ec247 Mon Sep 17 00:00:00 2001 From: Maciek Starzyk Date: Thu, 20 Aug 2015 21:04:27 +0200 Subject: [PATCH 01/25] obnam: 1.14 -> 1.15 --- pkgs/tools/backup/obnam/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/obnam/default.nix b/pkgs/tools/backup/obnam/default.nix index 123933881fdc..b430c4732ff1 100644 --- a/pkgs/tools/backup/obnam/default.nix +++ b/pkgs/tools/backup/obnam/default.nix @@ -2,13 +2,13 @@ pythonPackages.buildPythonPackage rec { name = "obnam-${version}"; - version = "1.14"; + version = "1.15"; namePrefix = ""; src = fetchurl rec { url = "http://code.liw.fi/debian/pool/main/o/obnam/obnam_${version}.orig.tar.xz"; - sha256 = "16875g14b7mxfd46159b92qa3gxq59w5gzf8x2n7icqa05s3483q"; + sha256 = "1wpvy6qrrp2k0b38a864n0ayh5mr8353rndiqb8ax7z0y3jz484x"; }; buildInputs = [ pythonPackages.sphinx attr ]; From 93037836496871eb7b736ccba7e81d62d0a25bf5 Mon Sep 17 00:00:00 2001 From: Tom Hunger Date: Thu, 20 Aug 2015 22:23:44 +0100 Subject: [PATCH 02/25] haskell-purescript: Disable tests. Tests need network + /homeless-shelter. --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index fde9bb782d8e..cc7ef9cfdf79 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -680,6 +680,10 @@ self: super: { ''; }); + # Tests attempt to use NPM to install from the network into + # /homeless-shelter. Disabled. + purescript = dontCheck super.purescript; + # Broken by GLUT update. Monadius = markBroken super.Monadius; From 54c7053bffe96d67274efafbc3518a2c40b2dc06 Mon Sep 17 00:00:00 2001 From: Tanner Doshier Date: Fri, 21 Aug 2015 09:34:46 -0500 Subject: [PATCH 03/25] tarsnap: 1.0.35 -> 1.0.36.1 and use upstream bash completion scripts --- pkgs/tools/backup/tarsnap/default.nix | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/backup/tarsnap/default.nix b/pkgs/tools/backup/tarsnap/default.nix index e2857eed7d86..7537451595f8 100644 --- a/pkgs/tools/backup/tarsnap/default.nix +++ b/pkgs/tools/backup/tarsnap/default.nix @@ -1,11 +1,6 @@ { stdenv, fetchurl, openssl, zlib, e2fsprogs }: let - bashCompletion = fetchurl { - url = "https://gist.githubusercontent.com/thoughtpolice/daa9431044883d3896f6/raw/282360677007db9739e5bf229873d3b231eb303a/tarsnap.bash"; - sha256 = "1cj7m0n3sw9vlaz2dfvf0bgaxkv1pcc0l31zb4h5rmm8z6d33405"; - }; - zshCompletion = fetchurl { url = "https://gist.githubusercontent.com/thoughtpolice/daa9431044883d3896f6/raw/282360677007db9739e5bf229873d3b231eb303a/tarsnap.zsh"; sha256 = "0pawqwichzpz29rva7mh8lpx4zznnrh2rqyzzj6h7z98l0dxpair"; @@ -13,18 +8,20 @@ let in stdenv.mkDerivation rec { name = "tarsnap-${version}"; - version = "1.0.35"; + version = "1.0.36.1"; src = fetchurl { - url = "https://www.tarsnap.com/download/tarsnap-autoconf-1.0.35.tgz"; - sha256 = "16lc14rwrq84fz95j1g10vv0qki0qw73lzighidj5g23pib6g7vc"; + url = "https://www.tarsnap.com/download/tarsnap-autoconf-${version}.tgz"; + sha256 = "1446l8g39bi5xxk4x1ijc1qjrj824729887gcffig0zrw80rx452"; }; + preConfigure = '' + configureFlags="--with-bash-completion-dir=$out/etc/bash_completion.d" + ''; + postInstall = '' # Install some handy-dandy shell completions - mkdir -p $out/etc/bash_completion.d $out/share/zsh/site-functions - cp ${bashCompletion} $out/etc/bash_completion.d/tarsnap.bash - cp ${zshCompletion} $out/share/zsh/site-functions/_tarsnap + install -m 444 -D ${zshCompletion} $out/share/zsh/site-functions/_tarsnap ''; buildInputs = [ openssl zlib e2fsprogs ]; From 7f1efceff855f0260cbe584f1017959f1581dda7 Mon Sep 17 00:00:00 2001 From: Artjom Vejsel Date: Fri, 21 Aug 2015 19:45:40 +0300 Subject: [PATCH 04/25] qtox: add wrapper for set runtime qt5.svg plugin --- .../networking/instant-messengers/qtox/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix index cba5bdeec7e9..647e0da37192 100644 --- a/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, pkgconfig, libtoxcore-dev, qt5, openal, opencv, libsodium, libXScrnSaver, glib, gdk_pixbuf, gtk2, cairo, - pango, atk, qrencode, ffmpeg, filter-audio }: + pango, atk, qrencode, ffmpeg, filter-audio, makeWrapper }: stdenv.mkDerivation rec { name = "qtox-dev-20150624"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { [ libtoxcore-dev openal opencv libsodium filter-audio qt5.base qt5.tools libXScrnSaver glib gtk2 cairo - pango atk qrencode ffmpeg qt5.translations + pango atk qrencode ffmpeg qt5.translations makeWrapper ]; nativeBuildInputs = [ pkgconfig ]; @@ -37,13 +37,16 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin cp qtox $out/bin + wrapProgram $out/bin/qtox \ + --prefix QT_PLUGIN_PATH : ${qt5.svg}/lib/qt5/plugins ''; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "QT Tox client"; license = licenses.gpl3; maintainers = with maintainers; [ viric jgeerds ]; platforms = platforms.all; }; -} - +} \ No newline at end of file From c9ca9db21367bda2e114e82931985f941fcc8f19 Mon Sep 17 00:00:00 2001 From: Artjom Vejsel Date: Fri, 21 Aug 2015 19:51:12 +0300 Subject: [PATCH 05/25] qtox: 20150624 -> 20150821 --- .../networking/instant-messengers/qtox/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix index 647e0da37192..5c8a03eb8efc 100644 --- a/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -3,12 +3,12 @@ pango, atk, qrencode, ffmpeg, filter-audio, makeWrapper }: stdenv.mkDerivation rec { - name = "qtox-dev-20150624"; + name = "qtox-dev-20150821"; src = fetchgit { url = "https://github.com/tux3/qTox.git"; - rev = "9f386135a2cf428d2802b158c70be4beee5abf86"; - sha256 = "1m2y50q5yim1q75k48cy5daq5qm77cvb3kcla7lpqv54xnfdwxk8"; + rev = "2f6b5e052f2a625d506e83f880c5d68b49118f95"; + md5 = "b2f9cf283136b6e558876ca2e6d128a3"; }; buildInputs = @@ -49,4 +49,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ viric jgeerds ]; platforms = platforms.all; }; -} \ No newline at end of file +} From 75250d5addedfd82c1573a34b0b2349d268e64c2 Mon Sep 17 00:00:00 2001 From: Kamil Chmielewski Date: Thu, 20 Aug 2015 13:21:00 +0200 Subject: [PATCH 06/25] vim_configurable: fix revision name and update (close #9365) --- pkgs/applications/editors/vim/configurable.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index ee3edaaf61b2..cd7db6bb82e3 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -31,9 +31,10 @@ let inherit (args.composableDerivation) composableDerivation edf; ''; in composableDerivation { -} (fix: { +} (fix: rec { - name = "vim_configurable-7.4.516"; + name = "vim_configurable-${version}"; + version = "7.4.826"; enableParallelBuilding = true; # test this @@ -43,8 +44,8 @@ composableDerivation { # latest release args.fetchhg { url = "http://vim.googlecode.com/hg/"; - rev = "v7-4-516"; - sha256 = "0a3b5qaywfn7jjr7fjpl8y8jx4wjj2630wxfjnmn3hi1l7iiz4z8"; + rev = "v${version}"; + sha256 = "01m67lvnkz0ad28ifj964zcg63y5hixplbnzas5xarj8vl3pc5a0"; }; "vim-nox" = From afe6f0531068c43ac40555755a625aec16a1a7bb Mon Sep 17 00:00:00 2001 From: Aycan iRiCAN Date: Sat, 22 Aug 2015 11:04:09 +0300 Subject: [PATCH 07/25] cabal2nix: fixed sha256 hash MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I was getting below error: output path ‘/nix/store/i73iz0id6ap6qg1p6jaqadl053h2cgfz-cabal2nix-9f58996’ should have r:sha256 hash ‘1w5ba7cdanpq4nr8xngk1jsj0p6b17c6ap24ldzggrln216f3f7d’, instead has ‘0vy18gmyrw72m98psz7hz51aqj66b98h1pdv98hf3k1hrdva3ncv’ --- pkgs/development/tools/haskell/cabal2nix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix index cf0cfd64e8f4..88e8c55b0618 100644 --- a/pkgs/development/tools/haskell/cabal2nix/default.nix +++ b/pkgs/development/tools/haskell/cabal2nix/default.nix @@ -12,7 +12,7 @@ mkDerivation rec { src = fetchgit { url = "http://github.com/NixOS/cabal2nix.git"; rev = "9f589961fba9fa6a92900c37cf1ab16c597b0c69"; - sha256 = "1w5ba7cdanpq4nr8xngk1jsj0p6b17c6ap24ldzggrln216f3f7d"; + sha256 = "0vy18gmyrw72m98psz7hz51aqj66b98h1pdv98hf3k1hrdva3ncv"; deepClone = true; }; isLibrary = false; From 21c9f40b4d82c873246dbde087632206e358df5e Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 22 Aug 2015 11:36:41 +0300 Subject: [PATCH 08/25] yed: fix checksum --- pkgs/applications/graphics/yed/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix index e22c7804914b..c4ee645fda26 100644 --- a/pkgs/applications/graphics/yed/default.nix +++ b/pkgs/applications/graphics/yed/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://www.yworks.com/products/yed/demo/${name}.zip"; - sha256 = "1i2fncp7q0xin42sf55zc79jzrkzbp25yw8rcjkgsy6hgnhl73nh"; + sha256 = "0i39n8h97v688r0nydcm0wj1ins2v83xjgykr7czpnmp600cq9cy"; }; nativeBuildInputs = [ unzip makeWrapper ]; From 5986ec09237a04feed56b11df9dbd7a80010fed6 Mon Sep 17 00:00:00 2001 From: "Desmond O. Chang" Date: Sat, 22 Aug 2015 18:22:31 +0800 Subject: [PATCH 09/25] android-udev-rules: 20150301 -> 20150821 --- pkgs/os-specific/linux/android-udev-rules/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix index 61e4291ecc50..3f763e917e34 100644 --- a/pkgs/os-specific/linux/android-udev-rules/default.nix +++ b/pkgs/os-specific/linux/android-udev-rules/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit }: stdenv.mkDerivation { - name = "android-udev-rules-20150301"; + name = "android-udev-rules-20150821"; src = fetchgit { url = "https://github.com/M0Rf30/android-udev-rules"; - rev = "2cc51a456ccfbca338c4e6b76211645aaac631e9"; - sha256 = "dbf1614cebb466d1adbcc5f17cefc0c37f148f9e3b46443b3e82f6cd19a1514f"; + rev = "07ccded2a89c2bb6da984e596c015c5e9546e497"; + sha256 = "953fc10bd0de46afef999dc1c1b20801b3d6e289af48d18fa96b1cac3ac54518"; }; installPhase = '' From c6c2e253a6f4011b0cceb11852a513012300da9d Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 22 Aug 2015 12:25:18 +0300 Subject: [PATCH 10/25] yed: 3.14.2 -> 3.14.3, mark as not redistributable Their license explicitly prohibits distribution and it's unclear whether they allow to download their binary automatically. I've asked to clarify their terms; this may be temporary. --- pkgs/applications/graphics/yed/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix index c4ee645fda26..0cd853a2cbea 100644 --- a/pkgs/applications/graphics/yed/default.nix +++ b/pkgs/applications/graphics/yed/default.nix @@ -1,11 +1,16 @@ -{ stdenv, fetchurl, makeWrapper, unzip, jre }: +{ stdenv, fetchurl, requireFile, makeWrapper, unzip, jre }: stdenv.mkDerivation rec { - name = "yEd-3.14.2"; + name = "yEd-3.14.3"; - src = fetchurl { - url = "http://www.yworks.com/products/yed/demo/${name}.zip"; - sha256 = "0i39n8h97v688r0nydcm0wj1ins2v83xjgykr7czpnmp600cq9cy"; + #src = fetchurl { + # url = "http://www.yworks.com/products/yed/demo/${name}.zip"; + # sha256 = "0xgazknbz82sgk65hxmvbycl1vd25z80a7jgwjgw7syicrgmplcl"; + #}; + src = requireFile { + name = "${name}.zip"; + url = "https://www.yworks.com/en/products_download.php?file=${name}.zip"; + sha256 = "0xgazknbz82sgk65hxmvbycl1vd25z80a7jgwjgw7syicrgmplcl"; }; nativeBuildInputs = [ unzip makeWrapper ]; @@ -20,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - license = licenses.unfreeRedistributable; + license = licenses.unfree; homepage = http://www.yworks.com/en/products/yfiles/yed/; description = "A powerful desktop application that can be used to quickly and effectively generate high-quality diagrams"; platforms = jre.meta.platforms; From 648973d6419992c28322954ad0205cb05ef87997 Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Fri, 21 Aug 2015 16:18:09 -0400 Subject: [PATCH 11/25] nixos: rename service 'ubuntu-fan' as 'fan' --- nixos/modules/module-list.nix | 2 +- .../networking/{ubuntu-fan.nix => fan.nix} | 14 +++++++------- pkgs/os-specific/linux/fanctl/default.nix | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) rename nixos/modules/services/networking/{ubuntu-fan.nix => fan.nix} (71%) diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 60255914d5d9..ebfe5afe52f3 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -279,6 +279,7 @@ ./services/networking/dnsmasq.nix ./services/networking/docker-registry-server.nix ./services/networking/ejabberd.nix + ./services/networking/fan.nix ./services/networking/firefox/sync-server.nix ./services/networking/firewall.nix ./services/networking/flashpolicyd.nix @@ -344,7 +345,6 @@ ./services/networking/tlsdated.nix ./services/networking/tox-bootstrapd.nix ./services/networking/tvheadend.nix - ./services/networking/ubuntu-fan.nix ./services/networking/unbound.nix ./services/networking/unifi.nix ./services/networking/vsftpd.nix diff --git a/nixos/modules/services/networking/ubuntu-fan.nix b/nixos/modules/services/networking/fan.nix similarity index 71% rename from nixos/modules/services/networking/ubuntu-fan.nix rename to nixos/modules/services/networking/fan.nix index 2759a671b81f..3170567e5b4a 100644 --- a/nixos/modules/services/networking/ubuntu-fan.nix +++ b/nixos/modules/services/networking/fan.nix @@ -4,7 +4,7 @@ with lib; let - cfg = config.networking.ubuntu-fan; + cfg = config.networking.fan; modprobe = "${config.system.sbin.modprobe}/sbin/modprobe"; in @@ -15,9 +15,9 @@ in options = { - networking.ubuntu-fan = { + networking.fan = { - enable = mkEnableOption "Ubuntu FAN Networking"; + enable = mkEnableOption "FAN Networking"; }; @@ -30,8 +30,8 @@ in environment.systemPackages = [ pkgs.fanctl ]; - systemd.services.ubuntu-fan = { - description = "Ubuntu FAN Networking"; + systemd.services.fan = { + description = "FAN Networking"; wantedBy = [ "multi-user.target" ]; after = [ "network-online.target" ]; before = [ "docker.service" ]; @@ -40,12 +40,12 @@ in if [ ! -f /proc/sys/net/fan/version ]; then ${modprobe} ipip if [ ! -f /proc/sys/net/fan/version ]; then - echo "The Ubuntu Fan Networking patches have not been applied to this kernel!" 1>&2 + echo "The Fan Networking patches have not been applied to this kernel!" 1>&2 exit 1 fi fi - mkdir -p /var/lib/ubuntu-fan + mkdir -p /var/lib/fan-networking ''; serviceConfig = { Type = "oneshot"; diff --git a/pkgs/os-specific/linux/fanctl/default.nix b/pkgs/os-specific/linux/fanctl/default.nix index f0b863e01488..1d6e5e744cdf 100644 --- a/pkgs/os-specific/linux/fanctl/default.nix +++ b/pkgs/os-specific/linux/fanctl/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { # if that files does not exist, dnsmasq subsequently fails, # so we'll use /dev/null. # - # Also, make sure /var/lib/ubuntu-fan exists before starting dnsmasq. + # Also, make sure /var/lib/fan-networking exists before starting dnsmasq. buildPhase = '' substituteInPlace fanctl \ --replace '--conf-file= ' \ @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { '/var/lib/ubuntu-fan' sed -i '/dnsmasq -u/i \ - mkdir -p /var/lib/ubuntu-fan' fanctl + mkdir -p /var/lib/fan-networking' fanctl ''; installPhase = '' From 7408ede358ba79c011db35e03abce0759e643ddf Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Sat, 22 Aug 2015 14:08:29 -0400 Subject: [PATCH 12/25] fanctl: fix state directory --- pkgs/os-specific/linux/fanctl/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/fanctl/default.nix b/pkgs/os-specific/linux/fanctl/default.nix index 1d6e5e744cdf..61e100f4c9b7 100644 --- a/pkgs/os-specific/linux/fanctl/default.nix +++ b/pkgs/os-specific/linux/fanctl/default.nix @@ -1,6 +1,7 @@ { stdenv, lib, fetchbzr, makeWrapper, bridge-utils, iproute, dnsmasq, iptables, kmod, utillinux }: -stdenv.mkDerivation rec { +let stateDir = "/var/lib/fan-networking"; +in stdenv.mkDerivation rec { name = "fanctl-${version}"; version = "0.3.0"; @@ -17,16 +18,16 @@ stdenv.mkDerivation rec { # if that files does not exist, dnsmasq subsequently fails, # so we'll use /dev/null. # - # Also, make sure /var/lib/fan-networking exists before starting dnsmasq. + # Also, make sure the state directory before starting dnsmasq. buildPhase = '' substituteInPlace fanctl \ --replace '--conf-file= ' \ '--conf-file=/dev/null ' \ --replace '/var/lib/misc' \ - '/var/lib/ubuntu-fan' + '${stateDir}' sed -i '/dnsmasq -u/i \ - mkdir -p /var/lib/fan-networking' fanctl + mkdir -p ${stateDir}' fanctl ''; installPhase = '' From a4b9b5ce7d610e178ad20bad5f73dbde1274c31b Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 22 Aug 2015 20:21:38 +0300 Subject: [PATCH 13/25] deluge: fix translations and desktop file --- pkgs/top-level/python-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 45dc9ede8833..7c355900025f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5075,8 +5075,9 @@ let pyGtkGlade pkgs.libtorrentRasterbar twisted Mako chardet pyxdg self.pyopenssl modules.curses ]; + nativeBuildInputs = [ pkgs.intltool ]; + postInstall = '' - cp -R deluge/data/share $out/share cp -R deluge/data/pixmaps $out/share/ cp -R deluge/data/icons $out/share/ ''; From 69114f74aae2d2c3496d2d8e6e942cf2189b0ab5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Aug 2015 00:02:29 +0200 Subject: [PATCH 14/25] packagekit: use http:// instead of https:// Proxy weirdness? --- pkgs/tools/package-management/packagekit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix index 15b6fd5fe9cb..7075b03bdfa4 100644 --- a/pkgs/tools/package-management/packagekit/default.nix +++ b/pkgs/tools/package-management/packagekit/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { src = fetchurl { sha256 = "0klwr0y3a72xpz6bwv4afbk3vvx5r1av5idhz3mx4p9ssnscb1mi"; - url = "https://www.freedesktop.org/software/PackageKit/releases/PackageKit-${version}.tar.xz"; + url = "http://www.freedesktop.org/software/PackageKit/releases/PackageKit-${version}.tar.xz"; }; buildInputs = [ glib polkit python ]; From c2a8e5e609d62de9bcf903accd62f136e3911261 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Fri, 14 Aug 2015 10:04:54 +0200 Subject: [PATCH 15/25] qt53: sync plugin/import/qml dirs with qt54 It seems like a sensible thing to keep these in sync. --- pkgs/development/libraries/qt-5/5.3/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/qt-5/5.3/default.nix b/pkgs/development/libraries/qt-5/5.3/default.nix index 595bb5bb10bf..8a08c952bba4 100644 --- a/pkgs/development/libraries/qt-5/5.3/default.nix +++ b/pkgs/development/libraries/qt-5/5.3/default.nix @@ -86,6 +86,7 @@ stdenv.mkDerivation rec { preConfigure = '' export LD_LIBRARY_PATH="$PWD/qtbase/lib:$PWD/qtbase/plugins/platforms:$PWD/qttools/lib:$LD_LIBRARY_PATH" export MAKEFLAGS=-j$NIX_BUILD_CORES + export configureFlags+="-plugindir $out/lib/qt5/plugins -importdir $out/lib/qt5/imports -qmldir $out/lib/qt5/qml" ''; prefixKey = "-prefix "; From 019a23db3e242eceafb5b24f74c0af1be7a74eae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Fri, 14 Aug 2015 10:09:17 +0200 Subject: [PATCH 16/25] qt5: specify docdir Due to a bug somewhere, the qt documentation is by default placed in $out/share/doc although "qmake -query" reports $out/doc. That discrepancy causes qtcreator withDocumentation builds to fail. This fixes it. --- pkgs/development/libraries/qt-5/5.3/default.nix | 1 + pkgs/development/libraries/qt-5/5.4/qtbase.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/development/libraries/qt-5/5.3/default.nix b/pkgs/development/libraries/qt-5/5.3/default.nix index 8a08c952bba4..7f4e0b60c2d0 100644 --- a/pkgs/development/libraries/qt-5/5.3/default.nix +++ b/pkgs/development/libraries/qt-5/5.3/default.nix @@ -87,6 +87,7 @@ stdenv.mkDerivation rec { export LD_LIBRARY_PATH="$PWD/qtbase/lib:$PWD/qtbase/plugins/platforms:$PWD/qttools/lib:$LD_LIBRARY_PATH" export MAKEFLAGS=-j$NIX_BUILD_CORES export configureFlags+="-plugindir $out/lib/qt5/plugins -importdir $out/lib/qt5/imports -qmldir $out/lib/qt5/qml" + export configureFlags+=" -docdir $out/share/doc/qt5" ''; prefixKey = "-prefix "; diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase.nix b/pkgs/development/libraries/qt-5/5.4/qtbase.nix index 780f1b60f7ce..6ec57787e224 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtbase.nix +++ b/pkgs/development/libraries/qt-5/5.4/qtbase.nix @@ -84,6 +84,7 @@ stdenv.mkDerivation { sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in" export configureFlags+="-plugindir $out/lib/qt5/plugins -importdir $out/lib/qt5/imports -qmldir $out/lib/qt5/qml" + export configureFlags+=" -docdir $out/share/doc/qt5" ''; prefixKey = "-prefix "; From 84c96cd4f6081e658dd415aad244fe7b061b02c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Fri, 14 Aug 2015 10:18:20 +0200 Subject: [PATCH 17/25] qt5SDK: build with documentation It was disabled due to a build error that is now fixed. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c899b875400c..c33028267170 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7975,7 +7975,7 @@ let qt5SDK = qtcreator.override { sdkBuild = true; qtLib = qt5Full; - withDocumentation = false; # fails to setup some paths + withDocumentation = true; }; qtcreator = callPackage ../development/qtcreator { From 2cf8502397cc6aa0573a012c6606d24d946f166f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Fri, 14 Aug 2015 10:19:18 +0200 Subject: [PATCH 18/25] qtcreator: build with documentation It was disabled due to a build error that is now fixed. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c33028267170..f515868a7bd9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7980,7 +7980,7 @@ let qtcreator = callPackage ../development/qtcreator { qtLib = qt5Full; # 3.4 only supports qt5; TODO: use modularized qt>=5.4 - withDocumentation = false; # FIXME: fails to setup some paths + withDocumentation = true; }; qtkeychain = callPackage ../development/libraries/qtkeychain { }; From ef721079ca6911ba5e2fdba83d346f24cb9969e9 Mon Sep 17 00:00:00 2001 From: "Desmond O. Chang" Date: Thu, 20 Aug 2015 18:54:22 +0800 Subject: [PATCH 19/25] gradle: 2.2.1 -> 2.6 --- pkgs/development/tools/build-managers/gradle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index fd99437630c7..185f4a29e00d 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, unzip, jdk, makeWrapper }: stdenv.mkDerivation rec { - name = "gradle-2.2.1"; + name = "gradle-2.6"; src = fetchurl { url = "http://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "420aa50738299327b611c10b8304b749e8d3a579407ee9e755b15921d95ff418"; + sha256 = "10ww9vqyi5jkdw5bna14y63fjfhh40n81q7qsfhdycgj19b8ra8q"; }; installPhase = '' From 3bbd79aaa65062f81311300668dd58d7b66c14a3 Mon Sep 17 00:00:00 2001 From: Phil Scott Date: Sun, 23 Aug 2015 07:54:13 +0000 Subject: [PATCH 20/25] scanmem: init at 0.15.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [Bjørn: Remove trailing dot in description.] --- pkgs/tools/misc/scanmem/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/tools/misc/scanmem/default.nix diff --git a/pkgs/tools/misc/scanmem/default.nix b/pkgs/tools/misc/scanmem/default.nix new file mode 100644 index 000000000000..e21da0deca2d --- /dev/null +++ b/pkgs/tools/misc/scanmem/default.nix @@ -0,0 +1,23 @@ +{ stdenv, autoconf, automake, intltool, libtool, fetchFromGitHub, readline }: + +stdenv.mkDerivation rec { + version = "0.15.2"; + name = "scanmem-${version}"; + src = fetchFromGitHub { + owner = "scanmem"; + repo = "scanmem"; + rev = "v${version}"; + sha256 = "0f93ac5rycf46q60flab5nl7ksadjls13axijg5j5wy1yif0k094"; + }; + buildInputs = [ autoconf automake intltool libtool readline ]; + preConfigure = '' + ./autogen.sh + ''; + meta = { + homepage = "https://github.com/scanmem/scanmem"; + description = "Memory scanner for finding and poking addresses in executing processes"; + maintainers = [ stdenv.lib.maintainers.chattered ]; + platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl3; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f515868a7bd9..eceaf669abc9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10141,6 +10141,8 @@ let sassc = callPackage ../development/tools/sassc { }; + scanmem = callPackage ../tools/misc/scanmem { }; + schedtool = callPackage ../os-specific/linux/schedtool { }; sdparm = callPackage ../os-specific/linux/sdparm { }; From d0a03e078c539dc4d337de6dc5dd5f39210bfe76 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 23 Aug 2015 17:33:04 +0300 Subject: [PATCH 21/25] tlp: install man pages --- pkgs/tools/misc/tlp/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/misc/tlp/default.nix b/pkgs/tools/misc/tlp/default.nix index 4d3de16434b4..1e90ecfee328 100644 --- a/pkgs/tools/misc/tlp/default.nix +++ b/pkgs/tools/misc/tlp/default.nix @@ -51,6 +51,10 @@ in stdenv.mkDerivation { for i in $out/lib/udev/rules.d/*; do sed -i "s,RUN+=\",\\0$out,g; s,/usr/sbin,/bin,g" "$i" done + + for i in man/*; do + install -D $i $out/share/man/man''${i##*.}/$(basename $i) + done ''; passthru = { inherit enableRDW; }; From e40579d91e1de6cf920bbea52732b2317e0ea2ef Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 23 Aug 2015 10:16:21 -0500 Subject: [PATCH 22/25] qt54: set runtime env vars during build for makeWrapper Set QT_PLUGIN_PATH, QML_IMPORT_PATH, and QML2_IMPORT_PATH during build so that Qt programs may easily be wrapped for use outside NixOS. The paths are set appropriately for the dependencies of the package. --- pkgs/development/libraries/qt-5/5.4/qt-submodule.nix | 6 ------ pkgs/development/libraries/qt-5/5.4/setup-hook.sh | 12 ++++++++++++ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.4/qt-submodule.nix b/pkgs/development/libraries/qt-5/5.4/qt-submodule.nix index b242661270d2..4012b637e286 100644 --- a/pkgs/development/libraries/qt-5/5.4/qt-submodule.nix +++ b/pkgs/development/libraries/qt-5/5.4/qt-submodule.nix @@ -20,12 +20,6 @@ mkDerivation (args // { dontFixLibtool = args.dontFixLibtool or true; configureScript = args.configureScript or "qmake"; - /* - preConfigure = '' - export PATH="$out/bin:$PATH" - ''; - */ - postInstall = '' rm "$out/bin/qmake" "$out/bin/qt.conf" diff --git a/pkgs/development/libraries/qt-5/5.4/setup-hook.sh b/pkgs/development/libraries/qt-5/5.4/setup-hook.sh index 940b9d4e7a1f..6866e4c57bdd 100644 --- a/pkgs/development/libraries/qt-5/5.4/setup-hook.sh +++ b/pkgs/development/libraries/qt-5/5.4/setup-hook.sh @@ -25,6 +25,18 @@ addQtModule() { if [[ -n $qtSubmodule ]]; then find "$1/lib" -printf 'lib/%P\n' >> "$qtOut/nix-support/qt-inputs" fi + + if [[ -d "$1/lib/qt5/plugins" ]]; then + QT_PLUGIN_PATH="$QT_PLUGIN_PATH${QT_PLUGIN_PATH:+:}$1/lib/qt5/plugins"; + fi + + if [[ -d "$1/lib/qt5/imports" ]]; then + QML_IMPORT_PATH="$QML_IMPORT_PATH${QML_IMPORT_PATH:+:}$1/lib/qt5/imports"; + fi + + if [[ -d "$1/lib/qt5/qml" ]]; then + QML2_IMPORT_PATH="$QML2_IMPORT_PATH${QML2_IMPORT_PATH:+:}$1/lib/qt5/qml"; + fi fi fi } From 04124c45a76729f08b710c1ce532775ad95f93cc Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 21 Aug 2015 10:00:22 -0500 Subject: [PATCH 23/25] emacs-evil: 20141020 -> 1.2.3 Use the actual upstream source, not some random mirror. --- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/emacs-packages.nix | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eceaf669abc9..b27ca65f7943 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11296,7 +11296,7 @@ let emacsPackagesNgGen = emacs: import ./emacs-packages.nix { overrides = (config.emacsPackageOverrides or (p: {})) pkgs; - inherit lib stdenv fetchurl fetchgit fetchFromGitHub emacs; + inherit lib stdenv fetchurl fetchgit fetchFromGitHub fetchhg emacs; trivialBuild = import ../build-support/emacs/trivial.nix { inherit lib stdenv emacs texinfo; diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index c5bb3a5f047f..4e03c300448f 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -33,7 +33,7 @@ { overrides -, lib, stdenv, fetchurl, fetchgit, fetchFromGitHub +, lib, stdenv, fetchurl, fetchgit, fetchFromGitHub, fetchhg , emacs , trivialBuild @@ -498,11 +498,11 @@ let self = _self // overrides; evil = melpaBuild { pname = "evil"; - version = "20141020"; - src = fetchgit { - url = "https://github.com/emacsmirror/evil.git"; - rev = "999ec15587f85100311c031aa8efb5d50c35afe4"; - sha256 = "5f67643d19a31172e68f2f195959d33bcd26c2786eb71e67eb27eb52f5bf387a"; + version = "1.2.3"; + src = fetchhg { + url = "https://bitbucket.org/lyro/evil"; + rev = "e5588e50c0e40a66c099868ea825755e348311fb"; + sha256 = "0185vrzfdz6iwhmc22rjy0n7ppfppp2ddc8xl0vvbda79q6w3bp8"; }; packageRequires = [ goto-chg undo-tree ]; meta = { @@ -740,10 +740,10 @@ let self = _self // overrides; goto-chg = melpaBuild rec { pname = "goto-chg"; version = "1.6"; - src = fetchgit { - url = "https://gitorious.org/evil/evil.git"; - rev = "999ec15587f85100311c031aa8efb5d50c35afe4"; - sha256 = "5f67643d19a31172e68f2f195959d33bcd26c2786eb71e67eb27eb52f5bf387a"; + src = fetchhg { + url = "https://bitbucket.org/lyro/evil"; + rev = "e5588e50c0e40a66c099868ea825755e348311fb"; + sha256 = "0185vrzfdz6iwhmc22rjy0n7ppfppp2ddc8xl0vvbda79q6w3bp8"; }; files = [ "lib/goto-chg.el" ]; meta = { license = gpl3Plus; }; From 1ea4ea1375b96929e08286667f326305818ce81a Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 22 Aug 2015 16:10:52 -0500 Subject: [PATCH 24/25] autogen: don't write temp files outside build dir --- pkgs/development/tools/misc/autogen/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/tools/misc/autogen/default.nix b/pkgs/development/tools/misc/autogen/default.nix index 71ea938ea78f..623c9262ba3c 100644 --- a/pkgs/development/tools/misc/autogen/default.nix +++ b/pkgs/development/tools/misc/autogen/default.nix @@ -16,6 +16,9 @@ stdenv.mkDerivation rec { # Fix a broken sed expression used for detecting the minor # version of guile we are using sed -i "s,sed '.*-I.*',sed 's/\\\(^\\\| \\\)-I/\\\1/g',g" configure + + # Don't write temporary files outside the build directory + sed -i "s,/tmp/mklibsrc-log.tx,$TMPDIR/mklibsrc-log.tx,g" pkg/libopts/mklibsrc.sh ''; #doCheck = true; # 2 tests fail because of missing /dev/tty From 06717667cc9e4c3c2025e101e6cf68cde0b25fcd Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 23 Aug 2015 10:28:48 -0500 Subject: [PATCH 25/25] Revert "autogen: don't write temp files outside build dir" This reverts commit 1ea4ea1375b96929e08286667f326305818ce81a. --- pkgs/development/tools/misc/autogen/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/tools/misc/autogen/default.nix b/pkgs/development/tools/misc/autogen/default.nix index 623c9262ba3c..71ea938ea78f 100644 --- a/pkgs/development/tools/misc/autogen/default.nix +++ b/pkgs/development/tools/misc/autogen/default.nix @@ -16,9 +16,6 @@ stdenv.mkDerivation rec { # Fix a broken sed expression used for detecting the minor # version of guile we are using sed -i "s,sed '.*-I.*',sed 's/\\\(^\\\| \\\)-I/\\\1/g',g" configure - - # Don't write temporary files outside the build directory - sed -i "s,/tmp/mklibsrc-log.tx,$TMPDIR/mklibsrc-log.tx,g" pkg/libopts/mklibsrc.sh ''; #doCheck = true; # 2 tests fail because of missing /dev/tty