date:20170617

Re: [Nix-dev] drone and nix (sort of solved)

2017-06-17 Thread Wout Mertens

Nice! Why is it not perfect?

On Fri, Jun 16, 2017 at 1:21 PM Harmen  wrote:

> Hi all,
>
> I while ago here I asked about using nix with drone.io (a CI system which
> uses docker), to deal with push based tests. I previously reported back
> with a solution with gitlab, but I did end up with a workable (not perfect)
> solution for drone.
>
> On the 'drone agent' machine run this once:
>
> # docker volume create nix
> # docker run --rm -v nix:/newnix nixos/nix cp -a /nix/store /nix/var
> /newnix
>
> in the .drone.yml files:
>
> pipeline:
>   build:
> image: nixos/nix
> commands:
>   ...
> volumes:
>   - nix:/nix/
>
> And whenever you want to update nixchannel:
>
> # docker run -v nix:/nix/ --rm -ti nixos/nix nix-channel --update
>
>
> This will share the /nix directory with every build, so rebuild (and
> downloads!) are kept to a minimum.
>
>
> Maybe it helps someone.
> Thanks!
> Harmen
>
> ___
> 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-17 Thread Wout Mertens

Note, sharing /nix is already not really possible because the metadata is
stored in sqlite and its locking does not play nice with nfs. (*)
Another issue is that right now, nix does not /require/ the daemon to work,
and this proposal would change that.

However, you can totally share /nix between multiple hosts, you just have
to pinkie-promise not to write to it from multiple hosts at the same time.

Wout.

(*): the reason is that fnctl() locking is broken on many implementations.
If this testing project
https://sourceforge.net/projects/locktests/files/?source=navbar says it's
not broken, you can totally use nix on nfs.

On Sun, 18 Jun 2017, 5:10 AM ,  wrote:

>
> My understanding is that currently GC roots (symlinks in
> profiles/gcroots) are created and deleted directly by the various Nix
> tools, even in multi-user configurations. (whether on NixOS or on
> another Linux distribution)
>
> It seems to me that it would be useful for the daemon to handle making
> GC roots, and forbid users to directly create GC roots.
>
> The features that come to mind:
> - Allows later implementing policy about GC roots/space consumption
> - Allows avoiding complicated locking around doing GC
> - Allows /nix to be put on network storage transparently
> - Allows /nix to be shared between containers transparently
>
> The network-storage-/nix use case may be the most important, since there
> seems to be a lot of people who want to put /nix on NFS.
>
> Thoughts? Has this been considered?
>
> Thanks for Nix!
>
> ___
> 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

[Nix-commits] [NixOS/nixpkgs] 7e10ec: chromium: Allow to put extensions in system path

2017-06-17 Thread aszlig

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

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

  Log Message:
  ---
  chromium: Allow to put extensions in system path

This should allow us to easily add system-wide Chromium extensions via a
NixOS configuration similar to this:

{ pkgs, ... }: {
  environment.pathsToLink = [ "/share/chromium/extensions" ];
  environment.systemPackages = [ pkgs.my-shiny-extension ];
}

For more details about what Chromium expects within that directory, see:

https://developer.chrome.com/extensions/external_extensions

I've introduced this because of a personal desire to gain more control
about which extensions are installed and what they are able to do. All
of the extensions I use are free software, but despite that it's useful
to either easily patch them and also prevent unwanted automatic updates.

Tested this using the NixOS "chromium.stable" test on x86_64-linux.

Signed-off-by: aszlig 
Cc: @offlinehacker because of #21050


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

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

2017-06-17 Thread sbaugh


My understanding is that currently GC roots (symlinks in
profiles/gcroots) are created and deleted directly by the various Nix
tools, even in multi-user configurations. (whether on NixOS or on
another Linux distribution)

It seems to me that it would be useful for the daemon to handle making
GC roots, and forbid users to directly create GC roots.

The features that come to mind:
- Allows later implementing policy about GC roots/space consumption
- Allows avoiding complicated locking around doing GC
- Allows /nix to be put on network storage transparently
- Allows /nix to be shared between containers transparently

The network-storage-/nix use case may be the most important, since there
seems to be a lot of people who want to put /nix on NFS.

Thoughts? Has this been considered?

Thanks for Nix!

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

[Nix-commits] [NixOS/nixpkgs] 63b8d6: syncthing-inotify: 0.8.5 -> 0.8.6

2017-06-17 Thread Peter Hoeg

  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 63b8d659f6ab50871416262307e828191a7c2d0d
  
https://github.com/NixOS/nixpkgs/commit/63b8d659f6ab50871416262307e828191a7c2d0d
  Author: Peter Hoeg 
  Date:   2017-06-18 (Sun, 18 Jun 2017)

  Changed paths:
M pkgs/applications/networking/syncthing/inotify-deps.nix
M pkgs/applications/networking/syncthing/inotify.nix

  Log Message:
  ---
  syncthing-inotify: 0.8.5 -> 0.8.6


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

[Nix-commits] [NixOS/nixpkgs] b4b698: qstopmotion: init -> 2.3.2

2017-06-17 Thread Michiel Leenaars

  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: b4b698248fcecfbf52f908810ea8f40eb74f1491
  
https://github.com/NixOS/nixpkgs/commit/b4b698248fcecfbf52f908810ea8f40eb74f1491
  Author: Michiel Leenaars 
  Date:   2017-06-18 (Sun, 18 Jun 2017)

  Changed paths:
A pkgs/applications/video/qstopmotion/default.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  qstopmotion: init -> 2.3.2


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

[Nix-commits] [NixOS/nixpkgs] ec65ef: cockroachdb: beta-20160915 -> v1.0.2

2017-06-17 Thread Rushmore Mushambi

  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: ec65ef744bfef934cea0374122d830d4c3656223
  
https://github.com/NixOS/nixpkgs/commit/ec65ef744bfef934cea0374122d830d4c3656223
  Author: rushmorem 
  Date:   2017-06-17 (Sat, 17 Jun 2017)

  Changed paths:
M pkgs/servers/sql/cockroachdb/default.nix
R pkgs/servers/sql/cockroachdb/deps.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  cockroachdb: beta-20160915 -> v1.0.2


  Commit: e1ec8d9e9cf49f845584ddd83f4bfd438c98cfc3
  
https://github.com/NixOS/nixpkgs/commit/e1ec8d9e9cf49f845584ddd83f4bfd438c98cfc3
  Author: Rushmore Mushambi 
  Date:   2017-06-18 (Sun, 18 Jun 2017)

  Changed paths:
