Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: be5e8faafc69
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: beef7ae1b389
Choose a head ref
  • 16 commits
  • 15 files changed
  • 9 contributors

Commits on May 18, 2018

  1. libsForQt5.libkdegames: init at 18.04.1

    @lheckemann
    lheckemann committed May 18, 2018
    Copy the full SHA
    60216b2 View commit details

  2. kdeApplications.konquest: init at 2.4

    @lheckemann
    lheckemann committed May 18, 2018
    Copy the full SHA
    9eb61e8 View commit details

Commits on May 19, 2018

  1. tmon: fix missing libgcc_s.so required by pthreads

    @lopsided98
    lopsided98 committed May 19, 2018
    Copy the full SHA
    6e222ef View commit details

Commits on May 20, 2018

  1. gitAndTools.git-dit: Fix darwin build

    @knedlsepp
    knedlsepp committed May 20, 2018
    Copy the full SHA
    3575b82 View commit details

  2. Merge pull request #40721 from lheckemann/konquest 

    kdeApplications.konquest: init at 2.4
    @adisbladis
    adisbladis authored May 20, 2018
    Copy the full SHA
    4810776 View commit details

  3. buildRustCrate: add extraLinkFlags parameter 

    This is useful when build scripts do not apply linking flags
    @P-E-Meunier @Mic92
    P-E-Meunier authored and Mic92 committed May 20, 2018
    Copy the full SHA
    c0e2f7b View commit details

  4. curl-sys: fix linking against zlib

    @P-E-Meunier @Mic92
    P-E-Meunier authored and Mic92 committed May 20, 2018
    Copy the full SHA
    aa1d796 View commit details

  5. Merge pull request #40799 from lopsided98/tmon-lib-gcc-s 

    tmon: fix missing libgcc_s.so required by pthreads
    @Mic92
    Mic92 authored May 20, 2018
    Copy the full SHA
    f814d8f View commit details

  6. Merge pull request #40802 from knedlsepp/fix-git-dit-on-darwin 

    gitAndTools.git-dit: Fix darwin build
    @Mic92
    Mic92 authored May 20, 2018
    Copy the full SHA
    8ac7c7f View commit details

  7. Merge pull request #40808 from Mic92/rust-curl-sys 

    cargo-vendor: fix build
    @Mic92
    Mic92 authored May 20, 2018
    Copy the full SHA
    9d3693b View commit details

  8. firefox-devedition-bin: 61.0b5 -> 61.0b6

    @adisbladis
    adisbladis committed May 20, 2018
    Copy the full SHA
    1544960 View commit details

  9. firefox-beta-bin: 61.0b5 -> 61.0b6

    @adisbladis
    adisbladis committed May 20, 2018
    Copy the full SHA
    68cdc9c View commit details

  10. kmscube: Fix src 

    Someone sedded a bit too eagerly.
    @dezgeg
    dezgeg committed May 20, 2018
    Copy the full SHA
    430bfa5 View commit details

  11. libnatpmp: init at 20150609

    @orivej
    orivej committed May 20, 2018
    Copy the full SHA
    5188ef3 View commit details

  12. swift-im: init at 4.0.2 

    (cherry picked from commit d7117945f5a3edf44b3c71432a8a6a4f94e1d75b)
    @orivej
    orivej committed May 20, 2018
    Copy the full SHA
    75e66b5 View commit details

  13. Merge pull request #40803 from orivej/swift-im 

    swift-im: init at 4.0.2
    @orivej
    orivej authored May 20, 2018
    Copy the full SHA
    beef7ae View commit details
2 changes: 2 additions & 0 deletions pkgs/applications/kde/default.nix
View file
Original file line number Diff line number Diff line change
@@ -127,6 +127,7 @@ let
konsole = callPackage ./konsole.nix {};
kontact = callPackage ./kontact.nix {};
kontactinterface = callPackage ./kontactinterface.nix {};
konquest = callPackage ./konquest.nix {};
korganizer = callPackage ./korganizer.nix {};
kpimtextedit = callPackage ./kpimtextedit.nix {};
ksmtp = callPackage ./ksmtp {};
@@ -140,6 +141,7 @@ let
libgravatar = callPackage ./libgravatar.nix {};
libkcddb = callPackage ./libkcddb.nix {};
libkdcraw = callPackage ./libkdcraw.nix {};
libkdegames = callPackage ./libkdegames.nix {};
libkdepim = callPackage ./libkdepim.nix {};
libkexiv2 = callPackage ./libkexiv2.nix {};
libkgapi = callPackage ./libkgapi.nix {};
18 changes: 18 additions & 0 deletions pkgs/applications/kde/konquest.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{ lib
, mkDerivation
, extra-cmake-modules
, kdoctools
, kdelibs4support
, libkdegames
, qtquickcontrols
}:

mkDerivation {
name = "konquest";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ kdelibs4support libkdegames qtquickcontrols ];
meta = {
license = with lib.licenses; [ gpl2 ];
maintainers = with lib.maintainers; [ lheckemann ];
};
}
26 changes: 26 additions & 0 deletions pkgs/applications/kde/libkdegames.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{ lib
, mkDerivation
, extra-cmake-modules
, kdoctools
, kdelibs4support
, qtdeclarative
, kdeclarative
, kdnssd
, knewstuff
, openal
, libsndfile
, qtquickcontrols
}:

mkDerivation {
name = "libkdegames";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kdelibs4support qtdeclarative kdeclarative kdnssd knewstuff openal libsndfile
qtquickcontrols
];
meta = {
license = with lib.licenses; [ gpl2 ];
maintainers = with lib.maintainers; [ lheckemann ];
};
}
Loading