summary refs log tree commit diff
Commit message (Collapse)AuthorAge
* Revert "Merge branch 'staging-next'"Vladimír Čunát2019-09-21
| | | | | | | This reverts commit 41af38f3728bd64b80721c44ed1fb019978cbc1b, reversing changes made to f0fec244ca380b9d3e617ee7b419c59758c8b0f1. Let's delay this. We have some serious regressions.
* Merge pull request #69174 from HugoReeves/masterworldofpeace2019-09-21
|\ | | | | croc: 6.1.1 -> 6.1.3
| * croc: 6.1.1 -> 6.1.3Hugo Reeves2019-09-21
| |
* | Merge pull request #69145 from delroth/mcomix-setuptoolsworldofpeace2019-09-21
|\ \ | | | | | | mcomix: add missing setuptools dependency
| * | mcomix: add missing setuptools dependencyPierre Bourdon2019-09-20
| | |
* | | ammonite: add scala-2.13 versionvolth2019-09-21
| | |
* | | Merge pull request #69152 from hkjn/20190920-bump-ledgerblueworldofpeace2019-09-21
|\ \ \ | | | | | | | | pythonPackages.ledgerblue: 0.1.24 -> 0.1.28
| * | | pythonPackages.ledgerblue: 0.1.24 -> 0.1.28Henrik Jonsson2019-09-21
| | | |
* | | | Fix Python 3 support for pythonPackages.ncclient (#68226)Simon2019-09-21
| | | |
* | | | Merge pull request #68859 from volth/patch-366worldofpeace2019-09-21
|\ \ \ \ | | | | | | | | | | jogl: remove #37364 workaround
| * | | | jogl: remove #37364 workaroundvolth2019-09-15
| | | | |
* | | | | Merge pull request #69129 from eadwu/typora/include-pandocworldofpeace2019-09-21
|\ \ \ \ \ | | | | | | | | | | | | typora: allow pandoc to be in PATH
| * | | | | typora: allow pandoc to be in PATHEdmund Wu2019-09-21
| | | | | |
* | | | | | Merge pull request #69143 from Taneb/fix-kexiworldofpeace2019-09-21
|\ \ \ \ \ \ | | | | | | | | | | | | | | kexi: patch error due to Qt 5.13
| * | | | | | kexi: patch error due to Qt 5.13Nathan van Doorn2019-09-20
| | | | | | |
* | | | | | | Merge pull request #68302 from jD91mZM2/yaruJosé Romildo Malaquias2019-09-21
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | yaru-theme: init at 19.10.2
| * | | | | | | yaru-theme: init at 19.10.2jD91mZM22019-09-20
| | | | | | | |
* | | | | | | | Add cri-o service to modules (#68153)Sascha Grunert2019-09-21
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sascha Grunert <sgrunert@suse.com>
* | | | | | | | Merge pull request #69136 from doronbehar/package-onedrivemarkuskowa2019-09-21
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | onedrive: init at 2.3.9
| * | | | | | | | onedrive: init at 2.3.9Doron Behar2019-09-20
| | | | | | | | |
* | | | | | | | | Merge pull request #69177 from rnhmjoj/bupmarkuskowa2019-09-21
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | bup: 0.29.2 -> 0.29.3
| * | | | | | | | | bup: 0.29.2 -> 0.29.3rnhmjoj2019-09-20
| | | | | | | | | |
* | | | | | | | | | Merge pull request #67680 from gilligan/add-hydra-cliMaximilian Bosch2019-09-21
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | hydra-cli: init at 0.2.0
| * | | | | | | | | | hydra-cli: init at 0.2.0tobias pflug2019-08-30
| | | | | | | | | | |
* | | | | | | | | | | turses: fix python3.7 support (#61984)Ihar Hrachyshka2019-09-21
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #69179 from uri-canva/algebraic-data-typesDaiderd Jordan2019-09-21
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | pythonPackages.algebraic-data-types: init at 0.1.1
| * | | | | | | | | | | pythonPackages.algebraic-data-types: init at 0.1.1Uri Baghin2019-09-21
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'staging-next'Vladimír Čunát2019-09-21
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | libgdiplus: 5.6.1 -> 6.0.2Vladimír Čunát2019-09-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes build error: undefined reference to `GifQuantizeBuffer' that was most likely caused by giflib update in 3605f1285 ABI tracker didn't show removal of this symbol - I don't know, perhaps we have different build setting, or something. Here I found no NEWS, ABI tracker seems OK - only minor incompatibilities in -private headers. Mono stuff builds now.
| * | | | | | | | | | | Merge master into staging-nextFrederik Rietdijk2019-09-19
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into staging-nextJan Tojnar2019-09-18
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into staging-nextJan Tojnar2019-09-18
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into staging-nextVladimír Čunát2019-09-16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | giflib_5_1: remove the alias (appears unused)Vladimír Čunát2019-09-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 3605f128 I somehow forgot about the 5.1 names that now don't make sense anymore. I can't see any evidence of _5_1 alias ever being used or (potentially) useful; _5 might make sense, but for now I couldn't see why add it.
| * | | | | | | | | | | | | | | Merge branch 'master' into staging-nextVladimír Čunát2019-09-15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'staging' into staging-nextVladimír Čunát2019-09-15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This brings openssl CVE fixes, and I can't see anything too risky in there, so let's merge these two staging iterations together.
| | * | | | | | | | | | | | | | | | networkmanager,modemmanager: fix service symlinks for systemd v243Will Dietz2019-09-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes problems such as: systemd[1]: Failed to put bus name to hashmap: File exists systemd[1]: dbus-org.freedesktop.nm-dispatcher.service: Two services allocated for the same bus name org.freedesktop.nm_dispatcher, refusing operation. Problem is that systemd treats symlinks to files outside the service path differently, causing our old workaround to look like two separate services. These symlinks are intended to be a means for manually emulating the behavior of the `Alias=` directive in these services. Unfortunately even making these symlinks relative isn't enough, since they don't make it to where it matters-- that only makes the links in /etc/static/systemd/system/* relative, with systemd still being shown non-relative links in /etc/systemd/system/*. To fix this, drop all of this at the package level and instead simply specify the aliases in the NixOS modules. Also handle the same for modemmanager, since the networkmanager NixOS module also handles that.
| | * | | | | | | | | | | | | | | | python.pkgs.cryptography: fix/ignore broken testsRobin Gloster2019-09-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Broken tests by openssl 1.1.1d, added patch and skipped one test Issue for skipped test: https://github.com/pyca/cryptography/issues/4998
| | * | | | | | | | | | | | | | | | Merge branch 'staging-next' into stagingJan Tojnar2019-09-12
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | openssl_1_0_2: fixup sha256Andreas Rammhold2019-09-11
| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge pull request #68448 from andir/opensslAndreas Rammhold2019-09-11
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | openssl: 1.1.1c -> 1.1.1d, openssl_1_0_2: 1.0.2s -> 1.0.2t (low severity security)
| | | * | | | | | | | | | | | | | | | | openssl: 1.1.1c -> 1.1.1dAndreas Rammhold2019-09-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 76d54c72acaaa32e2c1f8b13002f0ceac3b7b06f)
| | | * | | | | | | | | | | | | | | | | openssl_1_0_2: 1.0.2s -> 1.0.2tAndreas Rammhold2019-09-10
| | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit aa6327c29c2de41a61db5aef8444385c531d4cc2)
| | * | | | | | | | | | | | | | | | | wrapGAppsHook: add wrapGApp helper (#68402)Jan Tojnar2019-09-10
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wrapGAppsHook: add wrapGApp helper
| | | * | | | | | | | | | | | | | | | | tree-wide: replace wrapProgram with wrapGAppJan Tojnar2019-09-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | where appropriate
| | | * | | | | | | | | | | | | | | | | nixos/doc/gnome: fix exampleJan Tojnar2019-09-10
| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | wrapGAppsHook: address some shellcheck suggestionsJan Tojnar2019-09-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These should not cause issues in practice but it is good idea to handle them. * prefix and targetOffset are mandatory, as they are always set by the generic builder. * wrapPrefixVariables and dontWrapGApps are now defaulting to empty value, as they are not mandatory.
| | | * | | | | | | | | | | | | | | | | wrapGAppsHook: simplify taking env varsJan Tojnar2019-09-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | using indirect variable access must be better than eval
| | | * | | | | | | | | | | | | | | | | wrapGAppsHook: add wrapGApp helperJan Tojnar2019-09-10
| | |/ / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | Merge branch 'staging-next' into stagingJan Tojnar2019-09-10
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \