| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | Revert "qtbase: Fix paths returned by qmake -query"origin/revert-57097-qmake-header | Thomas Tuegel | 2019-07-26 | 1 | -13/+1 |
| * | Merge staging-next into staging | Frederik Rietdijk | 2019-07-26 | 38 | -168/+460 |
| |\ |
|
| | * | Merge #65393: Revert "unzip: CVE-2019-13232"•••...into staging-next
| Vladimír Čunát | 2019-07-25 | 1 | -5/+0 |
| | |\ |
|
| | | * | Revert "unzip: CVE-2019-13232"•••This reverts commit 0238946872c1c63709790f6285bf9cc5585a6704.
This patch broke a number of legitimate zips in the wild, including but
not limited to most luarocks and a number of gradle-produced JARs.
| adisbladis | 2019-07-25 | 1 | -5/+0 |
| | * | | Merge branch 'master' into staging-next | Vladimír Čunát | 2019-07-25 | 30 | -117/+399 |
| | |\| |
|
| | | * | tmux-ctrlw: init at 0.1.0 | Jason Felice | 2019-07-25 | 1 | -0/+9 |
| | | * | Merge pull request #64989 from eyJhb/rotate-backups•••pythonPackages.rotate-backups: init at 6.0 | worldofpeace | 2019-07-25 | 10 | -0/+232 |
| | | |\ |
|
| | | | * | pythonPackages.capturer: init at 2.4 | eyjhbb@gmail.com | 2019-07-24 | 2 | -0/+29 |
| | | | * | pythonPackages.coloredlogs: init at 10.0 | eyjhbb@gmail.com | 2019-07-24 | 3 | -0/+38 |
| | | | * | pythonPackages.executor: init at 21.3 | eyjhbb@gmail.com | 2019-07-24 | 3 | -0/+35 |
| | | | * | pythonPackages.naturalsort: init at 1.5.1 | eyjhbb@gmail.com | 2019-07-24 | 2 | -0/+22 |
| | | | * | pythonPackages.rotate-backups: init at 6.0 | eyjhbb@gmail.com | 2019-07-24 | 3 | -0/+27 |
| | | | * | pythonPackages.property-manager: init at 2.3.1 | eyjhbb@gmail.com | 2019-07-24 | 2 | -0/+25 |
| | | | * | pythonPackages.update-dotdee: init at 5.0 | eyjhbb@gmail.com | 2019-07-24 | 3 | -0/+26 |
| | | | * | pythonPackages.verboselogs: init at 1.7 | eyjhbb@gmail.com | 2019-07-24 | 2 | -0/+28 |
| | | | * | humanfriendly: add top level attribute | eyjhbb@gmail.com | 2019-07-24 | 1 | -0/+2 |
| | | * | | Merge pull request #65358 from josephtheengineer/master•••kitty: fix wayland support (EGL: Library not found error) on swaywm | Graham Christensen | 2019-07-25 | 1 | -1/+7 |
| | | |\ \ |
|
| | | | * | | kitty: fix wayland support (EGL: Library not found) | josephtheengineer | 2019-07-25 | 1 | -1/+7 |
| | | * | | | Merge pull request #64987 from luispedro/remove_rocksdb_gflags_dep•••rocksdb: Remove gflags dependency | worldofpeace | 2019-07-25 | 1 | -2/+3 |
| | | |\ \ \ |
|
| | | | * | | | rocksdb: Remove gflags dependency•••GFlags are only used for the tools, which are not installed in any case.
| Luis Pedro Coelho | 2019-07-25 | 1 | -2/+3 |
| | | * | | | | python37Packages.google_api_python_client: 1.7.9 -> 1.7.10 | Michael Weiss | 2019-07-25 | 1 | -2/+2 |
| | | * | | | | tmuxPlugins.tmux-colors-solarized: init tmux plugin | Nick Hu | 2019-07-25 | 1 | -0/+11 |
| | | * | | | | Merge pull request #65083 from basvandijk/fix-composability-of-sourceByRegex•••lib: allow sourceByRegex to be composed after cleanSourceWith | Eelco Dolstra | 2019-07-25 | 1 | -6/+10 |
| | | |\ \ \ \ |
|
| | | | * | | | | lib: allow sourceByRegex to be composed after cleanSourceWith•••`sourceByRegex src regexes` should include a source file if one of the
regular expressions `regexes` matches the path of that file relative
to `src`.
However to compute this relative path `sourceByRegex` uses:
```
relPath = lib.removePrefix (toString src + "/") (toString path);
```
Note that `toString path` evaluates to an absolute file somewhere
under `src` and not under `/nix/store`.
The problem is that this doesn't work if `src` is a `cleanSourceWith`
invocation as well because `toString src` will then evaluate to
`src.outPath` which will evaluate to `builtins.filterSource ...` which
evaluates to a path in `/nix/store` which is not a prefix of `path`.
The solution is to replace `src` with `origSrc` where
```
origSrc = if isFiltered then src.origSrc else src;
isFiltered = src ? _isLibCleanSourceWith;
```
Test this by executing the following from the nixpkgs repo:
```
(cat << 'EOI'
let
pkgs = import ./. {};
in pkgs.runCommand "test-sourceByRegex" {
test_sourceByRegex =
let
src1 = pkgs.lib.sourceByRegex ./. [ "^test-sourceByRegex.nix$" ];
src2 = pkgs.lib.sourceByRegex src1 [ "^test-sourceByRegex.nix$" ];
in src2 + "/test-sourceByRegex.nix";
} ''
cp $test_sourceByRegex $out
''
EOI
) > test-sourceByRegex.nix
nix-build test-sourceByRegex.nix
```
| Bas van Dijk | 2019-07-19 | 1 | -6/+10 |
| | | * | | | | | Merge pull request #65316 from kalbasit/nixpkgs_fix-moto-collision•••moto: fix colliding dependencies | Wael Nasreddine | 2019-07-25 | 1 | -4/+7 |
| | | |\ \ \ \ \ |
|
| | | | * | | | | | jsondiff: patch setup.py to prevent creating bin/jsondiff•••pythonPackages.jsonpatch also creates bin/jsondiff, and packages
depending on both are not usable.
| Wael M. Nasreddine | 2019-07-24 | 1 | -0/+4 |
| | | | * | | | | | jsondiff: 1.1.2 -> 1.2.0 | Wael M. Nasreddine | 2019-07-24 | 1 | -4/+3 |
| | | * | | | | | | bazel-deps: 2019-02-01 -> 2019-07-11, mark as broken•••Also drop preInstall cleanup for dependencies. The reason is while it's more
thorough than default cleanup in buildBazelPackage if such a problem happens we
should fix buildBazelPackage instead. Perhaps even move this (awesome!) snippet
there but it's very slow-running so we'd rather attempt to fix it in other
ways.
Anyway after an update at least .deps build, checked with `nix-build -A --check`.
| Nikolay Amiantov | 2019-07-25 | 1 | -46/+5 |
| | | * | | | | | | bazel-remote: mark as broken | Nikolay Amiantov | 2019-07-25 | 1 | -0/+1 |
| | | * | | | | | | Merge pull request #65319 from nicknovitski/fix-darwin-ngrok•••ngrok: fix build on darwin | Matthew Bauer | 2019-07-25 | 1 | -3/+3 |
| | | |\ \ \ \ \ \ |
|
| | | | * | | | | | | ngrok: fix build on darwin | Nick Novitski | 2019-07-24 | 1 | -3/+3 |
| | | * | | | | | | | Merge pull request #65049 from matthewbauer/zmq-enable-drafts•••zmq: enable drafts api | Matthew Bauer | 2019-07-25 | 2 | -2/+7 |
| | | |\ \ \ \ \ \ \ |
|
| | | | * | | | | | | | zmq: add enableDrafts option•••This is needed by emacs-zmq, and will be used by it.
| Matthew Bauer | 2019-07-24 | 2 | -2/+7 |
| | | * | | | | | | | | Merge pull request #64982 from NixOS/staging-next•••Staging next | Frederik Rietdijk | 2019-07-25 | 70 | -695/+939 |
| | | |\ \ \ \ \ \ \ \
| | |/ / / / / / / /
| |/| | | | | | | | |
|
| | * | | | | | | | | | Merge master into staging-next | Frederik Rietdijk | 2019-07-25 | 194 | -1937/+4462 |
| | |\ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | pythonPackages.pyyaml_3: init , instead of multiple pyyaml overrides•••Temporary attribute until we can get rid of it everywhere.
This was triggered due to the libyaml 0.2.2 incompatibilty requiring
patches and still not building.
| Frederik Rietdijk | 2019-07-25 | 6 | -38/+22 |
| | * | | | | | | | | | | Merge pull request #65237 from worldofpeace/dont-multiout-demos•••[staging-next] gtk3: don't multiout demos | worldofpeace | 2019-07-22 | 1 | -7/+3 |
| | |\ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | gtk3: don't multiout demos | worldofpeace | 2019-07-21 | 1 | -7/+3 |
| | | | | * | | | | | | | | matrix-synapse: fix documentation better | Léo Gaspard | 2019-07-25 | 1 | -1/+1 |
| | | | | * | | | | | | | | Merge pull request #65305 from averelld/disable-zbar-wine-gstreamer•••wine: disable zbar in gst-plugins-bad | Michael Raskin | 2019-07-25 | 2 | -2/+6 |
| | | | | |\ \ \ \ \ \ \ \ |
|
| | | | | | * | | | | | | | | wine: disable zbar in gst-plugins-bad | Averell Dalton | 2019-07-23 | 2 | -2/+6 |
| | | | | * | | | | | | | | | Merge pull request #65342 from bradleyjensen/master•••Improve ergonomics of clwrapper | Michael Raskin | 2019-07-25 | 1 | -6/+13 |
| | | | | |\ \ \ \ \ \ \ \ \ |
|
| | | | | | * | | | | | | | | | Use if instead of && for deciding whether to run a command•••The only difference between these forms is the return value when
"$NIX_LISP_SKIP_CODE" is the empty string. In the original
formulation, the script would return a false exit status. In the new
formulation, it will return a true exit status.
Its useful to be able to source cl-wrapper.sh (to get the variables it
establishes), and its a bit annoying that sourcing it with
NIX_LISP_SKIP_CODE=1 results in a false exit status.
| Brad Jensen | 2019-07-24 | 1 | -5/+7 |
| | | | | | * | | | | | | | | | Resolve symlinks before trying to recognize a lisp implementation•••The CCL package installs a symlink named "ccl" that points at the
actual implementation executable: lx86cl64 (or lx86cl for 32 bit).
When clwrapper is used with CCL as the backing implementation, this
script fails to recognize the implementation. By resolving the
symlink, we are able to recognize which implementation we're actually
working with.
| Brad Jensen | 2019-07-24 | 1 | -1/+6 |
| | | | | * | | | | | | | | | | Merge pull request #65348 from mayflower/checksec-2.0.1•••checksec: 1.5 -> 2.0.1 | WilliButz | 2019-07-25 | 2 | -38/+35 |
| | | | | |\ \ \ \ \ \ \ \ \ \ |
|
| | | | | | * | | | | | | | | | | checksec: 1.5 -> 2.0.1 | Robin Gloster | 2019-07-24 | 2 | -38/+35 |
| | | | | * | | | | | | | | | | | bazel: disable dm-sonnet downstream test | Profpatsch | 2019-07-25 | 1 | -2/+3 |
| | | | | * | | | | | | | | | | | bazel: execute dm-sonnet test only on linux | Profpatsch | 2019-07-25 | 1 | -3/+6 |
| | | | | * | | | | | | | | | | | python-modules/dm-sonnet: update fixed-output hash | Profpatsch | 2019-07-25 | 1 | -1/+1 |
| | | | | * | | | | | | | | | | | bazel: add fixed output test case•••Feels like a horrible hack, but it should make sure that downstream
hashes are preserved between bazel versions.
| Timo Kaufmann | 2019-07-25 | 1 | -1/+12 |
