about summary refs log tree commit diff
Commit message (Expand)AuthorAge
* Merge remote-tracking branch 'upstream/master' into stagingTuomas Tynkkynen2018-05-26
|\
| * solargraph: init at 0.21.1 (#41089)worldofpeace2018-05-26
| * Merge pull request #41056 from r-ryantm/auto-update/nanomsgadisbladis2018-05-26
| |\
| | * nanomsg: 1.1.2 -> 1.1.3R. RyanTM2018-05-24
| * | pan: 0.144 -> 0.145 (#40963)R. RyanTM2018-05-26
| * | jgmenu: 0.8.2 -> 0.9 (#40965)R. RyanTM2018-05-26
| * | slack: 3.1.0 -> 3.2.0-beta2 (#41051)Benjamin Staffin2018-05-26
| * | gitlab-runner: 10.7.0 -> 10.8.0 (#41096)Pascal Bach2018-05-26
| * | tex-gyre: ~2.003 → 2.501 (#41037)Jan Tojnar2018-05-26
| * | tint2: 16.2 -> 16.4 (#41097)José Romildo Malaquias2018-05-26
| * | tdesktopPackages.preview: 1.2.22 -> 1.2.23Michael Weiss2018-05-26
| * | Merge pull request #41073 from johanot/kube-1.10Sarah Brofeldt2018-05-26
| |\ \
| | * | Kubernetes:Johan Thomsen2018-05-26
| | * | Kubernetes tests: increase the size of the VM from 700MB to 1.5GBAlberto Berti2018-05-25
| | * | Kuberetes Dashboard addon 1.8.2 -> 1.8.3Alberto Berti2018-05-25
| | * | Kuberbetes DNS addon 1.14.4 -> 1.14.10Alberto Berti2018-05-25
| | * | kubernetes: 1.10.0 -> 1.10.3Johan Thomsen2018-05-25
| | * | kubernetes: update to 1.10Charles Strahan2018-05-25
| * | | python-osc: 0.159.0-4 -> 0.162.0-55Peter Simons2018-05-26
| * | | Merge pull request #41087 from oxij/pkgs/tor-browsersJoachim F2018-05-26
| |\ \ \
| | * | | tor-browser: 52.7.3esr-7.5-1 -> 52.8.0esr-7.5-1, 52.7.0esr-8.0-1 -> 52.8.0esr...SLNOS2018-05-25
| * | | | nodejs-8_x: 8.11.1 -> 8.11.2adisbladis2018-05-26
| * | | | nodejs-6_x: 6.14.1 -> 6.14.2adisbladis2018-05-26
| * | | | firefox-beta-bin: 61.0b6 -> 61.0b8adisbladis2018-05-26
| * | | | firefox-devedition-bin: 61.0b6 -> 61.0b8adisbladis2018-05-26
| * | | | ids: assing openvpnPeter Hoeg2018-05-26
| * | | | Merge pull request #36344 from grahamc/fancy-option-namesGraham Christensen2018-05-25
| |\ \ \ \
| | * | | | lib/options: teach showOptions about funny option namesGraham Christensen2018-03-05
* | | | | | Merge pull request #41088 from oxij/merge/master-to-staging-20180526Tuomas Tynkkynen2018-05-26
|\ \ \ \ \ \
| * | | | | | Merge branch 'master' into stagingJan Malakhovski2018-05-26
| |\| | | | |
| | * | | | | Merge pull request #41084 from obsidiansystems/fix-darwin-haskellJohn Ericson2018-05-25
| | |\ \ \ \ \
| | | * | | | | haskell generic-builder: Limit usage of --extra-framework-dirs for compatJohn Ericson2018-05-25
| | * | | | | | tdesktopPackages.preview: 1.2.21 -> 1.2.22Michael Weiss2018-05-25
| | |/ / / / /
| | * | | | | Merge pull request #40996 from obsidiansystems/cross-ghcJohn Ericson2018-05-25
| | |\ \ \ \ \
| | | * | | | | ghc 8.4.2, head: Drop `libiconv` on windows.Moritz Angermann2018-05-23
| | | * | | | | ghc 8.4.2, head: Adjust enableShared enableTerminfo for windowsJohn Ericson2018-05-23
| | | * | | | | ghc: paxmark all unwraped executables across the boardMoritz Angermann2018-05-23
| | | * | | | | ghc: Handle flavors betterJohn Ericson2018-05-23
| | | * | | | | ghc: Normalize derivationsJohn Ericson2018-05-23
| | | * | | | | used stdenv.targetPlatform.isDarwin and not stdenv.isDarwin.Moritz Angermann2018-05-23
| | | * | | | | haskell infra: Adds buildFlags logicMoritz Angermann2018-05-23
| | | * | | | | haskell generic builder: Do the `links` dance only if shared is enabled.Moritz Angermann2018-05-23
| | | * | | | | haskell generic builder: Disable static libs on Windows because no -staticlibMoritz Angermann2018-05-23
| | | * | | | | haskell generic builder: Use setup package database for setup-dependsMoritz Angermann2018-05-23
| | | * | | | | haskell generic builder: `setupHaskellDepends` should be `nativeBuildInputsJohn Ericson2018-05-23
| | | * | | | | haskell-generic-builder: Add extra framework dirsJohn Ericson2018-05-23
| | * | | | | | gopass: 1.6.11 -> 1.7.1 (#41078)Vladyslav M2018-05-25
| | * | | | | | memo: 0.2 -> 0.4 (#40697)Ingolf Wagner2018-05-25
| | | |_|/ / / | | |/| | | |
| | * | | | | nheko: 0.4.1 -> 0.4.2 (#41077)Léo Gaspard2018-05-25
| | * | | | | Merge pull request #41076 from jlesquembre/kittyJörg Thalheim2018-05-25
| | |\ \ \ \ \