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

Commits on Mar 9, 2019

  1. pantheon.elementary-redacted-script: init at 2016-06-03 

    (cherry picked from commit 86f4bad)
    @worldofpeace
    worldofpeace committed Mar 9, 2019

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: 916062A1C4748647
    Learn about vigilant mode
    Copy the full SHA
    96587cc View commit details

  2. nixos/pantheon: add elementary-redacted-script to fonts 

    Needed by elementary-screenshot-tool to conceal text.

(cherry picked from commit 59f4708)
    @worldofpeace
    worldofpeace committed Mar 9, 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
    ad3e19a View commit details
1 change: 1 addition & 0 deletions nixos/modules/services/x11/desktop-managers/pantheon.nix
View file
Original file line number Diff line number Diff line change
@@ -184,6 +184,7 @@ in
fonts.fonts = with pkgs; [
opensans-ttf
roboto-mono
pantheon.elementary-redacted-script # needed by screenshot-tool
];
fonts.fontconfig.defaultFonts = {
monospace = [ "Roboto Mono" ];
11 changes: 0 additions & 11 deletions pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,12 +2,6 @@
, ninja, vala, python3, desktop-file-utils, gtk3, granite, libgee
, libcanberra, gobject-introspection, elementary-icon-theme, wrapGAppsHook }:

let

redacted-script = callPackage ./redacted-script.nix {};

in

stdenv.mkDerivation rec {
pname = "screenshot-tool"; # This will be renamed to "screenshot" soon. See -> https://github.com/elementary/screenshot/pull/93
version = "1.6.2";
@@ -52,11 +46,6 @@ stdenv.mkDerivation rec {
patchShebangs meson/post_install.py
'';

postInstall = ''
mkdir -p $out/share/fonts/truetype
cp -rva ${redacted-script}/share/fonts/truetype/redacted-elementary $out/share/fonts/truetype
'';

meta = with stdenv.lib; {
description = "Screenshot tool designed for elementary OS";
homepage = https://github.com/elementary/screenshot;
28 changes: 0 additions & 28 deletions pkgs/desktops/pantheon/apps/elementary-screenshot-tool/redacted-script.nix
View file

This file was deleted.

28 changes: 28 additions & 0 deletions pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{ stdenv, fetchFromGitHub, pantheon }:

stdenv.mkDerivation rec {
pname = "elementary-redacted-script";
version = "unstable-2016-06-03";

src = fetchFromGitHub {
owner = "png2378";
repo = "redacted-elementary";
rev = "346440ff9ce19465e6d5c3d6d67a8573f992c746";
sha256 = "1jpd13sxkarclr0mlm66wzgpjh52ghzjzn4mywhyshyyskwn7jg1";
};

dontBuild = true;

installPhase = ''
mkdir -p $out/share/fonts/truetype/redacted-elementary
cp -a truetype/*.ttf $out/share/fonts/truetype/redacted-elementary
'';

meta = with stdenv.lib; {
description = "Font for concealing text";
homepage = https://github.com/png2378/redacted-elementary;
license = licenses.ofl;
maintainers = pantheon.maintainers;
platforms = platforms.linux;
};
}
2 changes: 2 additions & 0 deletions pkgs/desktops/pantheon/default.nix
View file
Original file line number Diff line number Diff line change
@@ -217,6 +217,8 @@ lib.makeScope pkgs.newScope (self: with self; {

elementary-icon-theme = callPackage ./artwork/elementary-icon-theme { };

elementary-redacted-script = callPackage ./artwork/elementary-redacted-script { };

elementary-sound-theme = callPackage ./artwork/elementary-sound-theme { };

elementary-wallpapers = callPackage ./artwork/elementary-wallpapers { };