mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-25 03:17:13 +00:00
Code Issues Wiki Activity
85769 commits 204 branches 125 tags 10 GiB
Commit graph

85769 commits

This branch
This branch
All branches
Author SHA1 Message Date
Francis St-Amour c5aebc693a stumpwm: Added newer version of stumpwm from its git repository (alongside the latest release). 2016-06-22 11:48:37 +02:00
Marius Bakke 4a7d31a392 treewide: remove double quotes from wrappers 
Close #14753; see that for context.
 2016-06-22 11:12:27 +02:00
Vladimír Čunát c05d829598 Merge branch 'staging' 2016-06-22 10:49:56 +02:00
Vladimír Čunát ebf1cb28a2 openspades, arangodb: more #include error fixups 
... after gcc-5.4.
 2016-06-22 10:45:47 +02:00
John Ericson f073df60d6 Replace ./../* with ../* in Nix expressions (#16414) 2016-06-22 10:39:50 +02:00
Vladimír Čunát 48f1d9c483 libav: fixup build after e9cce6d 
Fixes #16411. The patch wasn't applied anymore.
 2016-06-22 10:25:06 +02:00
Tobias Geerinckx-Rice 271443daa1
gobject-introspection: remove unused separate-rpath-arg.patch 2016-06-22 03:58:55 +02:00
Tobias Geerinckx-Rice 2a08ea9426
epiphany: remove unused libxml_depend.patch 2016-06-22 03:58:55 +02:00
Tobias Geerinckx-Rice eec8d44335
nvidia_x11_legacy*: remove unused nvidia-340.76-kernel-4.0.patch 2016-06-22 03:58:55 +02:00
Tobias Geerinckx-Rice 30ba40798c
zeromq: remove unused sodium_warning.patch 2016-06-22 03:58:55 +02:00
Nikolay Amiantov d51ec20a50 biber: 1.9 -> 2.4 2016-06-22 04:57:57 +03:00
Nikolay Amiantov c890f28fb1 perlPackages.TextRoman: init at 3.3 2016-06-22 04:57:57 +03:00
Nikolay Amiantov 389981f34b uwsgi: add rack support 2016-06-22 04:57:57 +03:00
Tobias Geerinckx-Rice 84e83fe055
riak: remove unused 1.x patches 2016-06-22 02:14:10 +02:00
Tobias Geerinckx-Rice 12bf38609e
pythonPackages.scipy: remove unused scipy-0.16.1-decorator-fix.patch 2016-06-22 02:13:39 +02:00
Tobias Geerinckx-Rice aa18ee6a73
geary 0.10: remove unused disable_valadoc.patch 2016-06-22 02:10:49 +02:00
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
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
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
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
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
John Ericson 98b9403a22 top-level: builtins.toPath no longer needed 2016-06-21 00:19:00 -07: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
Joachim Fasting b07051ce6c Merge pull request #16369 from Baughn/factorio 
factorio: Bump to 0.12.35
 2016-06-21 02:00:52 +02: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