[Nix-commits] [NixOS/nixpkgs] a0f938: fzf: Include fzf shell scripts in output

2017-07-03 Thread Jörg Thalheim
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: a0f9386d53e8a5ff97fe02ebc308c91b718d5a22
  
https://github.com/NixOS/nixpkgs/commit/a0f9386d53e8a5ff97fe02ebc308c91b718d5a22
  Author: Nadrieril 
  Date:   2017-07-02 (Sun, 02 Jul 2017)

  Changed paths:
M pkgs/tools/misc/fzf/default.nix

  Log Message:
  ---
  fzf: Include fzf shell scripts in output


  Commit: 40c6f7e1084e41cc0ae6d31ef05e7ac64b74b69c
  
https://github.com/NixOS/nixpkgs/commit/40c6f7e1084e41cc0ae6d31ef05e7ac64b74b69c
  Author: Jörg Thalheim 
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
M pkgs/tools/misc/fzf/default.nix

  Log Message:
  ---
  Merge pull request #27058 from Nadrieril/fzf-shell-scripts

fzf: Include fzf shell scripts in output


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


[Nix-commits] [NixOS/nixpkgs] 7ec7aa: Revert "splix: enable JBIG" (#27054)

2017-07-03 Thread Emmanuel Rosa
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 7ec7aa0bb1ab2c5e66a34803461ac0f929eca729
  
https://github.com/NixOS/nixpkgs/commit/7ec7aa0bb1ab2c5e66a34803461ac0f929eca729
  Author: Emmanuel Rosa 
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
M pkgs/misc/cups/drivers/splix/default.nix

  Log Message:
  ---
  Revert "splix: enable JBIG" (#27054)

This reverts commit 0878ca7ab4c9da80ba18357cfd29596dc0500973.

My change to enable JBIG for splix did not work correctly. I was unable to get 
to the bottom of it because the build never completed. Given that it's also 
timing out in Hydra (see https://hydra.nixos.org/eval/1372226) I think it's 
best to simply back it out.


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


Re: [Nix-dev] (no subject)

2017-07-03 Thread Alexey Shmalko
Stephan Sahm  writes:

> $ plasmapkg2 --type kwinscript -i . 
>
> Package type "KWin/Script" not found No metadata file in package "/home/demo" 
> "/home/demo/" Error: Installation of /home/demo failed: No metadata file in 
> package: /home/demo

I am not a KWin user and have no idea what you're doing, but it looks
like you're running the command in your home directory and it expects to
be ran in another place. (Perhaps the root of the package you're trying
to install.)

Hope this helps,
Alexey


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


[Nix-commits] [NixOS/nixpkgs] 0b1c87: gnomeExtensions.caffeine: init at revision unstabl...

2017-07-03 Thread Emanuele Peruffo
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 0b1c8793fc20944b68562d9a73a5ce391f1603e0
  
https://github.com/NixOS/nixpkgs/commit/0b1c8793fc20944b68562d9a73a5ce391f1603e0
  Author: Emanuele Peruffo 
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
A pkgs/desktops/gnome-3/extensions/caffeine/default.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  gnomeExtensions.caffeine: init at revision unstable-2017-06-21 (#26901)

Caffeine extension for Gnome 3


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


[Nix-commits] [NixOS/nixpkgs] a719b1: skrooge: drop kdelibs4support dependency

2017-07-03 Thread Frederik Rietdijk
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: a719b1be00763e26aa8edbb98c4dc25dcef742a5
  
https://github.com/NixOS/nixpkgs/commit/a719b1be00763e26aa8edbb98c4dc25dcef742a5
  Author: Ioannis Koutras 
  Date:   2017-07-02 (Sun, 02 Jul 2017)

  Changed paths:
M pkgs/applications/office/skrooge/default.nix

  Log Message:
  ---
  skrooge: drop kdelibs4support dependency

Since Qt 5.7 and Skrooge v2.5.0, the latter can be built without
KDELibs4Support.


  Commit: 8e66ea0a1d04737e1fd7e2167a4602a2e92af28d
  
https://github.com/NixOS/nixpkgs/commit/8e66ea0a1d04737e1fd7e2167a4602a2e92af28d
  Author: Frederik Rietdijk 
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
M pkgs/applications/office/skrooge/default.nix

  Log Message:
  ---
  Merge pull request #27041 from jokogr/f/skrooge-drop-kdelibs4support

skrooge: drop kdelibs4support dependency


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


[Nix-commits] [NixOS/nixpkgs] 37f0aa: releaseTools: add channel function

2017-07-03 Thread Vladimír Čunát
  Branch: refs/heads/staging
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 37f0aafc56c3357213833c43edc45c33e71a0f15
  
https://github.com/NixOS/nixpkgs/commit/37f0aafc56c3357213833c43edc45c33e71a0f15
  Author: Eric Sagnes 
  Date:   2016-09-27 (Tue, 27 Sep 2016)

  Changed paths:
M pkgs/build-support/release/default.nix

  Log Message:
  ---
  releaseTools: add channel function


  Commit: bd0811166cdaaa199e40ae6ec433f2c128158c7f
  
https://github.com/NixOS/nixpkgs/commit/bd0811166cdaaa199e40ae6ec433f2c128158c7f
  Author: Frederik Rietdijk 
  Date:   2017-06-05 (Mon, 05 Jun 2017)

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

  Log Message:
  ---
  python.pkgs.django_1_9: remove

Old version, so removing.

https://github.com/NixOS/nixpkgs/issues/25375#issuecomment-298522597


  Commit: 6bcf106b6564f246f7c226b05230ce39ed771374
  
https://github.com/NixOS/nixpkgs/commit/6bcf106b6564f246f7c226b05230ce39ed771374
  Author: Frederik Rietdijk 
  Date:   2017-06-05 (Mon, 05 Jun 2017)

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

  Log Message:
  ---
  python.pkgs.django_1_6: remove

Old version, so removing.

https://github.com/NixOS/nixpkgs/issues/25375#issuecomment-298522597


  Commit: d25c87c36d9e6a265de985f37c7cf611a8184951
  
https://github.com/NixOS/nixpkgs/commit/d25c87c36d9e6a265de985f37c7cf611a8184951
  Author: Frederik Rietdijk 
  Date:   2017-06-05 (Mon, 05 Jun 2017)

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

  Log Message:
  ---
  python.pkgs: do not pin django version

instead, override the package set and set `django = super.django_1_8`.


  Commit: 01e19386f7ed01ef4aef3e142da857def2c8d5be
  
https://github.com/NixOS/nixpkgs/commit/01e19386f7ed01ef4aef3e142da857def2c8d5be
  Author: Frederik Rietdijk 
  Date:   2017-06-05 (Mon, 05 Jun 2017)

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

  Log Message:
  ---
  python.pkgs.django_1_10: will be dropped before 17.09


  Commit: cce12a644c8a4c5d540c6d30bba1fabff60e57db
  
https://github.com/NixOS/nixpkgs/commit/cce12a644c8a4c5d540c6d30bba1fabff60e57db
  Author: Josef Kemetmueller 
  Date:   2017-06-08 (Thu, 08 Jun 2017)

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

  Log Message:
  ---
  hdf4: Init at 4.2.12


  Commit: 7b25d31825efa3a05ad76277c9042f86f918d5ef
  
https://github.com/NixOS/nixpkgs/commit/7b25d31825efa3a05ad76277c9042f86f918d5ef
  Author: Josef Kemetmueller 
  Date:   2017-06-08 (Thu, 08 Jun 2017)

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

  Log Message:
  ---
  gdal: Add hdf4 support


  Commit: 7f89293051e96549bd7f1ef0f0a148d459a16766
  
https://github.com/NixOS/nixpkgs/commit/7f89293051e96549bd7f1ef0f0a148d459a16766
  Author: rnhmjoj 
  Date:   2017-06-19 (Mon, 19 Jun 2017)

  Changed paths:
A pkgs/misc/gnash/default.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  gnash: init at 0.8.11-2017-03-08


  Commit: 9e6bfbb2f92d8e1995365775bee63809631b132c
  
https://github.com/NixOS/nixpkgs/commit/9e6bfbb2f92d8e1995365775bee63809631b132c
  Author: Michał Pałka 
  Date:   2017-06-27 (Tue, 27 Jun 2017)

  Changed paths:
M nixos/modules/virtualisation/xen-dom0.nix
A pkgs/applications/virtualization/xen/4.8.nix
M pkgs/applications/virtualization/xen/generic.nix
M pkgs/applications/virtualization/xen/packages.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  xen_4_8: init at 4.8.1

This commit adds the xen_4_8 package to be used instead of
xen (currently at 4.5.5):
 * Add packages xen_4_8, xen_4_8-slim and xen_4_8-light
 * Add packages qemu_xen_4_8 and qemu_xen_4_8-light to be used
   with xen_4_8-slim and xen_4_8-light respectively.
 * Add systemd to buildInputs of xen (it is required by oxenstored)
 * Adapt xen service to work with the new version of xen
 * Use xen-init-dom0 to initlilise dom0 in xen-store
 * Currently, the virtualisation.xen.stored option is ignored
   if xen 4.8 is used


  Commit: 7b5d72ce048ffc48ba437560247bf069a87b1c73
  
https://github.com/NixOS/nixpkgs/commit/7b5d72ce048ffc48ba437560247bf069a87b1c73
  Author: Michał Pałka 
  Date:   2017-06-27 (Tue, 27 Jun 2017)

  Changed paths:
M pkgs/applications/virtualization/xen/4.8.nix

  Log Message:
  ---
  xen: patch for XSAs: 216, 217, 218, 219, 220, 221, 222, and 224 (xen 4.8)

This commit contains security patches for xen 4.8. The patches
for XSA-216 applied to the kernel are omitted, as they are part of
80e0cda7ff92233edc94161eae5838a1c423e5e4.

XSA-216 Issue Description:

> The block interface response structure has some discontiguous fields.
> Certain backends populate the structure fields of an otherwise
> uninitialized instance of this structure on their stacks, leaking
> data through the (internal or trailing) padding field.

More: https://xenbits.xen.org/x

[Nix-commits] [NixOS/nixpkgs] bf9e5d: kdiff3: add dependency to kcrash

2017-07-03 Thread Frederik Rietdijk
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: bf9e5d2111acbc8574bb9f4327f3469fb5301286
  
https://github.com/NixOS/nixpkgs/commit/bf9e5d2111acbc8574bb9f4327f3469fb5301286
  Author: Ioannis Koutras 
  Date:   2017-07-02 (Sun, 02 Jul 2017)

  Changed paths:
M pkgs/tools/text/kdiff3/default.nix

  Log Message:
  ---
  kdiff3: add dependency to kcrash


  Commit: 680298ef85ebf1717eb25f063a4cc7135d3976b8
  
https://github.com/NixOS/nixpkgs/commit/680298ef85ebf1717eb25f063a4cc7135d3976b8
  Author: Frederik Rietdijk 
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
M pkgs/tools/text/kdiff3/default.nix

  Log Message:
  ---
  Merge pull request #27039 from jokogr/f/kdiff3-kcrash

kdiff3: add dependency to kcrash


Compare: https://github.com/NixOS/nixpkgs/compare/8e66ea0a1d04...680298ef85eb___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 8f5cf6: ktorrent: fix build

2017-07-03 Thread Frederik Rietdijk
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 8f5cf685ad7b8a79b2033e99604898a9fa1fe819
  
https://github.com/NixOS/nixpkgs/commit/8f5cf685ad7b8a79b2033e99604898a9fa1fe819
  Author: Frederik Rietdijk 
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
M pkgs/applications/networking/p2p/ktorrent/default.nix

  Log Message:
  ---
  ktorrent: fix build


  Commit: 43ca91106d7d53e5e9214da12dacfdaa9e4672e4
  
https://github.com/NixOS/nixpkgs/commit/43ca91106d7d53e5e9214da12dacfdaa9e4672e4
  Author: Frederik Rietdijk 
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
M pkgs/applications/editors/kdevelop5/kdevplatform.nix

  Log Message:
  ---
  kdevplatform: fix build


Compare: https://github.com/NixOS/nixpkgs/compare/680298ef85eb...43ca91106d7d___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


Re: [Nix-dev] (no subject)

2017-07-03 Thread Stephan Sahm
thanks for your answer!

that should in fact not be the mistake, I followed the tutorial on
kwin-tiling step by step

On Mon, Jul 3, 2017 at 9:13 AM Alexey Shmalko  wrote:

> Stephan Sahm  writes:
>
> > $ plasmapkg2 --type kwinscript -i .
> >
> > Package type "KWin/Script" not found No metadata file in package
> "/home/demo" "/home/demo/" Error: Installation of /home/demo failed: No
> metadata file in package: /home/demo
>
> I am not a KWin user and have no idea what you're doing, but it looks
> like you're running the command in your home directory and it expects to
> be ran in another place. (Perhaps the root of the package you're trying
> to install.)
>
> Hope this helps,
> Alexey
>
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-dev


[Nix-commits] [NixOS/nixpkgs] d307db: wlc: 0.0.8 -> 0.0.9

2017-07-03 Thread Jörg Thalheim
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: d307dbd85378dd15a4841a265720861f42a9f1f5
  
https://github.com/NixOS/nixpkgs/commit/d307dbd85378dd15a4841a265720861f42a9f1f5
  Author: Linus Heckemann 
  Date:   2017-07-02 (Sun, 02 Jul 2017)

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

  Log Message:
  ---
  wlc: 0.0.8 -> 0.0.9


  Commit: f70d440ae9c31c1397891616cb4f49f4c4f2cd96
  
https://github.com/NixOS/nixpkgs/commit/f70d440ae9c31c1397891616cb4f49f4c4f2cd96
  Author: Jörg Thalheim 
  Date:   2017-07-03 (Mon, 03 Jul 2017)

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

  Log Message:
  ---
  Merge pull request #27040 from lheckemann/wlc-0.0.9

wlc: 0.0.8 -> 0.0.9


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


Re: [Nix-dev] (no subject)

2017-07-03 Thread Alexey Shmalko
Stephan Sahm  writes:

> that should in fact not be the mistake, I followed the tutorial on 
> kwin-tiling step by step

From https://github.com/faho/kwin-tiling#installation:
> git clone https://github.com/faho/kwin-tiling.git
> cd kwin-tiling/
> plasmapkg2 --type kwinscript -i .

It very much looks like you have missed the next command:
cd kwin-tiling/

The issue does not look Nix-related, so if that does not help, I
recommend opening an issue/question at the kwin-tiling repo.


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


[Nix-commits] [NixOS/nixpkgs] 3e1c66: maintainers: add zarelit

2017-07-03 Thread Jörg Thalheim
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 3e1c6607d1e63e241c63fa96dfcd119787de7110
  
https://github.com/NixOS/nixpkgs/commit/3e1c6607d1e63e241c63fa96dfcd119787de7110
  Author: David Costa 
  Date:   2017-07-01 (Sat, 01 Jul 2017)

  Changed paths:
M lib/maintainers.nix

  Log Message:
  ---
  maintainers: add zarelit


  Commit: 87b15664728464373d3307f3c1df35eba9d905f9
  
https://github.com/NixOS/nixpkgs/commit/87b15664728464373d3307f3c1df35eba9d905f9
  Author: David Costa 
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
A pkgs/development/web/mailcatcher/Gemfile
A pkgs/development/web/mailcatcher/Gemfile.lock
A pkgs/development/web/mailcatcher/default.nix
A pkgs/development/web/mailcatcher/gemset.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  mailcatcher: init at 0.6.5


  Commit: 19cd9f557fa58e80f6a733f8a34c0c5aa65b66fb
  
https://github.com/NixOS/nixpkgs/commit/19cd9f557fa58e80f6a733f8a34c0c5aa65b66fb
  Author: Jörg Thalheim 
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
M pkgs/development/web/mailcatcher/default.nix

  Log Message:
  ---
  mailcatcher: do not override phases


  Commit: abd7237573e54a74452853e26ffc1f861b78147b
  
https://github.com/NixOS/nixpkgs/commit/abd7237573e54a74452853e26ffc1f861b78147b
  Author: Jörg Thalheim 
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
M lib/maintainers.nix
A pkgs/development/web/mailcatcher/Gemfile
A pkgs/development/web/mailcatcher/Gemfile.lock
A pkgs/development/web/mailcatcher/default.nix
A pkgs/development/web/mailcatcher/gemset.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  Merge pull request #27024 from zarelit/mailcatcher

mailcatcher: init at 0.6.5


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


[Nix-commits] [NixOS/nixpkgs] 09d626: notmuch: 0.23.5 -> 0.24.2

2017-07-03 Thread Frederik Rietdijk
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 09d626e6f1dd71026d83a385f1bd70e9ffdecfc2
  
https://github.com/NixOS/nixpkgs/commit/09d626e6f1dd71026d83a385f1bd70e9ffdecfc2
  Author: Bart Brouns 
  Date:   2017-07-02 (Sun, 02 Jul 2017)

  Changed paths:
M pkgs/applications/networking/mailreaders/notmuch/default.nix

  Log Message:
  ---
  notmuch: 0.23.5 -> 0.24.2


  Commit: 01c3847b9c656d3829dd947395aacd0f84178eb2
  
https://github.com/NixOS/nixpkgs/commit/01c3847b9c656d3829dd947395aacd0f84178eb2
  Author: Frederik Rietdijk 
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
M pkgs/applications/networking/mailreaders/notmuch/default.nix

  Log Message:
  ---
  Merge pull request #27051 from magnetophon/notmuch

notmuch: 0.23.5 -> 0.24.2


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


[Nix-commits] [NixOS/nix] 90da34: processGraph(): Call getEdges in parallel

2017-07-03 Thread Eelco Dolstra
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nix
  Commit: 90da34e421607ad6c40f3dea08709ae89db7a7e1
  
https://github.com/NixOS/nix/commit/90da34e421607ad6c40f3dea08709ae89db7a7e1
  Author: Eelco Dolstra 
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
M src/libutil/thread-pool.hh

  Log Message:
  ---
  processGraph(): Call getEdges in parallel


  Commit: fcca702a96a8ca0e73f6d035052c30121776aeba
  
https://github.com/NixOS/nix/commit/fcca702a96a8ca0e73f6d035052c30121776aeba
  Author: Eelco Dolstra 
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
M src/build-remote/build-remote.cc
M src/libexpr/eval.cc
M src/libexpr/eval.hh
M src/libstore/binary-cache-store.cc
M src/libstore/binary-cache-store.hh
M src/libstore/build.cc
M src/libstore/derivations.cc
M src/libstore/derivations.hh
M src/libstore/download.cc
M src/libstore/export-import.cc
M src/libstore/legacy-ssh-store.cc
M src/libstore/local-store.cc
M src/libstore/local-store.hh
M src/libstore/remote-store.cc
M src/libstore/remote-store.hh
M src/libstore/store-api.cc
M src/libstore/store-api.hh
M src/nix-copy-closure/nix-copy-closure.cc
M src/nix-daemon/nix-daemon.cc
M src/nix-env/nix-env.cc
M src/nix-instantiate/nix-instantiate.cc
M src/nix-store/nix-store.cc

  Log Message:
  ---
  Replace a few bool flags with enums

Functions like copyClosure() had 3 bool arguments, which creates a
severe risk of mixing up arguments.

Also, implement copyClosure() using copyPaths().


  Commit: 0a5a867758285ee07334a44ede336ae75fd51c50
  
https://github.com/NixOS/nix/commit/0a5a867758285ee07334a44ede336ae75fd51c50
  Author: Eelco Dolstra 
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
M src/nix-build/nix-build.cc

  Log Message:
  ---
  nix-shell: Respect --dry-run

Fixes #824.


Compare: https://github.com/NixOS/nix/compare/63d6e0ad3f0a...0a5a86775828___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] bb3c8a: lib: Include darwin in isUnix

2017-07-03 Thread David McFarland
  Branch: refs/heads/staging
  Home:   https://github.com/NixOS/nixpkgs
  Commit: bb3c8a164c037a5c5697bb411c5b965c7e01d1a7
  
https://github.com/NixOS/nixpkgs/commit/bb3c8a164c037a5c5697bb411c5b965c7e01d1a7
  Author: David McFarland 
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
M lib/systems/inspect.nix

  Log Message:
  ---
  lib: Include darwin in isUnix


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


[Nix-dev] nix-daemon and private git repos

2017-07-03 Thread Harmen
Hi all,

I'm struggling to get fetchgitPrivate to work on nix-daemon installation (no
NixOS, these are Ubuntu machines with nix).
I can make it work on my dev machine, with is a non-daemon install, by setting

NIX_PATH=ssh-config-file=/my/ssh/config:$NIX_PATH

But that doesn't work in sandboxed daemon mode, because the nixbld* users can't
read that file (both because of access rights, and because of the sandbox).

Nix has this warning in fetchgitPrivate:
> Note that the config file and any keys it points to must be readable
> by the build user, which depending on your nix configuration means making it
> readable by the build-users-group, the user of the running nix-daemon, or the
> user calling the nix command which started the build. Similarly, if using an
> ssh agent ssh-auth-sock must point to a socket the build user can access.
> You may need StrictHostKeyChecking=no in the config file. Since ssh
> will refuse to use a group-readable private key, if using build-users you will
> likely want to use something like IdentityFile /some/directory/%u/key and have
> a directory for each build user accessible to that user.
from
https://github.com/NixOS/nixpkgs/blob/master/pkgs/build-support/fetchgit/private.nix

which sounds reasonable, but it I don't see how to do that since I don't know
exactly which user will run the build. Also because of the sandbox the build
can't read the ssh config file at all.


So next option is to generate the configfile in my expression, a-la
https://www.mpscholten.de/nixos/2016/07/07/private-github-repositories-and-nixos.html
but I don't know how to set nix.path from inside an expression. It would also
require bundling the key with the expression, but if that works...


I can't be the first to want to use fetchgitPrivate with a sandboxed
nix-daemon. Any experiences or tips?
Thanks!
Harmen
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-dev


Re: [Nix-dev] nix-daemon and private git repos

2017-07-03 Thread Tomasz Czyż
You don't need to know the user itself I think, you could share it with
nixbld group (probably).
Also, I think this way recommends to use ssh-agent as far as I remember
looking at that (but could changed).

What I did for one project was:

 337   fetchgitPrivate = (args: derivation ((nixpkgs.fetchgit
> args).drvAttrs // {
>  338 # This function is wrapper around nix fetch git function
> to use SSH key.
>  339 # It can be useful when fetching from private
> repositories.
>  340 #
>
>  341 # Original function is in
> https://github.com/NixOS/nixpkgs/blob/master/pkgs/build-support/fetchgit/default.nix
>  342 #
>
>  343 GIT_SSH = rr.lib.writeShellScript "git-ssh" ''#!
> ${nixpkgs.bash}/bin/bash -eu
>  344   if ! [[ -r '${repositories-ssh-private-key-path}'
> ]];then
>  345 echo "ERROR:" >&2
>
>  346 echo "ERROR:" >&2
>
>  347 echo "ERROR: ssh key
> '${repositories-ssh-private-key-path}' is not readable by build user
> ($(id))" >&2
>  348 echo "ERROR:" >&2
>
>  349 echo "ERROR:" >&2
>
>  350 exit 5
>
>  351   fi
>
>  352   exec ${nixpkgs.openssh}/bin/ssh -o
> StrictHostKeyChecking=no -i '${repositories-ssh-private-key-path}' "$@"
>  353 '';

But probably is way better to go with agent.

2017-07-03 14:19 GMT+01:00 Harmen :

> Hi all,
>
> I'm struggling to get fetchgitPrivate to work on nix-daemon installation
> (no
> NixOS, these are Ubuntu machines with nix).
> I can make it work on my dev machine, with is a non-daemon install, by
> setting
>
> NIX_PATH=ssh-config-file=/my/ssh/config:$NIX_PATH
>
> But that doesn't work in sandboxed daemon mode, because the nixbld* users
> can't
> read that file (both because of access rights, and because of the sandbox).
>
> Nix has this warning in fetchgitPrivate:
> > Note that the config file and any keys it points to must be readable
> > by the build user, which depending on your nix configuration means
> making it
> > readable by the build-users-group, the user of the running nix-daemon,
> or the
> > user calling the nix command which started the build. Similarly, if
> using an
> > ssh agent ssh-auth-sock must point to a socket the build user can access.
> > You may need StrictHostKeyChecking=no in the config file. Since ssh
> > will refuse to use a group-readable private key, if using build-users
> you will
> > likely want to use something like IdentityFile /some/directory/%u/key
> and have
> > a directory for each build user accessible to that user.
> from
> https://github.com/NixOS/nixpkgs/blob/master/pkgs/build-support/fetchgit/
> private.nix
>
> which sounds reasonable, but it I don't see how to do that since I don't
> know
> exactly which user will run the build. Also because of the sandbox the
> build
> can't read the ssh config file at all.
>
>
> So next option is to generate the configfile in my expression, a-la
> https://www.mpscholten.de/nixos/2016/07/07/private-
> github-repositories-and-nixos.html
> but I don't know how to set nix.path from inside an expression. It would
> also
> require bundling the key with the expression, but if that works...
>
>
> I can't be the first to want to use fetchgitPrivate with a sandboxed
> nix-daemon. Any experiences or tips?
> Thanks!
> Harmen
> ___
> nix-dev mailing list
> nix-dev@lists.science.uu.nl
> https://mailman.science.uu.nl/mailman/listinfo/nix-dev
>



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


Re: [Nix-dev] nix-daemon and private git repos

2017-07-03 Thread Harmen
On Mon, Jul 03, 2017 at 03:27:34PM +0200, Tomas Hlavaty wrote:
> Hi Harmen,
> 
> On Mon 03 Jul 2017 at 15:19, Harmen  wrote:
> > I can't be the first to want to use fetchgitPrivate with a sandboxed
> > nix-daemon. Any experiences or tips?
> 
> I had it working but there are several cases which needs extra setup
> that I recommend to avoid fetchgitPrivate and use source variables,
> e.g. src = ; This works the same in any context, e.g. in
> hydra, without hydra, etc.  You just need to set the proprietarySrc
> accordingly.

Thanks for the help Tomas,

could you be a bit more specific what you mean?

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


[Nix-commits] [NixOS/nixpkgs] 08ae94: drumgizmo: 9.12 -> 9.14

2017-07-03 Thread Frederik Rietdijk
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 08ae945396b7948d41b2561a769a5f15a286decb
  
https://github.com/NixOS/nixpkgs/commit/08ae945396b7948d41b2561a769a5f15a286decb
  Author: Nicolò Balzarotti 
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
M pkgs/applications/audio/drumgizmo/default.nix

  Log Message:
  ---
  drumgizmo: 9.12 -> 9.14


  Commit: 7d36ae33df9ca87c03ed0040e476525db92a385f
  
https://github.com/NixOS/nixpkgs/commit/7d36ae33df9ca87c03ed0040e476525db92a385f
  Author: Frederik Rietdijk 
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
M pkgs/applications/audio/drumgizmo/default.nix

  Log Message:
  ---
  Merge pull request #27085 from nico202/master

drumgizmo: 9.12 -> 9.14


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


[Nix-commits] [NixOS/nixops] d1907c: Use UTC for spot request expiration.

2017-07-03 Thread Rob Vermaas
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixops
  Commit: d1907cb1a4defa1d01cd7c2d18e09c9276e716e5
  
https://github.com/NixOS/nixops/commit/d1907cb1a4defa1d01cd7c2d18e09c9276e716e5
  Author: Rob Vermaas 
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
M nixops/backends/ec2.py

  Log Message:
  ---
  Use UTC for spot request expiration.


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


[Nix-commits] [NixOS/nixpkgs] 6685b7: burpsuite: 1.7.06 -> 1.7.23

2017-07-03 Thread Benno Fünfstück
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 6685b7a3d8ef5ab9cd1fd896bcbcd89d76643c86
  
https://github.com/NixOS/nixpkgs/commit/6685b7a3d8ef5ab9cd1fd896bcbcd89d76643c86
  Author: Benno Fünfstück 
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
M pkgs/tools/networking/burpsuite/default.nix

  Log Message:
  ---
  burpsuite: 1.7.06 -> 1.7.23


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


[Nix-commits] [NixOS/nixpkgs] f130e0: linux: Add 4.12

2017-07-03 Thread Tim Steinbach
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: f130e0027e6f7630c27a90293fa204f5da0fd061
  
https://github.com/NixOS/nixpkgs/commit/f130e0027e6f7630c27a90293fa204f5da0fd061
  Author: Tim Steinbach 
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
M pkgs/os-specific/linux/kernel/common-config.nix
A pkgs/os-specific/linux/kernel/linux-4.12.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  linux: Add 4.12


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


[Nix-commits] [NixOS/nixpkgs] 57f394: yarn: 0.24.6 -> 0.27.5

2017-07-03 Thread dywedir
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 57f394572d2236c77f99aa48d98e62a4362d510c
  
https://github.com/NixOS/nixpkgs/commit/57f394572d2236c77f99aa48d98e62a4362d510c
  Author: dywedir 
  Date:   2017-07-03 (Mon, 03 Jul 2017)

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

  Log Message:
  ---
  yarn: 0.24.6 -> 0.27.5


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


[Nix-commits] [NixOS/nixpkgs] caf44a: google-cloud-sdk: enable alpha and beta features

2017-07-03 Thread Maarten Hoogendoorn
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: caf44a5dd3d5baf99a30290dd067f40266197435
  
https://github.com/NixOS/nixpkgs/commit/caf44a5dd3d5baf99a30290dd067f40266197435
  Author: Maarten Hoogendoorn 
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
A pkgs/tools/admin/google-cloud-sdk/alpha__init__.py
A pkgs/tools/admin/google-cloud-sdk/beta__init__.py
M pkgs/tools/admin/google-cloud-sdk/default.nix

  Log Message:
  ---
  google-cloud-sdk: enable alpha and beta features

google-cloud-sdk: enable alpha and beta features


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


[Nix-commits] [NixOS/nixpkgs] 5605f9: google-app-engine-go-sdk: 1.9.53 -> 1.9.55

2017-07-03 Thread Frederik Rietdijk
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 5605f9d2c8ea31a4e956999ebd360d2211390645
  
https://github.com/NixOS/nixpkgs/commit/5605f9d2c8ea31a4e956999ebd360d2211390645
  Author: lufia 
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
M pkgs/development/tools/google-app-engine-go-sdk/default.nix

  Log Message:
  ---
  google-app-engine-go-sdk: 1.9.53 -> 1.9.55


  Commit: 970c2cc35fabee6b82ccc6c492499694d656c0c5
  
https://github.com/NixOS/nixpkgs/commit/970c2cc35fabee6b82ccc6c492499694d656c0c5
  Author: Frederik Rietdijk 
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
M pkgs/development/tools/google-app-engine-go-sdk/default.nix

  Log Message:
  ---
  Merge pull request #27084 from lufia/update-gae-go

google-app-engine-go-sdk: 1.9.53 -> 1.9.55


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


[Nix-commits] [NixOS/nixpkgs] ac8601: pythonPackage.markdownsuperscript: init at 2.0.0

2017-07-03 Thread Frederik Rietdijk
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: ac86016094b5b45872f72584b29927118be5ca11
  
https://github.com/NixOS/nixpkgs/commit/ac86016094b5b45872f72584b29927118be5ca11
  Author: Théo Zimmermann 
  Date:   2017-07-03 (Mon, 03 Jul 2017)

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

  Log Message:
  ---
  pythonPackage.markdownsuperscript: init at 2.0.0


  Commit: 1336fde8cef288d11ed2a9d1d85900911d87f2df
  
https://github.com/NixOS/nixpkgs/commit/1336fde8cef288d11ed2a9d1d85900911d87f2df
  Author: Frederik Rietdijk 
  Date:   2017-07-03 (Mon, 03 Jul 2017)

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

  Log Message:
  ---
  Merge pull request #26985 from Zimmi48/add_markdownsuperscript

pythonPackage.markdownsuperscript: init at 2.0.0


Compare: https://github.com/NixOS/nixpkgs/compare/970c2cc35fab...1336fde8cef2___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 753aab: pythonPackages.codecov: init at 2.0.9 (#27018)

2017-07-03 Thread Théo Zimmermann
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 753aab14947c987fc8be1538d828e74a4665bdd2
  
https://github.com/NixOS/nixpkgs/commit/753aab14947c987fc8be1538d828e74a4665bdd2
  Author: Théo Zimmermann 
  Date:   2017-07-03 (Mon, 03 Jul 2017)

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

  Log Message:
  ---
  pythonPackages.codecov: init at 2.0.9 (#27018)

* pythonPackages.codecov: init at 2.0.9

* Update default.nix


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


[Nix-commits] [NixOS/nixpkgs] c73f0c: mesa: maintenance 17.1.2 -> 17.1.4

2017-07-03 Thread Vladimír Čunát
  Branch: refs/heads/staging
  Home:   https://github.com/NixOS/nixpkgs
  Commit: c73f0caea5f0822ea044b4f90de4b64706d91362
  
https://github.com/NixOS/nixpkgs/commit/c73f0caea5f0822ea044b4f90de4b64706d91362
  Author: Vladimír Čunát 
  Date:   2017-07-03 (Mon, 03 Jul 2017)

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

  Log Message:
  ---
  mesa: maintenance 17.1.2 -> 17.1.4

The announcement seems safe, as usual.

Hydra's Darwin machines will be busy for quite some time on staging,
so let me squeeze this, as it will only be mass rebuild on *-linux.


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


[Nix-commits] [NixOS/nixpkgs] 54eeab: Python: fix update script in case no PyPI releases...

2017-07-03 Thread Frederik Rietdijk
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 54eeab4da0a6421ebeffb5d2d6dc047a24774a08
  
https://github.com/NixOS/nixpkgs/commit/54eeab4da0a6421ebeffb5d2d6dc047a24774a08
  Author: Frederik Rietdijk 
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
M maintainers/scripts/update-python-libraries

  Log Message:
  ---
  Python: fix update script in case no PyPI releases are available for a given 
version


  Commit: 034c1a29fac4bb60f600e04a7c4db2fa0077db46
  
https://github.com/NixOS/nixpkgs/commit/034c1a29fac4bb60f600e04a7c4db2fa0077db46
  Author: Frederik Rietdijk 
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
M pkgs/development/python-modules/channels/default.nix
M pkgs/development/python-modules/django_guardian.nix
M pkgs/development/python-modules/dogpile.cache/default.nix

  Log Message:
  ---
  python.pkgs: several maintenance updates


  Commit: c64d8eaaead7c918b1757e980690b6facf644b6e
  
https://github.com/NixOS/nixpkgs/commit/c64d8eaaead7c918b1757e980690b6facf644b6e
  Author: Frederik Rietdijk 
  Date:   2017-07-03 (Mon, 03 Jul 2017)

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

  Log Message:
  ---
  python.pkgs.jupyter_client: 5.0.1 -> 5.1.0


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


[Nix-commits] [NixOS/nixpkgs] 72c9ed: Merge #26628: treewide: setuid/setgid fallout

2017-07-03 Thread Vladimír Čunát
  Branch: refs/heads/release-17.03
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 72c9ed78d0b1d9d5f531805ddf5bf06bfd447614
  
https://github.com/NixOS/nixpkgs/commit/72c9ed78d0b1d9d5f531805ddf5bf06bfd447614
  Author: Vladimír Čunát 
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
M pkgs/applications/misc/udevil/default.nix
M pkgs/games/unnethack/default.nix
M pkgs/games/xconq/default.nix
M pkgs/games/xsokoban/default.nix
M pkgs/servers/computing/torque/default.nix
M pkgs/servers/http/hiawatha/default.nix
M pkgs/shells/rssh/default.nix
M pkgs/tools/misc/uucp/default.nix
M pkgs/tools/security/logkeys/default.nix
M pkgs/tools/security/sudo/default.nix
M pkgs/tools/security/super/default.nix
M pkgs/tools/system/logcheck/default.nix

  Log Message:
  ---
  Merge #26628: treewide: setuid/setgid fallout

(cherry picked from commit d88c0cf8678c7accbd95010bb20ea0812a48bac5)
There were just a couple of conflicts, apparently someone has already
fixed rewritefs and cron on 17.03.
I re-checked that all those do build now (with a new-enough nix daemon).


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


[Nix-commits] [NixOS/nixpkgs] e02d40: mypaint: 1.1.0 -> 1.2.1 (#27004)

2017-07-03 Thread Jan Tojnar
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: e02d40c33e6d556d7d9b684c45841287f8b5df68
  
https://github.com/NixOS/nixpkgs/commit/e02d40c33e6d556d7d9b684c45841287f8b5df68
  Author: Jan Tojnar 
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
M lib/maintainers.nix
M pkgs/applications/graphics/mypaint/default.nix

  Log Message:
  ---
  mypaint: 1.1.0 -> 1.2.1 (#27004)


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


[Nix-commits] [NixOS/nixpkgs] 85a832: qbittorrent: fix build

2017-07-03 Thread Pascal Wittmann
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 85a8323e8f2964b9a7cfd4021e2f7cb73c0ad7b0
  
https://github.com/NixOS/nixpkgs/commit/85a8323e8f2964b9a7cfd4021e2f7cb73c0ad7b0
  Author: Alexey Shmalko 
  Date:   2017-07-01 (Sat, 01 Jul 2017)

  Changed paths:
M pkgs/applications/networking/p2p/qbittorrent/default.nix

  Log Message:
  ---
  qbittorrent: fix build

The qbittorrent has been broken by
210f6888023c1df8aff2d053a5e41f5e1effdfe7, which adds `qmake` as a
build input. `qmake` is overriding the default configure phase (which
should be `./configure ...` for qbittorrent) so build goes wrong.

Remove `qmake` from build inputs (basically, reverting the said
commit).


  Commit: 24ec6634f4df0683bcf7b32dcf5499d4409a4030
  
https://github.com/NixOS/nixpkgs/commit/24ec6634f4df0683bcf7b32dcf5499d4409a4030
  Author: Pascal Wittmann 
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
M pkgs/applications/networking/p2p/qbittorrent/default.nix

  Log Message:
  ---
  Merge pull request #27010 from rasendubi/qbittorrent-qmake

qbittorrent: fix build


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


[Nix-commits] [NixOS/nixpkgs] fd92bd: qbittorrent: 3.3.12 -> 3.3.13

2017-07-03 Thread Pascal Wittmann
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: fd92bd0d805f015eb0254ffe15753f412cfc1202
  
https://github.com/NixOS/nixpkgs/commit/fd92bd0d805f015eb0254ffe15753f412cfc1202
  Author: romildo 
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
M pkgs/applications/networking/p2p/qbittorrent/default.nix

  Log Message:
  ---
  qbittorrent: 3.3.12 -> 3.3.13


  Commit: dc7cc77111a49f332c3f4c430685890a1f004c9b
  
https://github.com/NixOS/nixpkgs/commit/dc7cc77111a49f332c3f4c430685890a1f004c9b
  Author: Pascal Wittmann 
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
M pkgs/applications/networking/p2p/qbittorrent/default.nix

  Log Message:
  ---
  Merge pull request #27098 from romildo/upd.qbittorrent

qbittorrent: 3.3.12 -> 3.3.13


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


[Nix-commits] [NixOS/nixpkgs] 9ccdf6: libunwind: fix version macros

2017-07-03 Thread Orivej Desh
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 9ccdf60be6bf512918e951ef2cdc75dfd2149442
  
https://github.com/NixOS/nixpkgs/commit/9ccdf60be6bf512918e951ef2cdc75dfd2149442
  Author: Orivej Desh 
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
M pkgs/development/libraries/libunwind/default.nix
A pkgs/development/libraries/libunwind/version-1.2.1.patch

  Log Message:
  ---
  libunwind: fix version macros

Fixes julia_05 build: #26891


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


[Nix-commits] [NixOS/nixpkgs] 7f7b74: gogs: Fix cyclic dependency on darwin

2017-07-03 Thread Daiderd Jordan
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 7f7b74dfed2ede093fec5f7338319bf72c4fc3c3
  
https://github.com/NixOS/nixpkgs/commit/7f7b74dfed2ede093fec5f7338319bf72c4fc3c3
  Author: Josef Kemetmueller 
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
M pkgs/applications/version-management/gogs/default.nix

  Log Message:
  ---
  gogs: Fix cyclic dependency on darwin

This fixes the "cycle detected in the references of" error when building
on darwin. The fix is based on the solution in issue #18131.


  Commit: 2e2769f96c4dd3f32eb2f21dafbfc096cbcb5c40
  
https://github.com/NixOS/nixpkgs/commit/2e2769f96c4dd3f32eb2f21dafbfc096cbcb5c40
  Author: Daiderd Jordan 
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
M pkgs/applications/version-management/gogs/default.nix

  Log Message:
  ---
  Merge pull request #27104 from knedlsepp/fix-gogs-on-darwin

gogs: Fix cyclic dependency on darwin


Compare: https://github.com/NixOS/nixpkgs/compare/9ccdf60be6bf...2e2769f96c4d___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] ba757e: ocamlPackages.pgocaml: requires OCaml ≥ 4.00

2017-07-03 Thread Vincent Laporte
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: ba757e6a7661ba6286fe5a1bbd05918dde625994
  
https://github.com/NixOS/nixpkgs/commit/ba757e6a7661ba6286fe5a1bbd05918dde625994
  Author: Vincent Laporte 
  Date:   2017-07-03 (Mon, 03 Jul 2017)

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

  Log Message:
  ---
  ocamlPackages.pgocaml: requires OCaml ≥ 4.00


  Commit: 9f9ca26f2836c61508beadb7f11486419483307e
  
https://github.com/NixOS/nixpkgs/commit/9f9ca26f2836c61508beadb7f11486419483307e
  Author: Vincent Laporte 
  Date:   2017-07-03 (Mon, 03 Jul 2017)

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

  Log Message:
  ---
  ocamlPackages.lwt: requires OCaml ≥ 4.00


  Commit: 91e8a6a9ff7254636616fd1ed5004939fc99db3d
  
https://github.com/NixOS/nixpkgs/commit/91e8a6a9ff7254636616fd1ed5004939fc99db3d
  Author: Vincent Laporte 
  Date:   2017-07-03 (Mon, 03 Jul 2017)

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

  Log Message:
  ---
  ocamlPackages.csv: 1.4.2 -> 1.5


Compare: https://github.com/NixOS/nixpkgs/compare/2e2769f96c4d...91e8a6a9ff72___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] b424c4: sxiv: Add support for custom config

2017-07-03 Thread Mateusz Kowalczyk
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: b424c4346568701789b70604b40c389c9d535b1d
  
https://github.com/NixOS/nixpkgs/commit/b424c4346568701789b70604b40c389c9d535b1d
  Author: Johannes Frankenau 
  Date:   2017-07-03 (Mon, 03 Jul 2017)

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

  Log Message:
  ---
  sxiv: Add support for custom config


  Commit: c31d21c9b1b81cf78e08a85d298d3f09ddc7c0ae
  
https://github.com/NixOS/nixpkgs/commit/c31d21c9b1b81cf78e08a85d298d3f09ddc7c0ae
  Author: Mateusz Kowalczyk 
  Date:   2017-07-03 (Mon, 03 Jul 2017)

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

  Log Message:
  ---
  Merge pull request #27090 from jfrankenau/config-sxiv

sxiv: Add support for custom config


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


Re: [Nix-dev] [ANN] Home Manager

2017-07-03 Thread Nicolas Pierron
Nice work!

On Sun, Jul 2, 2017 at 11:58 PM, Robert Helgesson  wrote:
> In short Home Manager is a set of NixOS modules and a command line tool
> called `home-manager` that lets you configure your user's environment
> similar to how you configure your NixOS system.

For your information, the module system was made such that you can
re-use it as a submodule.
So technically, you might be able to create a NixOS module for NixOS
which imports the home-manager within NixOS users ;)

This home-manager submodule would have to forward pkgs as a module
argument (as done in NixOS), and import the modules from the
home-manager.

-- 
Nicolas Pierron
http://www.linkedin.com/in/nicolasbpierron - http://nbp.name/
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-dev


[Nix-commits] [NixOS/nixpkgs] cb703f: linux-copperhead: 4.11.8.a -> 4.12.a

2017-07-03 Thread Tim Steinbach
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: cb703f1314987fe22a9a5fc3b468b7f311cc1ab7
  
https://github.com/NixOS/nixpkgs/commit/cb703f1314987fe22a9a5fc3b468b7f311cc1ab7
  Author: Tim Steinbach 
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
M pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix

  Log Message:
  ---
  linux-copperhead: 4.11.8.a -> 4.12.a


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


[Nix-commits] [NixOS/nixpkgs] c6f572: dr14_tmeter: init at 1.0.16

2017-07-03 Thread Pascal Wittmann
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: c6f57263986657ce4354588f945a62415d156ae4
  
https://github.com/NixOS/nixpkgs/commit/c6f57263986657ce4354588f945a62415d156ae4
  Author: adisbladis 
  Date:   2017-07-04 (Tue, 04 Jul 2017)

  Changed paths:
M lib/maintainers.nix
A pkgs/applications/audio/dr14_tmeter/default.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  dr14_tmeter: init at 1.0.16


  Commit: ec04f18acb5ab11d0b3ee1a2e24f724b8d5868bf
  
https://github.com/NixOS/nixpkgs/commit/ec04f18acb5ab11d0b3ee1a2e24f724b8d5868bf
  Author: Pascal Wittmann 
  Date:   2017-07-04 (Tue, 04 Jul 2017)

  Changed paths:
M lib/maintainers.nix
A pkgs/applications/audio/dr14_tmeter/default.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  Merge pull request #27092 from adisbladis/add_dr14_tmeter

dr14_tmeter: init at 1.0.16


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


[Nix-commits] [NixOS/nixpkgs] 81fceb: linux: Add 4.12

2017-07-03 Thread Tim Steinbach
  Branch: refs/heads/release-17.03
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 81fceb255448415e70b9e7775d590b6def45f861
  
https://github.com/NixOS/nixpkgs/commit/81fceb255448415e70b9e7775d590b6def45f861
  Author: Tim Steinbach 
  Date:   2017-07-04 (Tue, 04 Jul 2017)

  Changed paths:
M pkgs/os-specific/linux/kernel/common-config.nix
A pkgs/os-specific/linux/kernel/linux-4.12.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  linux: Add 4.12

(cherry picked from commit f130e0027e6f7630c27a90293fa204f5da0fd061)
Signed-off-by: Domen Kožar 


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