M pkgs/servers/sql/cockroachdb/default.nix
R pkgs/servers/sql/cockroachdb/deps.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  Merge pull request #26658 from rushmorem/cockroach

cockroachdb: beta-20160915 -> v1.0.2


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

Re: [Nix-dev] Trying to install the SailfishOS SDK

2017-06-17 Thread David

On Thu, 19 Jan 2017 21:13:55 +0100
Christoph-Simon Senjak  wrote:

> I am trying to write a package for the SailfishOS SDK. 

I am sorry for the necrobump but... is there any news on this?
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-dev

[Nix-commits] [NixOS/nixpkgs] 351b59: cairo: bugfix 1.14.8 -> 1.14.10

2017-06-17 Thread Vladimír Čunát

  Branch: refs/heads/staging
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 351b59be55851d94ea078f2a211c0706b317e979
  
https://github.com/NixOS/nixpkgs/commit/351b59be55851d94ea078f2a211c0706b317e979
  Author: Vladimír Čunát 
  Date:   2017-06-17 (Sat, 17 Jun 2017)

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

  Log Message:
  ---
  cairo: bugfix 1.14.8 -> 1.14.10


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

[Nix-commits] [NixOS/nixpkgs] dd99d1: ghcHEAD: Split docs into their own output

2017-06-17 Thread Peter Simons

  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: dd99d1f8d0b8391e3a8057dceae11f71fff07ee9
  
https://github.com/NixOS/nixpkgs/commit/dd99d1f8d0b8391e3a8057dceae11f71fff07ee9
  Author: John Ericson 
  Date:   2017-06-17 (Sat, 17 Jun 2017)

  Changed paths:
M pkgs/development/compilers/ghc/head.nix

  Log Message:
  ---
  ghcHEAD: Split docs into their own output

This ghc was forgetten from 2089dd4ab6be089bda12a942846ab7954b28b459


  Commit: 10493d393acc12b83e148b31d75c6f355d4a7e53
  
https://github.com/NixOS/nixpkgs/commit/10493d393acc12b83e148b31d75c6f355d4a7e53
  Author: Peter Simons 
  Date:   2017-06-17 (Sat, 17 Jun 2017)

  Changed paths:
M pkgs/development/compilers/ghc/head.nix

  Log Message:
  ---
  Merge pull request #26676 from obsidiansystems/ghc-head-doc

ghcHEAD: Split docs into their own output


Compare: https://github.com/NixOS/nixpkgs/compare/6b199db895e9...10493d393acc___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] [NixOS/nixpkgs] 9560fc: curl: 7.54.0 -> 7.54.1

2017-06-17 Thread Tim Steinbach

  Branch: refs/heads/staging
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 9560fcbadf2b3784ed2515a6027afa8a67a3fec5
  
https://github.com/NixOS/nixpkgs/commit/9560fcbadf2b3784ed2515a6027afa8a67a3fec5
  Author: Tim Steinbach 
  Date:   2017-06-16 (Fri, 16 Jun 2017)

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

  Log Message:
  ---
  curl: 7.54.0 -> 7.54.1


  Commit: a81e1fc6acb2e9b13f531fb22ca1a32d78488803
  
https://github.com/NixOS/nixpkgs/commit/a81e1fc6acb2e9b13f531fb22ca1a32d78488803
  Author: Tim Steinbach 
  Date:   2017-06-17 (Sat, 17 Jun 2017)

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

  Log Message:
  ---
  Merge pull request #26641 from NeQuissimus/staging_curl_7_54_1

[staging] curl: 7.54.0 -> 7.54.1


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

[Nix-commits] [NixOS/nixpkgs] a4a0f3: gradle: 3.5 -> 4.0

2017-06-17 Thread Tim Steinbach

  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: a4a0f301085279936a97cc8f498d9f473f4580a8
  
https://github.com/NixOS/nixpkgs/commit/a4a0f301085279936a97cc8f498d9f473f4580a8
  Author: Tim Steinbach 
  Date:   2017-06-16 (Fri, 16 Jun 2017)

  Changed paths:
M pkgs/development/tools/build-managers/gradle/default.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  gradle: 3.5 -> 4.0


  Commit: 6b199db895e917bd75ee6767c021890c25536c86
  
https://github.com/NixOS/nixpkgs/commit/6b199db895e917bd75ee6767c021890c25536c86
  Author: Tim Steinbach 
  Date:   2017-06-17 (Sat, 17 Jun 2017)

  Changed paths:
M pkgs/development/tools/build-managers/gradle/default.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  Merge pull request #26644 from NeQuissimus/gradle_4_0

gradle: 3.5 -> 4.0


Compare: https://github.com/NixOS/nixpkgs/compare/243217fe3f90...6b199db895e9___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] [NixOS/nixpkgs] 858c47: Manual: Add paragraph on xserver keyboard layout

2017-06-17 Thread Michael Raskin

  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 858c47c18e02535621b12ff3ceedf6c52efe39ac
  
https://github.com/NixOS/nixpkgs/commit/858c47c18e02535621b12ff3ceedf6c52efe39ac
  Author: Manuel Bärenz 
  Date:   2017-06-17 (Sat, 17 Jun 2017)

  Changed paths:
M nixos/doc/manual/configuration/x-windows.xml

  Log Message:
  ---
  Manual: Add paragraph on xserver keyboard layout


  Commit: 243217fe3f90e9ccc814f5d2c357f967351b660a
  
https://github.com/NixOS/nixpkgs/commit/243217fe3f90e9ccc814f5d2c357f967351b660a
  Author: Michael Raskin <7c6f4...@mail.ru>
  Date:   2017-06-17 (Sat, 17 Jun 2017)

  Changed paths:
M nixos/doc/manual/configuration/x-windows.xml

  Log Message:
  ---
  Merge pull request #26677 from turion/master

Manual: Add paragraph on xserver keyboard layout


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

[Nix-commits] [NixOS/nixpkgs] 16118f: libreoffice: fix #25831

2017-06-17 Thread Michael Raskin

  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 16118fede571909dd0c986d0c5a713fde88c9ecd
  
https://github.com/NixOS/nixpkgs/commit/16118fede571909dd0c986d0c5a713fde88c9ecd
  Author: Laverne Schrock 
  Date:   2017-06-17 (Sat, 17 Jun 2017)

  Changed paths:
M pkgs/applications/office/libreoffice/default.nix
M pkgs/applications/office/libreoffice/still.nix
A pkgs/applications/office/libreoffice/xdg-open.patch

  Log Message:
  ---
  libreoffice: fix #25831

