summary refs log tree commit diff
Commit message (Collapse)AuthorAge
* uwsgi: add rack supportNikolay Amiantov2016-06-22
|
* riak: remove unused 1.x patchesTobias Geerinckx-Rice2016-06-22
|
* pythonPackages.scipy: remove unused scipy-0.16.1-decorator-fix.patchTobias Geerinckx-Rice2016-06-22
|
* geary 0.10: remove unused disable_valadoc.patchTobias Geerinckx-Rice2016-06-22
|
* Merge branch 'nix-tour' of git://github.com/qknight/nixpkgsShea Levy2016-06-21
|\
| * nix-tour: 0.0.1 initial release for offline useJoachim Schiele2016-06-17
| |
* | binutils: remove unused pt-pax-flags-20121023.patchTobias Geerinckx-Rice2016-06-22
| |
* | perlPackages: bump some packagesRobert Helgesson2016-06-22
| | | | | | | | | | | | | | | | - 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
* | Merge pull request #16402 from mayflower/graylog_2.0.3Arseniy Seroka2016-06-21
|\ \ | | | | | | graylog: 2.0.2 -> 2.0.3
| * | graylog: 2.0.2 -> 2.0.3Tristan Helmich2016-06-21
| | |
* | | Merge pull request #16396 from FRidh/trojitaThomas Tuegel2016-06-21
|\ \ \ | |/ / |/| | trojita: init at 0.7
| * | trojita: init at 0.7Frederik Rietdijk2016-06-21
| | |
* | | Merge pull request #16086 from layus/inginiousFrederik Rietdijk2016-06-21
|\ \ \ | | | | | | | | INGInious: provide a NixOS module
| * | | inginious: init NixOS moduleGuillaume Maudoux2016-06-14
| | | |
| * | | inginious: turn lib into a python app.Guillaume Maudoux2016-06-14
| | | |
| * | | python-lti: 0.4.0 -> 0.4.1Guillaume Maudoux2016-06-14
| | | |
* | | | Merge pull request #16377 from aszlig/improve-escape-shell-argzimbatm2016-06-21
|\ \ \ \ | | | | | | | | | | lib: Make escapeShellArg more robust
| * | | | lib: Make escapeShellArg more robustaszlig2016-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | autorevision: init at 1.14Bjørn Forsman2016-06-21
| | | | | | | | | | | | | | | | | | | | | | | | | A shell script for extracting revision information useful in release/build scripting from repositories.
* | | | | Merge pull request #16389 from mcmtroffaes/feature/wolfssl-3.9.6zimbatm2016-06-21
|\ \ \ \ \ | | | | | | | | | | | | wolfssl: 3.9.0 -> 3.9.6, split package
| * | | | | wolfssl: 3.9.0 -> 3.9.6, split packageMatthias C. M. Troffaes2016-06-21
| | | | | |
* | | | | | Merge pull request #16384 from Ericson2314/top-level-to-pathzimbatm2016-06-21
|\ \ \ \ \ \ | | | | | | | | | | | | | | top-level: builtins.toPath no longer needed
| * | | | | | top-level: builtins.toPath no longer neededJohn Ericson2016-06-21
| | | | | | |
* | | | | | | i2pd: 2.7.0 -> 2.8.0Edward Tjörnhammar2016-06-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Edward Tjörnhammar <ed@cflags.cc>
* | | | | | | Merge pull request #16049 from teh/masterFrederik Rietdijk2016-06-21
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Update several python packages
| * | | | | | | ujson: 1.33 -> 1.35Tom Hunger2016-06-07
| | | | | | | |
| * | | | | | | structlog: 15.3.0 -> 16.1.0Tom Hunger2016-06-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also removing twisted test to avoid pulling in twisted just for one test case.
| * | | | | | | pyramid-multiauth: 0.3.2 -> 0.8.0Tom Hunger2016-06-07
| | | | | | | |
| * | | | | | | pyramid: 1.5.7 -> 1.7Tom Hunger2016-06-07
| | | | | | | |
| * | | | | | | cornice: 0.17.0 -> 1.2.1Tom Hunger2016-06-07
| | | | | | | |
* | | | | | | | texmaker: 4.4.1 -> 4.5 (#16359)Miguel Madrid2016-06-21
| | | | | | | |
* | | | | | | | Merge pull request #16239 from Ralith/matrix-synapseFrederik Rietdijk2016-06-21
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | matrix-synapse: 0.14 -> 0.16
| * | | | | | | | matrix-synapse: 0.14 -> 0.16Benjamin Saunders2016-06-17
| | | | | | | | |
| * | | | | | | | bleach: 1.4 -> 1.4.3Benjamin Saunders2016-06-14
| | | | | | | | |
* | | | | | | | | Merge pull request #16334 from artuuge/theano_cudnnFrederik Rietdijk2016-06-21
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Theano-cuda: init at 0.8.2
| * | | | | | | | | Theano-cuda: init at 0.8.2artuuge2016-06-20
| | | | | | | | | |
* | | | | | | | | | aspino: init at 2016-01-31Gabriel Ebner2016-06-21
| | | | | | | | | |
* | | | | | | | | | glucose, glucose-syrup: init at 4.0Gabriel Ebner2016-06-21
| | | | | | | | | |
* | | | | | | | | | youtube-dl: 2016.05.21.2 -> 2016.06.19.1 (#16338)wrb2016-06-21
| | | | | | | | | |
* | | | | | | | | | coturn: init at 4.5.0.3 (#16284)Benjamin Saunders2016-06-21
| | | | | | | | | |
* | | | | | | | | | Merge pull request #16382 from Ericson2314/morguePeter Simons2016-06-21
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Remove misc dead code
| * | | | | | | | | | Remove dead `pkgs/development/compilers/ghc/with-packages.nix`John Ericson2016-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Superseded by `/pkgs/development/haskell-modules/with-packages-wrapper.nix`
| * | | | | | | | | | Remove more dead code: `stdenvDarwinNaked` no longer existsJohn Ericson2016-06-20
| | | | | | | | | | |
| * | | | | | | | | | Remove dead code in stdenvCross adaptorJohn Ericson2016-06-20
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | idea: make jdk overrideable using .overrideEdward Tjörnhammar2016-06-21
| |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Edward Tjörnhammar <ed@cflags.cc>
* | | | | | | | | spass: 3.7 -> 3.9Gabriel Ebner2016-06-21
| | | | | | | | |
* | | | | | | | | Merge pull request #16378 from vrthra/screenGabriel Ebner2016-06-21
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | screen: 4.3.1 -> 4.4.0
| * | | | | | | | | screen: 4.3.1 -> 4.4.0Rahul Gopinath2016-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | | Merge pull request #16369 from Baughn/factorioJoachim Fasting2016-06-21
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | factorio: Bump to 0.12.35
| * | | | | | | | | | factorio: Disable automatic updatesSvein Ove Aas2016-06-20
| | | | | | | | | | |