3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

936 commits

Author SHA1 Message Date
Vladimír Čunát d4de02c46e treewide: change $IN_NIX_SHELL handling
... to be compatible with https://github.com/NixOS/nix/pull/933
while not breaking compatibility with current nix.
2016-08-11 16:40:44 +02:00
Domen Kožar 221f7f18c1 hasSuffix: human readable inputs 2016-08-10 20:06:52 +02:00
Mohammed Yaseen Mowzer 04f0cb86d0 geogebra: init at 5.0.265.0
Closes #17400
2016-08-10 14:32:09 +01:00
Domen Kožar ebffa9fd06 flatten: drastically improve performance, see #17626 2016-08-10 12:02:58 +02:00
obadz f242b752fe lib/sources.nix@commitIdFromGitRepo: parenthesize what should always have been
Fixes error: cannot coerce a partially applied built-in function to a string, at lib/sources.nix:59:32

I don't understand how this used to work, but doesn't work anymore?
2016-08-08 11:46:41 +01:00
Rok Garbas d21981c2a8 Merge pull request #16506 from Profpatsch/debug-trace
traceSeq, traceValSeq, deprecate strict
2016-08-07 03:49:05 +02:00
Domen Kožar 39e689e316 cleanSource: filter out also nix result symlinks (#16120) 2016-08-06 19:53:18 +01:00
Mounium 8fcea0822e added myself to maintainers.nix 2016-08-03 09:49:44 +02:00
Eric Sagnes e276842f6a lib: refactor nixpkgsVersion with fileContents 2016-08-01 18:35:26 +09:00
Eric Sagnes 85d8b01660 lib: refactor commitIdFromGitRepo with fileContents 2016-08-01 18:35:26 +09:00
Eric Sagnes 56575cc0ac lib: add fileContents function 2016-08-01 18:35:25 +09:00
Josef Kemetmueller 33b9935878 Add geant4 license
This license was left out during the geant4 pull request:
https://github.com/NixOS/nixpkgs/pull/3963
2016-07-31 21:27:44 +02:00
Robin Lambertz b65e9d87e2 matrix-synapse: Only run StartPre script when data folder doesn't exist (#17216) 2016-07-28 04:13:21 +02:00
obadz fee334f672 lib/sources.nix@commitIdFromGitRepo: remove use of lib.splitString
lib.splitString was blowing up the stack in instances where the
.git/packed-refs file was too large. We now use a regexp over the
whole file instead.

Closes #16570
2016-07-27 15:47:08 +01:00
Proglodyte 16bd51fc0d v8: fix 4.5.107 build
Similar to #14272, but fixes 4.5 build rather than generic.
- Ignores errors due to strict-overflow warnings
- Strips clang-only '-Wno-format-pedantic' flag out since this build
  uses gcc
2016-07-24 02:34:32 -04:00
Shawn Warren 9886c80daa Add gocd agent and server service packages (#16273)
GoCD is an open source continuous delivery server specializing in advanced workflow
modeling and visualization.  Update maintainers list to include swarren83.  Update
module list to include gocd agent and server module.  Update packages list to include
gocd agent and server package.  Update version, revision and checksum for GoCD
release 16.5.0.
2016-07-23 00:29:18 +02:00
Joachim F 46c924c4a2 Merge pull request #17178 from amiloradovsky/add-evilwm
evilwm: init at 1.1.1 (#17104)
2016-07-22 23:28:11 +02:00
Andrew Miloradovsky 17b127205d evilwm: init at 1.1.1 (#17104)
Minimalist window manager for the X Window System
2016-07-22 19:15:57 +00:00
Dmytro Rets 2311673aa9
pythonPackages.jenkinsapi: init at 0.2.32 2016-07-20 01:33:04 +02:00
Langston Barrett c40a0b50f7 doctl: init at 1.3.1 (#17066) 2016-07-19 12:30:35 +02:00
Hans-Christian Esperer 88154e2877 commandergenius: init at 194beta 2016-07-15 12:54:52 +02:00
Ioannis Koutras 4f987e0e60 maintainers.nix: add joko 2016-07-13 15:47:14 +03:00
Eric Bailey 9d58f894cd lfe: init at 1.1.1 (#16865)
This is a first pass at adding an LFE package.

N.B. man pages are ignored for now.
2016-07-12 13:48:33 +02:00
Martin Gammelsæter 811cf56f5f mypy-lang: init at 0.4.2 2016-07-11 19:35:00 +02:00
Adolfo E. García b25d21955e libqrencode: init at 3.4.4
* libqrencode: init at 3.4.4
* libqrencode: add maintainer

#16861
2016-07-11 17:46:30 +02:00
Eelco Dolstra 532211c68d Really remove library functions
Throwing a message like "removed 2016-02-29 because unused and broken"
is unhelpful because it doesn't show what function was removed.
2016-07-11 16:34:46 +02:00
Nathan Moore 09f366a360 solarus: init at 1.4.5 2016-07-05 18:33:51 -07:00
Joachim Fasting 291c454d5e Merge pull request #16594 from mpscholten/maphosts2
maphosts: init at 1.1.1
2016-07-02 14:05:09 +02:00
Ram Kromberg 0253f7eafb transgui: init at 5.0.1-svn-r986 2016-07-01 13:51:47 +03:00
Scott Olson 73ee19f0e1 drumstick: init at 1.0.2 2016-06-30 14:39:03 -06:00
Marc Scholten 479c08750a maphosts: init at 1.1.1 2016-06-29 13:31:54 +02:00
Ole Jørgen Brønner 08f0ce1d0a zsh-completions: init at version 0.18.0 (#16512)
"This projects aims at gathering/developing new completion scripts that
are not available in Zsh yet. The scripts are meant to be contributed to
the Zsh project when stable enough."
2016-06-27 00:39:18 +02:00
zimbatm 8f5184beab Merge pull request #16500 from carlsverre/add/sift
sift: init at 0.8.0
2016-06-26 12:08:17 +01:00
Profpatsch 93bbe13f98 debug.nix: deprecate strict
Replace the implementation by seq and add a deprecation warning.
The semantics seems a little bit off, but the function should only be
used for debugging.
2016-06-26 02:05:45 +02:00
Profpatsch 6889f53397 debug.nix: add traceSeq & traceValSeq
Debugging functions that strictly deep-evaluate the argument that should
be traced.
2016-06-26 02:04:58 +02:00
Carl Sverre a12ec263fa sift: init at 0.8.0
sift is a fast and powerful alternative to grep.

https://sift-tool.org
2016-06-25 14:10:34 -07:00
Christine Koppelt 117fb73965 git-ant-tools.git-extras: 3.0.0 -> 4.1.0 2016-06-25 14:21:16 +02:00
John Ericson f073df60d6 Replace ./../* with ../* in Nix expressions (#16414) 2016-06-22 10:39:50 +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
Benjamin Saunders 8e47786c0e coturn: init at 4.5.0.3 (#16284) 2016-06-21 12:59:29 +02: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
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
Severen Redwood 915edac0ce
adapta-gtk-theme: Init at 3.21.2 2016-06-18 23:33:29 +12:00
Eelco Dolstra f81fc6b5ac Merge pull request #16289 from zimbatm/old-nix-cleanup
Remove unecessary branching on old nix versions
2016-06-17 14:38:42 +02:00
zimbatm bec28d748c Remove unecessary branching on old nix versions
All these builtins are available since 1.10 or earlier (1.10 being the
lib/minver.nix)
2016-06-17 11:06:48 +01:00
Franz Thoma b60b7eeaab i3-gaps: init at 4.12 2016-06-16 14:25:46 +01:00
Paweł Pacana d2b58dd39a buildkite-agent: init at 2.1.8
* nixos module included
* install compiled binary
* only one platform now
* limited config options
* relies on providing ssh keys for agent
2016-06-13 17:21:08 +01:00
zimbatm 2974b6f4c8 Use shell packages to select the user's shell
The string type is still available for backward-compatiblity.
2016-06-12 20:35:34 +01:00
zimbatm 28fa4a2f03 Escape all shell arguments uniformly 2016-06-12 18:11:37 +01:00