Thanks to Linus Heckemann  for creating the patch.


  Commit: fd92d817a33c24041feba3df3c11dbc987b4f331
  
https://github.com/NixOS/nixpkgs/commit/fd92d817a33c24041feba3df3c11dbc987b4f331
  Author: Michael Raskin <7c6f4...@mail.ru>
  Date:   2017-06-17 (Sat, 17 Jun 2017)

  Changed paths:
M pkgs/applications/office/libreoffice/default.nix
M pkgs/applications/office/libreoffice/still.nix
A pkgs/applications/office/libreoffice/xdg-open.patch

  Log Message:
  ---
  Merge pull request #26670 from lverns/libreoffice-fix-xdg

libreoffice: fix #25831


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

[Nix-commits] [NixOS/nixpkgs] 4e8d44: feh: build and install man pages

2017-06-17 Thread Franz Pletz

  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 4e8d44c2cdaccc030bd30b3dd8b78eea68391fb5
  
https://github.com/NixOS/nixpkgs/commit/4e8d44c2cdaccc030bd30b3dd8b78eea68391fb5
  Author: Franz Pletz 
  Date:   2017-06-17 (Sat, 17 Jun 2017)

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

  Log Message:
  ---
  feh: build and install man pages


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

[Nix-commits] [NixOS/nixpkgs] d6e946: atlassian-confluence: 6.1.1 -> 6.2.2

2017-06-17 Thread Franz Pletz

  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: d6e94684fb381d21b99421f402fd1f17ef85585f
  
https://github.com/NixOS/nixpkgs/commit/d6e94684fb381d21b99421f402fd1f17ef85585f
  Author: Franz Pletz 
  Date:   2017-06-17 (Sat, 17 Jun 2017)

  Changed paths:
M pkgs/servers/atlassian/confluence.nix

  Log Message:
  ---
  atlassian-confluence: 6.1.1 -> 6.2.2


  Commit: c0a582f4bb45209d967a2f4ebab10f6ce6da5a68
  
https://github.com/NixOS/nixpkgs/commit/c0a582f4bb45209d967a2f4ebab10f6ce6da5a68
  Author: Franz Pletz 
  Date:   2017-06-17 (Sat, 17 Jun 2017)

  Changed paths:
M pkgs/servers/atlassian/crowd.nix

  Log Message:
  ---
  atlassian-crowd: 2.11.1 -> 2.12.0


  Commit: aa06a6e00b7f021ecf5e057929db978d6485bb26
  
https://github.com/NixOS/nixpkgs/commit/aa06a6e00b7f021ecf5e057929db978d6485bb26
  Author: Franz Pletz 
  Date:   2017-06-17 (Sat, 17 Jun 2017)

  Changed paths:
M pkgs/servers/atlassian/jira.nix

  Log Message:
  ---
  atlassian-jira: 7.3.4 -> 7.3.7


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

[Nix-commits] [NixOS/nixpkgs] d5ac9b: linux: 4.11.5 -> 4.11.6

2017-06-17 Thread Franz Pletz

  Branch: refs/heads/release-17.03
  Home:   https://github.com/NixOS/nixpkgs
  Commit: d5ac9b0ff2be597bfeac806775391d0deb07e3b0
  
https://github.com/NixOS/nixpkgs/commit/d5ac9b0ff2be597bfeac806775391d0deb07e3b0
  Author: Franz Pletz 
  Date:   2017-06-17 (Sat, 17 Jun 2017)

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

  Log Message:
  ---
  linux: 4.11.5 -> 4.11.6

(cherry picked from commit c973a4a8875a36bba856712f260b487eb0a91307)


  Commit: b2e0946f460e63b6a9be397ee34399c431fc274f
  
https://github.com/NixOS/nixpkgs/commit/b2e0946f460e63b6a9be397ee34399c431fc274f
  Author: Franz Pletz 
  Date:   2017-06-17 (Sat, 17 Jun 2017)

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

  Log Message:
  ---
  linux: 4.4.72 -> 4.4.73

(cherry picked from commit a470aa09244ff54a59e354f0e94dc722a27eec03)


  Commit: d1fce4f2c319c9d573242196e26d1ef925069896
  
https://github.com/NixOS/nixpkgs/commit/d1fce4f2c319c9d573242196e26d1ef925069896
  Author: Franz Pletz 
  Date:   2017-06-17 (Sat, 17 Jun 2017)

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

  Log Message:
  ---
  linux: 4.9.32 -> 4.9.33

(cherry picked from commit bbb9182cbc117df5bc7434d1b93d36fd65e5af46)


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

[Nix-commits] [NixOS/nixpkgs] c973a4: linux: 4.11.5 -> 4.11.6

2017-06-17 Thread Franz Pletz

  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: c973a4a8875a36bba856712f260b487eb0a91307
  
https://github.com/NixOS/nixpkgs/commit/c973a4a8875a36bba856712f260b487eb0a91307
  Author: Franz Pletz 
  Date:   2017-06-17 (Sat, 17 Jun 2017)

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

  Log Message:
  ---
  linux: 4.11.5 -> 4.11.6


  Commit: a470aa09244ff54a59e354f0e94dc722a27eec03
  
https://github.com/NixOS/nixpkgs/commit/a470aa09244ff54a59e354f0e94dc722a27eec03
  Author: Franz Pletz 
  Date:   2017-06-17 (Sat, 17 Jun 2017)

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

  Log Message:
  ---
  linux: 4.4.72 -> 4.4.73


  Commit: bbb9182cbc117df5bc7434d1b93d36fd65e5af46
  
https://github.com/NixOS/nixpkgs/commit/bbb9182cbc117df5bc7434d1b93d36fd65e5af46
  Author: Franz Pletz 
  Date:   2017-06-17 (Sat, 17 Jun 2017)

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

  Log Message:
  ---
  linux: 4.9.32 -> 4.9.33


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

[Nix-commits] [NixOS/nixpkgs] df7d0b: chromium: apply patch to fix chromecast

2017-06-17 Thread Domen Kožar

  Branch: refs/heads/release-17.03
  Home:   https://github.com/NixOS/nixpkgs
  Commit: df7d0bcf720b26f5331dad369d803dba0d6366b7
  
https://github.com/NixOS/nixpkgs/commit/df7d0bcf720b26f5331dad369d803dba0d6366b7
  Author: Domen Kožar 
  Date:   2017-06-17 (Sat, 17 Jun 2017)

  Changed paths:
M pkgs/applications/networking/browsers/chromium/common.nix
A 
pkgs/applications/networking/browsers/chromium/patches/fix_network_api_crash.patch

  Log Message:
  ---
  chromium: apply patch to fix chromecast

(cherry picked from commit af4056f22ba52762c669551d90a3ec4d650bb233)
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

[Nix-commits] [NixOS/nixpkgs] af4056: chromium: apply patch to fix chromecast

2017-06-17 Thread Domen Kožar

  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: af4056f22ba52762c669551d90a3ec4d650bb233
  
https://github.com/NixOS/nixpkgs/commit/af4056f22ba52762c669551d90a3ec4d650bb233
  Author: Domen Kožar 
  Date:   2017-06-17 (Sat, 17 Jun 2017)

  Changed paths:
M pkgs/applications/networking/browsers/chromium/common.nix
A 
pkgs/applications/networking/browsers/chromium/patches/fix_network_api_crash.patch

  Log Message:
  ---
  chromium: apply patch to fix chromecast


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

[Nix-commits] [NixOS/nixpkgs] b1f56b: wirelessInterfaces: Add a missing parameter

2017-06-17 Thread Joachim F

  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: b1f56b8b0c87ea01e1cf5f423124b83170d26272
  
https://github.com/NixOS/nixpkgs/commit/b1f56b8b0c87ea01e1cf5f423124b83170d26272
  Author: Kirill Elagin 
  Date:   2017-05-28 (Sun, 28 May 2017)

  Changed paths:
M nixos/modules/tasks/network-interfaces.nix

  Log Message:
  ---
  wirelessInterfaces: Add a missing parameter


  Commit: 0b7c4c19002d917a225675089fb58bb46dcdff8d
  
https://github.com/NixOS/nixpkgs/commit/0b7c4c19002d917a225675089fb58bb46dcdff8d
  Author: Joachim F 
  Date:   2017-06-17 (Sat, 17 Jun 2017)

  Changed paths:
M nixos/modules/tasks/network-interfaces.nix

  Log Message:
  ---
  Merge pull request #26170 from kirelagin/wlan-fix

wirelessInterfaces: Add a missing parameter


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

[Nix-commits] [NixOS/nixpkgs] a071a0: quiterss: 0.18.4 -> 0.18.5

2017-06-17 Thread Michael Weiss

  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: a071a06c61ff112f102d98f8ff4e29c1084f04fc
  
https://github.com/NixOS/nixpkgs/commit/a071a06c61ff112f102d98f8ff4e29c1084f04fc
  Author: Michael Weiss 
  Date:   2017-06-17 (Sat, 17 Jun 2017)

  Changed paths:
M pkgs/applications/networking/newsreaders/quiterss/default.nix

  Log Message:
  ---
  quiterss: 0.18.4 -> 0.18.5


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

[Nix-commits] [NixOS/nixpkgs] e3d49b: imagemagick7: 7.0.5-7 -> 7.0.6-0

2017-06-17 Thread Franz Pletz

  Branch: refs/heads/release-17.03
  Home:   https://github.com/NixOS/nixpkgs
  Commit: e3d49bb40916023bd6e3100455220ca31a448e87
  
https://github.com/NixOS/nixpkgs/commit/e3d49bb40916023bd6e3100455220ca31a448e87
  Author: Franz Pletz 
  Date:   2017-06-17 (Sat, 17 Jun 2017)

  Changed paths:
M pkgs/applications/graphics/ImageMagick/7.0.nix

  Log Message:
  ---
  imagemagick7: 7.0.5-7 -> 7.0.6-0

(cherry picked from commit 9be1951a8ad67d1433b794de191688fb22d5a14a)


  Commit: b9d7a4a9361760314e7f384dc250137b46b4bdcc
  
https://github.com/NixOS/nixpkgs/commit/b9d7a4a9361760314e7f384dc250137b46b4bdcc
  Author: Jan Malakhovski 
  Date:   2017-06-17 (Sat, 17 Jun 2017)

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

  Log Message:
  ---
  ImageMagick: 6.9.8-6 -> 6.9.8-9

(cherry picked from commit 66963789118f131deae8554a9b3e7ab527654e9d)


  Commit: ba6654f137f3e9e5230f67a331d9cd6e8d86794f
  
https://github.com/NixOS/nixpkgs/commit/ba6654f137f3e9e5230f67a331d9cd6e8d86794f
  Author: Franz Pletz 
  Date:   2017-06-17 (Sat, 17 Jun 2017)

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

  Log Message:
  ---
  imagemagick: 6.9.8-9 -> 6.9.8-10

(cherry picked from commit 5f803db91f15bb99e8c78cca6d993c60ad5864bd)


  Commit: 4ba5d813cb34c73550546c58a6dce1571218a81b
  
https://github.com/NixOS/nixpkgs/commit/4ba5d813cb34c73550546c58a6dce1571218a81b
  Author: Franz Pletz 
  Date:   2017-06-17 (Sat, 17 Jun 2017)

  Changed paths:
M pkgs/os-specific/linux/spl/default.nix
M pkgs/os-specific/linux/zfs/default.nix

  Log Message:
  ---
  kernelPackages.zfs: 0.6.5.9 -> 0.6.5.10

(cherry picked from commit de74d2015fa551c36cc250b196bc9f0d97f73f2d)


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

[Nix-commits] [NixOS/nixpkgs] 9be195: imagemagick7: 7.0.5-7 -> 7.0.6-0

2017-06-17 Thread Franz Pletz

  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 9be1951a8ad67d1433b794de191688fb22d5a14a
  
https://github.com/NixOS/nixpkgs/commit/9be1951a8ad67d1433b794de191688fb22d5a14a
  Author: Franz Pletz 
  Date:   2017-06-17 (Sat, 17 Jun 2017)

  Changed paths:
M pkgs/applications/graphics/ImageMagick/7.0.nix

  Log Message:
  ---
  imagemagick7: 7.0.5-7 -> 7.0.6-0


  Commit: 5f803db91f15bb99e8c78cca6d993c60ad5864bd
  
https://github.com/NixOS/nixpkgs/commit/5f803db91f15bb99e8c78cca6d993c60ad5864bd
  Author: Franz Pletz 
  Date:   2017-06-17 (Sat, 17 Jun 2017)

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

  Log Message:
  ---
  imagemagick: 6.9.8-9 -> 6.9.8-10


  Commit: de74d2015fa551c36cc250b196bc9f0d97f73f2d
  
https://github.com/NixOS/nixpkgs/commit/de74d2015fa551c36cc250b196bc9f0d97f73f2d
  Author: Franz Pletz 
  Date:   2017-06-17 (Sat, 17 Jun 2017)

  Changed paths:
