Commit Graph

85771 Commits

Author SHA1 Message Date
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
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
obadz
fb6b4860c7 xl2tpd: add nixos module for service
(required adding execv to libredirect)
2016-06-20 21:41:59 +01:00
obadz
c8d3b166f5 network-manager/l2tp: add workaround for https://github.com/xelerance/xl2tpd/issues/108 2016-06-20 21:41:59 +01:00
Gabriel Ebner
cbb0effa6e wget: 1.17.1 -> 1.18
Fixes #16368.
2016-06-20 22:15:46 +02:00
Alexey Shmalko
87aa864ff9
haskell-hoogle: adapt to GHC docs split
The docs were split at #16167 and broke google support. @peti fixed
build, however hoogle still didn't see packages shipped with GHC. This
patch fixes location of the libraries shipped with GHC.
2016-06-20 22:52:20 +03:00
Svein Ove Aas
7a37c1b6c3 factorio: Disable automatic updates 2016-06-20 20:21:58 +01:00
Svein Ove Aas
989990b3b7 factorio: Bump to 0.12.35 2016-06-20 20:15:52 +01:00
Arseniy Seroka
f529432ca5 Merge pull request #16349 from telotortium/ssh-ident
ssh-ident: init at 2016-04-21
2016-06-20 22:04:57 +03:00
Tobias Geerinckx-Rice
ffd2afd89d
dub: 0.9.25 -> 1.0.0 2016-06-20 19:34:19 +02:00
aszlig
9728554c4f
Merge pull request #16099 (Chromium update)
The changes contain an update of the stable channel (along with beta and
dev as well) fixing 18 security vulnerabilities:

http://googlechromereleases.blogspot.de/2016/06/stable-channel-update.html
http://googlechromereleases.blogspot.de/2016/06/stable-channel-update_6.html
http://googlechromereleases.blogspot.de/2016/06/stable-channel-update_16.html

I've built and tested this at the following evaluation on my Hydra:

https://headcounter.org/hydra/eval/324449
2016-06-20 18:43:41 +02:00
Michael Raskin
ca495a53a5 tptp: fix hash 2016-06-20 18:38:08 +02:00
Gabriel Ebner
0d9bb144d9 dstat: 0.7.2 -> 0.7.3 2016-06-20 18:08:31 +02:00
Gabriel Ebner
05a89a6512 goldendict: 1.5.0.ec86515 -> 1.5.0.rc2 2016-06-20 17:59:37 +02:00
Peter Simons
06d3636596 git-annex: update sha256 hash 2016-06-20 17:01:36 +02:00
Peter Simons
1178ccf085 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20160613-7-g3089457 using the following inputs:

  - Hackage: 08c95c9ddf
  - LTS Haskell: 2a2cddb443
  - Stackage Nightly: 5f88469291
2016-06-20 17:01:36 +02:00
Bjørn Forsman
099d3dc43b microscheme: 0.9.2 -> 0.9.3 2016-06-20 16:29:23 +02:00
Tobias Geerinckx-Rice
bcde5c3353
ganttproject-bin: init at 2.7.2-r1954 2016-06-20 16:04:36 +02:00
Tobias Geerinckx-Rice
5dd3dbdec4
geolite-legacy: 2016-06-13 -> 2016-06-20 2016-06-20 15:58:56 +02:00
Vladimír Čunát
8bf002daac libcxx-3.8: apply Darwin-specific patch only on Darwin
... to better decouple different platforms (in future).
2016-06-20 15:17:41 +02:00
Vladimír Čunát
c67e08e1af Merge #16323: llvmPackages_38 fixes 2016-06-20 15:17:40 +02:00
Eelco Dolstra
c51af01325 apache-httpd: 2.4.18 -> 2.4.20
CVE-2016-1546
2016-06-20 15:17:12 +02:00
obadz
d7960ef4a0 libreoffice: default to (and have hydra build) still rather than fresh
fresh users were experiencing lots of segfaults.

Closes #15825
2016-06-20 13:58:07 +01:00
Eelco Dolstra
d0b2524633 Merge pull request #16021 from Baughn/systemd-linger
systemd: Set KillUserProcesses=no in logind.conf
2016-06-20 14:54:03 +02:00
Peter Simons
06489a1850 haskell-hoogle: remedy some fallout from https://github.com/NixOS/nixpkgs/pull/16167
ghcWithHoogle builds with this patch applied, but it's probably still broken in
the sense that links might point nowhere or that the generated databases and/or
documentation might be incomplete.
2016-06-20 14:50:52 +02:00
Vladimír Čunát
b626e83838 Merge #16291: krb5: fix compilation on weird prefixes
(when nix store prefix contains a "+" character)
2016-06-20 14:46:19 +02:00
Eelco Dolstra
5fc64c4baa debian: 7.10 -> 7.11, 8.4 -> 8.5 2016-06-20 14:39:44 +02:00
Bjørn Forsman
bd01fad0ed Captialize meta.description of all packages
In line with the Nixpkgs manual.

