[Nix-commits] [NixOS/nixpkgs] 6b89bc: ocamlPackages.core_bench: fix on OCaml ≥ 4.03

2017-06-25 Thread Vincent Laporte
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 6b89bcbaa6a31f3ab30449a7fb21d257c2308917
  
https://github.com/NixOS/nixpkgs/commit/6b89bcbaa6a31f3ab30449a7fb21d257c2308917
  Author: Vincent Laporte 
  Date:   2017-06-26 (Mon, 26 Jun 2017)

  Changed paths:
M pkgs/top-level/ocaml-packages.nix

  Log Message:
  ---
  ocamlPackages.core_bench: fix on OCaml ≥ 4.03


___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] e08216: ocamlPackages.type_conv-{108, 109}: disable for OC...

2017-06-25 Thread Vincent Laporte
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: e082162f09a74ef0c5c962da6c27d33f77c7af56
  
https://github.com/NixOS/nixpkgs/commit/e082162f09a74ef0c5c962da6c27d33f77c7af56
  Author: Vincent Laporte 
  Date:   2017-06-26 (Mon, 26 Jun 2017)

  Changed paths:
M pkgs/development/ocaml-modules/type_conv/108.08.00.nix
M pkgs/development/ocaml-modules/type_conv/109.60.01.nix

  Log Message:
  ---
   ocamlPackages.type_conv-{108,109}: disable for OCaml ≥ 4.03


___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 41b3b2: ocamlPackages.sexplib_p4: disable for OCaml ≥ 4.03

2017-06-25 Thread Vincent Laporte
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 41b3b2c0776ff637fd33d4b12f33cbbbf95e8017
  
https://github.com/NixOS/nixpkgs/commit/41b3b2c0776ff637fd33d4b12f33cbbbf95e8017
  Author: Vincent Laporte 
  Date:   2017-06-26 (Mon, 26 Jun 2017)

  Changed paths:
M pkgs/development/ocaml-modules/sexplib/108.08.00.nix
M pkgs/development/ocaml-modules/sexplib/111.25.00.nix
M pkgs/development/ocaml-modules/sexplib/112.24.01.nix

  Log Message:
  ---
  ocamlPackages.sexplib_p4: disable for OCaml ≥ 4.03


___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] f0dbe1: ocamlPackages.twt: don’t strip

2017-06-25 Thread Vincent Laporte
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: f0dbe18e9b0fe59e8369dbbb02252ccbbd98f0bd
  
https://github.com/NixOS/nixpkgs/commit/f0dbe18e9b0fe59e8369dbbb02252ccbbd98f0bd
  Author: Vincent Laporte 
  Date:   2017-06-26 (Mon, 26 Jun 2017)

  Changed paths:
M pkgs/development/ocaml-modules/twt/default.nix

  Log Message:
  ---
  ocamlPackages.twt: don’t strip


  Commit: 7829eb794f9ec6572217260323db473a685be541
  
https://github.com/NixOS/nixpkgs/commit/7829eb794f9ec6572217260323db473a685be541
  Author: Vincent Laporte 
  Date:   2017-06-26 (Mon, 26 Jun 2017)

  Changed paths:
M pkgs/development/compilers/reason/default.nix

  Log Message:
  ---
  ocamlPackages.reason: 1.13.4 -> 2.0.0


  Commit: 459f17a8d5d67871ad3a3646df034e2d1793f664
  
https://github.com/NixOS/nixpkgs/commit/459f17a8d5d67871ad3a3646df034e2d1793f664
  Author: Vincent Laporte 
  Date:   2017-06-26 (Mon, 26 Jun 2017)

  Changed paths:
M pkgs/development/ocaml-modules/uri/default.nix

  Log Message:
  ---
  ocamlPackages.uri_p4: disable for OCaml ≥ 4.03


Compare: https://github.com/NixOS/nixpkgs/compare/aa66c9ad3724...459f17a8d5d6___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] e5def4: minio: 20170316 -> 20170613

2017-06-25 Thread Pascal Bach
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: e5def4442e6d4ce66bf66716dc85c97481fce156
  
https://github.com/NixOS/nixpkgs/commit/e5def4442e6d4ce66bf66716dc85c97481fce156
  Author: Pascal Bach 
  Date:   2017-06-26 (Mon, 26 Jun 2017)

  Changed paths:
M pkgs/servers/minio/default.nix

  Log Message:
  ---
  minio: 20170316 -> 20170613


  Commit: aa66c9ad372448277ff113bd78039e6a30034662
  
https://github.com/NixOS/nixpkgs/commit/aa66c9ad372448277ff113bd78039e6a30034662
  Author: Pascal Bach 
  Date:   2017-06-26 (Mon, 26 Jun 2017)

  Changed paths:
M nixos/modules/misc/ids.nix
M nixos/modules/module-list.nix
A nixos/modules/services/web-servers/minio.nix
A nixos/tests/minio.nix

  Log Message:
  ---
  minio service: add inital service

features:
- change listen port and address
- configure config and data directory
- basic test to check if minio server starts


Compare: https://github.com/NixOS/nixpkgs/compare/d4002bd6d4a9...aa66c9ad3724___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] bb16bc: toxvpn: 20161230 -> 2017-06-25

2017-06-25 Thread Franz Pletz
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: bb16bced36be4f61d19c7472ecb14949eb2d6914
  
https://github.com/NixOS/nixpkgs/commit/bb16bced36be4f61d19c7472ecb14949eb2d6914
  Author: michael bishop 
  Date:   2017-06-25 (Sun, 25 Jun 2017)

  Changed paths:
M nixos/modules/services/networking/toxvpn.nix
M pkgs/tools/networking/toxvpn/default.nix

  Log Message:
  ---
  toxvpn: 20161230 -> 2017-06-25


  Commit: d4002bd6d4a90481f1c102d0957a6ea42d60144b
  
https://github.com/NixOS/nixpkgs/commit/d4002bd6d4a90481f1c102d0957a6ea42d60144b
  Author: Franz Pletz 
  Date:   2017-06-26 (Mon, 26 Jun 2017)

  Changed paths:
M nixos/modules/services/networking/toxvpn.nix
M pkgs/tools/networking/toxvpn/default.nix

  Log Message:
  ---
  Merge pull request #26863 from cleverca22/update-toxvpn

toxvpn: 20161230 -> 2017-06-25


Compare: https://github.com/NixOS/nixpkgs/compare/d80f2e18c62c...d4002bd6d4a9___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 315626: rsync: build with iconv, zlib & popt from nixpkgs

2017-06-25 Thread Franz Pletz
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 3156263876719c75ef5d98c36d701363eb4565ef
  
https://github.com/NixOS/nixpkgs/commit/3156263876719c75ef5d98c36d701363eb4565ef
  Author: Franz Pletz 
  Date:   2017-06-26 (Mon, 26 Jun 2017)

  Changed paths:
M pkgs/applications/networking/sync/rsync/default.nix

  Log Message:
  ---
  rsync: build with iconv, zlib & popt from nixpkgs

The rsync binary was previously built without iconv support which is needed
for utf-8 conversions on darwin. Fixes #26864.

Additionally rsync used to be built with bundled versions of zlib and popt
that were outdated. This decreases the size of the rsync binary by ~82KB.


  Commit: 356bac704a07f6b57bd94448e5396ebcf4189ca6
  
https://github.com/NixOS/nixpkgs/commit/356bac704a07f6b57bd94448e5396ebcf4189ca6
  Author: Franz Pletz 
  Date:   2017-06-26 (Mon, 26 Jun 2017)

  Changed paths:
R pkgs/tools/backup/burp/burp_1.4.40.patch
M pkgs/tools/backup/burp/default.nix

  Log Message:
  ---
  burp: 1.4.40 -> 2.0.54


  Commit: 1a7f330335c3fb17b3c41d043ca94306584e095e
  
https://github.com/NixOS/nixpkgs/commit/1a7f330335c3fb17b3c41d043ca94306584e095e
  Author: Franz Pletz 
  Date:   2017-06-26 (Mon, 26 Jun 2017)

  Changed paths:
R pkgs/tools/backup/burp/1.3.48.nix
R pkgs/tools/backup/burp/burp_1.3.48.patch
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  burp_1_3: remove


  Commit: edf5cbdc33cec8c473160a660cf98b729c285d80
  
https://github.com/NixOS/nixpkgs/commit/edf5cbdc33cec8c473160a660cf98b729c285d80
  Author: Franz Pletz 
  Date:   2017-06-26 (Mon, 26 Jun 2017)

  Changed paths:
M pkgs/development/libraries/librsync/default.nix

  Log Message:
  ---
  librsync: 1.0.0 -> 2.0.0


  Commit: d80f2e18c62c3b88b4ea5a39d2fa9f2f0fda0611
  
https://github.com/NixOS/nixpkgs/commit/d80f2e18c62c3b88b4ea5a39d2fa9f2f0fda0611
  Author: Franz Pletz 
  Date:   2017-06-26 (Mon, 26 Jun 2017)

  Changed paths:
M pkgs/development/libraries/uthash/default.nix

  Log Message:
  ---
  uthash: 1.9.9 -> 2.0.2


Compare: https://github.com/NixOS/nixpkgs/compare/1a25495b6344...d80f2e18c62c___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 1a2549: git: 2.13.1 -> 2.13.2

2017-06-25 Thread Tim Steinbach
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 1a25495b6344c832dc3750dc9b8a95fd2d68583c
  
https://github.com/NixOS/nixpkgs/commit/1a25495b6344c832dc3750dc9b8a95fd2d68583c
  Author: Tim Steinbach 
  Date:   2017-06-25 (Sun, 25 Jun 2017)

  Changed paths:
M pkgs/applications/version-management/git-and-tools/git/default.nix

  Log Message:
  ---
  git: 2.13.1 -> 2.13.2


___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 0e14a8: mpv: eliminate `config.mpv` options

2017-06-25 Thread AndersonTorres
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 0e14a8621dbcd5ae8fa4217c32568ee0a4a22920
  
https://github.com/NixOS/nixpkgs/commit/0e14a8621dbcd5ae8fa4217c32568ee0a4a22920
  Author: AndersonTorres 
  Date:   2017-06-26 (Mon, 26 Jun 2017)

  Changed paths:
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  mpv: eliminate `config.mpv` options

Removing all `config.mpv.*` options will improve readability. MPV has many
configurable options, and using the config approach is prone to confusion and
unnecessary code duplication. If needed, the user can `override` the relevant
variables in the function itself, so no functionality is lost.

Closes issue #26786


___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 5b54e9: glibc: fix i686 build

2017-06-25 Thread Franz Pletz
  Branch: refs/heads/release-17.03
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 5b54e99cea44145450da06e0ccae4539cbe68db5
  
https://github.com/NixOS/nixpkgs/commit/5b54e99cea44145450da06e0ccae4539cbe68db5
  Author: Franz Pletz 
  Date:   2017-06-26 (Mon, 26 Jun 2017)

  Changed paths:
M pkgs/development/libraries/glibc/common.nix
A pkgs/development/libraries/glibc/i686-fix-vectorized-strcspn.patch

  Log Message:
  ---
  glibc: fix i686 build

(cherry picked from commit 7cfd1c8c1bb04c0d42db3cb9a90f6791b9196b21)


___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 7cfd1c: glibc: fix i686 build

2017-06-25 Thread Franz Pletz
  Branch: refs/heads/staging
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 7cfd1c8c1bb04c0d42db3cb9a90f6791b9196b21
  
https://github.com/NixOS/nixpkgs/commit/7cfd1c8c1bb04c0d42db3cb9a90f6791b9196b21
  Author: Franz Pletz 
  Date:   2017-06-26 (Mon, 26 Jun 2017)

  Changed paths:
M pkgs/development/libraries/glibc/common.nix
A pkgs/development/libraries/glibc/i686-fix-vectorized-strcspn.patch

  Log Message:
  ---
  glibc: fix i686 build


___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] a42526: Revert "cc-wrapper: fix darwin"

2017-06-25 Thread Franz Pletz
  Branch: refs/heads/staging
  Home:   https://github.com/NixOS/nixpkgs
  Commit: a4252649bfa0a885a69785718ca624e3eae65595
  
https://github.com/NixOS/nixpkgs/commit/a4252649bfa0a885a69785718ca624e3eae65595
  Author: Franz Pletz 
  Date:   2017-06-26 (Mon, 26 Jun 2017)

  Changed paths:
M pkgs/build-support/cc-wrapper/add-hardening.sh

  Log Message:
  ---
  Revert "cc-wrapper: fix darwin"

This reverts commit c3a8595276ee8ee6f019e1dd3fec6827e1d15c22.

The stack protector hardening breaks the llvm_4 build.


  Commit: d42f502c84805e85957b264a93f4cc196d41bed9
  
https://github.com/NixOS/nixpkgs/commit/d42f502c84805e85957b264a93f4cc196d41bed9
  Author: Franz Pletz 
  Date:   2017-06-26 (Mon, 26 Jun 2017)

  Changed paths:
M pkgs/build-support/cc-wrapper/add-hardening.sh

  Log Message:
  ---
  Revert "cc-wrapper: add stackcheck hardening (stack clash)"

This reverts commit 4150f5e8ba650416dcb8956c9835885cc6a2a80d.

The stack protector hardening breaks the llvm_4 build.


Compare: https://github.com/NixOS/nixpkgs/compare/87fab3d6a548...d42f502c8480___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 572786: gitlab-runner: 9.2.0 -> 9.3.0

2017-06-25 Thread Pascal Bach
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 572786387d1669b24c84f5ec4e0ca6f8ebee4ba5
  
https://github.com/NixOS/nixpkgs/commit/572786387d1669b24c84f5ec4e0ca6f8ebee4ba5
  Author: Pascal Bach 
  Date:   2017-06-26 (Mon, 26 Jun 2017)

  Changed paths:
M pkgs/development/tools/continuous-integration/gitlab-runner/default.nix

  Log Message:
  ---
  gitlab-runner: 9.2.0 -> 9.3.0


___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


Re: [Nix-dev] nixos-rebuild without Internet

2017-06-25 Thread Maximilian Bosch
Hi,

at first thanks for your answers :-)

> If you only make a configuration change like reconfiguring a network
> interface, I'd expect nixos-rebuild to work without a network.

the last time(s) I ran into this I avoided GCs or Channel updates before as
I feared such issues.

> Or is it trying to access the binary cache?

yes I think that describes the problem way better. Last time it attempted
to download several items from the binary cache (unfortunately I don't
remeber which).
I think that avoiding downloads from the binary cache here might help,
however I'm wondering if Nix is (or should in future versions be) able to
skip such downloads in cases like no (appropriate) connection
automateically.

> if you do know, what possible NixOS configurations may help you in
future, use the `nesting.clone` option.

That example looks quite interestng, thanks for the hint! I hope that I'll
find some time next week to play around with this :-)

Have a nice evening,

Maximilian

On Sun, Jun 25, 2017 at 5:02 AM, Danylo Hlynskyi 
wrote:

> In general, no, there isn't "partial" rebuild, because Nix itself doesn't
> support "partial" builds (and NixOS is
> just another derivation)
>
> There are workarounds, however:
> - don't setup network via NixOS modules, do it with direct imperative
> commands
> - often some commands are hidden. For example, when network-manager is
> enabled, dhcpcd is disabled.
>   And the only way to run dhcpcd is to find the binary in /nix/store/...
> hoping GC didn't remove it.
> - don't do channel updates and GCs, if you know you may experience
> internet problems.
> - if you do channel updates, don't GC channel profiles at least (so you
> can nix-channel --rollback)
>   I've done this several times, updated a channel to setup some package,
> but didn't do nixos-rebuild...
> - if you do know, what possible NixOS configurations may help you in
> future, use the `nesting.clone` option.
>   Let me show you an example.
>
>   # configuration.nix
>   { lib, ...}: {
>
>  networking.networkmanager.enable = true;
>
>  nesting.clone = [
>{
>networking.networkmanager.enable = lib.mkForce false;
>networking.dhcpcd.enable = lib.mkForce true;
>}
>  ];
>
>   }
>
>   This defines a default configuration with NM enabled, and alternative
> with NM disabled and DHCPcd enabled
>   You can activate the alternative configuration with
>   $ sudo /run/current-system/fine-tune/child-1/bin/switch-to-configuration
> test
>
>   To revert back either reboot, or
>   $ sudo /run/booted-system/bin/switch-to-configuration test
>
>   By using nesting.clone, you can declaratively control which parts of
> configuration should
>   be retained by GC collector without polluting your current environment.
>   The activation of configuration shouldn't require internet connection.
>
> 2017-06-25 1:52 GMT+03:00 Maximilian Bosch :
>
>> Hey guys,
>>
>> I'm using a NixOS setup on my developer machine. For WLAN networks I use
>> the `networking.wireless` option as it allows me a declarative/reproducible
>> setup of the networks I use on a daily basis.
>>
>> Unfortunately I'm facing from time to time the following issue: whenever
>> I try to add a new network (and no connection is available ATM) I have a
>> problem running `nixos-rebuild` as the rebuild usually causes a lot of
>> other operations and some of them require a connection to the internet
>> (e.g. for [re]downloads).
>>
>> However this is quite bad when I need a new network, but the rebuild
>> fails. I currently solve it using several tricks, but in the end I'd like
>> to now if there's some kind of tool to do a "partial-rebuild" on a NixOS
>> machine (although it might break the reproducability as the expressions
>> wouln'dt be 100%-deterministic anymore) or if I have to live with this
>> issue.
>>
>> Thanks and have a nice Sunday,
>>
>> Maximilian
>>
>> ___
>> nix-dev mailing list
>> nix-dev@lists.science.uu.nl
>> https://mailman.science.uu.nl/mailman/listinfo/nix-dev
>>
>>
>
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-dev


Re: [Nix-dev] In multi-user Nix, let the daemon handle creation of GC roots

2017-06-25 Thread sbaugh

Two other observations about adding such a feature, where GC roots are
added and removed by sending messages to the daemon:

- Since the daemon would now know exactly when a GC root was removed,
  this would allow for a time-based garbage collection policy, where a
  GC only collects things if they have been unreferenced for at least an
  hour, or a week, or any other period of time.

- I believe this would make our GC approach be an example of "partial
  tracing" as described in Bacon 2004. "A Unified Theory of Garbage
  Collection", https://www.cs.virginia.edu/~cs415/reading/bacon-garbage.pdf
  which would be interestingly novel, since they say "We know of no
  implementation of partial tracing."

___
nix-dev mailing list
nix-dev@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-dev


[Nix-dev] KDE applications

2017-06-25 Thread Karn Kallio

A number of the KDE applications in Nixpkgs fail to build due to
missing dependencies.  The attached patch fixes these builds by adding
the dependencies.

This patch includes the same changes as the individual patches sent
earlier as well as fixes for kig and akondadi-mime
>From fb0f55357c0ef6a9e5d196df94d65fa6b6a53615 Mon Sep 17 00:00:00 2001
From: Karn Kallio 
Date: Sun, 25 Jun 2017 13:11:11 -0400
Subject: [PATCH] kde applications : fix builds by adding missing dependencies

---
 pkgs/applications/kde/akonadi-mime.nix| 6 --
 pkgs/applications/kde/akonadi/default.nix | 5 +++--
 pkgs/applications/kde/k3b.nix | 8 
 pkgs/applications/kde/kcachegrind.nix | 4 ++--
 pkgs/applications/kde/kig.nix | 5 +++--
 pkgs/applications/kde/krfb.nix| 5 +++--
 pkgs/applications/kde/okteta.nix  | 9 ++---
 7 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/kde/akonadi-mime.nix b/pkgs/applications/kde/akonadi-mime.nix
index 1fb5075666..98a341da6b 100644
--- a/pkgs/applications/kde/akonadi-mime.nix
+++ b/pkgs/applications/kde/akonadi-mime.nix
@@ -1,7 +1,8 @@
 {
   mkDerivation, lib,
   extra-cmake-modules,
-  akonadi, kdbusaddons, ki18n, kio, kitemmodels, kmime
+  akonadi, kdbusaddons, ki18n, kio, kitemmodels, kmime,
+  shared_mime_info
 }:
 
 mkDerivation {
@@ -11,6 +12,7 @@ mkDerivation {
 maintainers = [ lib.maintainers.ttuegel ];
   };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ akonadi kdbusaddons ki18n kio kitemmodels kmime ];
+  buildInputs = [ akonadi shared_mime_info
+  kdbusaddons ki18n kio kitemmodels kmime ];
   outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/applications/kde/akonadi/default.nix b/pkgs/applications/kde/akonadi/default.nix
index a264ebc9f0..c2e3442847 100644
--- a/pkgs/applications/kde/akonadi/default.nix
+++ b/pkgs/applications/kde/akonadi/default.nix
@@ -2,8 +2,8 @@
   mkDerivation, copyPathsToStore, lib,
   extra-cmake-modules,
   kcompletion, kconfigwidgets, kdbusaddons, kdesignerplugin, kiconthemes,
-  kio,
-  boost, kitemmodels,
+  kwindowsystem, kcrash, kio,
+  boost, kitemmodels, shared_mime_info,
   mysql
 }:
 
