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

Commits on Oct 1, 2019

  1. Copy the full SHA
    6efc9c1 View commit details
  2. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    417c419 View commit details
  3. Copy the full SHA
    c993eb3 View commit details
  4. Copy the full SHA
    c1c13c0 View commit details

Commits on Oct 4, 2019

  1. Merge pull request #70174 from romildo/upd.numix-icon-theme

    Update numix icon themes to version 19.09.20
    romildo authored Oct 4, 2019
    Copy the full SHA
    554213b View commit details
6 changes: 3 additions & 3 deletions pkgs/data/icons/numix-icon-theme-circle/default.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
pname = "numix-icon-theme-circle";
version = "19.05.07";
version = "19.09.20";

src = fetchFromGitHub {
owner = "numixproject";
repo = pname;
rev = version;
sha256 = "04h7kp1895rkfaqrgzrpqjmqamkxv3dkmhslgm2cxsa6qc0wammg";
sha256 = "1pmz2dy1580ln5m57xw3vhqrjhviayisgbs2km3i77hyx66hiivi";
};

nativeBuildInputs = [ gtk3 numix-icon-theme ];
@@ -30,6 +30,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl3;
# darwin cannot deal with file names differing only in case
platforms = platforms.linux;
maintainers = with maintainers; [ ];
maintainers = with maintainers; [ romildo ];
};
}
4 changes: 2 additions & 2 deletions pkgs/data/icons/numix-icon-theme-square/default.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
pname = "numix-icon-theme-square";
version = "19.05.07";
version = "19.09.20";

src = fetchFromGitHub {
owner = "numixproject";
repo = pname;
rev = version;
sha256 = "13wxy36qys439pv0xaynqvmjshnfrk9wa89iw878ibvfj506ji2s";
sha256 = "0q3d4d4wndknz3043bh8ardjvdpds2hkzk73kyyh1848wg4ff0ly";
};

nativeBuildInputs = [ gtk3 numix-icon-theme ];
6 changes: 3 additions & 3 deletions pkgs/data/icons/numix-icon-theme/default.nix
Original file line number Diff line number Diff line change
@@ -2,20 +2,20 @@

stdenv.mkDerivation rec {
pname = "numix-icon-theme";
version = "18.07.17";
version = "19.09.20";

src = fetchFromGitHub {
owner = "numixproject";
repo = pname;
rev = version;
sha256 = "0clh55kmhc52d33dfm2c6h3lg6ddfh8a088ir9lv1camn9kj55bd";
sha256 = "0pn3x0mmsph777lwhg890ck366p31bjl3755h4pv161ym08d4z9w";
};

nativeBuildInputs = [ gtk3 hicolor-icon-theme ];

installPhase = ''
mkdir -p $out/share/icons
mv Numix{,-Light} $out/share/icons
cp -a Numix{,-Light} $out/share/icons/
'';

postFixup = ''