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: 33941e49f2f4
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: fec5edc7c089
Choose a head ref
  • 2 commits
  • 3 files changed
  • 2 contributors

Commits on Dec 25, 2019

  1. kmahjongg: init at 19.08.3

    Bignaux Ronan committed Dec 25, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    rasendubi Oleksii Shmalko
    GPG key ID: DCEF7BCCEB3066C3
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4d8cb42 View commit details

Commits on Jan 16, 2020

  1. Merge pull request #76508 from bignaux/kmahjongg 

    kmahjongg: init at 19.08.3
    @ttuegel
    ttuegel authored Jan 16, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    rasendubi Oleksii Shmalko
    GPG key ID: DCEF7BCCEB3066C3
    Verified
    Learn about vigilant mode
    Copy the full SHA
    fec5edc View commit details
Showing with 39 additions and 0 deletions.
  1. +2 −0 pkgs/applications/kde/default.nix
  2. +19 −0 pkgs/applications/kde/kmahjongg.nix
  3. +18 −0 pkgs/applications/kde/libkmahjongg.nix
2 changes: 2 additions & 0 deletions pkgs/applications/kde/default.nix
View file
Original file line number Diff line number Diff line change
@@ -121,6 +121,7 @@ let
kio-extras = callPackage ./kio-extras.nix {};
kldap = callPackage ./kldap.nix {};
kleopatra = callPackage ./kleopatra.nix {};
kmahjongg = callPackage ./kmahjongg.nix {};
kmail = callPackage ./kmail.nix {};
kmail-account-wizard = callPackage ./kmail-account-wizard.nix {};
kmailtransport = callPackage ./kmailtransport.nix {};
@@ -160,6 +161,7 @@ let
libkgapi = callPackage ./libkgapi.nix {};
libkipi = callPackage ./libkipi.nix {};
libkleo = callPackage ./libkleo.nix {};
libkmahjongg = callPackage ./libkmahjongg.nix {};
libkomparediff2 = callPackage ./libkomparediff2.nix {};
libksane = callPackage ./libksane.nix {};
libksieve = callPackage ./libksieve.nix {};
19 changes: 19 additions & 0 deletions pkgs/applications/kde/kmahjongg.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{ lib
, mkDerivation
, extra-cmake-modules
, kdoctools
, kdeclarative
, knewstuff
, libkdegames
, libkmahjongg
}:

mkDerivation {
name = "kmahjongg";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ kdeclarative libkmahjongg knewstuff libkdegames ];
meta = {
license = with lib.licenses; [ gpl2 ];
maintainers = with lib.maintainers; [ genesis ];
};
}
18 changes: 18 additions & 0 deletions pkgs/applications/kde/libkmahjongg.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
kcompletion, kconfig, kconfigwidgets, kcoreaddons, ki18n,
kwidgetsaddons
}:

mkDerivation {
name = "libkmahjongg";
meta = {
license = with lib.licenses; [ gpl2 ];
maintainers = with lib.maintainers; [ genesis ];
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ kcompletion kconfig kconfigwidgets kcoreaddons ki18n
kwidgetsaddons ];
outputs = [ "out" "dev" ];
}