3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

85973 commits

Author SHA1 Message Date
Shea Levy 8f28dad52c Merge branch 'nix-tour' of git://github.com/qknight/nixpkgs 2016-06-21 19:45:27 -04:00
Tobias Geerinckx-Rice 61ba956cc8
binutils: remove unused pt-pax-flags-20121023.patch 2016-06-22 01:25:26 +02:00
Kranium Gikos Mendoza ac680eed2b conkeror: 1.0pre-20160130 -> 1.0.3 2016-06-22 07:14:03 +08:00
Robert Helgesson 33f831ea4c perlPackages: bump some packages
- CryptX: 0.036 -> 0.037
 - DBIxClass: 0.082821 -> 0.082840
 - MathBigInt: 1.999723 -> 1.999724
 - Moo: 2.001001 -> 2.002002
 - MooseXGetopt: 0.70 -> 0.71
2016-06-22 00:36:31 +02:00
Michiel Leenaars f125db1c60 unbound: 1.5.8 -> 1.5.9 2016-06-21 23:22:18 +02:00
Guillaume Maudoux 3b4a4428ca python-lti: pin mock dependency at 1.0.1 2016-06-21 23:04:50 +02:00
Arseniy Seroka 8491cdff1b Merge pull request #16402 from mayflower/graylog_2.0.3
graylog: 2.0.2 -> 2.0.3
2016-06-21 23:59:28 +03:00
Matthias Beyer a1d42293ec timewarrior: 2016-03-29 -> 0.9.5.alpha
Also: Switch to use `fetchurl` instead of `fetchgit`
2016-06-21 21:06:13 +02:00
Silvio Frischknecht cffec6292a ibus: fix #16292
set GDK_PIXBUF_MODULE_FILE instead of prefixing it
2016-06-21 20:57:51 +02:00
Thomas Tuegel 6a61621cb4 Merge pull request #16396 from FRidh/trojita
trojita: init at 0.7
2016-06-21 10:53:41 -05:00
Tristan Helmich 571c134613 graylog: 2.0.2 -> 2.0.3 2016-06-21 17:32:33 +02:00
Tom Boettcher a1083a5d27 doc: Update stripHash documentation
The documentation now matches the behavior of the function.
2016-06-21 09:38:11 -05:00
Frederik Rietdijk 9e2866d5de Merge pull request #16086 from layus/inginious
INGInious: provide a NixOS module
2016-06-21 16:37:29 +02:00
zimbatm bc6b93511f Merge pull request #16377 from aszlig/improve-escape-shell-arg
lib: Make escapeShellArg more robust
2016-06-21 14:32:45 +01:00
Bjørn Forsman 6536804848 autorevision: init at 1.14
A shell script for extracting revision information useful in
release/build scripting from repositories.
2016-06-21 15:23:34 +02:00
zimbatm 6596d1eb61 Merge pull request #16389 from mcmtroffaes/feature/wolfssl-3.9.6
wolfssl: 3.9.0 -> 3.9.6, split package
2016-06-21 14:22:44 +01:00
zimbatm afbba2bffa Merge pull request #16384 from Ericson2314/top-level-to-path
top-level: builtins.toPath no longer needed
2016-06-21 14:21:01 +01:00
Edward Tjörnhammar f3950f712f
i2pd: 2.7.0 -> 2.8.0
Signed-off-by: Edward Tjörnhammar <ed@cflags.cc>
2016-06-21 15:03:59 +02:00
Frederik Rietdijk 832ac8479b Merge pull request #16049 from teh/master
Update several python packages
2016-06-21 14:45:10 +02:00
Miguel Madrid 4c454fed33 texmaker: 4.4.1 -> 4.5 (#16359) 2016-06-21 14:32:03 +02:00
Frederik Rietdijk 39043e4d6e Merge pull request #16239 from Ralith/matrix-synapse
matrix-synapse: 0.14 -> 0.16
2016-06-21 14:30:33 +02:00
Frederik Rietdijk 8ef747baed Merge pull request #16334 from artuuge/theano_cudnn
Theano-cuda: init at 0.8.2
2016-06-21 14:26:51 +02:00
Frederik Rietdijk bb8bd4b5cf trojita: init at 0.7 2016-06-21 14:24:45 +02:00
Matthias C. M. Troffaes c227201955 wolfssl: 3.9.0 -> 3.9.6, split package 2016-06-21 13:22:06 +01:00
Gabriel Ebner 0a8e613cea aspino: init at 2016-01-31 2016-06-21 13:55:28 +02:00
Gabriel Ebner 8f84a5cb08 glucose, glucose-syrup: init at 4.0 2016-06-21 13:26:51 +02:00
wrb 22a7f3a849 youtube-dl: 2016.05.21.2 -> 2016.06.19.1 (#16338) 2016-06-21 13:12:36 +02:00
Benjamin Saunders 8e47786c0e coturn: init at 4.5.0.3 (#16284) 2016-06-21 12:59:29 +02:00
Peter Simons bc08bef615 Merge pull request #16382 from Ericson2314/morgue
Remove misc dead code
2016-06-21 11:54:14 +02:00
Edward Tjörnhammar e945646be3
idea: make jdk overrideable using .override
Signed-off-by: Edward Tjörnhammar <ed@cflags.cc>
2016-06-21 11:09:50 +02:00
Peter Hoeg 31a88b4664 togglesg-download: 2016-02-08 -> 2016-05-31 2016-06-21 15:33:38 +08:00
John Ericson 98b9403a22 top-level: builtins.toPath no longer needed 2016-06-21 00:19:00 -07:00
Rahul Gopinath 293d23abb4 elvish: init at 0.1
A novel unix shell written in go language.
2016-06-21 00:04:54 -07:00
Philip Potter ea4738ff4f gnome-keyring: remove unused configure flag
The --with-ca-certificates flag seems to have been removed in
[this commit][1] from March 2013.  The configure script now just warns
about an unknown option.

[1]: https://git.gnome.org/browse/gnome-keyring/commit/?id=7afaae43f205c059163c3670169af302f1ba6de3
2016-06-21 07:56:09 +01:00
John Ericson 7cbf4a56f7 Remove dead pkgs/development/compilers/ghc/with-packages.nix
Superseded by `/pkgs/development/haskell-modules/with-packages-wrapper.nix`
2016-06-20 23:53:09 -07:00
John Ericson 5b7bdb2861 Remove more dead code: stdenvDarwinNaked no longer exists 2016-06-20 23:53:09 -07:00
John Ericson 47d95a7571 Remove dead code in stdenvCross adaptor 2016-06-20 23:53:09 -07:00
Gabriel Ebner 9c5588e99f spass: 3.7 -> 3.9 2016-06-21 08:18:20 +02:00
Gabriel Ebner e5740b2e8e Merge pull request #16378 from vrthra/screen
screen: 4.3.1 -> 4.4.0
2016-06-21 07:51:00 +02:00
Kranium Gikos Mendoza 28fc4871f5 aria2: 1.23.0 -> 1.24.0 2016-06-21 09:44:23 +08:00
Joachim Fasting b07051ce6c Merge pull request #16369 from Baughn/factorio
factorio: Bump to 0.12.35
2016-06-21 02:00:52 +02:00
Eric Litak 5d3ace24e9 dislocker: init at 0.6.1 2016-06-20 16:58:21 -07:00
Pascal Wittmann 5844bc63df Merge pull request #16372 from mimadrid/update/filezilla-3.18.0
filezilla: 3.17.0.1 -> 3.18.0
2016-06-21 01:27:36 +02:00
Rahul Gopinath 64260e70f2 screen: 4.3.1 -> 4.4.0
Removed the patches which were specific to 4.3, and redundant configure flags
The darwin specific utmp patch seems to have been accepted too, with
`u->ut_time = now` the default.
2016-06-20 15:24:32 -07:00
aszlig df475092e9
lib: Make escapeShellArg more robust
Quoting various characters that the shell *may* interpret specially is a
very fragile thing to do.

I've used something more robust all over the place in various Nix
expression I've written just because I didn't trust escapeShellArg.

Here is a proof of concept showing that I was indeed right in
distrusting escapeShellArg:

with import <nixpkgs> {};

let
  payload = runCommand "payload" {} ''
    # \x00 is not allowed for Nix strings, so let's begin at 1
    for i in $(seq 1 255); do
      echo -en "\\x$(printf %02x $i)"
    done > "$out"
  '';

  escapers = with lib; {
    current = escapeShellArg;
    better = arg: let
      backslashEscapes = stringToCharacters "\"\\ ';$`()|<>\r\t*[]&!~#";
      search = backslashEscapes ++ [ "\n" ];
      replace = map (c: "\\${c}") backslashEscapes ++ [ "'\n'" ];
    in replaceStrings search replace (toString arg);
    best = arg: "'${replaceStrings ["'"] ["'\\''"] (toString arg)}'";
  };

  testWith = escaper: let
    escaped = escaper (builtins.readFile payload);
  in runCommand "test" {} ''
    if ! r="$(bash -c ${escapers.best "echo -nE ${escaped}"} 2> /dev/null)"
    then
      echo bash eval error > "$out"
      exit 0
    fi
    if echo -n "$r" | cmp -s "${payload}"; then
      echo success > "$out"
    else
      echo failed > "$out"
    fi
  '';

in runCommand "results" {} ''
  echo "Test results:"
  ${lib.concatStrings (lib.mapAttrsToList (name: impl: ''
    echo "  ${name}: $(< "${testWith impl}")"
  '') escapers)}
  exit 1
''

The resulting output is the following:

Test results:
  best: success
  better: success
  current: bash eval error

I did the "better" implementation just to illustrate that the method of
quoting only "harmful" characters results in madness in terms of
implementation and performance.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @edolstra, @zimbatm
2016-06-20 23:53:36 +02:00
Peter Simons 99c6c9d42f Merge pull request #16370 from rasendubi/haskell-hoogle
haskell-hoogle: adapt to GHC docs split
2016-06-20 23:52:47 +02:00
Leon Isenberg ccbb3fa541 docker: Expose completions for fish 2016-06-20 23:41:32 +02:00
Jos van den Oever 91bc34f05b zanshin: 0.2.1 -> 0.3.1
This is the branch based on KDE 4.
2016-06-20 23:31:24 +02:00
mimadrid d7695b790f
filezilla: 3.17.0.1 -> 3.18.0 2016-06-20 22:48:23 +02:00
mimadrid baab0ff6d3
libfilezilla: 0.5.1 -> 0.5.3 2016-06-20 22:46:41 +02:00