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: db73b295caca
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: f841e48c9004
Choose a head ref
  • 4 commits
  • 4 files changed
  • 3 contributors

Commits on Sep 26, 2019

  1. electron-cash: use wrapQtApp 

    (cherry picked from commit 0838bc0)
    @gebner
    gebner committed Sep 26, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    SamirHafez Samir Hafez
    GPG key ID: 95806A3539FE7066
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0558109 View commit details

  2. python37Packages.dlib: 19.17 -> 19.18 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-dlib/versions

(cherry picked from commit 3a73ebd)
    @r-ryantm @Ma27
    r-ryantm authored and Ma27 committed Sep 26, 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
    e1dd830 View commit details

  3. gitAndTools.diff-so-fancy: 1.2.6 -> 1.2.7 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/diff-so-fancy/versions

(cherry picked from commit ea35632)
    @r-ryantm @Ma27
    r-ryantm authored and Ma27 committed Sep 26, 2019
    Copy the full SHA
    4289414 View commit details

  4. ceph: 14.2.3 -> 14.2.4 

    (cherry picked from commit 7a61cd2)
Backport of #69518
    @srhb
    Johan Thomsen authored and srhb committed Sep 26, 2019
    Copy the full SHA
    f841e48 View commit details
4 changes: 4 additions & 0 deletions pkgs/applications/misc/electron-cash/default.nix
View file
Original file line number Diff line number Diff line change
@@ -56,6 +56,10 @@ python3Packages.buildPythonApplication rec {
--replace "Exec=electron-cash" "Exec=$out/bin/electron-cash"
'';

postFixup = ''
wrapQtApp $out/bin/electron-cash
'';

doInstallCheck = true;
installCheckPhase = ''
$out/bin/electron-cash help >/dev/null
4 changes: 2 additions & 2 deletions pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
pname = "diff-so-fancy";
version = "1.2.6";
version = "1.2.7";

src = fetchFromGitHub {
owner = "so-fancy";
repo = "diff-so-fancy";
rev = "v${version}";
sha256 = "1w8x2d83zdhrnydiqq1qjf3j1y4cawdg8p1isj8zqwblnc47ygjm";
sha256 = "0y5cp236gi6h7llzai5d27086l4zz58mz1zs01r97xnnmjs9vw21";
};

# Perl is needed here for patchShebangs
4 changes: 2 additions & 2 deletions pkgs/development/libraries/dlib/default.nix
View file
Original file line number Diff line number Diff line change
@@ -7,13 +7,13 @@

stdenv.mkDerivation rec {
pname = "dlib";
version = "19.17";
version = "19.18";

src = fetchFromGitHub {
owner = "davisking";
repo = "dlib";
rev ="v${version}";
sha256 = "0g11ilma6cll3bd2ahm66j1sjb9v4rxz3xjbfkcg5pjsvb49n029";
sha256 = "1kbrcf35pn2ymyr8q48ls98n2zb7rrz5207kwpisfh6k22g802ic";
};

postPatch = ''
4 changes: 2 additions & 2 deletions pkgs/tools/filesystems/ceph/default.nix
View file
Original file line number Diff line number Diff line change
@@ -89,15 +89,15 @@ let
ps.six
]);

version = "14.2.3";
version = "14.2.4";
in rec {
ceph = stdenv.mkDerivation {
pname = "ceph";
inherit version;

src = fetchurl {
url = "http://download.ceph.com/tarballs/ceph-${version}.tar.gz";
sha256 = "1pa8czb205pz4vjfh82gsgickj3cdjrx51mcx7acsyqgp3dfvl33";
sha256 = "1y6hixh6srd5aswhzq0sf0dbygwhx0ardx3w3f7qazf5rapvd03i";
};

patches = [