about summary refs log tree commit diff
AgeCommit message (Collapse)AuthorFilesLines
2019-09-0920.03 is MarkhorSamuel Leathers4-2/+83
* Markhor is a spiral horned animal that is on the endangered species list * https://en.wikipedia.org/wiki/Markhor
2019-09-09Merge pull request #68358 from ivan/fix-python-lmdbworldofpeace1-2/+1
pythonPackages.lmdb: fix build
2019-09-09pythonPackages.lmdb: fix buildIvan Kozik1-2/+1
This fixes: pythonCatchConflictsPhase Found duplicated packages in closure for dependency 'lmdb': lmdb 0.97 (/build/lmdb-0.97) lmdb 0.97 (/nix/store/js0iimri6y9yqgfc111jzp3mrv5ic9cj-python3.7-lmdb-0.97/lib/python3.7/site-packages) Package duplicates found in closure, see above. Usually this happens if two packages depend on different version of the same dependency. builder for '/nix/store/9bcn2m3r5v8slmpj31hxw05j906qgl5l-python3.7-lmdb-0.97.drv' failed with exit code 1 This was probably broken by https://github.com/NixOS/nixpkgs/commit/f7e28bf5d8181926e600a222cb70180519d09726
2019-09-09Merge pull request #68309 from c0deaddict/fix/sonic-pi-qt-wrapperworldofpeace2-21/+26
sonic-pi: fix qt wrapper
2019-09-09sonic-pi: fix qt wrapperJos van Bakel2-21/+26
2019-09-09Merge pull request #68312 from mat8913/patch-2Samuel Dionne-Riel1-0/+2
kernel: Enable X86_AMD_PLATFORM_DEVICE
2019-09-09docker: 19.03.1 -> 19.03.2Tim Steinbach1-3/+3
2019-09-09docker: 18.09.8 -> 18.09.9Tim Steinbach1-3/+3
2019-09-09slack-theme-black: 2019-07-26 -> 2019-09-07Tim Steinbach1-3/+3
2019-09-09oh-my-zsh: 2019-08-07 -> 2019-09-08Tim Steinbach1-3/+3
2019-09-09python.pkgs.MySQL_python: remove (#68354)Jörg Thalheim2-35/+0
python.pkgs.MySQL_python: remove
2019-09-09Merge pull request #68352 from jtojnar/gthree-0.2.0worldofpeace3-21/+12
gthree: unstable-2019-08-21 → 0.2.0
2019-09-09python.pkgs.MySQL_python: removeJörg Thalheim2-35/+0
Reasons: - No release since 2014 - deprecated by upstream - no longer compatible with newer libmysql versions
2019-09-09gnome-hexgl: unstable-2019-08-21 → 0.2.0Jan Tojnar1-5/+5
https://github.com/alexlarsson/gnome-hexgl/releases/tag/0.2.0
2019-09-09gthree: unstable-2019-08-21 → 0.2.0Jan Tojnar1-14/+5
https://blogs.gnome.org/alexl/2019/09/09/gthree-ready-to-play/ https://github.com/alexlarsson/gthree/releases/tag/0.2.0
2019-09-09graphene: 1.9.6 → 1.10.0Jan Tojnar1-2/+2
2019-09-09helm: 2.14.2 -> 2.14.3zimbatm1-2/+2
2019-09-09Merge pull request #68345 from spacekookie/railcar-fixesworldofpeace1-3/+3
ociTools: fixing outdated documentation
2019-09-09kind: 0.3.0 -> 0.5.1 (#68319)zimbatm2-106/+130
2019-09-09Merge pull request #68336 from xrelkd/update/parityworldofpeace2-2/+2
parity, parity-beta: update cargoSha256 hashes
2019-09-09Merge pull request #68330 from lilyball/ffsend-installShellFilesworldofpeace1-5/+3
ffsend: adopt installShellFiles
2019-09-09Merge pull request #68344 from Izorkin/gixyElis Hirwing1-0/+1
gixy: fix error - no module named pkg_resources
2019-09-09Merge pull request #68329 from lilyball/exa-installShellFilesMaximilian Bosch1-13/+9
exa: adopt installShellFiles
2019-09-09Merge pull request #68218 from worldofpeace/cups-pk/no-auth-wheelworldofpeace1-0/+10
nixos/cupsd: passwordless admin for wheel with polkit
2019-09-09Merge pull request #68310 from rnhmjoj/xkbLinus Heckemann3-4/+13
services.xserver.extraLayouts fixes
2019-09-09Merge pull request #68339 from NixOS/staging-nextFrederik Rietdijk393-509/+527
Staging next with systemd 243
2019-09-09gixy: fix error - no module named pkg_resourcesIzorkin1-0/+1
2019-09-09cachix: fix buildDomen Kožar1-1/+6
2019-09-09git-cola: fix wrappingFrederik Rietdijk1-2/+2
2019-09-09ociTools: fixing outdated documentationKatharina Fey1-3/+3
2019-09-09Merge pull request #68245 from jonringer/bump-grabserialMarek Mahut1-14/+14
grabserial: 1.9.3 -> 1.9.8
2019-09-09Merge pull request #68252 from jluttine/eth-typing-2.1.0Marek Mahut2-4/+4
eth-typing: 2.0.0 -> 2.1.0 and eth-utils: 1.4.1 -> 1.7.0
2019-09-09Merge pull request #68326 from romildo/upd.shades-of-gray-themeMarek Mahut1-2/+2
shades-of-gray-theme: 1.1.8 -> 1.1.9
2019-09-09Merge pull request #67498 from peterhoeg/f/xxdiffPeter Hoeg3-55/+41
xxdiff: drop the old qt4 version in favour of qt5
2019-09-09Merge staging into staging-nextFrederik Rietdijk393-509/+527
2019-09-09Merge staging-next into stagingFrederik Rietdijk33-132/+530
2019-09-09Merge master into staging-nextFrederik Rietdijk32-129/+525
2019-09-09Merge pull request #68244 from NixOS/staging-nextFrederik Rietdijk148-1194/+1477
Staging next that includes gcc8
2019-09-09xxdiff: drop the old qt4 version in favour of qt5Peter Hoeg3-55/+41
2019-09-09Merge pull request #67552 from volth/quotesJörg Thalheim387-487/+487
treewide: remove redundant quotes
2019-09-09nemiver: clean up (#68333)Jörg Thalheim5-34/+50
nemiver: clean up
2019-09-09Merge pull request #68332 from Ma27/urlview-handler-fixJörg Thalheim1-3/+14
urlview: fix path to url_handler.sh
2019-09-09Merge pull request #68335 from lopsided98/jemalloc450-disable-thpJörg Thalheim1-0/+7
jemalloc450: disable transparent huge pages on ARM
2019-09-09Merge pull request #68258 from teto/luarocks-nix_bumpMatthieu Coudron5-31/+17
Moved luarocks-nix to community and leverage luarocks mirrors when possible.
2019-09-09parity-beta: update cargoSha256 hashxrelkd1-1/+1
2019-09-09parity: update cargoSha256 hashxrelkd1-1/+1
2019-09-08jemalloc450: disable transparent huge pages on ARMBen Wolsieffer1-0/+7
2019-09-09python3Packages.django_2_2: 2.2.4 -> 2.2.5Orivej Desh1-2/+2
2019-09-08Merge pull request #68323 from romildo/upd.mateJosé Romildo Malaquias1-2/+2
mate.engrampa: 1.22.1 -> 1.22.2
2019-09-09Merge pull request #65489 from arcnmx/pr-bukubrow-updateSilvan Mosberger1-17/+29
bukubrow: 2.4.0 -> 5.0.0