| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | Merge branch master into security-updates•••This merge mostly take the changes made to the master branch.
Some conflict happen in top-level/default.nix due to a reformating of the
code of which is computing the fix-point. This merge fixes these issues by
adding the pkgsIndex argument, needed to re-evaluate the fix-point with
another set of packages, and also re-add the second fix-point made to
support the dependencies.
origin/security-updatesgitlab.intr/security-updates | Nicolas B. Pierron | 2016-10-31 | 1706 | -23078/+52142 |
| |\ |
|
| | * | Merge pull request #19675 from edwtjo/dictd-touchup•••Dictd touchup | Edward Tjörnhammar | 2016-10-31 | 4 | -10/+12 |
| | |\ |
|
| | | * | nixos: dictd, make wiktionary and wordnet default dicts | Edward Tjörnhammar | 2016-10-19 | 1 | -1/+1 |
| | | * | nixos: dictd config location; bind to cfg | Edward Tjörnhammar | 2016-10-19 | 1 | -2/+6 |
| | | * | move dictd* in toplevel dicts to dictdDBs | Edward Tjörnhammar | 2016-10-19 | 2 | -5/+3 |
| | | * | dictdWiktionary: 20140118 -> 20161001 | Edward Tjörnhammar | 2016-10-19 | 1 | -2/+2 |
| | * | | asciidoctor: 1.5.4 -> 1.5.5 | koral | 2016-10-31 | 2 | -45/+45 |
| | * | | Merge pull request #19902 from dtzWill/update/yices•••yices: 2.3.1 -> 2.5.1 | vbgl | 2016-10-31 | 1 | -7/+14 |
| | |\ \ |
|
| | | * | | yices: Add darwin to meta.platforms | Will Dietz | 2016-10-30 | 1 | -4/+4 |
| | | * | | yices: Build in parallel, run tests, fix test shebang. | Will Dietz | 2016-10-26 | 1 | -0/+5 |
| | | * | | yices: fix install target by using 'true' as ldconfig | Will Dietz | 2016-10-26 | 1 | -0/+2 |
| | | * | | yices: 2.3.1 -> 2.5.1 | Will Dietz | 2016-10-26 | 1 | -3/+3 |
| | * | | | Merge pull request #20011 from zraexy/maintainers-sort•••maintainers: fix alphabetical sorting | Jörg Thalheim | 2016-10-31 | 1 | -12/+12 |
| | |\ \ \ |
|
| | | * | | | maintainers: fix alphabetical sorting•••Put the list back into alphabetical order | zraexy | 2016-10-30 | 1 | -12/+12 |
| | |/ / / |
|
| | * | | | python: adding a back python27Full•••to make pypi2nix work with old and new nixpkgs. in future nixos release
we can remove it, but at least one release cycle of deprecation would
be nice.
| Rok Garbas | 2016-10-30 | 1 | -0/+1 |
| | * | | | neovim-qt: 0.2.1 -> 0.2.3 | Rok Garbas | 2016-10-30 | 1 | -2/+2 |
| | * | | | wpa_supplicant_gui: Add forgotten patch. | Moritz Ulrich | 2016-10-30 | 1 | -0/+30 |
| | * | | | wpa_supplicant_gui: Replace inkscape with imagemagick in build process. | Moritz Ulrich | 2016-10-30 | 1 | -24/+20 |
| | * | | | loc: 0.3.0 -> 0.3.3 | Gabriel Ebner | 2016-10-30 | 1 | -5/+5 |
| | * | | | Merge pull request #19979 from 8573/8573/pkg/update/rustRegistry/2016-10-29/1•••rustRegistry: 2016-09-29 -> 2016-10-29 | Gabriel Ebner | 2016-10-30 | 1 | -3/+3 |
| | |\ \ \ |
|
| | | * | | | rustRegistry: 2016-09-29 -> 2016-10-29•••Update the `rustRegistry` package from version 2016-09-29, revision
rust-lang/crates.io-index@12dc47026cadf5aa2823c9d0fdd055b9f2c0f52c, to
version 2016-10-29, revision
rust-lang/crates.io-index@623cc0d9328bfb949b54209443f2b4f06c41961e.
I have tested this patch per nixpkgs manual section 11.1 ("Making
patches").
| c74d | 2016-10-29 | 1 | -3/+3 |
| | * | | | | Merge pull request #19881 from matthiasbeyer/add-loc•••loc: init at 0.3.0 | Arseniy Seroka | 2016-10-30 | 2 | -0/+28 |
| | |\ \ \ \ |
|
| | | * | | | | loc: init at 0.3.0 | Matthias Beyer | 2016-10-28 | 2 | -0/+28 |
| | * | | | | | Merge pull request #19993 from 2chilled/master•••pyload change: another patch for missing templates | Joachim F | 2016-10-30 | 1 | -3/+3 |
| | |\ \ \ \ \ |
|
| | | * | | | | | pyload change: another patch for missing templates | Matthias Herrmann | 2016-10-30 | 1 | -3/+3 |
| | * | | | | | | Revert "pyload: fix setupPyPatch hash"•••This reverts commit 60bd86e27937f97e1d1e5cc9bc51ce08f9d0a81d.
I missed this https://github.com/NixOS/nixpkgs/pull/19993, sorry
| Joachim Fasting | 2016-10-30 | 1 | -1/+1 |
| | * | | | | | | Revert "pyload: add missing parameter"•••This reverts commit 9ac269b76f776877ae2544e715ed77a166abcb11.
Ach, I missed https://github.com/NixOS/nixpkgs/pull/19993 which seems
to fix the same issue.
| Joachim Fasting | 2016-10-30 | 1 | -1/+1 |
| | * | | | | | | pyload: fix setupPyPatch hash•••Seeing as this never built, this hash mismatch is probably due to a
packaging bug (i.e., having a file with that has in local store, before
switching to a different fetcher). The patch itself looks okay to me.
| Joachim Fasting | 2016-10-30 | 1 | -1/+1 |
| | * | | | | | | pyload: add missing parameter•••Ref a22c990e3300dbd776c1b7c25c919784534a024b
| Joachim Fasting | 2016-10-30 | 1 | -1/+1 |
| | * | | | | | | Merge pull request #15138 from magnetophon/qmidinet•••qmidinet: 0.2.1 -> 0.4.1 | zimbatm | 2016-10-30 | 1 | -4/+4 |
| | |\ \ \ \ \ \ |
|
| | | * | | | | | | qmidinet: 0.2.1 -> 0.4.1 | Bart Brouns | 2016-10-30 | 1 | -4/+4 |
| | | | | | | | | | |
| | | \ \ \ \ \ \ | |
| | | \ \ \ \ \ \ | |
| | | \ \ \ \ \ \ | |
| | *---. \ \ \ \ \ \ | Merge linux kernel maintenance updates•••PRs: #19995 #19996 #19997
| Vladimír Čunát | 2016-10-30 | 3 | -7/+7 |
| | |\ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | linux: 4.9-rc2 -> 4.9-rc3 | Tim Steinbach | 2016-10-30 | 1 | -3/+3 |
| | | | * | | | | | | | | linux: 4.8.4 -> 4.8.5 | Tim Steinbach | 2016-10-30 | 1 | -2/+2 |
| | | | |/ / / / / / / |
|
| | | * / / / / / / / | linux: 4.4.27 -> 4.4.28 | Tim Steinbach | 2016-10-30 | 1 | -2/+2 |
| | | |/ / / / / / / |
|
| | * | | | | | | | | android-udev-rules: 20160805 -> 20161014 | Jörg Thalheim | 2016-10-30 | 1 | -2/+2 |
| | * | | | | | | | | store-0.3: Build with the right version of store-core | Shea Levy | 2016-10-30 | 1 | -0/+4 |
| | * | | | | | | | | pythonPackage.tweepy: disabling tests•••tests require access to twitter.com api, fixes #19987
| Rok Garbas | 2016-10-30 | 1 | -0/+1 |
| | | |/ / / / / /
| |/| | | | | | |
|
| | * | | | | | | | mpw: build from github to fix segfault | Jude Taylor | 2016-10-30 | 1 | -16/+20 |
| | * | | | | | | | opensmtpd service: fix evaluation error caused by Joachim's refactoring | Aristid Breitkreuz | 2016-10-30 | 1 | -1/+1 |
| | * | | | | | | | Merge pull request #18660 from aneeshusa/add-override-attrs•••mkDerivation: add overrideAttrs function | Domen Kožar | 2016-10-30 | 3 | -10/+74 |
| | |\ \ \ \ \ \ \ |
|
| | | * | | | | | | | mkDerivation: add overrideAttrs function•••This is similar to `overrideDerivation`, but overrides the arguments to
`mkDerivation` instead of the underlying `derivation` call.
Also update `makeOverridable` so that uses of `overrideAttrs` can be
followed by `override` and `overrideDerivation`, i.e. they can be
mix-and-matched.
| Aneesh Agrawal | 2016-10-02 | 3 | -10/+74 |
| | * | | | | | | | | silver-searcher: 0.32.0 -> 0.33.0 | Jascha Geerds | 2016-10-30 | 1 | -2/+2 |
| | * | | | | | | | | xpra: 0.17.5 -> 0.17.6•••Many fixes.
| Bjørn Forsman | 2016-10-30 | 1 | -2/+2 |
| | | |_|_|_|/ / /
| |/| | | | | | |
|
| | * | | | | | | | Merge pull request #19978 from k0ral/nixos-unstable•••mercurial, tortoisehg: 3.9.1 -> 3.9.2 | Tim Steinbach | 2016-10-29 | 2 | -4/+4 |
| | |\ \ \ \ \ \ \ |
|
| | | * | | | | | | | tortoisehg: 3.9.1 -> 3.9.2 | koral | 2016-10-29 | 1 | -2/+2 |
| | | * | | | | | | | mercurial: 3.9.1 -> 3.9.2 | koral | 2016-10-29 | 1 | -2/+2 |
| | * | | | | | | | | pythonPackages: add pip2nix | Jude Taylor | 2016-10-29 | 1 | -0/+22 |
| | * | | | | | | | | emacsPackages.cask: 0.7.4 -> 0.8.1 | Jascha Geerds | 2016-10-29 | 1 | -2/+2 |
| | * | | | | | | | | nano: 2.7.0 -> 2.7.1 | Jascha Geerds | 2016-10-29 | 1 | -2/+2 |