M pkgs/os-specific/linux/spl/default.nix
M pkgs/os-specific/linux/zfs/default.nix

  Log Message:
  ---
  kernelPackages.zfs: 0.6.5.9 -> 0.6.5.10


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

[Nix-commits] [NixOS/nixpkgs] 0d9208: at: Don't set fancy bits on install

2017-06-17 Thread Vladimír Čunát

  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 0d92084f756032ae7f23ebed9873a2a5cd15d16f
  
https://github.com/NixOS/nixpkgs/commit/0d92084f756032ae7f23ebed9873a2a5cd15d16f
  Author: Will Dietz 
  Date:   2017-06-16 (Fri, 16 Jun 2017)

  Changed paths:
M pkgs/tools/system/at/install.patch

  Log Message:
  ---
  at: Don't set fancy bits on install


  Commit: 3d5409ac970d624e5c75708e0176ca2e8b3b59b9
  
https://github.com/NixOS/nixpkgs/commit/3d5409ac970d624e5c75708e0176ca2e8b3b59b9
  Author: Will Dietz 
  Date:   2017-06-16 (Fri, 16 Jun 2017)

  Changed paths:
M pkgs/tools/system/cron/default.nix

  Log Message:
  ---
  cron: don't set special permissions


  Commit: 714cd37b2150407960305d789d759d5191750b51
  
https://github.com/NixOS/nixpkgs/commit/714cd37b2150407960305d789d759d5191750b51
  Author: Will Dietz 
  Date:   2017-06-16 (Fri, 16 Jun 2017)

  Changed paths:
M pkgs/tools/system/logcheck/default.nix

  Log Message:
  ---
  logcheck: Don't set special permissions


  Commit: 4d57153659a2c3a47aa297a396f04a6c62d6efbb
  
https://github.com/NixOS/nixpkgs/commit/4d57153659a2c3a47aa297a396f04a6c62d6efbb
  Author: Will Dietz 
  Date:   2017-06-16 (Fri, 16 Jun 2017)

  Changed paths:
M pkgs/tools/security/logkeys/default.nix

  Log Message:
  ---
  logkeys: Don't chmod u+s


  Commit: 98b2e4816f0f2d638268f896bd79c69c28a4fe77
  
https://github.com/NixOS/nixpkgs/commit/98b2e4816f0f2d638268f896bd79c69c28a4fe77
  Author: Will Dietz 
  Date:   2017-06-16 (Fri, 16 Jun 2017)

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

  Log Message:
  ---
  udevil: minor cleanup, fix setuid/setgid problems


  Commit: b6caf109897f5860999d73680048640fd8525776
  
https://github.com/NixOS/nixpkgs/commit/b6caf109897f5860999d73680048640fd8525776
  Author: Will Dietz 
  Date:   2017-06-16 (Fri, 16 Jun 2017)

  Changed paths:
M pkgs/games/xconq/default.nix

  Log Message:
  ---
  xconq: don't set special perms on install


  Commit: 5d0a8792a745418b7f47b82c8ad32acee58a069d
  
https://github.com/NixOS/nixpkgs/commit/5d0a8792a745418b7f47b82c8ad32acee58a069d
  Author: Will Dietz 
  Date:   2017-06-16 (Fri, 16 Jun 2017)

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

  Log Message:
  ---
  uucp: Don't chown to 'uucp' user, don't set special perms


  Commit: 8098e4048bbce82e37603199c56334213e103b91
  
https://github.com/NixOS/nixpkgs/commit/8098e4048bbce82e37603199c56334213e103b91
  Author: Will Dietz 
  Date:   2017-06-16 (Fri, 16 Jun 2017)

  Changed paths:
M pkgs/tools/security/super/default.nix

  Log Message:
  ---
  super: Don't set special perms, don't chown to root


  Commit: 479d9f9cd321910d49f2803f200042dde1c1a8ab
  
https://github.com/NixOS/nixpkgs/commit/479d9f9cd321910d49f2803f200042dde1c1a8ab
  Author: Will Dietz 
  Date:   2017-06-16 (Fri, 16 Jun 2017)

  Changed paths:
M pkgs/games/xsokoban/default.nix

  Log Message:
  ---
  xsokoban: Don't set special bits on install


  Commit: 7270b9b425af84a287ed25ae6b976e3dd48696f8
  
https://github.com/NixOS/nixpkgs/commit/7270b9b425af84a287ed25ae6b976e3dd48696f8
  Author: Will Dietz 
  Date:   2017-06-16 (Fri, 16 Jun 2017)

  Changed paths:
M pkgs/os-specific/linux/rewritefs/default.nix

  Log Message:
  ---
  rewritefs: Don't attempt to set special bits


  Commit: b20b2af59fead38ef5d7839580de95106663cbbc
  
https://github.com/NixOS/nixpkgs/commit/b20b2af59fead38ef5d7839580de95106663cbbc
  Author: Will Dietz 
  Date:   2017-06-16 (Fri, 16 Jun 2017)

  Changed paths:
M pkgs/games/unnethack/default.nix

  Log Message:
  ---
  unnethack: override GAMEPERM to not include special bits


  Commit: bb1e0b51de9f40639fd4b4fca57421d72fb86df7
  
https://github.com/NixOS/nixpkgs/commit/bb1e0b51de9f40639fd4b4fca57421d72fb86df7
  Author: Will Dietz 
  Date:   2017-06-16 (Fri, 16 Jun 2017)

  Changed paths:
M pkgs/servers/computing/torque/default.nix

  Log Message:
  ---
  torque: Patch out attempts to set special bits


  Commit: 7eaa7adf4e7f3e32be85dcf3bd34ffd6b4cf23be
  
https://github.com/NixOS/nixpkgs/commit/7eaa7adf4e7f3e32be85dcf3bd34ffd6b4cf23be
  Author: Will Dietz 
  Date:   2017-06-16 (Fri, 16 Jun 2017)

  Changed paths:
M pkgs/shells/rssh/default.nix

  Log Message:
  ---
  rssh: don't set special bits


  Commit: 5e9edcfebefb09fd208c195856b073a4e5769248
  
https://github.com/NixOS/nixpkgs/commit/5e9edcfebefb09fd208c195856b073a4e5769248
  Author: Will Dietz 
  Date:   2017-06-16 (Fri, 16 Jun 2017)

  Changed paths:
M pkgs/servers/http/hiawatha/default.nix

  Log Message:
  ---
  hiawatha: Don't ask cmake to install w/setuid perms


  Commit: 794a4a5ce58dea4f164c53db601ef1af3bc8b2e1
  
