diff options
| author | Andreas Rammhold <andreas@rammhold.de> | 2018-10-16 00:23:02 +0200 |
|---|---|---|
| committer | Andreas Rammhold <andreas@rammhold.de> | 2018-10-26 12:17:58 +0200 |
| commit | 385e5ac8479f994dd4f2838a552341e009a99083 (patch) | |
| tree | 9a9d426c60e028d78b1b098c4dde3bab9628b3bd /pkgs/applications/display-managers | |
| parent | 1103b3fbe6e7349a1f95e7eb2f6f17af8210ab6e (diff) | |
sddm: 0.17.0 -> 0.18.0
Bumps to the latest stable version while fixing CVE-2018-14345 [1].
Changelog [2]:
- Support theme supplied avatars
- Compile against Qt 5.11
- Fix platform detection for HighDPI
- On close, switch VT to a running session if applicable
- Better ConsoleKit support
- Fix authentication when non-default hidden option ReuseSession=true is used (CVE-2018-14345)
- Hide sessions with NoDisplay=true
- Honor PAM's ambient supplemental groups
- Cleanup socket destruction
- Don't quit on SIGHUP
- Updated translations
[1] https://nvd.nist.gov/vuln/detail/CVE-2018-14345
[2] https://github.com/sddm/sddm/releases/tag/v0.18.0
Diffstat (limited to 'pkgs/applications/display-managers')
| -rw-r--r-- | pkgs/applications/display-managers/sddm/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/applications/display-managers/sddm/qt511.patch | 28 |
2 files changed, 2 insertions, 31 deletions
diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index c9fd4f9c4ab9..3de4067f55d5 100644 --- a/pkgs/applications/display-managers/sddm/default.nix +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -4,7 +4,7 @@ }: let - version = "0.17.0"; + version = "0.18.0"; in mkDerivation rec { name = "sddm-${version}"; @@ -13,12 +13,11 @@ in mkDerivation rec { owner = "sddm"; repo = "sddm"; rev = "v${version}"; - sha256 = "1m35ly6miwy8ivsln3j1bfv0nxbc4gyqnj7f847zzp53jsqrm3mq"; + sha256 = "16xnm02iqgy4hydzd6my0widq981glbazbhxnihhclgsaczh8mfq"; }; patches = [ ./sddm-ignore-config-mtime.patch - ./qt511.patch ]; postPatch = diff --git a/pkgs/applications/display-managers/sddm/qt511.patch b/pkgs/applications/display-managers/sddm/qt511.patch deleted file mode 100644 index 6430e60ed417..000000000000 --- a/pkgs/applications/display-managers/sddm/qt511.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 005c9ad..71b46d7 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -93,7 +93,7 @@ find_package(XCB REQUIRED) - find_package(XKB REQUIRED) - - # Qt 5 --find_package(Qt5 5.6.0 CONFIG REQUIRED Core DBus Gui Qml Quick LinguistTools) -+find_package(Qt5 5.6.0 CONFIG REQUIRED Core DBus Gui Qml Quick LinguistTools Test) - - # find qt5 imports dir - get_target_property(QMAKE_EXECUTABLE Qt5::qmake LOCATION) -diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt -index c9d935a..bb85ddd 100644 ---- a/test/CMakeLists.txt -+++ b/test/CMakeLists.txt -@@ -2,9 +2,8 @@ set(QT_USE_QTTEST TRUE) - - include_directories(../src/common) - -- - set(ConfigurationTest_SRCS ConfigurationTest.cpp ../src/common/ConfigReader.cpp) - add_executable(ConfigurationTest ${ConfigurationTest_SRCS}) - add_test(NAME Configuration COMMAND ConfigurationTest) - --qt5_use_modules(ConfigurationTest Test) -+target_link_libraries(ConfigurationTest Qt5::Core Qt5::Test) |