date:20161011

[Nix-commits] [NixOS/nixpkgs] da3684: nixos: make it easy to apply kernel patches

2016-10-11 Thread Charles Strahan

  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: da36847d925058fd86f027b64cc712c57be11ad8
  
https://github.com/NixOS/nixpkgs/commit/da36847d925058fd86f027b64cc712c57be11ad8
  Author: Charles Strahan 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
M lib/trivial.nix
M nixos/modules/system/boot/kernel.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  nixos: make it easy to apply kernel patches

This makes it easy to specify kernel patches:

boot.kernelPatches = [ pkgs.kernelPatches.ubuntu_fan_4_4 ];

To make the `boot.kernelPatches` option possible, this also makes it
easy to extend and/or modify the kernel packages within a linuxPackages
set. For example:

pkgs.linuxPackages.extend (self: super: {
  kernel = super.kernel.override {
  kernelPatches = super.kernel.kernelPatches ++ [
pkgs.kernelPatches.ubuntu_fan_4_4
  ];
  };
});

Closes #15095


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

[Nix-commits] [NixOS/nixpkgs] 697dbb: mariadb: 10.1.17 -> 10.1.18

2016-10-11 Thread Graham Christensen

  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 697dbb9741f4574c541cdbf63c295c20b323d658
  
https://github.com/NixOS/nixpkgs/commit/697dbb9741f4574c541cdbf63c295c20b323d658
  Author: Tim Steinbach 
  Date:   2016-10-09 (Sun, 09 Oct 2016)

  Changed paths:
M pkgs/servers/sql/mariadb/default.nix

  Log Message:
  ---
  mariadb: 10.1.17 -> 10.1.18


  Commit: 9ce4e47bf6acccbb586c8caaf6f2bcf20789ac39
  
https://github.com/NixOS/nixpkgs/commit/9ce4e47bf6acccbb586c8caaf6f2bcf20789ac39
  Author: Graham Christensen 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
M pkgs/servers/sql/mariadb/default.nix

  Log Message:
  ---
  Merge pull request #19408 from NeQuissimus/mariadb_10_1_18

mariadb: 10.1.17 -> 10.1.18


Compare: https://github.com/NixOS/nixpkgs/compare/550df4dc47db...9ce4e47bf6ac___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] [NixOS/nixpkgs] 90947a: grsecurity: 4.7.6-201609301918 -> 4.7.7-2016101019...

2016-10-11 Thread Joachim Fasting

  Branch: refs/heads/release-16.09
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 90947ad911890f542eb4a6a9cd38c029b526ab1e
  
https://github.com/NixOS/nixpkgs/commit/90947ad911890f542eb4a6a9cd38c029b526ab1e
  Author: Joachim Fasting 
  Date:   2016-10-12 (Wed, 12 Oct 2016)

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

  Log Message:
  ---
  grsecurity: 4.7.6-201609301918 -> 4.7.7-201610101902

(cherry picked from commit ce73a3ea0fd40ed8ff9cd875022851b0ddb8708f)


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

[Nix-commits] [NixOS/nixpkgs] 550df4: nixos network: fix evaluation after #19128

2016-10-11 Thread Jörg Thalheim

  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 550df4dc47db5fb2f4911ef318ce941ba22da4f4
  
https://github.com/NixOS/nixpkgs/commit/550df4dc47db5fb2f4911ef318ce941ba22da4f4
  Author: Jörg Thalheim 
  Date:   2016-10-12 (Wed, 12 Oct 2016)

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

  Log Message:
  ---
  nixos network: fix evaluation after #19128


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

[Nix-commits] [NixOS/nixpkgs] 9748c2: pythonPackages.libtmux: 0.5.0 -> 0.6.0

2016-10-11 Thread Jascha Geerds

  Branch: refs/heads/release-16.09
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 9748c2670a444eff5eec429c1021a4932146abc5
  
https://github.com/NixOS/nixpkgs/commit/9748c2670a444eff5eec429c1021a4932146abc5
  Author: Jascha Geerds 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

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

  Log Message:
  ---
  pythonPackages.libtmux: 0.5.0 -> 0.6.0

(cherry picked from commit 289c7cfc6936b3de90fd4c1955fb926f00359014)


  Commit: 4d17d41619344fcdf08df72fdb43886ecc0a4112
  
https://github.com/NixOS/nixpkgs/commit/4d17d41619344fcdf08df72fdb43886ecc0a4112
  Author: Jascha Geerds 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

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

  Log Message:
  ---
  tmuxp: 1.2.0 -> 1.2.2

(cherry picked from commit 30a3a098576fc680f33d196556269a834ee00cc0)


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

[Nix-commits] [NixOS/nixpkgs] 289c7c: pythonPackages.libtmux: 0.5.0 -> 0.6.0

2016-10-11 Thread Jascha Geerds

  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 289c7cfc6936b3de90fd4c1955fb926f00359014
  
https://github.com/NixOS/nixpkgs/commit/289c7cfc6936b3de90fd4c1955fb926f00359014
  Author: Jascha Geerds 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

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

  Log Message:
  ---
  pythonPackages.libtmux: 0.5.0 -> 0.6.0


  Commit: 30a3a098576fc680f33d196556269a834ee00cc0
  
https://github.com/NixOS/nixpkgs/commit/30a3a098576fc680f33d196556269a834ee00cc0
  Author: Jascha Geerds 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

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

  Log Message:
  ---
  tmuxp: 1.2.0 -> 1.2.2


Compare: https://github.com/NixOS/nixpkgs/compare/19c42ee0b7fd...30a3a098576f___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] [NixOS/nixpkgs] d36268: numix-icon-theme: 2016-06-10 -> 2016-10-05

2016-10-11 Thread Jascha Geerds

  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: d36268c47deb8690ee301c3d4c13861b5609efde
  
https://github.com/NixOS/nixpkgs/commit/d36268c47deb8690ee301c3d4c13861b5609efde
  Author: Jascha Geerds 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
M pkgs/data/icons/numix-icon-theme/default.nix

  Log Message:
  ---
  numix-icon-theme: 2016-06-10 -> 2016-10-05


  Commit: 44bb5caf7db6e5e9b314e7efe123c05094e4ab83
  
https://github.com/NixOS/nixpkgs/commit/44bb5caf7db6e5e9b314e7efe123c05094e4ab83
  Author: Jascha Geerds 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
M pkgs/data/icons/numix-icon-theme-circle/default.nix

  Log Message:
  ---
  numix-icon-theme-circle: 2016-06-10 -> 2016-09-27


Compare: https://github.com/NixOS/nixpkgs/compare/39106e757cbd...44bb5caf7db6___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] [NixOS/nixpkgs] 464888: llvm-3.8: Fix lldb build failure due to insecure f...

2016-10-11 Thread Vladimír Čunát

  Branch: refs/heads/release-16.09
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 464888c28cfcf2bc46993eeb3a759bd959460313
  
https://github.com/NixOS/nixpkgs/commit/464888c28cfcf2bc46993eeb3a759bd959460313
  Author: Will Dietz 
  Date:   2016-08-30 (Tue, 30 Aug 2016)

  Changed paths:
M pkgs/development/compilers/llvm/3.8/lldb.nix

  Log Message:
  ---
  llvm-3.8: Fix lldb build failure due to insecure format use.


  Commit: bffa7de808ff7c6d6ee46d498d726232754975e8
  
https://github.com/NixOS/nixpkgs/commit/bffa7de808ff7c6d6ee46d498d726232754975e8
  Author: Will Dietz 
  Date:   2016-08-30 (Tue, 30 Aug 2016)

  Changed paths:
M pkgs/development/compilers/llvm/3.8/clang/default.nix
M pkgs/development/compilers/llvm/3.8/default.nix
M pkgs/development/compilers/llvm/3.8/libc++/default.nix
M pkgs/development/compilers/llvm/3.8/libc++abi.nix
M pkgs/development/compilers/llvm/3.8/lldb.nix
M pkgs/development/compilers/llvm/3.8/llvm.nix

  Log Message:
  ---
  llvm: 3.8 -> 3.8.1


  Commit: 858188bf9b8be7e9ad7c8fcae71e3fbcb1768746
  
https://github.com/NixOS/nixpkgs/commit/858188bf9b8be7e9ad7c8fcae71e3fbcb1768746
  Author: Vladimír Čunát 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
