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

Commits on Oct 8, 2018

  1. konqueror: init at 18.08

    @colemickens
    colemickens committed Oct 8, 2018
    Copy the full SHA
    056c03a View commit details

Commits on Nov 1, 2018

  1. Merge pull request #48033 from colemickens/konqueror 

    konqueror: init at 18.08
    @7c6f434c
    7c6f434c authored Nov 1, 2018
    Copy the full SHA
    650fd5b View commit details
Showing with 21 additions and 0 deletions.
  1. +1 −0 pkgs/applications/kde/default.nix
  2. +20 −0 pkgs/applications/kde/konqueror.nix
1 change: 1 addition & 0 deletions pkgs/applications/kde/default.nix
View file
Original file line number Diff line number Diff line change
@@ -129,6 +129,7 @@ let
kontact = callPackage ./kontact.nix {};
kontactinterface = callPackage ./kontactinterface.nix {};
konquest = callPackage ./konquest.nix {};
konqueror = callPackage ./konqueror.nix {};
korganizer = callPackage ./korganizer.nix {};
kpimtextedit = callPackage ./kpimtextedit.nix {};
ksmtp = callPackage ./ksmtp {};
20 changes: 20 additions & 0 deletions pkgs/applications/kde/konqueror.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{ lib
, mkDerivation
, extra-cmake-modules, kdoctools
, kdelibs4support, kcmutils, khtml, kdesu
, qtwebkit, qtwebengine, qtx11extras, qtscript, qtwayland
}:

mkDerivation {
name = "konqueror";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kdelibs4support kcmutils khtml kdesu
qtwebkit qtwebengine qtx11extras qtscript qtwayland
];
meta = {
license = with lib.licenses; [ gpl2 ];
maintainers = with lib.maintainers; [ ];
};
}