A mechanical change, done with this command:

  find pkgs -name "*.nix" | \
      while read f; do \
          sed -e 's/description\s*=\s*"\([a-z]\)/description = "\u\1/' -i "$f"; \
      done

I manually skipped some:

* Descriptions starting with an abbreviation, a user name or package name
* Frequently generated expressions (haskell-packages.nix)
2016-06-20 13:55:52 +02:00
Rok Garbas
0880f1f335 pythonPackages.mycli, pythonPackages.pgcli: disable for py35 2016-06-20 13:41:05 +02:00
Ricardo Ardissone
b81f3e4682 pythonPackages.prompt_toolkit: move pygments to propagatedBuildInputs 2016-06-20 13:41:05 +02:00
Ricardo Ardissone
5d80a0244b xonsh: 0.3.2 -> 0.3.4 2016-06-20 13:41:05 +02:00
Marius Bakke
429fdbcd63 libxkbcommon: set X11 locale directory (close #16340) 2016-06-20 13:26:20 +02:00
Eelco Dolstra
453086a15f linux: 4.4.12 -> 4.4.13 2016-06-20 13:11:55 +02:00
zimbatm
aeef0b7089 Merge pull request #16331 from vrthra/ninka
ninka: 1.1 -> 2.0-pre
2016-06-20 10:24:12 +01:00
zimbatm
26d75c5d4d Merge pull request #16354 from RubenAstudillo/hakuneko
hakuneko: 1.3.12 -> 1.4.1
2016-06-20 09:29:31 +01:00
zimbatm
7c32638439 Merge pull request #16259 from layus/update-mptcp
linux_mptcp: update 0.90 -> 0.90.1
2016-06-20 09:29:07 +01:00
Scott R. Parish
1f1f0f049b chromium: Update to latest stable, beta, and dev channels
stable 51.0.2704.63 => 51.0.2704.103
beta   51.0.2704.63 => 52.0.2743.41
dev    52.0.2743.10 => 53.0.2767.4

This addresses 15 security fixes, including:

 * High   CVE-2015-1696: Cross-origin bypass in Extension bindings. Credit to
                         anonymous.
 * High   CVE-2015-1697: Cross-origin bypass in Blink. Credit to Mariusz
                         Mlynski.
 * Medium CVE-2016-1698: Information leak in Extension bindings. Credit to
                         Rob Wu.
 * Medium CVE-2016-1699: Parameter sanitization failure in DevTools. Credit
                         to Gregory Panakkal.
 * Medium CVE-2016-1700: Use-after-free in Extensions. Credit to Rob Wu.
 * Medium CVE-2016-1701: Use-after-free in Autofill. Credit to Rob Wu.
 * Medium CVE-2016-1702: Out-of-bounds read in Skia. Credit to cloudfuzzer.

See: http://googlechromereleases.blogspot.com/2016/06/stable-channel-update.html
2016-06-19 19:50:45 -07:00
Joachim Fasting
b3832e6288 Merge pull request #16339 from NeQuissimus/ohmyzsh20160618
oh-my-zsh: 2016-04-20 -> 2016-06-18
2016-06-20 03:54:10 +02:00
Ruben Astudillo
4f985377ac hakuneko: 1.3.12 -> 1.4.1 2016-06-19 20:09:27 -04:00
artuuge
465d6a2113 Theano-cuda: init at 0.8.2 2016-06-20 01:06:07 +02:00
obadz
0243ccfbff i3 & xfce modules: add extraSessionCommands for WM-specific user-defined xsession lines
Could be extended to other window managers/desktops as well
2016-06-19 23:52:14 +01:00
zimbatm
6e0b40af60 Merge pull request #16345 from mayflower/pkg/bird
bird: 1.5.0 -> 1.6.0, add IPv6 build
2016-06-19 23:38:18 +01:00
zimbatm
31c158ad45 Merge pull request #16189 from zimbatm/usershell-config
User shell config
2016-06-19 23:36:45 +01:00
zimbatm
b0f8416c5c Merge pull request #16180 from zimbatm/shell-escaping
Escape all shell arguments uniformly
2016-06-19 23:27:52 +01:00
zimbatm
53f421c0c4 Merge pull request #16325 from taku0/android-studio-2.1.2.0
android-studio: 2.1.1.0 -> 2.1.2.0, fixed Gradle link error
2016-06-19 22:30:34 +01:00
zimbatm
7795f11335 Merge pull request #16332 from solson/fix-fileSystems-example
Make fileSystems example literal.
2016-06-19 22:27:44 +01:00
zimbatm
a05b2f116e Merge pull request #16333 from gratuxri/fvwm
new fvwm version 2.6.6, ftp is not available
2016-06-19 22:26:30 +01:00