M pkgs/development/compilers/llvm/3.8/clang/default.nix
M pkgs/development/compilers/llvm/3.8/default.nix
M pkgs/development/compilers/llvm/3.8/libc++/default.nix
M pkgs/development/compilers/llvm/3.8/libc++abi.nix
M pkgs/development/compilers/llvm/3.8/lldb.nix
M pkgs/development/compilers/llvm/3.8/llvm.nix

  Log Message:
  ---
  Merge #18130: llvmPackages_38: 3.8.0 -> 3.8.1

(Equivalent master merge: 56e9bbfe6508)


Compare: https://github.com/NixOS/nixpkgs/compare/f2369131cbd0...858188bf9b8b___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] [NixOS/nixpkgs] 7aac81: boto: 2.41.0 -> 2.42.0

2016-10-11 Thread Daiderd Jordan

  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 7aac81d93aa0c733658f36252d6d173428d91653
  
https://github.com/NixOS/nixpkgs/commit/7aac81d93aa0c733658f36252d6d173428d91653
  Author: dipinhora 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

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

  Log Message:
  ---
  boto: 2.41.0 -> 2.42.0


  Commit: 39106e757cbd0d3c9ea227e07e2eec0518865c93
  
https://github.com/NixOS/nixpkgs/commit/39106e757cbd0d3c9ea227e07e2eec0518865c93
  Author: Daiderd Jordan 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

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

  Log Message:
  ---
  Merge pull request #19458 from dipinhora/boto-update

boto: 2.41.0 -> 2.42.0


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

[Nix-commits] [NixOS/nixpkgs] 67d22d: packet-python: init at 1.31

2016-10-11 Thread Daiderd Jordan

  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 67d22db807154418dc7990f99d97cdb6c4de3c16
  
https://github.com/NixOS/nixpkgs/commit/67d22db807154418dc7990f99d97cdb6c4de3c16
  Author: dipinhora 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

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

  Log Message:
  ---
  packet-python: init at 1.31


  Commit: 0dd3f7d4e96a1a971f2b9d28fc47c5b4931408de
  
https://github.com/NixOS/nixpkgs/commit/0dd3f7d4e96a1a971f2b9d28fc47c5b4931408de
  Author: Daiderd Jordan 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

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

  Log Message:
  ---
  Merge pull request #19461 from dipinhora/packet-python

packet-python: init at 1.31


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

[Nix-commits] [NixOS/nixpkgs] 735c1c: fix unstable job evaluation

2016-10-11 Thread Domen Kožar

  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 735c1cacbd01af82ab06f786648dd7024b732666
  
https://github.com/NixOS/nixpkgs/commit/735c1cacbd01af82ab06f786648dd7024b732666
  Author: Domen Kožar 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
M pkgs/top-level/release.nix

  Log Message:
  ---
  fix unstable job evaluation


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

[Nix-commits] [NixOS/nixpkgs] 8a7cb5: pony-stable: init at 2016-10-10

2016-10-11 Thread Peter Simons

  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 8a7cb597aedf0ada6b514e6e1fe89cd919072a9f
  
https://github.com/NixOS/nixpkgs/commit/8a7cb597aedf0ada6b514e6e1fe89cd919072a9f
  Author: dipinhora 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
M lib/maintainers.nix
A pkgs/development/compilers/ponyc/pony-stable.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  pony-stable: init at 2016-10-10


  Commit: 2804067fc8a273d547a626510f766ada5dcca4d8
  
https://github.com/NixOS/nixpkgs/commit/2804067fc8a273d547a626510f766ada5dcca4d8
  Author: Peter Simons 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
M lib/maintainers.nix
A pkgs/development/compilers/ponyc/pony-stable.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  Merge pull request #19462 from dipinhora/pony-stable

pony-stable: init at 2016-10-10


Compare: https://github.com/NixOS/nixpkgs/compare/56e9bbfe6508...2804067fc8a2___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] [NixOS/nixpkgs] 464888: llvm-3.8: Fix lldb build failure due to insecure f...

2016-10-11 Thread Vladimír Čunát

  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 464888c28cfcf2bc46993eeb3a759bd959460313
  
https://github.com/NixOS/nixpkgs/commit/464888c28cfcf2bc46993eeb3a759bd959460313
  Author: Will Dietz 
  Date:   2016-08-30 (Tue, 30 Aug 2016)

  Changed paths:
M pkgs/development/compilers/llvm/3.8/lldb.nix

  Log Message:
  ---
  llvm-3.8: Fix lldb build failure due to insecure format use.


  Commit: bffa7de808ff7c6d6ee46d498d726232754975e8
  
https://github.com/NixOS/nixpkgs/commit/bffa7de808ff7c6d6ee46d498d726232754975e8
  Author: Will Dietz 
  Date:   2016-08-30 (Tue, 30 Aug 2016)

  Changed paths:
M pkgs/development/compilers/llvm/3.8/clang/default.nix
M pkgs/development/compilers/llvm/3.8/default.nix
M pkgs/development/compilers/llvm/3.8/libc++/default.nix
M pkgs/development/compilers/llvm/3.8/libc++abi.nix
M pkgs/development/compilers/llvm/3.8/lldb.nix
M pkgs/development/compilers/llvm/3.8/llvm.nix

  Log Message:
  ---
  llvm: 3.8 -> 3.8.1


  Commit: 56e9bbfe650854f21ff703c39628987fa073b8cc
  
https://github.com/NixOS/nixpkgs/commit/56e9bbfe650854f21ff703c39628987fa073b8cc
  Author: Vladimír Čunát 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
M pkgs/development/compilers/llvm/3.8/clang/default.nix
M pkgs/development/compilers/llvm/3.8/default.nix
M pkgs/development/compilers/llvm/3.8/libc++/default.nix
M pkgs/development/compilers/llvm/3.8/libc++abi.nix
M pkgs/development/compilers/llvm/3.8/lldb.nix
M pkgs/development/compilers/llvm/3.8/llvm.nix

  Log Message:
  ---
  Merge #18130: llvmPackages_38: 3.8.0 -> 3.8.1


Compare: https://github.com/NixOS/nixpkgs/compare/945da0166c5f...56e9bbfe6508___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits

[Nix-dev] PoC: keys in XML files

2016-10-11 Thread Игорь Пашев

Most of Java apps use XML file to store configuration.
The idea is to keep this interface instead of multiple yet
limited number of options, complete set of which you may never know.
Especially with plugins ;-)

So if an app wants XML, it gets it. But since they may include secrets,
we need to deal with that. And the answer is XInclude.

Some apps may support XInclude, others need runtime support (xmllint
--xinclude ...). Anyway, we just write XML files, and extract keys, if
any, at nix evaluation time.

See example for Jenkins:
https://github.com/zalora/nixsap/commit/83e08fdb873016154c2880265b6e08ec653af644
(extracting keys)
https://github.com/zalora/nixsap/commit/1a4d734a4110a05e08b88b539b7ea4939d2d1c36
(Jenkins app)
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev

Re: [Nix-dev] Convert sha1 from base64 into "normal" string

2016-10-11 Thread Игорь Пашев

You must be wondering why :-)

https://github.com/zalora/nixsap/commit/592dee8bef92debede3724bf5ddbf8249c30c488
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev

Re: [Nix-dev] Convert sha1 from base64 into "normal" string

2016-10-11 Thread Игорь Пашев

Updated to fix padding
https://gist.github.com/ip1981/35b660779ad6935338ca5d09bc2f9fca

strBase64:

let

  inherit (builtins)
concatStringsSep genList stringLength substring trace ;

  base64 = {
# n=0; for l in {A..Z} {a..z} {0..9} + /; do printf '"%s" = %2s; '
$l $n; (( n++ )); (( n % 8 )) || echo; done
"A" =  0; "B" =  1; "C" =  2; "D" =  3; "E" =  4; "F" =  5; "G" =
6; "H" =  7;
"I" =  8; "J" =  9; "K" = 10; "L" = 11; "M" = 12; "N" = 13; "O" =
14; "P" = 15;
"Q" = 16; "R" = 17; "S" = 18; "T" = 19; "U" = 20; "V" = 21; "W" =
22; "X" = 23;
"Y" = 24; "Z" = 25; "a" = 26; "b" = 27; "c" = 28; "d" = 29; "e" =
30; "f" = 31;
"g" = 32; "h" = 33; "i" = 34; "j" = 35; "k" = 36; "l" = 37; "m" =
38; "n" = 39;
"o" = 40; "p" = 41; "q" = 42; "r" = 43; "s" = 44; "t" = 45; "u" =
46; "v" = 47;
"w" = 48; "x" = 49; "y" = 50; "z" = 51; "0" = 52; "1" = 53; "2" =
54; "3" = 55;
"4" = 56; "5" = 57; "6" = 58; "7" = 59; "8" = 60; "9" = 61; "+" =
62; "/" = 63;
  };

  quartet_to_int24 = q:
