summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch master into security-updatesorigin/security-updatesNicolas B. Pierron2016-10-311706-23078/+52142
|\ | | | | | | | | | | | | | | | | | | 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.
| * Merge pull request #19675 from edwtjo/dictd-touchupEdward Tjörnhammar2016-10-314-10/+12
| |\ | | | | | | Dictd touchup
| | * nixos: dictd, make wiktionary and wordnet default dictsEdward Tjörnhammar2016-10-191-1/+1
| | |
| | * nixos: dictd config location; bind to cfgEdward Tjörnhammar2016-10-191-2/+6
| | |
| | * move dictd* in toplevel dicts to dictdDBsEdward Tjörnhammar2016-10-192-5/+3
| | |
| | * dictdWiktionary: 20140118 -> 20161001Edward Tjörnhammar2016-10-191-2/+2
| | |
| * | asciidoctor: 1.5.4 -> 1.5.5koral2016-10-312-45/+45
| | |
| * | Merge pull request #19902 from dtzWill/update/yicesvbgl2016-10-311-7/+14
| |\ \ | | | | | | | | yices: 2.3.1 -> 2.5.1
| | * | yices: Add darwin to meta.platformsWill Dietz2016-10-301-4/+4
| | | |
| | * | yices: Build in parallel, run tests, fix test shebang.Will Dietz2016-10-261-0/+5
| | | |
| | * | yices: fix install target by using 'true' as ldconfigWill Dietz2016-10-261-0/+2
| | | |
| | * | yices: 2.3.1 -> 2.5.1Will Dietz2016-10-261-3/+3
| | | |
| * | | Merge pull request #20011 from zraexy/maintainers-sortJörg Thalheim2016-10-311-12/+12
| |\ \ \ | | | | | | | | | | maintainers: fix alphabetical sorting
| | * | | maintainers: fix alphabetical sortingzraexy2016-10-301-12/+12
| |/ / / | | | | | | | | Put the list back into alphabetical order
| * | | python: adding a back python27FullRok Garbas2016-10-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | neovim-qt: 0.2.1 -> 0.2.3Rok Garbas2016-10-301-2/+2
| | | |
| * | | wpa_supplicant_gui: Add forgotten patch.Moritz Ulrich2016-10-301-0/+30
| | | |
| * | | wpa_supplicant_gui: Replace inkscape with imagemagick in build process.Moritz Ulrich2016-10-301-24/+20
| | | |
| * | | loc: 0.3.0 -> 0.3.3Gabriel Ebner2016-10-301-5/+5
| | | |
| * | | Merge pull request #19979 from 8573/8573/pkg/update/rustRegistry/2016-10-29/1Gabriel Ebner2016-10-301-3/+3
| |\ \ \ | | | | | | | | | | rustRegistry: 2016-09-29 -> 2016-10-29
| | * | | rustRegistry: 2016-09-29 -> 2016-10-29c74d2016-10-291-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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").
| * | | | Merge pull request #19881 from matthiasbeyer/add-locArseniy Seroka2016-10-302-0/+28
| |\ \ \ \ | | | | | | | | | | | | loc: init at 0.3.0
| | * | | | loc: init at 0.3.0Matthias Beyer2016-10-282-0/+28
| | | | | |
| * | | | | Merge pull request #19993 from 2chilled/masterJoachim F2016-10-301-3/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | pyload change: another patch for missing templates
| | * | | | | pyload change: another patch for missing templatesMatthias Herrmann2016-10-301-3/+3
| | | | | | |
| * | | | | | Revert "pyload: fix setupPyPatch hash"Joachim Fasting2016-10-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 60bd86e27937f97e1d1e5cc9bc51ce08f9d0a81d. I missed this https://github.com/NixOS/nixpkgs/pull/19993, sorry
| * | | | | | Revert "pyload: add missing parameter"Joachim Fasting2016-10-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 9ac269b76f776877ae2544e715ed77a166abcb11. Ach, I missed https://github.com/NixOS/nixpkgs/pull/19993 which seems to fix the same issue.
| * | | | | | pyload: fix setupPyPatch hashJoachim Fasting2016-10-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | pyload: add missing parameterJoachim Fasting2016-10-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref a22c990e3300dbd776c1b7c25c919784534a024b
| * | | | | | Merge pull request #15138 from magnetophon/qmidinetzimbatm2016-10-301-4/+4
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | qmidinet: 0.2.1 -> 0.4.1
| | * | | | | | qmidinet: 0.2.1 -> 0.4.1Bart Brouns2016-10-301-4/+4
| | | | | | | |
| | | | | | | |
| | \ \ \ \ \ \
| | \ \ \ \ \ \
| | \ \ \ \ \ \
| *---. \ \ \ \ \ \ Merge linux kernel maintenance updatesVladimír Čunát2016-10-303-7/+7
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PRs: #19995 #19996 #19997
| | | | * | | | | | | linux: 4.9-rc2 -> 4.9-rc3Tim Steinbach2016-10-301-3/+3
| | | | | | | | | | |
| | | * | | | | | | | linux: 4.8.4 -> 4.8.5Tim Steinbach2016-10-301-2/+2
| | | |/ / / / / / /
| | * / / / / / / / linux: 4.4.27 -> 4.4.28Tim Steinbach2016-10-301-2/+2
| | |/ / / / / / /
| * | | | | | | | android-udev-rules: 20160805 -> 20161014Jörg Thalheim2016-10-301-2/+2
| | | | | | | | |
| * | | | | | | | store-0.3: Build with the right version of store-coreShea Levy2016-10-301-0/+4
| | | | | | | | |
| * | | | | | | | pythonPackage.tweepy: disabling testsRok Garbas2016-10-301-0/+1
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | tests require access to twitter.com api, fixes #19987
| * | | | | | | mpw: build from github to fix segfaultJude Taylor2016-10-301-16/+20
| | | | | | | |
| * | | | | | | opensmtpd service: fix evaluation error caused by Joachim's refactoringAristid Breitkreuz2016-10-301-1/+1
| | | | | | | |
| * | | | | | | Merge pull request #18660 from aneeshusa/add-override-attrsDomen Kožar2016-10-303-10/+74
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | mkDerivation: add overrideAttrs function
| | * | | | | | | mkDerivation: add overrideAttrs functionAneesh Agrawal2016-10-023-10/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | | silver-searcher: 0.32.0 -> 0.33.0Jascha Geerds2016-10-301-2/+2
| | | | | | | | |
| * | | | | | | | xpra: 0.17.5 -> 0.17.6Bjørn Forsman2016-10-301-2/+2
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | Many fixes.
| * | | | | | | Merge pull request #19978 from k0ral/nixos-unstableTim Steinbach2016-10-292-4/+4
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | mercurial, tortoisehg: 3.9.1 -> 3.9.2
| | * | | | | | | tortoisehg: 3.9.1 -> 3.9.2koral2016-10-291-2/+2
| | | | | | | | |
| | * | | | | | | mercurial: 3.9.1 -> 3.9.2koral2016-10-291-2/+2
| | | | | | | | |
| * | | | | | | | pythonPackages: add pip2nixJude Taylor2016-10-291-0/+22
| | | | | | | | |
| * | | | | | | | emacsPackages.cask: 0.7.4 -> 0.8.1Jascha Geerds2016-10-291-2/+2
| | | | | | | | |
| * | | | | | | | nano: 2.7.0 -> 2.7.1Jascha Geerds2016-10-291-2/+2
| | | | | | | | |
generated by cgit v1.2.3 (git 2.52.0) at 2026-08-20 08:18:03 +0000