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

Commits on Oct 21, 2019

  1. kmymoney: 5.0.5 -> 5.0.7 

    and mark as not broken anymore

see PR #69616 for the corresponding change on master
    @das-g
    das-g committed Oct 21, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5383748 View commit details

Commits on Oct 23, 2019

  1. Merge pull request #71477 from das-g/release-19.09_kmymoney 

    kmymoney: 5.0.5 -> 5.0.7
    @globin
    globin authored Oct 23, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6639362 View commit details

  2. eagle7: unbreak by using openssl 1.0 instead of 1.1 

    The default openssl version in nixpkgs is too new for eagle7 and it
fails to start:

  eagle: error while loading shared libraries: libssl.so.1.0.0: cannot open shared object file: No such file or directory

(cherry picked from commit 13859d0)
    @bjornfor
    bjornfor committed Oct 23, 2019
    Copy the full SHA
    5b314a1 View commit details
Showing with 5 additions and 4 deletions.
  1. +2 −3 pkgs/applications/office/kmymoney/default.nix
  2. +3 −1 pkgs/top-level/all-packages.nix
5 changes: 2 additions & 3 deletions pkgs/applications/office/kmymoney/default.nix
View file
Original file line number Diff line number Diff line change
@@ -16,11 +16,11 @@

stdenv.mkDerivation rec {
pname = "kmymoney";
version = "5.0.5";
version = "5.0.7";

src = fetchurl {
url = "mirror://kde/stable/kmymoney/${version}/src/${pname}-${version}.tar.xz";
sha256 = "1hghs4676kn2giwpwz1y7p6djpmi41x64idf3ybiz8ky14a5s977";
sha256 = "1h5mzvgpfyl2j66b3nsw17yxvg0ja1qhjlcmfkz62221vcqsrp6m";
};

# Hidden dependency that wasn't included in CMakeLists.txt:
@@ -70,6 +70,5 @@ stdenv.mkDerivation rec {
homepage = https://kmymoney.org/;
platforms = lib.platforms.linux;
license = lib.licenses.gpl2Plus;
broken = true;
};
}
4 changes: 3 additions & 1 deletion pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -23262,7 +23262,9 @@ in
# Since version 8 Eagle requires an Autodesk account and a subscription
# in contrast to single payment for the charged editions.
# This is the last version with the old model.
eagle7 = callPackage ../applications/science/electronics/eagle/eagle7.nix { };
eagle7 = callPackage ../applications/science/electronics/eagle/eagle7.nix {
openssl = openssl_1_0_2;
};

eagle = libsForQt5.callPackage ../applications/science/electronics/eagle/eagle.nix { };