# https://en.wikipedia.org/wiki/Base64
let
  s = n: assert (stringLength q == 4); substring (3 - n) 1 q;
  d = n: base64.${s n};
in if s 0 != "=" then
64 * (64 * (64 * (d 3) + (d 2)) + (d 1)) + (d 0)
  else if s 1 != "=" then
64 * (64 * (64 * (d 3) + (d 2)) + (d 1)) / 256 # right shift by 8 bits
  else
64 * (64 * (64 * (d 3) + (d 2))) / 65536 # right shift by 16 bits
  ;

  int24_to_hex = i: # 16777215 (0xFF, 2^24-1) max
let
  hex = "0123456789abcdef";
  toHex = n:
let
  d = n / 16;
  r = n - 16 * d;
in "${if d != 0 then toHex d else ""}${substring r 1 hex}";
in assert (0 <= i && i <= 16777215); toHex i;

  quartets = s:
let
  l = stringLength s;
  h = substring 0 4 s;
  t = substring 4 (l - 4) s;
in [h] ++ (if t != "" then quartets t else []);


  quartet_to_hex = q: # base64 quartet into hex with padding
let
  i = quartet_to_int24 q;
  h = int24_to_hex i;
  s = if substring 2 1 q == "=" then 1
  else if substring 3 1 q == "=" then 2
  else 3; # number of bytes
  w = s * 2; # number of hexadecimal digits
  filler = concatStringsSep "" (genList (_: "0") (w - stringLength h));
in "${filler}${h}";

/*

  FIXME: usage of library functions like concatMapString
  causes very cryptic errors:

  # nix-instantiate --eval --expr 'import ./fromBase64.nix
"kjOzmCPxyw0bPciMsGSh5q+bT9g="' --show-trace
  error: while evaluating anonymous function at
.../fromBase64.nix:1:1, called from (string):1:18:
  value is a function while a set was expected, at .../fromBase64.nix:3:4

*/

in concatStringsSep "" (map quartet_to_hex (quartets strBase64))