https://github.com/NixOS/nixpkgs/commit/794a4a5ce58dea4f164c53db601ef1af3bc8b2e1
  Author: Will Dietz 
  Date:   2017-06

[Nix-commits] [NixOS/nixpkgs] 0d4431: fakeroot: apply patch to ignore EINVAL errors as w...

2017-06-17 Thread Piotr Bogdan

  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 0d4431cfe90b2242723ccb1ccc90714f2f68a609
  
https://github.com/NixOS/nixpkgs/commit/0d4431cfe90b2242723ccb1ccc90714f2f68a609
  Author: Piotr Bogdan 
  Date:   2017-06-17 (Sat, 17 Jun 2017)

  Changed paths:
M pkgs/tools/system/fakeroot/default.nix
A pkgs/tools/system/fakeroot/einval.patch

  Log Message:
  ---
  fakeroot: apply patch to ignore EINVAL errors as well

Fixes #25901 the nixos.ova job.  See the referred links.


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

[Nix-commits] [NixOS/nixpkgs] f094fa: flashplayer: 26.0.0.126 -> 26.0.0.131

2017-06-17 Thread Jörg Thalheim

  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: f094fad7a9ea9a99d853b56c0eff937caffbcedb
  
https://github.com/NixOS/nixpkgs/commit/f094fad7a9ea9a99d853b56c0eff937caffbcedb
  Author: taku0 
  Date:   2017-06-17 (Sat, 17 Jun 2017)

  Changed paths:
M pkgs/applications/networking/browsers/chromium/plugins.nix
M 
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
M 
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix

  Log Message:
  ---
  flashplayer: 26.0.0.126 -> 26.0.0.131


  Commit: 05547dbcb419acb76126135bb51bf7cb1279ec72
  
https://github.com/NixOS/nixpkgs/commit/05547dbcb419acb76126135bb51bf7cb1279ec72
  Author: Jörg Thalheim 
  Date:   2017-06-17 (Sat, 17 Jun 2017)

  Log Message:
  ---
  Merge pull request #26664 from taku0/flashplayer-26.0.0.131

flashplayer: 26.0.0.126 -> 26.0.0.131


Compare: https://github.com/NixOS/nixpkgs/compare/481cf50b1f4e...05547dbcb419___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] [NixOS/nixpkgs] d036d8: ocamlPackages.containers: 0.22 -> 1.2

2017-06-17 Thread Jörg Thalheim

  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: d036d882965989f38a9a414a3f34b692d146bdf6
  
https://github.com/NixOS/nixpkgs/commit/d036d882965989f38a9a414a3f34b692d146bdf6
  Author: regnat 
  Date:   2017-06-16 (Fri, 16 Jun 2017)

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

  Log Message:
  ---
  ocamlPackages.containers: 0.22 -> 1.2


  Commit: 481cf50b1f4ecd2283131a494f1d269f07b2b3be
  
https://github.com/NixOS/nixpkgs/commit/481cf50b1f4ecd2283131a494f1d269f07b2b3be
  Author: Jörg Thalheim 
  Date:   2017-06-17 (Sat, 17 Jun 2017)

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

  Log Message:
  ---
  Merge pull request #26619 from regnat/ocaml-containers

ocamlPackages.containers: 0.22 -> 1.2


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

[Nix-commits] [NixOS/nixpkgs] a889c4: Merge #26657: nixos security.wrappers: fix a typo

2017-06-17 Thread Vladimír Čunát

  Branch: refs/heads/release-17.03
  Home:   https://github.com/NixOS/nixpkgs
  Commit: a889c4c379f489d8cd1cbb87b64351a8d95508a8
  
https://github.com/NixOS/nixpkgs/commit/a889c4c379f489d8cd1cbb87b64351a8d95508a8
  Author: Vladimír Čunát 
  Date:   2017-06-17 (Sat, 17 Jun 2017)

  Changed paths:
M nixos/modules/security/wrappers/default.nix

  Log Message:
  ---
  Merge #26657: nixos security.wrappers: fix a typo

Fixes #26611.

(cherry picked from commit c416641d4d1de6ac6db350974abc350cc774badc)


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

[Nix-commits] [NixOS/nixpkgs] 5ca644: Fixing attribute name mistake: setguid => setgid

2017-06-17 Thread Vladimír Čunát

  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 5ca644c22876866751e653b0f15928a7d32bf9fc
  
https://github.com/NixOS/nixpkgs/commit/5ca644c22876866751e653b0f15928a7d32bf9fc
  Author: Parnell Springmeyer 
  Date:   2017-06-15 (Thu, 15 Jun 2017)

  Changed paths:
M nixos/modules/security/wrappers/default.nix

  Log Message:
  ---
  Fixing attribute name mistake: setguid => setgid


  Commit: c416641d4d1de6ac6db350974abc350cc774badc
  
https://github.com/NixOS/nixpkgs/commit/c416641d4d1de6ac6db350974abc350cc774badc
  Author: Vladimír Čunát 
  Date:   2017-06-17 (Sat, 17 Jun 2017)

  Changed paths:
M nixos/modules/security/wrappers/default.nix

  Log Message:
  ---
  Merge #26657: nixos security.wrappers: fix a typo

Fixes #26611.


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

[Nix-commits] [NixOS/nixpkgs] fdef88: ply: init at v1-beta1(9e810b1)

2017-06-17 Thread Vladimír Čunát

  Branch: refs/heads/staging
  Home:   https://github.com/NixOS/nixpkgs
  Commit: fdef885d9769fe619e1f9b7bc780047cd2e01fa3
  
https://github.com/NixOS/nixpkgs/commit/fdef885d9769fe619e1f9b7bc780047cd2e01fa3
  Author: Susan Potter 
  Date:   2017-06-14 (Wed, 14 Jun 2017)

  Changed paths:
A pkgs/os-specific/linux/ply/default.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  ply: init at v1-beta1(9e810b1)


  Commit: f5d98e8e18067fd5980704a04bd44c68514f6778
  
https://github.com/NixOS/nixpkgs/commit/f5d98e8e18067fd5980704a04bd44c68514f6778
  Author: Jörg Thalheim 
  Date:   2017-06-15 (Thu, 15 Jun 2017)

  Changed paths:
M pkgs/os-specific/linux/ply/default.nix

  Log Message:
  ---
  ply: fix build


  Commit: 60183a11775014f7487fe8c9715b0333824bb22a
  
https://github.com/NixOS/nixpkgs/commit/60183a11775014f7487fe8c9715b0333824bb22a
  Author: Guillaume Koenig 
  Date:   2017-06-16 (Fri, 16 Jun 2017)

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

  Log Message:
  ---
  gtk3: install gtk-launch


  Commit: d990d618c0ad555ed222bf453adb1c82c20f809c
  
https://github.com/NixOS/nixpkgs/commit/d990d618c0ad555ed222bf453adb1c82c20f809c
  Author: Tim Steinbach 
  Date:   2017-06-16 (Fri, 16 Jun 2017)

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

  Log Message:
  ---
  atom: 1.17.2 -> 1.18.0


  Commit: ef2f34d3d7693df68829aa3cc8f47a12ab9fd919
  
https://github.com/NixOS/nixpkgs/commit/ef2f34d3d7693df68829aa3cc8f47a12ab9fd919
  Author: Tim Steinbach 
  Date:   2017-06-16 (Fri, 16 Jun 2017)

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

  Log Message:
  ---
  kotlin: 1.1.2 -> 1.1.2-5


  Commit: 6383a544406cb3642658113fbda160830b573912
  
https://github.com/NixOS/nixpkgs/commit/6383a544406cb3642658113fbda160830b573912
  Author: Bart Brouns 
  Date:   2017-06-16 (Fri, 16 Jun 2017)

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

  Log Message:
  ---
  Ardour: 5.8 -> 5.10


  Commit: fc0a4a52f9d08051e78abfac927f75591f054bfe
  
https://github.com/NixOS/nixpkgs/commit/fc0a4a52f9d08051e78abfac927f75591f054bfe
  Author: Bart Brouns 
  Date:   2017-06-16 (Fri, 16 Jun 2017)

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

  Log Message:
  ---
  clipster: 2017-02-27 -> 1.0.1


  Commit: b1928704d440f6c2ec36444d709c340dd1dec469
  
https://github.com/NixOS/nixpkgs/commit/b1928704d440f6c2ec36444d709c340dd1dec469
  Author: Volth 
  Date:   2017-06-16 (Fri, 16 Jun 2017)

  Changed paths:
A pkgs/development/tools/build-managers/sbt/scala-native.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  sbt: support build scala-native targets


  Commit: e0c1c51d738304e7851a547a992e0fc27d2a45c8
  
https://github.com/NixOS/nixpkgs/commit/e0c1c51d738304e7851a547a992e0fc27d2a45c8
  Author: Simon Lackerbauer 
  Date:   2017-06-16 (Fri, 16 Jun 2017)

  Changed paths:
A pkgs/games/ltris/default.nix
A pkgs/games/ltris/gcc5_compliance.diff
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  ltris: init at 1.0.19


  Commit: c4037ee92b7722cd2f2577d12bb87f36d12f9ff0
  
https://github.com/NixOS/nixpkgs/commit/c4037ee92b7722cd2f2577d12bb87f36d12f9ff0
  Author: Jörg Thalheim 
  Date:   2017-06-16 (Fri, 16 Jun 2017)

  Changed paths:
A pkgs/os-specific/linux/ply/default.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  Merge pull request #26583 from mbbx6spp/init-ply-package

ply: init at v1-beta1(9e810b1)


  Commit: 61feffbe57ca49211024ed1f0b507185fd7a49d7
  
https://github.com/NixOS/nixpkgs/commit/61feffbe57ca49211024ed1f0b507185fd7a49d7
  Author: Jörg Thalheim 
  Date:   2017-06-16 (Fri, 16 Jun 2017)

  Changed paths:
A pkgs/games/ltris/default.nix
A pkgs/games/ltris/gcc5_compliance.diff
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  Merge pull request #26652 from ciil/ltris

ltris: init at 1.0.19


  Commit: e9c0d5f1ba75b37b00f7d518d45990fa82ae757f
  
https://github.com/NixOS/nixpkgs/commit/e9c0d5f1ba75b37b00f7d518d45990fa82ae757f
  Author: Jörg Thalheim 
  Date:   2017-06-16 (Fri, 16 Jun 2017)

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

  Log Message:
  ---
  Merge pull request #26649 from magnetophon/clipster

clipster: 2017-02-27 -> 1.0.1


  Commit: b40cda750bd6827a1669a3766a7edd2b863732c3
  
https://github.com/NixOS/nixpkgs/commit/b40cda750bd6827a1669a3766a7edd2b863732c3
  Author: Jörg Thalheim 
  Date:   2017-06-16 (Fri, 16 Jun 2017)

  Changed paths:
A pkgs/development/tools/build-managers/sbt/scala-native.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  Merge pull request #26656 from volth/sbt-with-scala-native

sbt: support scala-native


  Commit: 5b0a370f3f41c7a49d160c20836c112a40889706
  
https://github.com/NixOS/nixpkgs/commit/5b0a370f3f41c7a49d16

Re: [Nix-dev] conflicting packages / priority values

2017-06-17 Thread Layus

When you get too many such conflicts, you are probably looking for 
virtual environments.
These are provided by nix-shell, and allow to temporarilly override the 
set of available, installed applications.


Looking at your example, a clash between two different git's at the same 
version is very weird...


-- Layus.

On 17/06/17 05:14, Roger Qiu wrote:
I wonder in other programming languages, name clashes are usually 
resolved through aliasing. Would it be possible for nix to install 
packages while aliasing their outputs to a different name to avoid 
clashes like this?


On 17 Jun 2017 09:07, "Roni Choudhury" > wrote:


From time to time I see an error message like this:

|collision between
‘/nix/store/qs8fq5ld2shc0i3fvbs6n0g0k8fypndm-git-2.13.0/bin/git’
and
‘/nix/store/64fjdb4whkf2r5x8xyqf9kkljnk6w59b-git-2.13.0/bin/git’;
use ‘nix-env --set-flag priority NUMBER PKGNAME’ to change the
priority of one of the conflicting packages |

I understand what causes it (two packages competing to place the
same, e.g., binaries in my profile), but I’ve never understood how
to resolve it. Usually I just guess priority numbers until it
works; more lately I’ve simply removed the offending package from
my environment before repeating the failing install command.
Obviously, neither approach is healthy or correct :)

The man page for |nix-env| contains the following:

If there are multiple derivations matching a name in args that
have the same name (e.g., gcc-3.3.6 and gcc-4.1.1), then the
derivation with the highest priority is used. A derivation can
define a priority by declaring the meta.priority attribute.
This attribute should be a number, with a higher value
denoting a lower priority. The default priority is 0.

But I’m still not sure what this means for my error situation. How
do I know what the priorities are for the different packages? The
default value is 0, which is the highest priority; what does that
mean exactly, for the default priority to be the highest priority?

