Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1c9efa61b4ea
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4039c1125560
Choose a head ref
  • 3 commits
  • 3 files changed
  • 1 contributor

Commits on Nov 9, 2020

  1. elisa: build requires Qt5.14

    @freezeboy @alyssais
    freezeboy authored and alyssais committed Nov 9, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    prusnak Pavol Rusnak
    GPG key ID: 91F3B339B9A02A3D
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0f6b72e View commit details

  2. kwave: build requires Qt5.14

    @freezeboy @alyssais
    freezeboy authored and alyssais committed Nov 9, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    prusnak Pavol Rusnak
    GPG key ID: 91F3B339B9A02A3D
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0c441e2 View commit details

  3. minuet: build requires Qt5.14

    @freezeboy @alyssais
    freezeboy authored and alyssais committed Nov 9, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4039c11 View commit details
Showing with 9 additions and 3 deletions.
  1. +2 −0 pkgs/applications/kde/elisa.nix
  2. +5 −2 pkgs/applications/kde/kwave.nix
  3. +2 −1 pkgs/applications/kde/minuet.nix
2 changes: 2 additions & 0 deletions pkgs/applications/kde/elisa.nix
View file
Original file line number Diff line number Diff line change
@@ -3,6 +3,7 @@
, lib
, extra-cmake-modules
, kdoctools
, qtbase
, qtmultimedia
, qtquickcontrols2
, qtwebsockets
@@ -42,5 +43,6 @@ mkDerivation rec {
description = "A simple media player for KDE";
license = licenses.gpl3;
maintainers = with maintainers; [ peterhoeg ];
broken = lib.versionOlder qtbase.version "5.14";
};
}
7 changes: 5 additions & 2 deletions pkgs/applications/kde/kwave.nix
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
{ mkDerivation, lib, extra-cmake-modules, kdoctools, qtmultimedia, kcompletion, kconfig, kcrash, kiconthemes, kio, audiofile, libsamplerate
, alsaLib, libpulseaudio, flac, id3lib, libogg, libmad, libopus, libvorbis, fftw, librsvg }:
{ mkDerivation, lib, extra-cmake-modules, kdoctools, qtmultimedia, kcompletion, kconfig
, kcrash, kiconthemes, kio, audiofile, libsamplerate, alsaLib, libpulseaudio, flac, id3lib
, libogg, libmad, libopus, libvorbis, fftw, librsvg, qtbase }:

mkDerivation {
name = "kwave";

meta = with lib; {
homepage = "https://kde.org/applications/en/multimedia/org.kde.kwave";
description = "A simple media player";
maintainers = with maintainers; [ freezeboy ];
license = licenses.gpl2Plus;
platforms = platforms.linux;
broken = lib.versionOlder qtbase.version "5.14";
};
nativeBuildInputs = [
extra-cmake-modules
3 changes: 2 additions & 1 deletion pkgs/applications/kde/minuet.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ mkDerivation
{ mkDerivation, qtbase
, lib, extra-cmake-modules, gettext, python
, drumstick, fluidsynth
, kcoreaddons, kcrash, kdoctools
@@ -10,6 +10,7 @@ mkDerivation {
meta = with lib; {
license = with licenses; [ lgpl21 gpl3 ];
maintainers = with maintainers; [ peterhoeg HaoZeke ];
broken = lib.versionOlder qtbase.version "5.14";
};

nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python qtdeclarative ];