Re: [Nix-dev] Using system.autoUpgrade with a git channel

2017-07-08 Thread John Ramsden via nix-dev
Cool, might have to do some experimenting.

--
  John Ramsden


On Fri, Jul 7, 2017, at 08:35 PM, Danylo Hlynskyi wrote:
> I've seen this in a wild
> 
>  system.autoUpgrade.enable = true;
> system.autoUpgrade.flags = lib.mkForce
>   [ "--no-build-output"
> "-I" "nixpkgs=/etc/nixos/nixpkgs-channels"
>   ];
> systemd.services.nixos-upgrade.path = [ pkgs.git ];
> systemd.services.nixos-upgrade.preStart = ''
>   cd /etc/nixos/nixpkgs-channels
>   ${pkgs.git}/bin/git pull
> '';
> 
> 
> 
> https://github.com/garbas/dotfiles/blob/a76e12166efa57edded8c381074104fefe5c7da6/nixos/floki.nix#L27-L36>
>  
> 2017-07-07 9:36 GMT+03:00 John Ramsden via nix-dev 
> :>> Thanks that's helpful. In other words if I'm 
> using a checked out git>>  repository I'm no longer able to use 
> 'system.autoUpgrade'.
>> 
>>  --
>>John Ramsden
>> 
>> On Thu, Jul 6, 2017, at 10:56 PM, Vladimír Čunát wrote:
>>  > On 07/07/2017 01:46 AM, John Ramsden via nix-dev wrote:
>>  > > I was also wondering what exactly the 'nixos-rebuild switch' 
>> command's>>  > > '--upgrade' flag does.
>>  >
>>  > It does
>>  > $ nix-channel --update nixos
>>  > Best see the source if you want details, as it's relatively simple:>>  > 
>> https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/installer/tools/nixos-rebuild.sh#L197>>
>>   >
>>  > --Vladimir
>>  ___
>>  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] Call For Testers: Multi-User Nix Installer for Darwin

2017-07-08 Thread Graham Christensen via nix-dev

Hello everyone,

tl;dr: If you have a macOS computer with Nix, please test my new
installer! Remember, if you don't like the daemon, it is easy to
uninstall again, and go back to without a daemon! Please test! Link at
the end.

I wrote an extensive, thorough, and almost always correct installer for
Darwin (macOS.)

There is no middle point of having a single-user Nix installation. It
doesn't use the default single-user nix install.sh, instead I read the
source to the single-user installer, nixos-install, and the various
NixOS modules that handle installing and configuring Nix on NixOS. 

While the script works flawlessly for me every time I use it, I'd very
much like to have other experienced Nix users test it, before inflicting
it upon newbies. Note: You have to uninstall any nix already installed,
prior to testing the installer. The installer guides you on how to do
this. Remember, at the end it is easy to uninstall again, and go back to
without a daemon! Please test! 

Thus far no user has run in to a problem they couldn't easily fix, and
every time the installer was updated to account for it. I'm tracking
successfull installations here:
https://gitlab.com/grahamc/mac-nix-multi-user/issues/2 

Here is an issue discussing replacing the Darwin installer with this
script: https://github.com/NixOS/nix/issues/1061#issuecomment-313850400

TLDR Here is the installer, please test:
https://gitlab.com/grahamc/mac-nix-multi-user/blob/master/install.sh

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


[Nix-dev] [***SPAM***] re2c fix build

2017-07-08 Thread Karn Kallio via nix-dev

The attached patch fixes the build of the re2c Nixpkgs expression by
adjusting the sourceRoot to account for the unpackFile treatment of a
directory.
>From 39acc883cca970653b7b2fa5ed1c4630b11a1e9d Mon Sep 17 00:00:00 2001
From: Karn Kallio 
Date: Sat, 8 Jul 2017 21:32:17 -0400
Subject: [PATCH] re2c : Fix build by adjusting sourceRoot.

---
 pkgs/development/tools/parsing/re2c/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/parsing/re2c/default.nix b/pkgs/development/tools/parsing/re2c/default.nix
index a70afe5117..6d74656d61 100644
--- a/pkgs/development/tools/parsing/re2c/default.nix
+++ b/pkgs/development/tools/parsing/re2c/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "re2c-${version}";
   version = "0.16";
 
-  sourceRoot = "${name}-src/re2c";
+  sourceRoot = "re2c/re2c";
 
   src = fetchFromGitHub {
 owner = "skvadrik";
-- 
2.13.2

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


[Nix-dev] [***SPAM***] unzipNLS

2017-07-08 Thread Karn Kallio via nix-dev

The unzip Nixpkgs expression does not build with the NLS attribute
selected because the patch conditionally applied conflicts with the
earlier patch [dont-hardcode-cc.patch].

The attached patch fixes the build by increasing the patch fuzz to the
size of the context.
>From 67ebd468d2780affe665308151607d00a3766d50 Mon Sep 17 00:00:00 2001
From: Karn Kallio 
Date: Sat, 8 Jul 2017 21:58:43 -0400
Subject: [PATCH] unzipNLS : Fix build by removing patch fuzz.

---
 pkgs/tools/archivers/unzip/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/archivers/unzip/default.nix b/pkgs/tools/archivers/unzip/default.nix
index 896cdd5097..a35e473ec3 100644
--- a/pkgs/tools/archivers/unzip/default.nix
+++ b/pkgs/tools/archivers/unzip/default.nix
@@ -13,6 +13,8 @@ stdenv.mkDerivation {
 
   hardeningDisable = [ "format" ];
 
+  patchFlags = "-p1 -F3";
+
   patches = [
 ./CVE-2014-8139.diff
 ./CVE-2014-8140.diff
-- 
2.13.2

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