2016-10-11 14:53 GMT+03:00 Игорь Пашев :
> Draft:
>
> # nix-instantiate --eval --expr 'import ./fromBase64.nix
> "kjOzmCPxyw0bPciMsGSh5q+bT9g=" ==
> "9233b39823f1cb0d1b3dc88cb064a1e6af9b4fd8"' --show-trace
> true
>
> ./fromBase64.nix:
>
>
> strBase64:
>
> let
>
>   inherit (builtins) concatStringsSep stringLength substring ;
>
>   base64 = {
> # n=0; for l in {A..Z} {a..z} {0..9} + /; do printf '"%s" = %2s; '
> $l $n; (( n++ )); (( n % 8 )) || echo; done
> "A" =  0; "B" =  1; "C" =  2; "D" =  3; "E" =  4; "F" =  5; "G" =
> 6; "H" =  7;
> "I" =  8; "J" =  9; "K" = 10; "L" = 11; "M" = 12; "N" = 13; "O" =
> 14; "P" = 15;
> "Q" = 16; "R" = 17; "S" = 18; "T" = 19; "U" = 20; "V" = 21; "W" =
> 22; "X" = 23;
> "Y" = 24; "Z" = 25; "a" = 26; "b" = 27; "c" = 28; "d" = 29; "e" =
> 30; "f" = 31;
> "g" = 32; "h" = 33; "i" = 34; "j" = 35; "k" = 36; "l" = 37; "m" =
> 38; "n" = 39;
> "o" = 40; "p" = 41; "q" = 42; "r" = 43; "s" = 44; "t" = 45; "u" =
> 46; "v" = 47;
> "w" = 48; "x" = 49; "y" = 50; "z" = 51; "0" = 52; "1" = 53; "2" =
> 54; "3" = 55;
> "4" = 56; "5" = 57; "6" = 58; "7" = 59; "8" = 60; "9" = 61; "+" =
> 62; "/" = 63;
>   };
>
>   quartet_to_int24 = q:
> # https://en.wikipedia.org/wiki/Base64
> let
>   s = n: assert (stringLength q == 4); substring (3 - n) 1 q;
>   d = n: base64.${s n};
> in if s 0 != "=" then
> 64 * (64 * (64 * (d 3) + (d 2)) + (d 1)) + (d 0)
>   else if s 1 != "=" then
> 64 * (64 * (64 * (d 3) + (d 2)) + (d 1)) / 256 # right shift by 8 bits
>   else
> 64 * (64 * (64 * (d 3) + (d 2))) / 65536 # right shift by 16 bits
>   ;
>
>   int24_to_hex = i: # 16777215 (0xFF, 2^24-1) max
> let
>   hex = "0123456789abcdef";
>   toHex = n:
> let
>   d = n / 16;
>   r = n - 16 * d;
> in "${if d != 0 then toHex d else ""}${substring r 1 hex}";
> in assert (0 <= i && i <= 16777215); toHex i;
>
>   quartets = s:
> let
>   l = stringLength s;
>   h = substring 0 4 s;
>   t = substring 4 (l - 4) s;
> in [h] ++ (if t != "" then quartets t else []);
>
> /*
>
>   FIXME: usage of library functions like concatMapString
>   causes very cryptic

[Nix-commits] [NixOS/nixpkgs] e228c8: libdrm: 2.4.70 -> 2.4.71

2016-10-11 Thread Vladimír Čunát

  Branch: refs/heads/staging
  Home:   https://github.com/NixOS/nixpkgs
  Commit: e228c804ada2acbe614e8a4cb5b2105d4b1eed15
  
https://github.com/NixOS/nixpkgs/commit/e228c804ada2acbe614e8a4cb5b2105d4b1eed15
  Author: Vladimír Čunát 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

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

  Log Message:
  ---
  libdrm: 2.4.70 -> 2.4.71


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

[Nix-commits] [NixOS/nixpkgs] f75529: xorg: security fixes #19234

2016-10-11 Thread Vladimír Čunát

  Branch: refs/heads/staging
  Home:   https://github.com/NixOS/nixpkgs
  Commit: f75529944374c3f0569035cf7641222b7fd7e98f
  
https://github.com/NixOS/nixpkgs/commit/f75529944374c3f0569035cf7641222b7fd7e98f
  Author: Vladimír Čunát 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
M pkgs/servers/x11/xorg/default.nix
M pkgs/servers/x11/xorg/tarballs-7.7.list

  Log Message:
  ---
  xorg: security fixes #19234

https://lists.x.org/archives/xorg-announce/2016-October/002720.html


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

[Nix-commits] [NixOS/nixpkgs] 3229de: libhttpseverywhere: init at 0.1.0

2016-10-11 Thread Graham Christensen

  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 3229de5eb557fa71c5ebf0f3c933c7aa36368a70
  
https://github.com/NixOS/nixpkgs/commit/3229de5eb557fa71c5ebf0f3c933c7aa36368a70
  Author: sternenseemann 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
A pkgs/development/libraries/libhttpseverywhere/default.nix
A pkgs/development/libraries/libhttpseverywhere/meson.patch
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  libhttpseverywhere: init at 0.1.0


  Commit: 945da0166c5f0343c9c52c714c9fbcb8c631e41e
  
https://github.com/NixOS/nixpkgs/commit/945da0166c5f0343c9c52c714c9fbcb8c631e41e
  Author: Graham Christensen 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
A pkgs/development/libraries/libhttpseverywhere/default.nix
A pkgs/development/libraries/libhttpseverywhere/meson.patch
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  Merge pull request #19432 from sternenseemann/libhttpseverywhere

libhttpseverywhere: init at 0.1.0


Compare: https://github.com/NixOS/nixpkgs/compare/6898810ba65a...945da0166c5f___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] [NixOS/nixpkgs] f23691: Merge #19297: openssh: apply patch to fix vulnerab...

2016-10-11 Thread Vladimír Čunát

  Branch: refs/heads/release-16.09
  Home:   https://github.com/NixOS/nixpkgs
  Commit: f2369131cbd080106f244e6ef9f6fa20e3cc7302
  
https://github.com/NixOS/nixpkgs/commit/f2369131cbd080106f244e6ef9f6fa20e3cc7302
  Author: Vladimír Čunát 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
A pkgs/tools/networking/openssh/RH-1380296-NEWKEYS-null-pointer-deref.patch
M pkgs/tools/networking/openssh/default.nix

  Log Message:
  ---
  Merge #19297: openssh: apply patch to fix vulnerability

NEWKEYS null pointer dereference.

(cherry picked from commit 6898810ba65a166192df3efe78808c799a5b8f49)


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

[Nix-commits] [NixOS/nixpkgs] 83a8cb: openssh: apply patch to fix https://bugzilla.redha...

2016-10-11 Thread Vladimír Čunát

  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 83a8cb1dc2343c00ddc26caea51cf7fa30ca1fd1
  
https://github.com/NixOS/nixpkgs/commit/83a8cb1dc2343c00ddc26caea51cf7fa30ca1fd1
  Author: Graham Christensen 
  Date:   2016-10-06 (Thu, 06 Oct 2016)

  Changed paths:
A pkgs/tools/networking/openssh/RH-1380296-NEWKEYS-null-pointer-deref.patch
M pkgs/tools/networking/openssh/default.nix

  Log Message:
  ---
  openssh: apply patch to fix 
https://bugzilla.redhat.com/show_bug.cgi?id=1380296


  Commit: 6898810ba65a166192df3efe78808c799a5b8f49
  
https://github.com/NixOS/nixpkgs/commit/6898810ba65a166192df3efe78808c799a5b8f49
  Author: Vladimír Čunát 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
A pkgs/tools/networking/openssh/RH-1380296-NEWKEYS-null-pointer-deref.patch
M pkgs/tools/networking/openssh/default.nix

  Log Message:
  ---
  Merge #19297: openssh: apply patch to fix vulnerability

NEWKEYS null pointer dereference.


Compare: https://github.com/NixOS/nixpkgs/compare/9d1dfc9ed01b...6898810ba65a___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits

Re: [Nix-dev] Great news for users of Node on NixOS

2016-10-11 Thread Alexandre Peyroux

Ouaou It looks a bit like Nixpkgs ;)

2016-10-11 19:22 GMT+02:00 Colin Putney :

> https://code.facebook.com/posts/1840075619545360
>
> ___
> nix-dev mailing list
> nix-dev@lists.science.uu.nl
> http://lists.science.uu.nl/mailman/listinfo/nix-dev
>
>
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev

[Nix-commits] [NixOS/nixpkgs] e1ff6e: Merge #18861: add AMDGPU-PRO driver

2016-10-11 Thread Vladimír Čunát

  Branch: refs/heads/release-16.09
  Home:   https://github.com/NixOS/nixpkgs
  Commit: e1ff6e766d52e56f0192f0159642cc8d78874958
  
https://github.com/NixOS/nixpkgs/commit/e1ff6e766d52e56f0192f0159642cc8d78874958
  Author: Vladimír Čunát 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
M lib/maintainers.nix
A nixos/modules/hardware/video/amdgpu-pro.nix
M nixos/modules/module-list.nix
A pkgs/os-specific/linux/amdgpu-pro/default.nix
A 
pkgs/os-specific/linux/amdgpu-pro/patches/0001-add-OS-detection-for-arch.patch
A 
pkgs/os-specific/linux/amdgpu-pro/patches/0002-update-kcl_ttm_bo_reserve-for-linux-4.7.patch
A 
pkgs/os-specific/linux/amdgpu-pro/patches/0003-add-kcl_drm_gem_object_lookup.patch
A 
pkgs/os-specific/linux/amdgpu-pro/patches/0004-paging-changes-for-linux-4.6.patch
A 
pkgs/os-specific/linux/amdgpu-pro/patches/0005-LRU-stuff-isn-t-available-until-4.7.x.patch
A 
pkgs/os-specific/linux/amdgpu-pro/patches/0006-Change-name-of-vblank_disable_allowed-to-vblank_disa.patch
A 
pkgs/os-specific/linux/amdgpu-pro/patches/0007-Remove-connector-parameter-from-__drm_atomic_helper_.patch
A 
pkgs/os-specific/linux/amdgpu-pro/patches/0008-fix-apparent-typo-in-bandwidth_calcs-causing-array-e.patch
A 
pkgs/os-specific/linux/amdgpu-pro/patches/0009-disable-dal-by-default.patch
A 
pkgs/os-specific/linux/amdgpu-pro/patches/0010-remove-dependency-on-System.map.patch
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  Merge #18861: add AMDGPU-PRO driver

(cherry picked from commit 9d1dfc9ed01bd07655f617514770959490dc1a7c)
It seems very unlikely to break anything.


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

[Nix-commits] [NixOS/nixpkgs] 44bc50: Add myself as maintainer

2016-10-11 Thread Vladimír Čunát

  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 44bc50ca159c4c0fb4327358f869c3c37f969204
  
https://github.com/NixOS/nixpkgs/commit/44bc50ca159c4c0fb4327358f869c3c37f969204
  Author: David McFarland 
  Date:   2016-09-28 (Wed, 28 Sep 2016)

  Changed paths:
M lib/maintainers.nix

  Log Message:
  ---
  Add myself as maintainer


  Commit: 3b4ce62451358882fb3f9bad5930fd13086223d1
  
https://github.com/NixOS/nixpkgs/commit/3b4ce62451358882fb3f9bad5930fd13086223d1
  Author: David McFarland 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
A nixos/modules/hardware/video/amdgpu-pro.nix
M nixos/modules/module-list.nix
A pkgs/os-specific/linux/amdgpu-pro/default.nix
A 
pkgs/os-specific/linux/amdgpu-pro/patches/0001-add-OS-detection-for-arch.patch
A 
pkgs/os-specific/linux/amdgpu-pro/patches/0002-update-kcl_ttm_bo_reserve-for-linux-4.7.patch
A 
pkgs/os-specific/linux/amdgpu-pro/patches/0003-add-kcl_drm_gem_object_lookup.patch
A 
pkgs/os-specific/linux/amdgpu-pro/patches/0004-paging-changes-for-linux-4.6.patch
A 
pkgs/os-specific/linux/amdgpu-pro/patches/0005-LRU-stuff-isn-t-available-until-4.7.x.patch
A 
pkgs/os-specific/linux/amdgpu-pro/patches/0006-Change-name-of-vblank_disable_allowed-to-vblank_disa.patch
A 
pkgs/os-specific/linux/amdgpu-pro/patches/0007-Remove-connector-parameter-from-__drm_atomic_helper_.patch
A 
pkgs/os-specific/linux/amdgpu-pro/patches/0008-fix-apparent-typo-in-bandwidth_calcs-causing-array-e.patch
A 
pkgs/os-specific/linux/amdgpu-pro/patches/0009-disable-dal-by-default.patch
A 
pkgs/os-specific/linux/amdgpu-pro/patches/0010-remove-dependency-on-System.map.patch
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  amdgpu-pro: Init at 16.30.3-315407


  Commit: 9d1dfc9ed01bd07655f617514770959490dc1a7c
  
https://github.com/NixOS/nixpkgs/commit/9d1dfc9ed01bd07655f617514770959490dc1a7c
  Author: Vladimír Čunát 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
M lib/maintainers.nix
A nixos/modules/hardware/video/amdgpu-pro.nix
M nixos/modules/module-list.nix
A pkgs/os-specific/linux/amdgpu-pro/default.nix
A 
pkgs/os-specific/linux/amdgpu-pro/patches/0001-add-OS-detection-for-arch.patch
A 
pkgs/os-specific/linux/amdgpu-pro/patches/0002-update-kcl_ttm_bo_reserve-for-linux-4.7.patch
A 
pkgs/os-specific/linux/amdgpu-pro/patches/0003-add-kcl_drm_gem_object_lookup.patch
A 
pkgs/os-specific/linux/amdgpu-pro/patches/0004-paging-changes-for-linux-4.6.patch
A 
pkgs/os-specific/linux/amdgpu-pro/patches/0005-LRU-stuff-isn-t-available-until-4.7.x.patch
A 
pkgs/os-specific/linux/amdgpu-pro/patches/0006-Change-name-of-vblank_disable_allowed-to-vblank_disa.patch
A 
pkgs/os-specific/linux/amdgpu-pro/patches/0007-Remove-connector-parameter-from-__drm_atomic_helper_.patch
A 
pkgs/os-specific/linux/amdgpu-pro/patches/0008-fix-apparent-typo-in-bandwidth_calcs-causing-array-e.patch
A 
pkgs/os-specific/linux/amdgpu-pro/patches/0009-disable-dal-by-default.patch
A 
pkgs/os-specific/linux/amdgpu-pro/patches/0010-remove-dependency-on-System.map.patch
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  Merge #18861: add AMDGPU-PRO driver


Compare: https://github.com/NixOS/nixpkgs/compare/48388dde18f1...9d1dfc9ed01b___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] [NixOS/nixpkgs] 48388d: gimpPlugins.resynthesizer2: init at 2.0.1. A rewri...

2016-10-11 Thread Michael Raskin

  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 48388dde18f1a43aea04a63c21724c0bab065a29
  
https://github.com/NixOS/nixpkgs/commit/48388dde18f1a43aea04a63c21724c0bab065a29
  Author: Michael Raskin <7c6f4...@mail.ru>
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
M pkgs/applications/graphics/gimp/plugins/default.nix

  Log Message:
  ---
  gimpPlugins.resynthesizer2: init at 2.0.1. A rewrite with python wrappers; 
GUI is better for some tasks and worse for some other tasks.


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

[Nix-commits] [NixOS/nixpkgs] bfc1ec: kde5.plasma: 5.8.0 -> 5.8.1

2016-10-11 Thread Thomas Tuegel

  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: bfc1ec2807f65cb83471ea983ff05da136ff2866
  
https://github.com/NixOS/nixpkgs/commit/bfc1ec2807f65cb83471ea983ff05da136ff2866
  Author: Thomas Tuegel 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
M pkgs/desktops/kde-5/plasma/fetch.sh
M pkgs/desktops/kde-5/plasma/srcs.nix

  Log Message:
  ---
  kde5.plasma: 5.8.0 -> 5.8.1


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

[Nix-dev] Great news for users of Node on NixOS

2016-10-11 Thread Colin Putney

https://code.facebook.com/posts/1840075619545360
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev

[Nix-commits] [NixOS/nixpkgs] 2dd0f1: libsoup: 2.54.1 -> 2.56.0

2016-10-11 Thread Alexander Ried

  Branch: refs/heads/staging
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 2dd0f1f25413082de84c31326711e231f0b704ad
  
https://github.com/NixOS/nixpkgs/commit/2dd0f1f25413082de84c31326711e231f0b704ad
  Author: Alexander Ried 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

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

  Log Message:
  ---
  libsoup: 2.54.1 -> 2.56.0

>From #19081.


  Commit: 85eef7bc8646eb1f7a805bf111be7e819635f220
  
https://github.com/NixOS/nixpkgs/commit/85eef7bc8646eb1f7a805bf111be7e819635f220
  Author: Alexander Ried 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
M pkgs/development/libraries/clutter-gst/default.nix

  Log Message:
  ---
  clutter-gst: 3.0.18 -> 3.0.20

>From #19081.


  Commit: dd1e890e98aaa5c01973bd485f55d0f80683e411
  
https://github.com/NixOS/nixpkgs/commit/dd1e890e98aaa5c01973bd485f55d0f80683e411
  Author: Alexander Ried 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
M pkgs/development/libraries/clutter-gtk/default.nix

  Log Message:
  ---
  clutter-gtk: 1.8.0 -> 1.8.2

>From #19081.


  Commit: 61c467937bd3b17717ee0b599593cad2a21ca3b1
  
https://github.com/NixOS/nixpkgs/commit/61c467937bd3b17717ee0b599593cad2a21ca3b1
  Author: Alexander Ried 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
M pkgs/development/libraries/gtkmm/2.x.nix

  Log Message:
  ---
  gtkmm_2: 2.24.4 -> 2.24.5

>From #19081.


  Commit: ae1671e3023b20156e8f12913005d63493eff4f2
  
https://github.com/NixOS/nixpkgs/commit/ae1671e3023b20156e8f12913005d63493eff4f2
  Author: Alexander Ried 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

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

  Log Message:
  ---
  pangomm: 2.40.0 -> 2.40.1

>From #19081.


  Commit: 82cb3efef8bc24d1f59cc406462f3e45275499bb
  
https://github.com/NixOS/nixpkgs/commit/82cb3efef8bc24d1f59cc406462f3e45275499bb
  Author: Alexander Ried 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
M pkgs/development/libraries/gdk-pixbuf/default.nix

  Log Message:
  ---
  gdk-pixbuf: 2.34 -> 2.36

>From #19081.


  Commit: 0809aeb47f1a1df1a7b45234a4d58d09d8265651
  
https://github.com/NixOS/nixpkgs/commit/0809aeb47f1a1df1a7b45234a4d58d09d8265651
  Author: Alexander Ried 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

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

  Log Message:
  ---
  gvfs: 1.22.4 -> 1.30.1

use libgnome-keyring from gnome package set

>From #19081.


Compare: https://github.com/NixOS/nixpkgs/compare/fa5d919ae921...0809aeb47f1a___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] [NixOS/nixpkgs] 9c44aa: gthumb: 3.4.3 -> 3.4.4

2016-10-11 Thread Tim Steinbach

  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 9c44aa664ed981100bd921dbc28620f00b2c66d9
  
https://github.com/NixOS/nixpkgs/commit/9c44aa664ed981100bd921dbc28620f00b2c66d9
  Author: Alexander Ried 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

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

  Log Message:
  ---
  gthumb: 3.4.3 -> 3.4.4


  Commit: 5f3ddfb0fe85b23c3ae72957617e101c64660919
  
https://github.com/NixOS/nixpkgs/commit/5f3ddfb0fe85b23c3ae72957617e101c64660919
  Author: Tim Steinbach 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

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

  Log Message:
  ---
  Merge pull request #19454 from groxxda/gthumb

gthumb: 3.4.3 -> 3.4.4


Compare: https://github.com/NixOS/nixpkgs/compare/733c706c91a8...5f3ddfb0fe85___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] [NixOS/nixpkgs] 733c70: webkitgtk214x: reenable needed fix

2016-10-11 Thread Alexander Ried

  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 733c706c91a83698ddd6c050dddf1d814bbd60bc
  
https://github.com/NixOS/nixpkgs/commit/733c706c91a83698ddd6c050dddf1d814bbd60bc
  Author: Alexander Ried 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
M pkgs/development/libraries/webkitgtk/2.14.nix

  Log Message:
  ---
  webkitgtk214x: reenable needed fix

was disabled for testing but somehow made it into my pr.

>From #19081.


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

[Nix-commits] [NixOS/nixpkgs] 83c594: glib: 2.50.0 -> 2.50.1

2016-10-11 Thread Tim Steinbach

  Branch: refs/heads/staging
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 83c594fe38938108d3512294966c34af6cc73d9f
  
https://github.com/NixOS/nixpkgs/commit/83c594fe38938108d3512294966c34af6cc73d9f
  Author: Alexander Ried 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

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

  Log Message:
  ---
  glib: 2.50.0 -> 2.50.1


  Commit: f9e025429047c3e81b117712974e8c78eea871e7
  
https://github.com/NixOS/nixpkgs/commit/f9e025429047c3e81b117712974e8c78eea871e7
  Author: Tim Steinbach 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

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

  Log Message:
  ---
  Merge pull request #19455 from groxxda/glib

glib: 2.50.0 -> 2.50.1


Compare: https://github.com/NixOS/nixpkgs/compare/16dafb018e09...f9e025429047___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits

Re: [Nix-dev] pass a text file on the internet through <>

2016-10-11 Thread stewart mackenzie

Yes you're right a separate arg should be used. Still the <> seems like a
wonderful tool and limiting it just to tarballs seems a bit of a waste.
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev

Re: [Nix-dev] recursiveUpdate for lists

2016-10-11 Thread Игорь Пашев

2016-10-11 16:44 GMT+03:00 Tomasz Czyż :
> Basically I created simple wrapper function to create systemd services.
>
> The function produces something like
>
> {
>   my-service={
> requires=["service1.service"];
>   };
> }
>
> I want to customize it after with recursiveUpdate function, I want to merge
> it with
>
> {
>   my-service={
> requires=["some-other.service"]
>   };
> }
>
> I tried to avoid module stuff as in that case if I understand correctly I
> need to prepare my description of systemd service on top of standard nix
> systemd config structures which is probably big waste.
>
> What do you think?


I don't think it's a waste :-)

I'd and I really go with modules, because it's clean:


options = {
 # you options, like attrsOf str
};

config = {
 systemd.services = ... # here you map your options (merged for you
already!) to systemd options.
};

And, apparently, existing modules already do merge for you:
https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/system/boot/systemd-unit-options.nix#L86
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev

Re: [Nix-dev] pass a text file on the internet through <>

2016-10-11 Thread Moritz Ulrich


stewart mackenzie  writes:

> Surely one should be able to pass text files over this medium?

Right now it's not, see the nix documentation:

"If a path in the Nix search path starts with http:// or https://, it is
interpreted as the URL of a tarball that will be downloaded and unpacked
to a temporary location. The tarball must consist of a single top-level
directory."

Also note that NIX_PATH (which is used with -I) might not be appropriate
for your use case, as it's explicitly documented as a list of
directories.

Maybe you can just use a separate argument and use `builtins.readFile`,
`builtins.fetchurl` or similar?


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

[Nix-dev] pass a text file on the internet through <>

2016-10-11 Thread stewart mackenzie

Greetings,

In my nix code I make use of a <>, when executing the nix-build
command I use `-I
fractalide_user=https://keybase.io/iElectric/key.asc`

(I chose iElectric cause it was convenient)

[stewart@rivergod:~/dev/fractalide/fractalide]$ nix-build  --argstr
debug true --argstr cache $(./support/buildCache.sh)  --argstr subnet
shells_lain_commands -I
fractalide_user=https://keybase.io/iElectric/key.asc
downloading ‘https://keybase.io/iElectric/key.asc’... [2/2 KiB, 1.5 KiB/s]
unpacking ‘https://keybase.io/iElectric/key.asc’...
tar: This does not look like a tar archive
tar: Skipping to next header
tar: Exiting with failure status due to previous errors
error: program ‘tar’ failed with exit code 2
(use ‘--show-trace’ to show detailed location information)

Surely one should be able to pass text files over this medium?

Kind regards
Stewart
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev

[Nix-commits] [NixOS/nixpkgs] 5173cd: buildbot: 0.9.0rc3 -> 0.9.0rc4

2016-10-11 Thread Frederik Rietdijk

  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 5173cdb9cb155ed894595a05d83b06928ac05273
  
https://github.com/NixOS/nixpkgs/commit/5173cdb9cb155ed894595a05d83b06928ac05273
  Author: Fernando J Pando 
  Date:   2016-10-05 (Wed, 05 Oct 2016)

  Changed paths:
M pkgs/development/tools/build-managers/buildbot/default.nix
M pkgs/development/tools/build-managers/buildbot/plugins.nix
M pkgs/development/tools/build-managers/buildbot/worker.nix

  Log Message:
  ---
  buildbot: 0.9.0rc3 -> 0.9.0rc4

- upgrade to rc4
- un-hardcode path in logwatcher
- fix shebang in wrapper
- add gpl2 license
- remove duplicate wrapper

Tested on CentOS and NixOS


  Commit: 67005e3c792556d48047dcf69970e76ac6b0eee9
  
https://github.com/NixOS/nixpkgs/commit/67005e3c792556d48047dcf69970e76ac6b0eee9
  Author: Frederik Rietdijk 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
M pkgs/development/tools/build-managers/buildbot/default.nix
M pkgs/development/tools/build-managers/buildbot/plugins.nix
M pkgs/development/tools/build-managers/buildbot/worker.nix

  Log Message:
  ---
  Merge pull request #19230 from nand0p/buildbot-9rc4

buildbot: 0.9.0rc3 -> 0.9.0rc4


Compare: https://github.com/NixOS/nixpkgs/compare/048e8dbe8fe5...67005e3c7925___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] [NixOS/nixpkgs] c2b0f6: timezone service: link localtime to /etc/zoneinfo ...

2016-10-11 Thread Nikolay Amiantov

  Branch: refs/heads/release-16.09
  Home:   https://github.com/NixOS/nixpkgs
  Commit: c2b0f628ba16095cf63190a6c18f0a0a4e974188
  
https://github.com/NixOS/nixpkgs/commit/c2b0f628ba16095cf63190a6c18f0a0a4e974188
  Author: Nikolay Amiantov 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
M nixos/modules/config/timezone.nix

  Log Message:
  ---
  timezone service: link localtime to /etc/zoneinfo instead of tzinfo directly

This is needed so systemd can extract timezone from a symlink.

(cherry picked from commit 0762396d68a21f82eed7044f361764b573c7f3e0)


  Commit: a5384e77b26336d59d7644980175248ea327186d
  
https://github.com/NixOS/nixpkgs/commit/a5384e77b26336d59d7644980175248ea327186d
  Author: Nikolay Amiantov 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
M pkgs/build-support/build-fhs-userenv/env.nix

  Log Message:
  ---
  buildFHSEnv: link /etc/zoneinfo

This is needed because now /etc/localtime symlink points there.

(cherry picked from commit 7a73ecc18e7a79a0088b7b761f48d0400ce0cff3)


Compare: https://github.com/NixOS/nixpkgs/compare/354fd3728952...a5384e77b263___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] [NixOS/nixpkgs] 048e8d: ocamlPackages.ppx-variants-conv : add variantslib ...

2016-10-11 Thread regnat

  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 048e8dbe8fe59a41479db2678e9767846a38a04e
  
https://github.com/NixOS/nixpkgs/commit/048e8dbe8fe59a41479db2678e9767846a38a04e
  Author: regnat 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
M pkgs/development/ocaml-modules/janestreet/ppx-variants-conv.nix

  Log Message:
  ---
  ocamlPackages.ppx-variants-conv : add variantslib in propagated buildInputs


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

[Nix-commits] [NixOS/nixpkgs] 076239: timezone service: link localtime to /etc/zoneinfo ...

2016-10-11 Thread Eelco Dolstra

  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 0762396d68a21f82eed7044f361764b573c7f3e0
  
https://github.com/NixOS/nixpkgs/commit/0762396d68a21f82eed7044f361764b573c7f3e0
  Author: Nikolay Amiantov 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
M nixos/modules/config/timezone.nix

  Log Message:
  ---
  timezone service: link localtime to /etc/zoneinfo instead of tzinfo directly

This is needed so systemd can extract timezone from a symlink.


  Commit: 7a73ecc18e7a79a0088b7b761f48d0400ce0cff3
  
https://github.com/NixOS/nixpkgs/commit/7a73ecc18e7a79a0088b7b761f48d0400ce0cff3
  Author: Nikolay Amiantov 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
M pkgs/build-support/build-fhs-userenv/env.nix

  Log Message:
  ---
  buildFHSEnv: link /etc/zoneinfo

This is needed because now /etc/localtime symlink points there.


  Commit: de9c5f54084438bec93bb5d18a81f700cb938268
  
https://github.com/NixOS/nixpkgs/commit/de9c5f54084438bec93bb5d18a81f700cb938268
  Author: Eelco Dolstra 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
M nixos/modules/config/timezone.nix
M pkgs/build-support/build-fhs-userenv/env.nix

  Log Message:
  ---
  Merge pull request #19449 from abbradar/timedated

timezone service: use /etc/zoneinfo instead of tzinfo directly


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

[Nix-commits] [NixOS/nixpkgs] 7b3073: svtplay-dl: 1.5 -> 1.6

2016-10-11 Thread Robert Helgesson

  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 7b3073e8fa6335a79f8f64ea72d879bc8fc3e53e
  
https://github.com/NixOS/nixpkgs/commit/7b3073e8fa6335a79f8f64ea72d879bc8fc3e53e
  Author: Robert Helgesson 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
M pkgs/tools/misc/svtplay-dl/default.nix

  Log Message:
  ---
  svtplay-dl: 1.5 -> 1.6


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

Re: [Nix-dev] recursiveUpdate for lists

2016-10-11 Thread Tomasz Czyż

Basically I created simple wrapper function to create systemd services.

The function produces something like

{
  my-service={
requires=["service1.service"];
  };
}

I want to customize it after with recursiveUpdate function, I want to merge
it with

{
  my-service={
requires=["some-other.service"]
  };
}

I tried to avoid module stuff as in that case if I understand correctly I
need to prepare my description of systemd service on top of standard nix
systemd config structures which is probably big waste.

What do you think?

2016-10-11 14:31 GMT+01:00 Игорь Пашев :

> Something like https://github.com/NixOS/nixpkgs/blob/master/lib/types.
> nix#L117 ?
>
> I don't know what you are dealing with, but probably you could
> delegate it to modules.
>
> 2016-10-11 16:00 GMT+03:00 Tomasz Czyż :
> > Hi,
> >
> > I'm using recursiveUpdate to merge some attribute sets to construct
> > configurations.
> >
> > Does anyone know similar function but which also merges lists?
> > recursiveUpdate just overrides list from the lastest attribute instead of
> > merging (list it does for attributes).
> >
> > Tom
> >
> > ___
> > nix-dev mailing list
> > nix-dev@lists.science.uu.nl
> > http://lists.science.uu.nl/mailman/listinfo/nix-dev
> >
>



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

Re: [Nix-dev] recursiveUpdate for lists

2016-10-11 Thread Игорь Пашев

Something like https://github.com/NixOS/nixpkgs/blob/master/lib/types.nix#L117 ?

I don't know what you are dealing with, but probably you could
delegate it to modules.

2016-10-11 16:00 GMT+03:00 Tomasz Czyż :
> Hi,
>
> I'm using recursiveUpdate to merge some attribute sets to construct
> configurations.
>
> Does anyone know similar function but which also merges lists?
> recursiveUpdate just overrides list from the lastest attribute instead of
> merging (list it does for attributes).
>
> Tom
>
> ___
> nix-dev mailing list
> nix-dev@lists.science.uu.nl
> http://lists.science.uu.nl/mailman/listinfo/nix-dev
>
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev

[Nix-commits] [NixOS/nixpkgs] dfc947: libunistring: Don't propagate glibc

2016-10-11 Thread Eelco Dolstra

  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: dfc94720b88e7f2358fb08aae47881a00546dd94
  
https://github.com/NixOS/nixpkgs/commit/dfc94720b88e7f2358fb08aae47881a00546dd94
  Author: Eelco Dolstra 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

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

  Log Message:
  ---
  libunistring: Don't propagate glibc

On Linux, libiconv is an alias of glibc. Propagating glibc breaks
using GCC 6 as an override (not sure why). So let's not do that.


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

[Nix-commits] [NixOS/nixpkgs] 354fd3: flashplayer: 11.2.202.635 -> 11.2.202.637

2016-10-11 Thread taku0

  Branch: refs/heads/release-16.09
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 354fd3728952c229fee4f2924737c601d7ab4725
  
https://github.com/NixOS/nixpkgs/commit/354fd3728952c229fee4f2924737c601d7ab4725
  Author: taku0 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

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

  Log Message:
  ---
  flashplayer: 11.2.202.635 -> 11.2.202.637

(cherry picked from commit 5e6c3b9fdec81b36fca9df0530c0e9325b3e9f88)


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

[Nix-commits] [NixOS/nixpkgs] 5e6c3b: flashplayer: 11.2.202.635 -> 11.2.202.637

2016-10-11 Thread Nikolay Amiantov

  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 5e6c3b9fdec81b36fca9df0530c0e9325b3e9f88
  
https://github.com/NixOS/nixpkgs/commit/5e6c3b9fdec81b36fca9df0530c0e9325b3e9f88
  Author: taku0 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

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

  Log Message:
  ---
  flashplayer: 11.2.202.635 -> 11.2.202.637


  Commit: 1244df410307360ec952ce4d7051563d0fb8a116
  
https://github.com/NixOS/nixpkgs/commit/1244df410307360ec952ce4d7051563d0fb8a116
  Author: Nikolay Amiantov 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

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

  Log Message:
  ---
  Merge pull request #19451 from taku0/flashplayer-11.2.202.637

flashplayer: 11.2.202.635 -> 11.2.202.637 (security fix)


Compare: https://github.com/NixOS/nixpkgs/compare/23274724df92...1244df410307___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits

[Nix-dev] recursiveUpdate for lists

2016-10-11 Thread Tomasz Czyż

Hi,

I'm using recursiveUpdate to merge some attribute sets to construct
configurations.

Does anyone know similar function but which also merges lists?
recursiveUpdate just overrides list from the lastest attribute instead of
merging (list it does for attributes).

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

[Nix-commits] [NixOS/nixpkgs] b116f9: rust: 1.11.0 -> 1.12.0, cargo: 0.12.0 -> 0.13.0

2016-10-11 Thread Jörg Thalheim

  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: b116f9b0cde682d08cab18a479f87e13bec58411
  
https://github.com/NixOS/nixpkgs/commit/b116f9b0cde682d08cab18a479f87e13bec58411
  Author: Tim Steinbach 
  Date:   2016-10-10 (Mon, 10 Oct 2016)

  Changed paths:
M pkgs/development/compilers/rust/bootstrap.nix
M pkgs/development/compilers/rust/default.nix
M pkgs/development/compilers/rust/rustc.nix

  Log Message:
  ---
  rust: 1.11.0 -> 1.12.0, cargo: 0.12.0 -> 0.13.0


  Commit: 23274724df9291a7c983ceb2cd84c2c0a972ef73
  
https://github.com/NixOS/nixpkgs/commit/23274724df9291a7c983ceb2cd84c2c0a972ef73
  Author: Jörg Thalheim 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
M pkgs/development/compilers/rust/bootstrap.nix
M pkgs/development/compilers/rust/default.nix
M pkgs/development/compilers/rust/rustc.nix

  Log Message:
  ---
  Merge pull request #19441 from NeQuissimus/rust_1_12_0

rust: 1.11.0 -> 1.12.0, cargo: 0.12.0 -> 0.13.0


Compare: https://github.com/NixOS/nixpkgs/compare/f1b9de38037e...23274724df92___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits

[Nix-dev] [Nix-Dev] Problem building Haskell-lts2.21 (ghc784)

2016-10-11 Thread Sergey Mironov

Hi. I have a problem while building Haskell packages for ghc-7.8.4.

I am using the following expression:

{ config, pkgs, ... } :

let mypkgs = a : with a ; [
  cabal-install
  alex
  happy
  parsec
  optparse-applicative
  hasktags];

in

{

  nixpkgs.config = {
packageOverrides = pkgs: {
  haskell-lts221 = (pkgs.haskell.packages.lts-2_21.override {
overrides = config.haskellPackageOverrides or (self: super: {});
  }).ghcWithPackages mypkgs;
   }
}

lts-2.21 eventually points out to expression declared in
`configuration-ghc-7.8.x.nix`. The error is as follows:

[1 of 1] Compiling Main ( Setup.hs,
/tmp/nix-build-hackage-security-0.5.2.2.drv-0/Main.o )
Linking Setup ...
configuring
configureFlags: --verbose
--prefix=/nix/store/677fi9nsc7kspqfilhqz029i75pg9lr5-hackage-security-0.5.2.2
--libdir=$prefix/lib/$compiler --libsubdir=$pkgid --with-gcc=gcc
--package-db=/tmp/nix-build-hackage-security-0.5.2.2.drv-0/package.conf.d
--ghc-option=-optl=-Wl,-rpath=/nix/store/677fi9nsc7kspqfilhqz029i75pg9lr5-hackage-security-0.5.2.2/lib/ghc-7.8.4/hackage-security-0.5.2.2
--enable-split-objs --disable-library-profiling
--disable-executable-profiling --enable-shared
--enable-library-vanilla --enable-executable-dynamic --enable-tests
Configuring hackage-security-0.5.2.2...
Warning: The flag --disable-executable-profiling is deprecated. Please use
--disable-profiling instead.
Setup: Encountered missing dependencies:
mtl ==2.2.*, transformers >=0.4 && <0.6
builder for 
‘/nix/store/yv2zdwniyypc2fdqmmcfgqq02wqcgwkd-hackage-security-0.5.2.2.drv’
failed with exit code 1

I checked versions, and it is true: all versions of hackage-security
depends on mtl-2.2.*. I've tried to change this dependency to plain
`mtl` by patching the sources, but it didn't help: looks like
hackage-security really does depend on mtl 2.2 and issue compiler
errors on older versions. So my decision was to force NIx use older
version of hackage-security itself. I think I can just modify
haskell-packages.nix but there is /*DO NOT EDIT*/ header, so my
question is: what is correct way of adding specific versions of
Haskell packages? Why do we have both, say, 'transformers' and
'transformers_0_3_1' but only one (latest) version of many other
pacakges, including hackage-security?

Regards,
Sergey
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev

Re: [Nix-dev] Convert sha1 from base64 into "normal" string

2016-10-11 Thread Игорь Пашев

Draft:

# nix-instantiate --eval --expr 'import ./fromBase64.nix
"kjOzmCPxyw0bPciMsGSh5q+bT9g=" ==
"9233b39823f1cb0d1b3dc88cb064a1e6af9b4fd8"' --show-trace
true

./fromBase64.nix:


strBase64:

let

  inherit (builtins) concatStringsSep stringLength substring ;

  base64 = {
# n=0; for l in {A..Z} {a..z} {0..9} + /; do printf '"%s" = %2s; '
$l $n; (( n++ )); (( n % 8 )) || echo; done
"A" =  0; "B" =  1; "C" =  2; "D" =  3; "E" =  4; "F" =  5; "G" =
6; "H" =  7;
"I" =  8; "J" =  9; "K" = 10; "L" = 11; "M" = 12; "N" = 13; "O" =
14; "P" = 15;
"Q" = 16; "R" = 17; "S" = 18; "T" = 19; "U" = 20; "V" = 21; "W" =
22; "X" = 23;
"Y" = 24; "Z" = 25; "a" = 26; "b" = 27; "c" = 28; "d" = 29; "e" =
30; "f" = 31;
"g" = 32; "h" = 33; "i" = 34; "j" = 35; "k" = 36; "l" = 37; "m" =
38; "n" = 39;
"o" = 40; "p" = 41; "q" = 42; "r" = 43; "s" = 44; "t" = 45; "u" =
46; "v" = 47;
"w" = 48; "x" = 49; "y" = 50; "z" = 51; "0" = 52; "1" = 53; "2" =
54; "3" = 55;
"4" = 56; "5" = 57; "6" = 58; "7" = 59; "8" = 60; "9" = 61; "+" =
62; "/" = 63;
  };

  quartet_to_int24 = q:
# https://en.wikipedia.org/wiki/Base64
let
  s = n: assert (stringLength q == 4); substring (3 - n) 1 q;
  d = n: base64.${s n};
in if s 0 != "=" then
64 * (64 * (64 * (d 3) + (d 2)) + (d 1)) + (d 0)
  else if s 1 != "=" then
64 * (64 * (64 * (d 3) + (d 2)) + (d 1)) / 256 # right shift by 8 bits
  else
64 * (64 * (64 * (d 3) + (d 2))) / 65536 # right shift by 16 bits
  ;

  int24_to_hex = i: # 16777215 (0xFF, 2^24-1) max
let
  hex = "0123456789abcdef";
  toHex = n:
let
  d = n / 16;
  r = n - 16 * d;
in "${if d != 0 then toHex d else ""}${substring r 1 hex}";
in assert (0 <= i && i <= 16777215); toHex i;

  quartets = s:
let
  l = stringLength s;
  h = substring 0 4 s;
  t = substring 4 (l - 4) s;
in [h] ++ (if t != "" then quartets t else []);

/*

  FIXME: usage of library functions like concatMapString
  causes very cryptic errors:

  # nix-instantiate --eval --expr 'import ./fromBase64.nix
"kjOzmCPxyw0bPciMsGSh5q+bT9g="' --show-trace
  error: while evaluating anonymous function at
.../fromBase64.nix:1:1, called from (string):1:18:
  value is a function while a set was expected, at .../fromBase64.nix:3:4

*/