@@ -17,6 +17,7 @@ mkDerivation {
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
 kcompletion kconfigwidgets kdbusaddons kdesignerplugin kiconthemes kio
+kwindowsystem kcrash shared_mime_info
   ];
   propagatedBuildInputs = [ boost kitemmodels ];
   cmakeFlags = [
diff --git a/pkgs/applications/kde/k3b.nix b/pkgs/applications/kde/k3b.nix
index e1f1132a08..79806dc93f 100644
--- a/pkgs/applications/kde/k3b.nix
+++ b/pkgs/applications/kde/k3b.nix
@@ -1,11 +1,11 @@
 { mkDerivation, lib
 , extra-cmake-modules, kdoctools, makeWrapper
 , qtwebkit
-, libkcddb, kcmutils, kfilemetadata, knewstuff, knotifyconfig, solid, kxmlgui
+, libkcddb, karchive, kcmutils, kfilemetadata, knewstuff, knotifyconfig, solid, kxmlgui
 , flac, lame, libmad, libmpcdec, libvorbis
 , libsamplerate, libsndfile, taglib
 , cdparanoia, cdrdao, cdrtools, dvdplusrwtools, libburn, libdvdcss, libdvdread, vcdimager
-, ffmpeg, libmusicbrainz2, normalize, sox, transcode
+, ffmpeg, libmusicbrainz2, normalize, sox, transcode, shared_mime_info
 }:
 
 mkDerivation {
@@ -20,7 +20,7 @@ mkDerivation {
 # qt
 qtwebkit
 # kde
-libkcddb kcmutils kfilemetadata knewstuff knotifyconfig solid kxmlgui
+libkcddb karchive kcmutils kfilemetadata knewstuff knotifyconfig solid kxmlgui
 # formats
 flac lame libmad libmpcdec libvorbis
 # sound utilities
@@ -28,7 +28,7 @@ mkDerivation {
 # cd/dvd
 cdparanoia libdvdcss libdvdread
 # others
-ffmpeg libmusicbrainz2
+ffmpeg libmusicbrainz2 shared_mime_info
   ];
   postFixup =
 let k3bPath = lib.makeBinPath [
diff --git a/pkgs/applications/kde/kcachegrind.nix b/pkgs/applications/kde/kcachegrind.nix
index a8833cfbf5..19e01aeebe 100644
--- a/pkgs/applications/kde/kcachegrind.nix
+++ b/pkgs/applications/kde/kcachegrind.nix
@@ -1,7 +1,7 @@
 {
   mkDerivation, lib,
   extra-cmake-modules, kdoctools,
-  kio, ki18n,
+  kio, ki18n, karchive, qttools,
   perl, python, php
 }:
 
@@ -13,5 +13,5 @@ mkDerivation {
   };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [ kio ];
-  buildInputs = [ perl python php ki18n ];
+  buildInputs = [ perl python php ki18n karchive qttools ];
 }
diff --git a/pkgs/applications/kde/kig.nix b/pkgs/applications/kde/kig.nix
index f2a1d275f6..34b3289620 100644
--- a/pkgs/applications/kde/kig.nix
+++ b/pkgs/applications/kde/kig.nix
@@ -1,7 +1,8 @@
 {
   mkDerivation, lib,
   extra-cmake-modules, kdoctools,
-  kparts, qtsvg, qtxmlpatterns, ktexteditor, boost
+  kparts, qtsvg, qtxmlpatterns, ktexteditor, boost,
+  karchive, kcrash
 }:
 
 mkDerivation {
@@ -13,7 +14,7 @@ mkDerivation {
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [ boost ];
   propagatedBuildInputs = [
-kparts 

[Nix-commits] [NixOS/nixpkgs] bd63da: chromium: Add installation of libGLESv2.so

2017-06-25 Thread aszlig
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: bd63daae03d6a3c014d0b5a526f2698c60f69e6f
  
https://github.com/NixOS/nixpkgs/commit/bd63daae03d6a3c014d0b5a526f2698c60f69e6f
  Author: aszlig 
  Date:   2017-06-25 (Sun, 25 Jun 2017)

  Changed paths:
M pkgs/applications/networking/browsers/chromium/browser.nix

  Log Message:
  ---
  chromium: Add installation of libGLESv2.so

The following errors occur when you start Chromium prior to this commit:

[2534:2534:0625/202928.673160:ERROR:gl_implementation.cc(246)] Failed to
load .../libexec/chromium/swiftshader/libGLESv2.so:
../libexec/chromium/swiftshader/libGLESv2.so: cannot open shared object
file: No such file or directory
[2534:2534:0625/202928.674434:ERROR:gpu_child_thread.cc(174)] Exiting
GPU process due to errors during initialization

While in theory we do not strictly need libGLESv2.so, in practice this
means that the GPU process isn't starting up at all which in turn leads
to crawling rendering performance on some sites.

So let's install all shared libraries in swiftshader.

I've tested this with the chromium.stable NixOS VM test and also locally
on my machine and the errors as well as the performance issues are gone.

Signed-off-by: aszlig 


___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] c43a2d: git-annex: the overrideScope must be applied first...

2017-06-25 Thread Peter Simons
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: c43a2d392ffbba0e9a4627a69c90dc30189208f9
  
https://github.com/NixOS/nixpkgs/commit/c43a2d392ffbba0e9a4627a69c90dc30189208f9
  Author: Peter Simons 
  Date:   2017-06-25 (Sun, 25 Jun 2017)

  Changed paths:
M pkgs/development/haskell-modules/configuration-common.nix

  Log Message:
  ---
  git-annex: the overrideScope must be applied first to avoid bug 
https://github.com/NixOS/nixpkgs/issues/26852


___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-dev] krfb fix build

2017-06-25 Thread Karn Kallio
The attached patch fixes the build for the KDE application krfb in the
Nixpkgs by adding missing dependencies.
>From 2e9a34ce6caf9d878fca95dfcfcd49555d6cf53d Mon Sep 17 00:00:00 2001
From: Karn Kallio 
Date: Sun, 25 Jun 2017 14:37:43 -0400
Subject: [PATCH] krfb : Fix build by adding missing dependencies.

---
 pkgs/applications/kde/krfb.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/kde/krfb.nix b/pkgs/applications/kde/krfb.nix
index 0f4aecb83d..9dd0384655 100644
--- a/pkgs/applications/kde/krfb.nix
+++ b/pkgs/applications/kde/krfb.nix
@@ -1,7 +1,8 @@
 {
   mkDerivation, lib,
   extra-cmake-modules, kdoctools,
-  kdelibs4support, kdnssd, libvncserver, libXtst
+  kdelibs4support, kdnssd, libvncserver, libXtst,
+  qtx11extras
 }:
 
 mkDerivation {
@@ -11,6 +12,6 @@ mkDerivation {
 maintainers = with lib.maintainers; [ jerith666 ];
   };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  buildInputs = [ libvncserver libXtst ];
+  buildInputs = [ libvncserver libXtst qtx11extras ];
   propagatedBuildInputs = [ kdelibs4support kdnssd ];
 }
-- 
2.13.1

___
nix-dev mailing list
nix-dev@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-dev


[Nix-dev] kcachegrind fix build

2017-06-25 Thread Karn Kallio
The attached patch fixes the build of the KDE application kcachegrind
in Nixpkgs by adding missing dependencies.
>From 860550b0479fc697386d883d34c23d38b7c196d8 Mon Sep 17 00:00:00 2001
From: Karn Kallio 
Date: Sun, 25 Jun 2017 14:32:03 -0400
Subject: [PATCH] kcachegrind : Fix build by adding missing dependencies.

---
 pkgs/applications/kde/kcachegrind.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/kde/kcachegrind.nix b/pkgs/applications/kde/kcachegrind.nix
index a8833cfbf5..19e01aeebe 100644
--- a/pkgs/applications/kde/kcachegrind.nix
+++ b/pkgs/applications/kde/kcachegrind.nix
@@ -1,7 +1,7 @@
 {
   mkDerivation, lib,
   extra-cmake-modules, kdoctools,
-  kio, ki18n,
+  kio, ki18n, karchive, qttools,
   perl, python, php
 }:
 
@@ -13,5 +13,5 @@ mkDerivation {
   };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [ kio ];
-  buildInputs = [ perl python php ki18n ];
+  buildInputs = [ perl python php ki18n karchive qttools ];
 }
-- 
2.13.1

___
nix-dev mailing list
nix-dev@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-dev


[Nix-dev] akonadi fix build

2017-06-25 Thread Karn Kallio
 The attached patch fixes the build of the KDE application akonadi in
 the Nixpkgs by adding some missing dependencies.
>From bd3a4216edde99b4838cb256d563cb8082021ab9 Mon Sep 17 00:00:00 2001
From: Karn Kallio 
Date: Sun, 25 Jun 2017 14:11:36 -0400
Subject: [PATCH] akonadi : Fix build by adding missing dependencies.

---
 pkgs/applications/kde/akonadi/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/kde/akonadi/default.nix b/pkgs/applications/kde/akonadi/default.nix
index a264ebc9f0..c2e3442847 100644
--- a/pkgs/applications/kde/akonadi/default.nix
+++ b/pkgs/applications/kde/akonadi/default.nix
@@ -2,8 +2,8 @@
   mkDerivation, copyPathsToStore, lib,
   extra-cmake-modules,
   kcompletion, kconfigwidgets, kdbusaddons, kdesignerplugin, kiconthemes,
-  kio,
-  boost, kitemmodels,
+  kwindowsystem, kcrash, kio,
+  boost, kitemmodels, shared_mime_info,
   mysql
 }:
 
@@ -17,6 +17,7 @@ mkDerivation {
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
 kcompletion kconfigwidgets kdbusaddons kdesignerplugin kiconthemes kio
+kwindowsystem kcrash shared_mime_info
   ];
   propagatedBuildInputs = [ boost kitemmodels ];
   cmakeFlags = [
-- 
2.13.1

___
nix-dev mailing list
nix-dev@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-dev


[Nix-commits] [NixOS/nixpkgs] 37ec46: bcache-tools: add name to the source store path

2017-06-25 Thread Bjørn Forsman
  Branch: refs/heads/release-17.03
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 37ec462019deea8f275111f3fd83ac9898921049
  
https://github.com/NixOS/nixpkgs/commit/37ec462019deea8f275111f3fd83ac9898921049
  Author: Bjørn Forsman 
  Date:   2017-06-25 (Sun, 25 Jun 2017)

  Changed paths:
M pkgs/tools/filesystems/bcache-tools/default.nix

  Log Message:
  ---
  bcache-tools: add name to the source store path

So that

 $ nix-build -A bcache-tools.src

gives

 /nix/store/HASH-bcache-tools-1.0.7.tar.gz

instead of

 /nix/store/HASH-v1.0.7.tar.gz

(cherry picked from commit f12b0a2179585d443bf0abab3ac1cfccebc24512)


  Commit: b71f5e311b7cf350f99b084c059691dd7749c265
  
https://github.com/NixOS/nixpkgs/commit/b71f5e311b7cf350f99b084c059691dd7749c265
  Author: Bjørn Forsman 
  Date:   2017-06-25 (Sun, 25 Jun 2017)

  Changed paths:
M nixos/modules/system/boot/stage-1.nix
M pkgs/tools/filesystems/bcache-tools/default.nix

  Log Message:
  ---
  nixos/bcache: /bin/sh -> ${bash}/bin/sh

Or else `services.udev.packages = [ bcache-tools ]` cannot be used.

To not break bcache in the initrd I'm modifying this in stage-1.nix:

  -  --replace /bin/sh ${extraUtils}/bin/sh
  +  --replace ${bash}/bin/sh ${extraUtils}/bin/sh

Reasoning behind that change:

* If not modifying the /bin/sh pattern in any way, it will also match
  ${bash}/bin/sh, creating a broken path like
  /nix/store/HASH-bash/nix/store/HASH-bash/bin/sh in the udev rule file.

* The addition of /bin/sh was done in 775f381a9e34
  ("stage-1: add bcache support"). It seems somewhat plausible that
  no new users have appeared since then and we can take this opportunity
  to back out of this change without much fear of regressions.

  If there _are_ regressions, they should be in the form of build time
  errors, not runtime (boot), due to how the udev rule output is checked
  for invalid path references. So low risk, IMHO.

* An alternative approach could be to copy the /bin/sh substitute rule
  over to the non-initrd udev rules implementation in NixOS, but I think
  this way is better:
  - The rules file comes with a working path out of the box.
  - We can use more precise pattern matching when modifying the udev
rules for the initrd.

(cherry picked from commit 581226cfb456b4c116594f1b79f45945703a4a4c)


  Commit: d0ad6a76518aa6444d27a53de7d84a3928800dd1
  
https://github.com/NixOS/nixpkgs/commit/d0ad6a76518aa6444d27a53de7d84a3928800dd1
  Author: Bjørn Forsman 
  Date:   2017-06-25 (Sun, 25 Jun 2017)

  Changed paths:
M nixos/modules/tasks/bcache.nix

  Log Message:
  ---
  nixos/bcache: add services.udev.packages = [ bcache-tools ]

Adds /dev/disk/by-{id,label}/* symlinks for bcache device nodes, in the
final rootfs.

Symlinks will only be created for bcache devices that contain
filesystems. So if you have a blank bcache device or run LVM on top of
bcache you will not get this kind of symlink.

(cherry picked from commit 5b48368386864af78658b7c18608df57f8e8a386)


Compare: https://github.com/NixOS/nixpkgs/compare/c1ad03b4602b...d0ad6a76518a___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-dev] okteta fix build

2017-06-25 Thread Karn Kallio

The attached patch fixes the build of the Nixpkgs KDE application
okteta by adding some missing dependencies.
>From 0bab312b4c1105baad904e0d6974137f04af9209 Mon Sep 17 00:00:00 2001
From: Karn Kallio 
Date: Sun, 25 Jun 2017 13:48:54 -0400
Subject: [PATCH] okteta : Fix build by adding missing dependencies.

---
 pkgs/applications/kde/okteta.nix | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/kde/okteta.nix b/pkgs/applications/kde/okteta.nix
index deeffa3207..1d44bb27fa 100644
--- a/pkgs/applications/kde/okteta.nix
+++ b/pkgs/applications/kde/okteta.nix
@@ -1,8 +1,9 @@
 {
   mkDerivation, lib,
   extra-cmake-modules, kdoctools,
-  kconfig, kinit,
-  kcmutils, kconfigwidgets, knewstuff, kparts, qca-qt5
+  qtscript, kconfig, kinit, karchive,
+  kcmutils, kconfigwidgets, knewstuff, kparts, qca-qt5,
+  shared_mime_info
 }:
 
 mkDerivation {
@@ -11,8 +12,10 @@ mkDerivation {
 license = with lib.licenses; [ gpl2 ];
 maintainers = with lib.maintainers; [ peterhoeg ];
   };
-  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ];
+  buildInputs = [ shared_mime_info ];
   propagatedBuildInputs = [
 kconfig kinit kcmutils kconfigwidgets knewstuff kparts qca-qt5
+karchive
   ];
 }
-- 
2.13.1

___
nix-dev mailing list
nix-dev@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-dev


[Nix-commits] [NixOS/nixpkgs] ddf7c6: lilypond-with-fonts: fix quoting

2017-06-25 Thread Jörg Thalheim
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: ddf7c6ef061bc2d900cf0323c992f03bef2af0c2
  
https://github.com/NixOS/nixpkgs/commit/ddf7c6ef061bc2d900cf0323c992f03bef2af0c2
  Author: Eric Bailey 
  Date:   2017-05-26 (Fri, 26 May 2017)

  Changed paths:
M pkgs/misc/lilypond/with-fonts.nix

  Log Message:
  ---
  lilypond-with-fonts: fix quoting


  Commit: ea5330c0e20b3c99c4f274f12ceda4e2cd1093bf
  
https://github.com/NixOS/nixpkgs/commit/ea5330c0e20b3c99c4f274f12ceda4e2cd1093bf
  Author: Jörg Thalheim 
  Date:   2017-06-25 (Sun, 25 Jun 2017)

  Changed paths:
M pkgs/misc/lilypond/with-fonts.nix

  Log Message:
  ---
  Merge pull request #26118 from yurrriq/update/pkgs/misc/lilypond-with-fonts

lilypond-with-fonts: fix quoting


Compare: https://github.com/NixOS/nixpkgs/compare/239920d7458d...ea5330c0e20b___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 60e19e: plv8: init at 2.0.3

2017-06-25 Thread Jörg Thalheim
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 60e19e7393d9978bfafd4b981a35cb48d22d3c52
  
https://github.com/NixOS/nixpkgs/commit/60e19e7393d9978bfafd4b981a35cb48d22d3c52
  Author: Volth 
  Date:   2017-06-25 (Sun, 25 Jun 2017)

  Changed paths:
A pkgs/servers/sql/postgresql/plv8/default.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  plv8: init at 2.0.3


  Commit: 239920d7458d5b4dd01df93f17b2c3c6ff07952f
  
https://github.com/NixOS/nixpkgs/commit/239920d7458d5b4dd01df93f17b2c3c6ff07952f
  Author: Jörg Thalheim 
  Date:   2017-06-25 (Sun, 25 Jun 2017)

  Changed paths:
A pkgs/servers/sql/postgresql/plv8/default.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  Merge pull request #26831 from volth/plv8-init-2.0.3

plv8: init at 2.0.3


Compare: https://github.com/NixOS/nixpkgs/compare/883148ef2657...239920d7458d___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-dev] fix k3b build

2017-06-25 Thread Karn Kallio

The Nixpkgs expression for the KDE application k3b does not build due
to some missing dependencies.  The attached patch fixes the build by
adding them.
>From 93d344738c75ad77e214145120b475876919c92d Mon Sep 17 00:00:00 2001
From: Karn Kallio 
Date: Sun, 25 Jun 2017 13:11:11 -0400
Subject: [PATCH] k3b : Fix build by adding missing dependencies.

---
 pkgs/applications/kde/k3b.nix | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/kde/k3b.nix b/pkgs/applications/kde/k3b.nix
index e1f1132a08..79806dc93f 100644
--- a/pkgs/applications/kde/k3b.nix
+++ b/pkgs/applications/kde/k3b.nix
@@ -1,11 +1,11 @@
 { mkDerivation, lib
 , extra-cmake-modules, kdoctools, makeWrapper
 , qtwebkit
-, libkcddb, kcmutils, kfilemetadata, knewstuff, knotifyconfig, solid, kxmlgui
+, libkcddb, karchive, kcmutils, kfilemetadata, knewstuff, knotifyconfig, solid, kxmlgui
 , flac, lame, libmad, libmpcdec, libvorbis
 , libsamplerate, libsndfile, taglib
 , cdparanoia, cdrdao, cdrtools, dvdplusrwtools, libburn, libdvdcss, libdvdread, vcdimager
-, ffmpeg, libmusicbrainz2, normalize, sox, transcode
+, ffmpeg, libmusicbrainz2, normalize, sox, transcode, shared_mime_info
 }:
 
 mkDerivation {
@@ -20,7 +20,7 @@ mkDerivation {
 # qt
 qtwebkit
 # kde
-libkcddb kcmutils kfilemetadata knewstuff knotifyconfig solid kxmlgui
+libkcddb karchive kcmutils kfilemetadata knewstuff knotifyconfig solid kxmlgui
 # formats
 flac lame libmad libmpcdec libvorbis
 # sound utilities
@@ -28,7 +28,7 @@ mkDerivation {
 # cd/dvd
 cdparanoia libdvdcss libdvdread
 # others
-ffmpeg libmusicbrainz2
+ffmpeg libmusicbrainz2 shared_mime_info
   ];
   postFixup =
 let k3bPath = lib.makeBinPath [
-- 
2.13.1

___
nix-dev mailing list
nix-dev@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-dev


[Nix-commits] [NixOS/nixpkgs] 883148: pip-tools: fix build

2017-06-25 Thread Benno Fünfstück
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 883148ef265761adcfde487d16f56e077bc0aa69
  
https://github.com/NixOS/nixpkgs/commit/883148ef265761adcfde487d16f56e077bc0aa69
  Author: Benno Fünfstück 
  Date:   2017-06-25 (Sun, 25 Jun 2017)

  Changed paths:
M pkgs/development/python-modules/pip-tools/default.nix

  Log Message:
  ---
  pip-tools: fix build


___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 252e9e: microcodeIntel: 20161104 -> 20170511

2017-06-25 Thread Gabriel Ebner
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 252e9ec84a7d00f93fa1e1ec4f3f4e706d505f4f
  
https://github.com/NixOS/nixpkgs/commit/252e9ec84a7d00f93fa1e1ec4f3f4e706d505f4f
  Author: Gabriel Ebner 
  Date:   2017-06-25 (Sun, 25 Jun 2017)

  Changed paths:
M pkgs/os-specific/linux/microcode/intel.nix

  Log Message:
  ---
  microcodeIntel: 20161104 -> 20170511


___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] f5665e: geogebra: 5-0-361-0 -> 5-0-369-0

2017-06-25 Thread Joachim F
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: f5665e9ab4dc2b4c8123cdd452ba7949dc41c558
  
https://github.com/NixOS/nixpkgs/commit/f5665e9ab4dc2b4c8123cdd452ba7949dc41c558
  Author: Maximilian Bosch 
  Date:   2017-06-25 (Sun, 25 Jun 2017)

  Changed paths:
M pkgs/applications/science/math/geogebra/default.nix

  Log Message:
  ---
  geogebra: 5-0-361-0 -> 5-0-369-0


  Commit: 90d3a0314c9b8a9534320b78eb30c4ef949c2ba2
  
https://github.com/NixOS/nixpkgs/commit/90d3a0314c9b8a9534320b78eb30c4ef949c2ba2
  Author: Joachim F 
  Date:   2017-06-25 (Sun, 25 Jun 2017)

  Changed paths:
M pkgs/applications/science/math/geogebra/default.nix

  Log Message:
  ---
  Merge pull request #26836 from Ma27/update/geogebra

geogebra: 5-0-361-0 -> 5-0-369-0


Compare: https://github.com/NixOS/nixpkgs/compare/c235bf3e3dd5...90d3a0314c9b___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 8a714e: elpa-packages: 2017-06-23

2017-06-25 Thread Joachim F
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 8a714e3bb6fc81eaf8466904f04508e2eaf431c8
  
https://github.com/NixOS/nixpkgs/commit/8a714e3bb6fc81eaf8466904f04508e2eaf431c8
  Author: Michael Alan Dorman 
  Date:   2017-06-23 (Fri, 23 Jun 2017)

  Changed paths:
M pkgs/applications/editors/emacs-modes/elpa-generated.nix

  Log Message:
  ---
  elpa-packages: 2017-06-23


  Commit: a10c8a97b40dfa828c4b4fd68995e6d55092526a
  
https://github.com/NixOS/nixpkgs/commit/a10c8a97b40dfa828c4b4fd68995e6d55092526a
  Author: Michael Alan Dorman 
  Date:   2017-06-23 (Fri, 23 Jun 2017)

  Changed paths:
M pkgs/applications/editors/emacs-modes/org-generated.nix

  Log Message:
  ---
  org-packages: 2017-06-23


  Commit: 40e17794ce8122aac38c3b62ecf3951105b490f1
  
https://github.com/NixOS/nixpkgs/commit/40e17794ce8122aac38c3b62ecf3951105b490f1
  Author: Michael Alan Dorman 
  Date:   2017-06-23 (Fri, 23 Jun 2017)

  Changed paths:
M pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix

  Log Message:
  ---
  melpa-stable-packages: 2017-06-23


  Commit: eea95af5d1ef81b832dde30320cd70f5b6ec30c0
  
https://github.com/NixOS/nixpkgs/commit/eea95af5d1ef81b832dde30320cd70f5b6ec30c0
  Author: Michael Alan Dorman 
  Date:   2017-06-23 (Fri, 23 Jun 2017)

  Changed paths:
M pkgs/applications/editors/emacs-modes/melpa-generated.nix

  Log Message:
  ---
  melpa-packages: 2017-06-23

Removals:
 - todochiku - Removed from melpa


  Commit: c235bf3e3dd562cb9b07a7d65748d3c5143420db
  
https://github.com/NixOS/nixpkgs/commit/c235bf3e3dd562cb9b07a7d65748d3c5143420db
  Author: Joachim F 
  Date:   2017-06-25 (Sun, 25 Jun 2017)

  Changed paths:
M pkgs/applications/editors/emacs-modes/elpa-generated.nix
M pkgs/applications/editors/emacs-modes/melpa-generated.nix
M pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
M pkgs/applications/editors/emacs-modes/org-generated.nix

  Log Message:
  ---
  Merge pull request #26792 from mdorman/emacs-updates

Automated Emacs package updates


Compare: https://github.com/NixOS/nixpkgs/compare/ed515c80803e...c235bf3e3dd5___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


Re: [Nix-dev] Setup hook evaluation order

2017-06-25 Thread Thomas Tuegel
On Sunday, June 25, 2017 1:31:28 AM CDT Vladimír Čunát wrote:
> On 06/22/2017 01:05 PM, Thomas Tuegel wrote:
> > How can I make my setup hook be evaluated after multiple-outputs.sh is
> > loaded?
> Immediate idea, maybe there's a better way: make the envHook just extend
> prePhases by a function that does the actual work.  That should get run
> after all envHooks but before all phases.

I think for most setup hooks your suggestion would work. Unfortunately, the 
setup hook I'm working with is actually a *template* for a family of setup 
hooks, so I can't define any functions as there is no easy way to ensure they 
are uniquely named.

The solution I implemented [1] is to set a postHook which reloads the setup 
hook by filename. The setup hook checks the hookName variable, and when it is 
set to postHook, runs the true body of the setup hook.

> Still, I wonder if we should change the order to run the setup hooks
> from stdenv before those from packages.  It would seem more natural.

I tend to agree. Upon examination, I found several other definitions which I 
thought should precede loading the setup hooks. I have made a pull request [2] 
to staging.

Regards,
Tom

---

[1]. 
https://github.com/NixOS/nixpkgs/commit/0030c6610353b3706fe77d4cce06f1905a4aec43
[2]. https://github.com/NixOS/nixpkgs/pull/26844


___
nix-dev mailing list
nix-dev@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-dev


[Nix-commits] [NixOS/nixpkgs] 280f0d: Revert "Revert "linux: 4.9.33 -> 4.9.34""

2017-06-25 Thread Tim Steinbach
  Branch: refs/heads/release-17.03
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 280f0db6a0cbb4c45f28a5de7ffa8a775815b684
  
https://github.com/NixOS/nixpkgs/commit/280f0db6a0cbb4c45f28a5de7ffa8a775815b684
  Author: Tim Steinbach 
  Date:   2017-06-25 (Sun, 25 Jun 2017)

  Changed paths:
M pkgs/os-specific/linux/kernel/common-config.nix
M pkgs/os-specific/linux/kernel/linux-4.9.nix

  Log Message:
  ---
  Revert "Revert "linux: 4.9.33 -> 4.9.34""

This reverts commit 0ee624c20844c89c60a31de39a500de45a65d966.


  Commit: c1ad03b4602b84851819d733e0f7c5a98ab9ef95
  
https://github.com/NixOS/nixpkgs/commit/c1ad03b4602b84851819d733e0f7c5a98ab9ef95
  Author: Tim Steinbach 
  Date:   2017-06-25 (Sun, 25 Jun 2017)

  Changed paths:
M pkgs/os-specific/linux/kernel/patches.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  Revert "linux: patch CVE-2017-1000364 (stack clash)"

This reverts commit 6c026fe3d0e93f5398907f37ed79eb0810dbf802.


Compare: https://github.com/NixOS/nixpkgs/compare/0ee624c20844...c1ad03b4602b___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 0ee624: Revert "linux: 4.9.33 -> 4.9.34"

2017-06-25 Thread Tim Steinbach
  Branch: refs/heads/release-17.03
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 0ee624c20844c89c60a31de39a500de45a65d966
  
https://github.com/NixOS/nixpkgs/commit/0ee624c20844c89c60a31de39a500de45a65d966
  Author: Tim Steinbach 
  Date:   2017-06-25 (Sun, 25 Jun 2017)

  Changed paths:
M pkgs/os-specific/linux/kernel/common-config.nix
M pkgs/os-specific/linux/kernel/linux-4.9.nix

  Log Message:
  ---
  Revert "linux: 4.9.33 -> 4.9.34"

This reverts commit e74d2b42c838c17b32545196d7911105456e3782.


___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] ed515c: weechat: 1.8 -> 1.9

2017-06-25 Thread Franz Pletz
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: ed515c80803e975e454e654d2de9e692aa1f3af1
  
https://github.com/NixOS/nixpkgs/commit/ed515c80803e975e454e654d2de9e692aa1f3af1
  Author: Franz Pletz 
  Date:   2017-06-25 (Sun, 25 Jun 2017)

  Changed paths:
M pkgs/applications/networking/irc/weechat/default.nix

  Log Message:
  ---
  weechat: 1.8 -> 1.9


___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 6e52ef: qgo: init at unstable-2016-06-23

2017-06-25 Thread Jörg Thalheim
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 6e52efe9ebf2e96fd797a5e98a5981ec111de5b0
  
https://github.com/NixOS/nixpkgs/commit/6e52efe9ebf2e96fd797a5e98a5981ec111de5b0
  Author: Unai Zalakain 
  Date:   2017-06-25 (Sun, 25 Jun 2017)

  Changed paths:
A pkgs/games/qgo/default.nix
A pkgs/games/qgo/fix-paths.patch
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  qgo: init at unstable-2016-06-23


  Commit: a93225fc6c714b3035bb81e449a8365bec81d7ae
  
https://github.com/NixOS/nixpkgs/commit/a93225fc6c714b3035bb81e449a8365bec81d7ae
  Author: Jörg Thalheim 
  Date:   2017-06-25 (Sun, 25 Jun 2017)

  Changed paths:
A pkgs/games/qgo/default.nix
A pkgs/games/qgo/fix-paths.patch
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  Merge pull request #26835 from unaizalakain/init_qgo

qgo: init at unstable-2016-06-23


Compare: https://github.com/NixOS/nixpkgs/compare/7a10cc84a0cd...a93225fc6c71___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] c610f9: Expose custom Rust registry versions

2017-06-25 Thread Jörg Thalheim
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: c610f99d8fc25dbdcd8530aca17a838c32ac569f
  
https://github.com/NixOS/nixpkgs/commit/c610f99d8fc25dbdcd8530aca17a838c32ac569f
  Author: tilpner 
  Date:   2017-06-25 (Sun, 25 Jun 2017)

  Changed paths:
M pkgs/build-support/rust/default.nix
M pkgs/top-level/all-packages.nix
M pkgs/top-level/rust-packages.nix

  Log Message:
  ---
  Expose custom Rust registry versions

This allows users to specify a custom registry src,
because currently every packager would need to create
an outdated Cargo.lock just to be compatible with the
probably outdated rustRegistry in nixpkgs.

Currently there is no easy way to convince cargo to
do that, so this makes that workaround unnecessary.


  Commit: 7a10cc84a0cd532c8a248d26dedf61d15615fb4d
  
https://github.com/NixOS/nixpkgs/commit/7a10cc84a0cd532c8a248d26dedf61d15615fb4d
  Author: Jörg Thalheim 
  Date:   2017-06-25 (Sun, 25 Jun 2017)

  Changed paths:
M pkgs/build-support/rust/default.nix
M pkgs/top-level/all-packages.nix
M pkgs/top-level/rust-packages.nix

  Log Message:
  ---
  rustRegistry: switch to mkDerivation

fixes #26582


Compare: https://github.com/NixOS/nixpkgs/compare/46427b77f44f...7a10cc84a0cd___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] aa2b64: tdesktop: 1.0.27 -> 1.1.7

2017-06-25 Thread Jörg Thalheim
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: aa2b643e4bc334d1b1b0863069920acdce00c9f2
  
https://github.com/NixOS/nixpkgs/commit/aa2b643e4bc334d1b1b0863069920acdce00c9f2
  Author: David Izquierdo 
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
M 
pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  tdesktop: 1.0.27 -> 1.1.7


  Commit: 46427b77f44fcb840584b88fa88bca21fb4706d5
  
https://github.com/NixOS/nixpkgs/commit/46427b77f44fcb840584b88fa88bca21fb4706d5
  Author: Jörg Thalheim 
  Date:   2017-06-25 (Sun, 25 Jun 2017)

  Changed paths:
M 
pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  Merge pull request #26690 from DIzFer/telegram-update

tdesktop: 1.0.27 -> 1.1.7


Compare: https://github.com/NixOS/nixpkgs/compare/b4973a5bbbae...46427b77f44f___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 9721c5: git-annex: replacing optparse-applicative needs a ...

2017-06-25 Thread Peter Simons
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 9721c545927610b77a304011d4aee72e098352cb
  
https://github.com/NixOS/nixpkgs/commit/9721c545927610b77a304011d4aee72e098352cb
  Author: Peter Simons 
  Date:   2017-06-25 (Sun, 25 Jun 2017)

  Changed paths:
M pkgs/development/haskell-modules/configuration-common.nix

  Log Message:
  ---
  git-annex: replacing optparse-applicative needs a deep override

 | Warning: This package indirectly depends on multiple versions of the same
 | package. This is highly likely to cause a compile failure.
 | package wai-app-static-3.1.6.1 requires optparse-applicative-0.13.2.0
 | package tasty-rerun-1.1.6 requires optparse-applicative-0.13.2.0
 | package tasty-0.11.2.1 requires optparse-applicative-0.13.2.0
 | package git-annex-6.20170520 requires optparse-applicative-0.14.0.0


  Commit: b4973a5bbbae610b465f7882aad5f99468a43a81
  
https://github.com/NixOS/nixpkgs/commit/b4973a5bbbae610b465f7882aad5f99468a43a81
  Author: Peter Simons 
  Date:   2017-06-25 (Sun, 25 Jun 2017)

  Changed paths:
M pkgs/development/haskell-modules/hackage-packages.nix

  Log Message:
  ---
  hackage-packages.nix: automatic Haskell package set update

This update was generated by hackage2nix v2.2.1-11-gb2cb3cb from Hackage 
revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/ec9f3d302b1e1f8b204426e1c4e8bd4f6d658eda.


Compare: https://github.com/NixOS/nixpkgs/compare/4ef00cab4e83...b4973a5bbbae___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 0eb34a: opencv: add openblas support

2017-06-25 Thread Jörg Thalheim
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 0eb34ac754608581aeed11e87b25a55d5427cce2
  
https://github.com/NixOS/nixpkgs/commit/0eb34ac754608581aeed11e87b25a55d5427cce2
  Author: Julien Dehos 
  Date:   2017-06-20 (Tue, 20 Jun 2017)

  Changed paths:
M pkgs/development/libraries/opencv/3.x.nix

  Log Message:
  ---
  opencv: add openblas support


  Commit: 4ef00cab4e835c8147d0db344c95d9230bd04b19
  
https://github.com/NixOS/nixpkgs/commit/4ef00cab4e835c8147d0db344c95d9230bd04b19
  Author: Jörg Thalheim 
  Date:   2017-06-25 (Sun, 25 Jun 2017)

  Changed paths:
M pkgs/development/libraries/opencv/3.x.nix

  Log Message:
  ---
  Merge pull request #26733 from juliendehos/opencv

opencv: add openblas support


Compare: https://github.com/NixOS/nixpkgs/compare/bc488d4cb537...4ef00cab4e83___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] e60031: calibre: 2.84.0 -> 3.1.1

2017-06-25 Thread Jörg Thalheim
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: e600317768110d0dddeecaded87e42a6c2352dd4
  
https://github.com/NixOS/nixpkgs/commit/e600317768110d0dddeecaded87e42a6c2352dd4
  Author: Victor Calvert 
  Date:   2017-06-25 (Sun, 25 Jun 2017)

  Changed paths:
M pkgs/applications/misc/calibre/default.nix
M pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch

  Log Message:
  ---
  calibre: 2.84.0 -> 3.1.1

links-privacy patch was removed as the content server was
rewritten in calibre 3.0.

The rewrite also needed a couple more python packages.


  Commit: bc488d4cb5379abd0b0b1e0ebad89c9b0a4cec14
  
https://github.com/NixOS/nixpkgs/commit/bc488d4cb5379abd0b0b1e0ebad89c9b0a4cec14
  Author: Jörg Thalheim 
  Date:   2017-06-25 (Sun, 25 Jun 2017)

  Changed paths:
M pkgs/applications/misc/calibre/default.nix
M pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch

  Log Message:
  ---
  Merge pull request #26834 from calvertvl/upgrade-calibre-to-3.1.1

calibre: 2.84.0 -> 3.1.1


Compare: https://github.com/NixOS/nixpkgs/compare/f506b723086e...bc488d4cb537___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] f506b7: krita: 3.1.3 -> 3.1.4

2017-06-25 Thread Jörg Thalheim
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: f506b723086e1739765d9065e468499eab3a2e54
  
https://github.com/NixOS/nixpkgs/commit/f506b723086e1739765d9065e468499eab3a2e54
  Author: Jörg Thalheim 
  Date:   2017-06-25 (Sun, 25 Jun 2017)

  Changed paths:
M pkgs/applications/graphics/krita/default.nix

  Log Message:
  ---
  krita: 3.1.3 -> 3.1.4


___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] edd2a9: gsl: 2.3 -> 2.4

2017-06-25 Thread Jörg Thalheim
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: edd2a9d5196358a458a5f2fb5f213e377631d02e
  
https://github.com/NixOS/nixpkgs/commit/edd2a9d5196358a458a5f2fb5f213e377631d02e
  Author: Lancelot SIX 
  Date:   2017-06-21 (Wed, 21 Jun 2017)

  Changed paths:
M pkgs/development/libraries/gsl/default.nix

  Log Message:
  ---
  gsl: 2.3 -> 2.4

See http://lists.gnu.org/archive/html/info-gnu/2017-06/msg8.html
for release announcement.


  Commit: bc7d575c5234872bbd4cd024128919f075e8c1ec
  
https://github.com/NixOS/nixpkgs/commit/bc7d575c5234872bbd4cd024128919f075e8c1ec
  Author: Jörg Thalheim 
  Date:   2017-06-25 (Sun, 25 Jun 2017)

  Changed paths:
M pkgs/development/libraries/gsl/default.nix

  Log Message:
  ---
  Merge pull request #26740 from lsix/update_gsl

gsl: 2.3 -> 2.4


Compare: https://github.com/NixOS/nixpkgs/compare/de21c43257d4...bc7d575c5234___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 33e4af: tiled: 0.18.2 -> 1.0.1

2017-06-25 Thread Jörg Thalheim
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 33e4afa172cd48ec1928646d211c2a9f879f9bf2
  
https://github.com/NixOS/nixpkgs/commit/33e4afa172cd48ec1928646d211c2a9f879f9bf2
  Author: dywedir 
  Date:   2017-06-25 (Sun, 25 Jun 2017)

  Changed paths:
M pkgs/applications/editors/tiled/default.nix

  Log Message:
  ---
  tiled: 0.18.2 -> 1.0.1


  Commit: de21c43257d4938b7a03ab6c7b4049b594d97cdb
  
https://github.com/NixOS/nixpkgs/commit/de21c43257d4938b7a03ab6c7b4049b594d97cdb
  Author: Jörg Thalheim 
  Date:   2017-06-25 (Sun, 25 Jun 2017)

  Changed paths:
M pkgs/applications/editors/tiled/default.nix

  Log Message:
  ---
  Merge pull request #26829 from dywedir/tiled

tiled: 0.18.2 -> 1.0.1


Compare: https://github.com/NixOS/nixpkgs/compare/24e9ec31665a...de21c43257d4___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 24e9ec: marble: fix src hash

2017-06-25 Thread Jörg Thalheim
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 24e9ec31665a1d8bd4593820b9d3e14049117174
  
https://github.com/NixOS/nixpkgs/commit/24e9ec31665a1d8bd4593820b9d3e14049117174
  Author: Jörg Thalheim 
  Date:   2017-06-25 (Sun, 25 Jun 2017)

  Changed paths:
M pkgs/applications/kde/srcs.nix

  Log Message:
  ---
  marble: fix src hash


___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] f31944: keepassxc: fix 4.9 compatibility

2017-06-25 Thread Jörg Thalheim
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: f319442b77bcbf6465119b84da548b6b41f820e3
  
https://github.com/NixOS/nixpkgs/commit/f319442b77bcbf6465119b84da548b6b41f820e3
  Author: Jörg Thalheim 
  Date:   2017-06-25 (Sun, 25 Jun 2017)

  Changed paths:
M pkgs/applications/misc/keepassx/community.nix

  Log Message:
  ---
  keepassxc: fix 4.9 compatibility


___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] a9c904: libatomic_ops: Provide alternate URL

2017-06-25 Thread Jörg Thalheim
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: a9c9040a02ba4acce12c15b85c4dc967bcc752aa
  
https://github.com/NixOS/nixpkgs/commit/a9c9040a02ba4acce12c15b85c4dc967bcc752aa
  Author: Ivan Jager 
  Date:   2017-06-23 (Fri, 23 Jun 2017)

  Changed paths:
M pkgs/development/libraries/libatomic_ops/default.nix

  Log Message:
  ---
  libatomic_ops: Provide alternate URL

www.ivmaisoft.com is currently down.


  Commit: 0ae147c50a61e2464dcbed12f0d3032f67f27562
  
https://github.com/NixOS/nixpkgs/commit/0ae147c50a61e2464dcbed12f0d3032f67f27562
  Author: Jörg Thalheim 
  Date:   2017-06-25 (Sun, 25 Jun 2017)

  Changed paths:
M pkgs/development/libraries/libatomic_ops/default.nix

  Log Message:
  ---
  Merge pull request #26771 from aij/fix/libatomic_ops

libatomic_ops: Provide alternate URL


Compare: https://github.com/NixOS/nixpkgs/compare/ad42e5f6e5da...0ae147c50a61___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] ada12f: root: 6.09.02 -> 6.10.00

2017-06-25 Thread Jörg Thalheim
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: ada12f46dc3ca9b57e896831d1052e7a49d311f5
  
https://github.com/NixOS/nixpkgs/commit/ada12f46dc3ca9b57e896831d1052e7a49d311f5
  Author: Dmitry Kalinkin 
  Date:   2017-06-24 (Sat, 24 Jun 2017)

  Changed paths:
M pkgs/applications/science/misc/root/ROOT-8728-extra.patch
M pkgs/applications/science/misc/root/default.nix

  Log Message:
  ---
  root: 6.09.02 -> 6.10.00

also workaround #26197


  Commit: ad42e5f6e5dacf7c5215e8a930e3a90577c5d24e
  
https://github.com/NixOS/nixpkgs/commit/ad42e5f6e5dacf7c5215e8a930e3a90577c5d24e
  Author: Jörg Thalheim 
  Date:   2017-06-25 (Sun, 25 Jun 2017)

  Changed paths:
M pkgs/applications/science/misc/root/ROOT-8728-extra.patch
M pkgs/applications/science/misc/root/default.nix

  Log Message:
  ---
  Merge pull request #26795 from veprbl/root_6.10.00

root: 6.09.02 -> 6.10.00


Compare: https://github.com/NixOS/nixpkgs/compare/fcd5804d7f72...ad42e5f6e5da___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] c7bc8b: kdeconnect: fix build

2017-06-25 Thread Frederik Rietdijk
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: c7bc8b42f2246a89120f6a42d8a38873bcdf1539
  
https://github.com/NixOS/nixpkgs/commit/c7bc8b42f2246a89120f6a42d8a38873bcdf1539
  Author: Frederik Rietdijk 
  Date:   2017-06-25 (Sun, 25 Jun 2017)

  Changed paths:
M pkgs/applications/misc/kdeconnect/default.nix

  Log Message:
  ---
  kdeconnect: fix build


  Commit: fdf181237b3826054ce631c460a44e0724b0c158
  
https://github.com/NixOS/nixpkgs/commit/fdf181237b3826054ce631c460a44e0724b0c158
  Author: Frederik Rietdijk 
  Date:   2017-06-25 (Sun, 25 Jun 2017)

  Changed paths:
M pkgs/applications/misc/yakuake/default.nix

  Log Message:
  ---
  yakuake: fix build


  Commit: fcd5804d7f72c1252e6dfc10924d17eb52409379
  
https://github.com/NixOS/nixpkgs/commit/fcd5804d7f72c1252e6dfc10924d17eb52409379
  Author: Frederik Rietdijk 
  Date:   2017-06-25 (Sun, 25 Jun 2017)

  Changed paths:
M pkgs/applications/networking/irc/konversation/default.nix

  Log Message:
  ---
  konversation: 1.6.2 -> 1.7.2 and fix build


Compare: https://github.com/NixOS/nixpkgs/compare/3913522a4172...fcd5804d7f72___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 4ebaed: mopidy-local-images: init at 1.0.0

2017-06-25 Thread Jörg Thalheim
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 4ebaed854f9b112d772050ce58dafc39fddff818
  
https://github.com/NixOS/nixpkgs/commit/4ebaed854f9b112d772050ce58dafc39fddff818
  Author: Roman Volosatovs 
  Date:   2017-06-25 (Sun, 25 Jun 2017)

  Changed paths:
A pkgs/applications/audio/mopidy-local-images/default.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  mopidy-local-images: init at 1.0.0


  Commit: 3913522a41724861768a42bd8ccd184b930b533d
  
https://github.com/NixOS/nixpkgs/commit/3913522a41724861768a42bd8ccd184b930b533d
  Author: Jörg Thalheim 
  Date:   2017-06-25 (Sun, 25 Jun 2017)

  Changed paths:
A pkgs/applications/audio/mopidy-local-images/default.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  Merge pull request #26828 from rvolosatovs/init/mopidy-local-images

mopidy-local-images: init at 1.0.0


Compare: https://github.com/NixOS/nixpkgs/compare/69eddfa090e9...3913522a4172___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 69eddf: pythonPackages.pylast: 0.5.11 -> 1.8.0 (#26825)

2017-06-25 Thread Roman Volosatovs
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 69eddfa090e9cf6c16c198aed7ad7b3fbe8a0f1f
  
https://github.com/NixOS/nixpkgs/commit/69eddfa090e9cf6c16c198aed7ad7b3fbe8a0f1f
  Author: Roman Volosatovs 
  Date:   2017-06-25 (Sun, 25 Jun 2017)

  Changed paths:
A pkgs/development/python-modules/pylast/default.nix
M pkgs/top-level/python-packages.nix

  Log Message:
  ---
  pythonPackages.pylast: 0.5.11 -> 1.8.0 (#26825)

* maintainers: add rvolosatovs

* pythonPackages.pylast: 0.5.11 -> 1.8.0

* pythonPackages.pylast: refactor

- Update homepage
- Add rvolosatovs to maintainers
- Fix test comment

* pylast: move out of python-packages.nix


___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 6aad18: pythonPackages.uritools: keep alphabetic order

2017-06-25 Thread Jörg Thalheim
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 6aad18a668e45c6cd664076b6bf890fb030b8bb1
  
https://github.com/NixOS/nixpkgs/commit/6aad18a668e45c6cd664076b6bf890fb030b8bb1
  Author: Jörg Thalheim 
  Date:   2017-06-25 (Sun, 25 Jun 2017)

  Changed paths:
M pkgs/top-level/python-packages.nix

  Log Message:
  ---
  pythonPackages.uritools: keep alphabetic order


___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 378c5e: maintainers: add rvolosatovs

2017-06-25 Thread Jörg Thalheim
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 378c5e7689b517ae56dcf85aa45ba56cd26c8143
  
https://github.com/NixOS/nixpkgs/commit/378c5e7689b517ae56dcf85aa45ba56cd26c8143
  Author: Roman Volosatovs 
  Date:   2017-06-24 (Sat, 24 Jun 2017)

  Changed paths:
M lib/maintainers.nix

  Log Message:
  ---
  maintainers: add rvolosatovs


  Commit: 90f85a2de5504bdd0a5f6c02ecb7f2989fc066e8
  
https://github.com/NixOS/nixpkgs/commit/90f85a2de5504bdd0a5f6c02ecb7f2989fc066e8
  Author: Roman Volosatovs 
  Date:   2017-06-24 (Sat, 24 Jun 2017)

  Changed paths:
A pkgs/development/python-modules/uritools/default.nix
M pkgs/top-level/python-packages.nix

  Log Message:
  ---
  pythonPackages.uritools: init at 2.0.0


  Commit: 6450a14880391c3be7c8648ee047e209e7eaaa5e
  
https://github.com/NixOS/nixpkgs/commit/6450a14880391c3be7c8648ee047e209e7eaaa5e
  Author: Jörg Thalheim 
  Date:   2017-06-25 (Sun, 25 Jun 2017)

  Changed paths:
A pkgs/development/python-modules/uritools/default.nix
M pkgs/top-level/python-packages.nix

  Log Message:
  ---
  Merge pull request #26826 from rvolosatovs/init/uritools

pythonPackages.uritools: init at 2.0.0


Compare: https://github.com/NixOS/nixpkgs/compare/4b6b811b34d8...6450a1488039___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] a59dc6: maintainers: add rvolosatovs

2017-06-25 Thread Jörg Thalheim
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: a59dc61e106fe9e8e528c837887178dbfe37daf5
  
https://github.com/NixOS/nixpkgs/commit/a59dc61e106fe9e8e528c837887178dbfe37daf5
  Author: Roman Volosatovs 
  Date:   2017-06-24 (Sat, 24 Jun 2017)

  Changed paths:
M lib/maintainers.nix

  Log Message:
  ---
  maintainers: add rvolosatovs


  Commit: ca69972f9ac4ef59798700ff5997135a4c159869
  
https://github.com/NixOS/nixpkgs/commit/ca69972f9ac4ef59798700ff5997135a4c159869
  Author: Roman Volosatovs 
  Date:   2017-06-24 (Sat, 24 Jun 2017)

  Changed paths:
A pkgs/development/python-modules/spotipy/default.nix
M pkgs/top-level/python-packages.nix

  Log Message:
  ---
  pythonPackages.spotipy: init at 2.4.4


  Commit: 4abb292f7558027f3741565b0da8262ec90f39b3
  
https://github.com/NixOS/nixpkgs/commit/4abb292f7558027f3741565b0da8262ec90f39b3
  Author: Roman Volosatovs 
  Date:   2017-06-24 (Sat, 24 Jun 2017)

  Changed paths:
M pkgs/development/python-modules/spotipy/default.nix

  Log Message:
  ---
  pythonPackages.spotipy: requests2 -> requests

Seems like this breaks build of #26518


  Commit: 5d5dde671e1770b98eb739a68659e2c82b10ce63
  
https://github.com/NixOS/nixpkgs/commit/5d5dde671e1770b98eb739a68659e2c82b10ce63
  Author: Jörg Thalheim 
  Date:   2017-06-25 (Sun, 25 Jun 2017)

  Changed paths:
M pkgs/top-level/python-packages.nix

  Log Message:
  ---
  pythonPackages.spotipy: keep alphabetic ordering


  Commit: 4b6b811b34d839ecff52d46daf24962510b582d3
  
https://github.com/NixOS/nixpkgs/commit/4b6b811b34d839ecff52d46daf24962510b582d3
  Author: Jörg Thalheim 
  Date:   2017-06-25 (Sun, 25 Jun 2017)

  Changed paths:
M lib/maintainers.nix
A pkgs/development/python-modules/spotipy/default.nix
M pkgs/top-level/python-packages.nix

  Log Message:
  ---
  Merge pull request #26827 from rvolosatovs/init/spotipy

pythonPackages.spotipy: init at 2.4.4


Compare: https://github.com/NixOS/nixpkgs/compare/cbd64924adc5...4b6b811b34d8___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 649a03: nailgun: init at 0.9.1

2017-06-25 Thread Jörg Thalheim
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 649a036dccfd2f23179582c3b995046833bd0b26
  
https://github.com/NixOS/nixpkgs/commit/649a036dccfd2f23179582c3b995046833bd0b26
  Author: Volth 
  Date:   2017-06-25 (Sun, 25 Jun 2017)

  Changed paths:
A pkgs/development/tools/nailgun/default.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  nailgun: init at 0.9.1


  Commit: 5b7fd8f3b8602259ef0640db3d7b7ec1a7fe93eb
  
https://github.com/NixOS/nixpkgs/commit/5b7fd8f3b8602259ef0640db3d7b7ec1a7fe93eb
  Author: Jörg Thalheim 
  Date:   2017-06-25 (Sun, 25 Jun 2017)

  Changed paths:
M pkgs/development/tools/nailgun/default.nix

  Log Message:
  ---
  nailgun: use makeWrapper


  Commit: cbd64924adc5503fcdb011908e6fd148a8b0abb7
  
https://github.com/NixOS/nixpkgs/commit/cbd64924adc5503fcdb011908e6fd148a8b0abb7
  Author: Jörg Thalheim 
  Date:   2017-06-25 (Sun, 25 Jun 2017)

  Changed paths:
A pkgs/development/tools/nailgun/default.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  Merge pull request #26832 from volth/nailgun-init-0.9.1

nailgun: init at 0.9.1


Compare: https://github.com/NixOS/nixpkgs/compare/6916f24e84ea...cbd64924adc5___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


Re: [Nix-dev] Setup hook evaluation order

2017-06-25 Thread Vladimír Čunát
On 06/22/2017 01:05 PM, Thomas Tuegel wrote:
> How can I make my setup hook be evaluated after multiple-outputs.sh is loaded?

Immediate idea, maybe there's a better way: make the envHook just extend
prePhases by a function that does the actual work.  That should get run
after all envHooks but before all phases.

Still, I wonder if we should change the order to run the setup hooks
from stdenv before those from packages.  It would seem more natural.

--Vladimir
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-dev


Re: [Nix-dev] 5 somewhat related questions

2017-06-25 Thread Linus
On 24 June 2017 20:07:27 BST, Matt McHenry  wrote:
>The only major downside of this approach is that I have to always
>remember to give '-I nixpkgs=...' arguments to all the usual nix
>commands.  But that's become pretty second nature to me by now.  :)

You could also set NIX_PATH in one of various locations to avoid having to 
specify it on every invocation.
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-dev