summary refs log tree commit diff
Commit message (Expand)AuthorAge
* xmind: init at 7.5-update1Michal Rus2016-09-20
* Merge remote-tracking branch 'upstream/staging' into masterTuomas Tynkkynen2016-09-11
|\
| * e2fsprogs: Split 'dev'Tuomas Tynkkynen2016-09-10
| * util-linux: Split 'dev'Tuomas Tynkkynen2016-09-10
| * texlive: add links to ht* tools, in particular htlatexVladimír Čunát2016-09-10
* | llvmPackages: generalize "3.9.0" string occurrencesVladimír Čunát2016-09-11
* | toxvpn service: doesn't require online networkFranz Pletz2016-09-11
* | treewide: fix fallout of ip-up deprecationFranz Pletz2016-09-11
* | Merge pull request #18497 from aneeshusa/add-z3-dependency-for-cryptolPeter Simons2016-09-11
|\ \
| * | cryptol: Make Z3 available for REPL usersAneesh Agrawal2016-09-10
* | | release-lib: Remove unused allowTexliveBuilds optionTuomas Tynkkynen2016-09-11
* | | vlc_npapi: Fix hashTuomas Tynkkynen2016-09-11
|/ /
* | Merge commit 'bd6e40c' from staging into masterTuomas Tynkkynen2016-09-10
|\|
| * Merge #16391: texlive: 2015 -> 2016Vladimír Čunát2016-09-10
| |\
| | * texlive: allow using pkgs.nix with empty hashesVladimír Čunát2016-09-04
| | * texlive: fixup some packages missing from scheme-fullVladimír Čunát2016-09-04
| | * texlive.bin.src: eradicate the last tug.org downloadVladimír Čunát2016-09-04
| | * texlive: rename the directory texlive-new -> texliveVladimír Čunát2016-09-04
| | * Merge commit 'da421bc' into p/texlive-2016Vladimír Čunát2016-09-04
| | |\
| | * | texlive.xindy: fixup after 2016 updateVladimír Čunát2016-09-04
| | * | texlive: use a cuni.cz mirror temporarilyVladimír Čunát2016-09-04
| | * | texlive: fixup some bin/ links, e.g. xe(la)texVladimír Čunát2016-09-04
| | * | dblatex: fixup build with texlive-2016Vladimír Čunát2016-09-04
| | * | texlive: 2015 -> 2016Vladimír Čunát2016-09-04
| * | | mesa: maintenance 12.0.1 -> 12.0.2Vladimír Čunát2016-09-10
| * | | Merge #18400: shared-mime-info: 1.5 -> 1.7Vladimír Čunát2016-09-10
| |\ \ \
| | * | | shared-mime-info: 1.5 -> 1.7mimadrid2016-09-07
| * | | | pango: maintenance 1.40.1 -> 1.40.2Vladimír Čunát2016-09-10
| * | | | gtk2: maintenance 2.24.30 -> 2.24.31Vladimír Čunát2016-09-10
| * | | | ffmpeg_2: 2.8.6 -> 2.8.7Vladimír Čunát2016-09-10
| * | | | orc: bug-fix 0.4.25 -> 0.4.26Vladimír Čunát2016-09-10
| * | | | Merge branch 'master' into stagingVladimír Čunát2016-09-10
| |\ \ \ \
* | \ \ \ \ Merge pull request #17997 from teozkr/fix/buildstackproject-stackrootPeter Simons2016-09-10
|\ \ \ \ \ \
| * | | | | | buildStackProject: Fix missing STACK_ROOT causing build errorsTeo Klestrup Röijezon2016-08-25
* | | | | | | Merge pull request #17145 from kalhauge/haskell_darwin_dyldPeter Simons2016-09-10
|\ \ \ \ \ \ \
| * | | | | | | Make the implementation cleanChristian Gram Kalhauge2016-07-21
| * | | | | | | Change if to optionalStringChristian Gram Kalhauge2016-07-21
| * | | | | | | Reduce computation time for non-darwin usersChristian Gram Kalhauge2016-07-21
| * | | | | | | Merge remote-tracking branch 'origin/master' into haskell_darwin_dyldChristian Gram Kalhauge2016-07-20
| |\ \ \ \ \ \ \
| * | | | | | | | Fix DLYD problem with haskell libraries on DarwinChristian Gram Kalhauge2016-07-20
* | | | | | | | | haskell-hasktags: don't install the "test" binaryChris Martin2016-09-10
* | | | | | | | | idris: clean up overridesPeter Simons2016-09-10
* | | | | | | | | mpv: 0.19.0 -> 0.20.0 (#18493)Kirill Boltaev2016-09-10
* | | | | | | | | haskell-configuration-common: cosmeticPeter Simons2016-09-10
* | | | | | | | | haskell-gtk2hs-buildtools: this override does not belong into commonPeter Simons2016-09-10
* | | | | | | | | haskell-yi: remove obsolete "broken" markerPeter Simons2016-09-10
* | | | | | | | | idea.idea14-ultimate: use base32 hashEdward Tjörnhammar2016-09-10
* | | | | | | | | idea.idea-{community,ultimate}: 2016.2.3 -> 2016.2.4Edward Tjörnhammar2016-09-10
* | | | | | | | | julia-git: mark as broken for i686Frederik Rietdijk2016-09-10
* | | | | | | | | julia: mark as broken for i686Frederik Rietdijk2016-09-10