Is there a more intuitive way to resolve this sort of conflict?
For instance, is there a way to tell |nix-env| to force the issue
by treating the requested package as higher priority than any
existing ones?

Thanks!

roni



___
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



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

Re: [Nix-dev] conflicting packages / priority values

2017-06-17 Thread Roger Qiu

Yes something like that but without too much fanfare. A standard nix
function encapsulating this aliasing logic and expose it to user space with
nix-env too.

On 17 Jun 2017 16:25, "James Cook"  wrote:

> Roger, I'm not sure what you're suggesting. Do you mean that the user's
> configuration would explicitly say "include pkgs.someAlternateGitVersion in
> my profile, but rename /bin/git to /bin/gitB"?
>
> As a starting point, I guess you could do that manually by making a new
> expression with a build script like cp -r "$git" "$out"; mv "$out/bin/git"
> "$out/bin/gitB".
>
> On 17 June 2017 at 03:14, Roger Qiu  wrote:
>
>> I wonder in other programming languages, name clashes are usually
>> resolved through aliasing. Would it be possible for nix to install packages
>> while aliasing their outputs to a different name to avoid clashes like this?
>>
>> On 17 Jun 2017 09:07, "Roni Choudhury"  wrote:
>>
>>> From time to time I see an error message like this:
>>>
>>> collision between 
>>> ‘/nix/store/qs8fq5ld2shc0i3fvbs6n0g0k8fypndm-git-2.13.0/bin/git’ and 
>>> ‘/nix/store/64fjdb4whkf2r5x8xyqf9kkljnk6w59b-git-2.13.0/bin/git’; use 
>>> ‘nix-env --set-flag priority NUMBER PKGNAME’ to change the priority of one 
>>> of the conflicting packages
>>>
>>> I understand what causes it (two packages competing to place the same,
>>> e.g., binaries in my profile), but I’ve never understood how to resolve it.
>>> Usually I just guess priority numbers until it works; more lately I’ve
>>> simply removed the offending package from my environment before repeating
>>> the failing install command. Obviously, neither approach is healthy or
>>> correct :)
>>>
>>> The man page for nix-env contains the following:
>>>
>>> If there are multiple derivations matching a name in args that have the
>>> same name (e.g., gcc-3.3.6 and gcc-4.1.1), then the derivation with the
>>> highest priority is used. A derivation can define a priority by declaring
>>> the meta.priority attribute. This attribute should be a number, with a
>>> higher value denoting a lower priority. The default priority is 0.
>>>
>>> But I’m still not sure what this means for my error situation. How do I
>>> know what the priorities are for the different packages? The default value
>>> is 0, which is the highest priority; what does that mean exactly, for the
>>> default priority to be the highest priority?
>>>
>>> Is there a more intuitive way to resolve this sort of conflict? For
>>> instance, is there a way to tell nix-env to force the issue by treating
>>> the requested package as higher priority than any existing ones?
>>>
>>> Thanks!
>>>
>>> roni
>>> 
>>>
>>> ___
>>> 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
>>
>>
>
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-dev

Re: [Nix-dev] drone and nix (sort of solved)

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

[Nix-commits] [NixOS/nixpkgs] 7e10ec: chromium: Allow to put extensions in system path

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

[Nix-commits] [NixOS/nixpkgs] 63b8d6: syncthing-inotify: 0.8.5 -> 0.8.6

[Nix-commits] [NixOS/nixpkgs] b4b698: qstopmotion: init -> 2.3.2

[Nix-commits] [NixOS/nixpkgs] ec65ef: cockroachdb: beta-20160915 -> v1.0.2

Re: [Nix-dev] Trying to install the SailfishOS SDK

[Nix-commits] [NixOS/nixpkgs] 351b59: cairo: bugfix 1.14.8 -> 1.14.10

[Nix-commits] [NixOS/nixpkgs] dd99d1: ghcHEAD: Split docs into their own output

[Nix-commits] [NixOS/nixpkgs] 9560fc: curl: 7.54.0 -> 7.54.1

[Nix-commits] [NixOS/nixpkgs] a4a0f3: gradle: 3.5 -> 4.0

[Nix-commits] [NixOS/nixpkgs] 858c47: Manual: Add paragraph on xserver keyboard layout

[Nix-commits] [NixOS/nixpkgs] 16118f: libreoffice: fix #25831

[Nix-commits] [NixOS/nixpkgs] 4e8d44: feh: build and install man pages

[Nix-commits] [NixOS/nixpkgs] d6e946: atlassian-confluence: 6.1.1 -> 6.2.2

[Nix-commits] [NixOS/nixpkgs] d5ac9b: linux: 4.11.5 -> 4.11.6

[Nix-commits] [NixOS/nixpkgs] c973a4: linux: 4.11.5 -> 4.11.6

[Nix-commits] [NixOS/nixpkgs] df7d0b: chromium: apply patch to fix chromecast

[Nix-commits] [NixOS/nixpkgs] af4056: chromium: apply patch to fix chromecast

[Nix-commits] [NixOS/nixpkgs] b1f56b: wirelessInterfaces: Add a missing parameter

[Nix-commits] [NixOS/nixpkgs] a071a0: quiterss: 0.18.4 -> 0.18.5

[Nix-commits] [NixOS/nixpkgs] e3d49b: imagemagick7: 7.0.5-7 -> 7.0.6-0

[Nix-commits] [NixOS/nixpkgs] 9be195: imagemagick7: 7.0.5-7 -> 7.0.6-0

[Nix-commits] [NixOS/nixpkgs] 0d9208: at: Don't set fancy bits on install

[Nix-commits] [NixOS/nixpkgs] 0d4431: fakeroot: apply patch to ignore EINVAL errors as w...

[Nix-commits] [NixOS/nixpkgs] f094fa: flashplayer: 26.0.0.126 -> 26.0.0.131

[Nix-commits] [NixOS/nixpkgs] d036d8: ocamlPackages.containers: 0.22 -> 1.2

[Nix-commits] [NixOS/nixpkgs] a889c4: Merge #26657: nixos security.wrappers: fix a typo

[Nix-commits] [NixOS/nixpkgs] 5ca644: Fixing attribute name mistake: setguid => setgid

[Nix-commits] [NixOS/nixpkgs] fdef88: ply: init at v1-beta1(9e810b1)

Re: [Nix-dev] conflicting packages / priority values

Re: [Nix-dev] conflicting packages / priority values

33 matches

Site Navigation

Mail list logo

Footer information