in concatStringsSep "" (map (x: int24_to_hex (quartet_to_int24 x))
(quartets strBase64))

2016-10-07 16:35 GMT+03:00 Игорь Пашев :
> Hi all.
>
> What options are there to convert a base64-encoded raw binary data
> into "normal" hexadecimal string in Nix (during evalutation)?
>
> E. i. "kjOzmCPxyw0bPciMsGSh5q+bT9g=" ->
> "9233b39823f1cb0d1b3dc88cb064a1e6af9b4fd8"
>
> to make it valid input for fetchurl, etc.
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev

[Nix-commits] [NixOS/nixpkgs] 53b270: aggregateModules: Preserve kernel's modules.{built...

2016-10-11 Thread Eelco Dolstra

  Branch: refs/heads/release-16.09
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 53b27007ae891dc9410f60dd5a70a1fe392f456a
  
https://github.com/NixOS/nixpkgs/commit/53b27007ae891dc9410f60dd5a70a1fe392f456a
  Author: Eelco Dolstra 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
M pkgs/os-specific/linux/kmod/aggregator.nix

  Log Message:
  ---
  aggregateModules: Preserve kernel's modules.{builtin,order}

Fixes #19426.

(cherry picked from commit 88f10ad40950d3134de0301cd226d768d765fd00)


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

