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

Commits on Jul 9, 2017

  1. kronometer: fix build

    @peterhoeg
    peterhoeg committed Jul 9, 2017
    Copy the full SHA
    73c21aa View commit details

  2. krusader: fix compilation

    @peterhoeg
    peterhoeg committed Jul 9, 2017
    Copy the full SHA
    4a8d67e View commit details
Showing with 4 additions and 4 deletions.
  1. +2 −2 pkgs/applications/misc/krusader/default.nix
  2. +2 −2 pkgs/tools/misc/kronometer/default.nix
4 changes: 2 additions & 2 deletions pkgs/applications/misc/krusader/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
mkDerivation, fetchurl, lib,
extra-cmake-modules, kdoctools, wrapGAppsHook,
kconfig, kinit, kparts
kconfig, kcrash, kinit, kparts
}:

let
@@ -23,5 +23,5 @@ in mkDerivation rec {
};

nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
propagatedBuildInputs = [ kconfig kinit kparts ];
propagatedBuildInputs = [ kconfig kcrash kinit kparts ];
}
4 changes: 2 additions & 2 deletions pkgs/tools/misc/kronometer/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
mkDerivation, fetchurl, lib,
extra-cmake-modules, kdoctools, wrapGAppsHook,
kconfig, kinit
kconfig, kcrash, kinit
}:

let
@@ -21,5 +21,5 @@ mkDerivation rec {
maintainers = with maintainers; [ peterhoeg ];
};
nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
propagatedBuildInputs = [ kconfig kinit ];
propagatedBuildInputs = [ kconfig kcrash kinit ];
}