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

Commits on May 27, 2019

  1. tetra-gtk-theme: 201905 -> 201905r1 

    - Rename to adementary-theme, following upstream
- Update to version 201905r1
    @romildo
    romildo committed May 27, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    ondrejmirtes Ondřej Mirtes
    GPG key ID: CF1A108D0E7AE720
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b2ccf38 View commit details

Commits on Jun 9, 2019

  1. Merge #62132: tetra-gtk-theme: 201905 -> 201905r1 

    And rename, without an alias (probably fine for this, I think).
    @vcunat
    vcunat committed Jun 9, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    ondrejmirtes Ondřej Mirtes
    GPG key ID: CF1A108D0E7AE720
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    308706f View commit details
Showing with 6 additions and 6 deletions.
  1. +4 −4 pkgs/data/themes/{tetra → adementary}/default.nix
  2. +2 −2 pkgs/top-level/all-packages.nix
8 changes: 4 additions & 4 deletions pkgs/data/themes/tetra/default.nix → pkgs/data/themes/adementary/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, gtk3, sassc }:

stdenv.mkDerivation rec {
pname = "tetra-gtk-theme";
version = "201905";
pname = "adementary-theme";
version = "201905r1";

src = fetchFromGitHub {
owner = "hrdwrrsk";
repo = pname;
rev = version;
sha256 = "1j2w8na564f5yjm5am7843hq5qk28h1rq8rcbak4xsygdc3lbsfi";
sha256 = "14y5s18g9r2c1ciw1skfksn09gvqgy8vjvwbr0z8gacf0jc2apqk";
};

preBuild = ''
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {

meta = with stdenv.lib; {
description = "Adwaita-based gtk+ theme with design influence from elementary OS and Vertex gtk+ theme";
homepage = https://github.com/hrdwrrsk/tetra-gtk-theme;
homepage = https://github.com/hrdwrrsk/adementary-theme;
license = licenses.gpl3;
maintainers = with maintainers; [ dtzWill ];
platforms = platforms.linux;
4 changes: 2 additions & 2 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -16082,6 +16082,8 @@ in

adapta-backgrounds = callPackage ../data/misc/adapta-backgrounds { };

adementary-theme = callPackage ../data/themes/adementary { };

agave = callPackage ../data/fonts/agave { };

aileron = callPackage ../data/fonts/aileron { };
@@ -16660,8 +16662,6 @@ in

termtekst = callPackage ../misc/emulators/termtekst { };

tetra-gtk-theme = callPackage ../data/themes/tetra { };

tex-gyre = callPackages ../data/fonts/tex-gyre { };

tex-gyre-math = callPackages ../data/fonts/tex-gyre-math { };