[Nix-commits] [NixOS/nixpkgs] 072143: tasksh : 1.0.0 -> 1.1.0

2016-10-11 Thread Joachim F

  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 07214307431b25da66500902d6ec126aebebdcac
  
https://github.com/NixOS/nixpkgs/commit/07214307431b25da66500902d6ec126aebebdcac
  Author: regnat 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

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

  Log Message:
  ---
  tasksh : 1.0.0 -> 1.1.0


  Commit: f1b9de38037ecc7019ab7c0da8629460cfd1eec3
  
https://github.com/NixOS/nixpkgs/commit/f1b9de38037ecc7019ab7c0da8629460cfd1eec3
  Author: Joachim F 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

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

  Log Message:
  ---
  Merge pull request #19445 from regnat/tasksh

tasksh : 1.0.0 -> 1.1.0


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

[Nix-commits] [NixOS/nixpkgs] ce73a3: grsecurity: 4.7.6-201609301918 -> 4.7.7-2016101019...

2016-10-11 Thread Joachim Fasting

  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: ce73a3ea0fd40ed8ff9cd875022851b0ddb8708f
  
https://github.com/NixOS/nixpkgs/commit/ce73a3ea0fd40ed8ff9cd875022851b0ddb8708f
  Author: Joachim Fasting 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

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

  Log Message:
  ---
  grsecurity: 4.7.6-201609301918 -> 4.7.7-201610101902


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

[Nix-commits] [NixOS/nixpkgs] bbb2f6: tinc: 1.0.28 -> 1.0.29 (#19444)

2016-10-11 Thread Alexander Ried

  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: bbb2f64588f605c67d2c2977df8c44da76b47a76
  
https://github.com/NixOS/nixpkgs/commit/bbb2f64588f605c67d2c2977df8c44da76b47a76
  Author: Alexander Ried 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

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

  Log Message:
  ---
  tinc: 1.0.28 -> 1.0.29 (#19444)


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

[Nix-commits] [NixOS/nixpkgs] 88f10a: aggregateModules: Preserve kernel's modules.{built...

2016-10-11 Thread Eelco Dolstra

  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 88f10ad40950d3134de0301cd226d768d765fd00
  
https://github.com/NixOS/nixpkgs/commit/88f10ad40950d3134de0301cd226d768d765fd00
  Author: Eelco Dolstra 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
M pkgs/os-specific/linux/kmod/aggregator.nix

  Log Message:
  ---
  aggregateModules: Preserve kernel's modules.{builtin,order}

Fixes #19426.


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

[Nix-commits] [NixOS/nixpkgs] 56d033: ghcjs: revert "mark build as broken"

2016-10-11 Thread Peter Simons

  Branch: refs/heads/release-16.09
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 56d033ac1b00a8b29bc29589312d2f5024656bd3
  
https://github.com/NixOS/nixpkgs/commit/56d033ac1b00a8b29bc29589312d2f5024656bd3
  Author: Peter Simons 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

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

  Log Message:
  ---
  ghcjs: revert "mark build as broken"

This reverts commit 8f07d4bd780a24dcf33be46d8cbfc6163fcdde0e. The build
failure blocking this package has been fixed in the meanwhile. Thanks to
@basvandijk for the heads-up.


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

55 matches

Mail list logo