summary refs log tree commit diff
Commit message (Collapse)AuthorAge
* timbreID: 0.6.0 -> 0.7.0Bart Brouns2017-12-09
|
* Merge pull request #32421 from caugner/zilla-slabJoachim F2017-12-08
|\ | | | | zilla-slab: init at 1.002
| * zilla-slab: init at 1.002Claas Augner2017-12-07
| |
* | Python docs: fix nix-shell exampleFrederik Rietdijk2017-12-08
| |
* | Revert "Python docs: fix nix-shell example"Frederik Rietdijk2017-12-08
| | | | | | | | | | | | This reverts commit aa2326682c7210027747a2b5ee7f33311dc8fe10. Forgot parentheses...
* | Python docs: fix nix-shell exampleFrederik Rietdijk2017-12-08
| |
* | nixUnstable: Remove unused dependenciesEelco Dolstra2017-12-08
| |
* | Merge pull request #32428 from dotlambda/git-annex-metadata-guiJoachim F2017-12-08
|\ \ | | | | | | git-annex-metadata-gui: init at 0.2.0
| * | git-annex-metadata-gui: init at 0.2.0Robert Schütz2017-12-08
| | |
* | | Merge pull request #32444 from hedning/recoll-1.23.5Joachim F2017-12-08
|\ \ \ | | | | | | | | recoll: 1.23.1 -> 1.23.5
| * | | recoll: 1.23.1 -> 1.23.5Tor Hedin Brønner2017-12-08
| | | |
* | | | Merge pull request #32450 from mdorman/emacs-updatesJoachim F2017-12-08
|\ \ \ \ | | | | | | | | | | Semi-Automated Emacs package updates
| * | | | melpa-packages: 2017-12-08Michael Alan Dorman2017-12-08
| | | | | | | | | | | | | | | | | | | | | | | | | Removals: - markdown-edit-indirect: removed from melpa
| * | | | melpa-stable-packages: 2017-12-08Michael Alan Dorman2017-12-08
| | | | |
| * | | | org-packages: 2017-12-08Michael Alan Dorman2017-12-08
| | | | |
| * | | | elpa-packages: 2017-12-08Michael Alan Dorman2017-12-08
| | |/ / | |/| |
* | | | R16B02-8-basho: mark insecureDaiderd Jordan2017-12-08
| | | |
* | | | erlangR17: mark insecureDaiderd Jordan2017-12-08
| | | |
* | | | Merge pull request #32443 from andir/erlang-cve-2017-1000385Daiderd Jordan2017-12-08
|\ \ \ \ | | | | | | | | | | Erlang CVE-2017-1000385 erlangR{18,19,20}
| * | | | erlangR16: removed outdated & unused versionAndreas Rammhold2017-12-08
| | | | | | | | | | | | | | | | | | | | | | | | | erlangR16 doesn't receive any upstream updates anymore and none of our packages depend on it.
| * | | | erlangR18: 18.3.4.4 -> 18.3.4.7 (fixes CVE-2017-1000385)Andreas Rammhold2017-12-08
| | | | |
| * | | | erlangR19: 19.3 -> 19.3.6.4 (fixes CVE-2017-1000385)Andreas Rammhold2017-12-08
| | | | |
| * | | | erlangR20: 20.1 -> 20.1.7 (fixes CVE-2017-1000385)Andreas Rammhold2017-12-08
| | | | |
* | | | | Restore "nixUnstable: rename to nix-unstable"Orivej Desh2017-12-08
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as discussed in https://github.com/NixOS/nixpkgs/commit/bed3695848c23a2ea98a48c42754e8b5d769e821 Different names make it easier for the users to notice updates to Nix stable, and to have Nix stable and unstable simultaneously. This reverts commit bed3695848c23a2ea98a48c42754e8b5d769e821.
* | | | Merge pull request #32400 from vbgl/ocamlnet-4.1.5Pascal Wittmann2017-12-08
|\ \ \ \ | | | | | | | | | | ocamlPackages.ocamlnet: 4.1.4 -> 4.1.5
| * | | | nettle: remove at 3.3Vincent Laporte2017-12-06
| | | | |
| * | | | ocamlPackages.ocamlnet: 4.1.4 -> 4.1.5Vincent Laporte2017-12-06
| | | | |
* | | | | Merge branch 'staging' (older one)Vladimír Čunát2017-12-08
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into stagingVladimír Čunát2017-12-06
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Haskell updates. Hydra: ?compare=1416248
| * \ \ \ \ \ Merge branch 'master' into stagingVladimír Čunát2017-12-05
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The haskell split got reverted (again). Hydra: ?compare=1416012
| * \ \ \ \ \ \ Merge pull request #32322 from berce/stagingOrivej Desh2017-12-04
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | ed: fix docs location. Fixes #32150. Supersedes #32315.
| | * | | | | | | ed: enable check on darwinOrivej Desh2017-12-04
| | | | | | | | |
| | * | | | | | | lzip: add unpackCmd hookOrivej Desh2017-12-04
| | | | | | | | |
| | * | | | | | | ed: fix docs locationBert Moens2017-12-04
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | by removing installFlags and configureFlags. Fixes #32159
| * | | | | | | libunistring: fix build and enable tests on darwinOrivej Desh2017-12-04
| | | | | | | |
| * | | | | | | Merge pull request #32317 from orivej/macos-10.13.2Orivej Desh2017-12-04
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | darwin.Libsystem: fix build on 10.13.2
| | * | | | | | | darwin.Libsystem: fix build on 10.13.2Orivej Desh2017-12-04
| |/ / / / / / /
| * | | | | | | Merge pull request #32299 from orivej/gettext-datadirsOrivej Desh2017-12-04
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | gettext: add setup hook populating GETTEXTDATADIRS
| | * | | | | | | gettext: add setup hook populating GETTEXTDATADIRSOrivej Desh2017-12-04
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #32296 (cherry picked from commit f727aeb4505a9646eb7f7d67ed0fd411900b570c)
| * | | | | | | Merge branch 'master' into stagingOrivej Desh2017-12-04
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (53 commits) hashcat: 4.0.0 -> 4.0.1 vault: add nixos test emem: 0.2.48 -> 0.2.50 nixos/nat: add dmzHost option (#32257) vulnix: 1.3.4 -> 1.4.0 linux-4.13: mark as insecure (+required generic changes) vault: 0.8.3 -> 0.9.0 gox: 20140904 -> 0.4.0 guitarix: 0.35.6 -> 0.36.1 geolite-legacy: 2017-10-25 -> 2017-12-02 premake5: 5.0.0pre.alpha.11 -> 5.0.0-alpha12 otfcc: build with ninja python/hetzner: 0.7.5 -> 0.8.0 linux-testing: 4.15-rc1 -> 4.15-rc2 Revert "linux_4_13: Remove, no longer supported." jenkins: 2.92 -> 2.93 psc-package: 0.2.4 -> 0.2.5 dino: 2017-09-26 -> 2017-12-03 gnome3.gpaste: fix keybindings path plasma: 5.11.3 -> 5.11.4 ...
| * \ \ \ \ \ \ \ Merge pull request #32307 from lsix/update_libunistringOrivej Desh2017-12-04
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | libunistring: 0.9.7 -> 0.9.8
| | * | | | | | | | libunistring: 0.9.7 -> 0.9.8Lancelot SIX2017-12-04
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://lists.gnu.org/archive/html/info-gnu/2017-12/msg00001.html for release information
| * | | | | | | | Merge pull request #32277 from WilliButz/update-nasmOrivej Desh2017-12-03
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | nasm: 2.13.01 -> 2.13.02
| | * | | | | | | | nasm: 2.13.01 -> 2.13.02WilliButz2017-12-03
| |/ / / / / / / /
| * | | | | | | | Merge to keep first-parent history on stagingVladimír Čunát2017-12-03
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (at least most of it) We got switched on 58307d15a.
| | * | | | | | | | docbook_xsl_*: Remove builder.shTuomas Tynkkynen2017-12-03
| | | | | | | | | |
| | * | | | | | | | xhtml1: libxml2 is a nativeBuildInputTuomas Tynkkynen2017-12-03
| | | | | | | | | |
| | * | | | | | | | docbook5: unzip is a nativeBuildInputTuomas Tynkkynen2017-12-03
| | | | | | | | | |
| | * | | | | | | | docbook_sgml_*: unzip is a nativeBuildInputBen Gamari2017-12-03
| | | | | | | | | |
| | * | | | | | | | docbook_xml_dtd_*: unzip is a nativeBuildInputBen Gamari2017-12-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [dezgeg resolved a merge conflict] Conflicts: pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix