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

Commits on Aug 4, 2019

  1. digikam: 6.1.0 -> 6.2.0 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/digikam/versions
    @r-ryantm
    r-ryantm committed Aug 4, 2019
    Copy the full SHA
    a9d9fea View commit details

  2. digikam: enable parallel build

    @Ma27
    Ma27 committed Aug 4, 2019
    Copy the full SHA
    997ed4e View commit details

  3. Merge pull request #65918 from r-ryantm/auto-update/digikam 

    digikam: 6.1.0 -> 6.2.0
    @Ma27
    Ma27 authored Aug 4, 2019
    Copy the full SHA
    9d48556 View commit details
Showing with 4 additions and 2 deletions.
  1. +4 −2 pkgs/applications/graphics/digikam/default.nix
6 changes: 4 additions & 2 deletions pkgs/applications/graphics/digikam/default.nix
View file
Original file line number Diff line number Diff line change
@@ -52,13 +52,13 @@

mkDerivation rec {
pname = "digikam";
version = "6.1.0";
version = "6.2.0";

src = fetchFromGitHub {
owner = "KDE";
repo = "digikam";
rev = "v${version}";
sha256 = "0h0jqfgpanhxfi3r7cgip58ppypqx79z6c5jj7i7f19hp2zziip8";
sha256 = "1l1nb1nwicmip2jxhn5gzr7h60igvns0zs3kzp36r6qf4wvg3v2z";
};

nativeBuildInputs = [ cmake doxygen extra-cmake-modules kdoctools wrapGAppsHook ];
@@ -105,6 +105,8 @@ mkDerivation rec {
threadweaver
];

enableParallelBuilding = true;

cmakeFlags = [
"-DENABLE_MYSQLSUPPORT=1"
"-DENABLE_INTERNALMYSQL=1"