summary refs log tree commit diff
Commit message (Expand)AuthorAge
* puredata: 0.47-1 -> 0.48-0Bart Brouns2017-12-08
* Merge pull request #32421 from caugner/zilla-slabJoachim F2017-12-08
|\
| * 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
* | 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.0Robert Schütz2017-12-08
* | | Merge pull request #32444 from hedning/recoll-1.23.5Joachim F2017-12-08
|\ \ \
| * | | recoll: 1.23.1 -> 1.23.5Tor Hedin Brønner2017-12-08
* | | | Merge pull request #32450 from mdorman/emacs-updatesJoachim F2017-12-08
|\ \ \ \
| * | | | melpa-packages: 2017-12-08Michael Alan Dorman2017-12-08
| * | | | 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
|\ \ \ \
| * | | | erlangR16: removed outdated & unused versionAndreas Rammhold2017-12-08
| * | | | 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
| |_|/ / |/| | |
* | | | Merge pull request #32400 from vbgl/ocamlnet-4.1.5Pascal Wittmann2017-12-08
|\ \ \ \
| * | | | 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
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into stagingVladimír Čunát2017-12-05
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge pull request #32322 from berce/stagingOrivej Desh2017-12-04
| |\ \ \ \ \ \ \
| | * | | | | | | ed: enable check on darwinOrivej Desh2017-12-04
| | * | | | | | | lzip: add unpackCmd hookOrivej Desh2017-12-04
| | * | | | | | | ed: fix docs locationBert Moens2017-12-04
| |/ / / / / / /
| * | | | | | | 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.2Orivej Desh2017-12-04
| |/ / / / / / /
| * | | | | | | Merge pull request #32299 from orivej/gettext-datadirsOrivej Desh2017-12-04
| |\ \ \ \ \ \ \
| | * | | | | | | gettext: add setup hook populating GETTEXTDATADIRSOrivej Desh2017-12-04
| |/ / / / / / /
| * | | | | | | Merge branch 'master' into stagingOrivej Desh2017-12-04
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge pull request #32307 from lsix/update_libunistringOrivej Desh2017-12-04
| |\ \ \ \ \ \ \ \
| | * | | | | | | | libunistring: 0.9.7 -> 0.9.8Lancelot SIX2017-12-04
| |/ / / / / / / /
| * | | | | | | | Merge pull request #32277 from WilliButz/update-nasmOrivej Desh2017-12-03
| |\ \ \ \ \ \ \ \
| | * | | | | | | | nasm: 2.13.01 -> 2.13.02WilliButz2017-12-03
| |/ / / / / / / /
| * | | | | | | | Merge to keep first-parent history on stagingVladimír Čunát2017-12-03
| |\ \ \ \ \ \ \ \
| | * | | | | | | | 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