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

Commits on Apr 28, 2019

  1. font-manager: bump to the actual 0.7.5 release :) 

    The hint was the need for fetching as a revision.
    @dtzWill
    dtzWill committed Apr 28, 2019
    Copy the full SHA
    c8eb032 View commit details

  2. font-manager: drop included patch

    @dtzWill
    dtzWill committed Apr 28, 2019
    Copy the full SHA
    9540f35 View commit details

  3. Merge pull request #60352 from dtzWill/fix/fontmanager-0.7.5 

    font-manager: "0.7.5" -> actual 0.7.5
    @worldofpeace
    worldofpeace authored Apr 28, 2019
    Copy the full SHA
    ebc9db2 View commit details
Showing with 2 additions and 19 deletions.
  1. +0 −13 pkgs/applications/misc/font-manager/correct-post-install.patch
  2. +2 −6 pkgs/applications/misc/font-manager/default.nix
13 changes: 0 additions & 13 deletions pkgs/applications/misc/font-manager/correct-post-install.patch
View file

This file was deleted.

8 changes: 2 additions & 6 deletions pkgs/applications/misc/font-manager/default.nix
View file
Original file line number Diff line number Diff line change
@@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "FontManager";
repo = "master";
rev = "cc057f3e93f5b1033b04decee03cdb44177e48b3";
sha256 = "1xg80bi2465p5r8zfmb34iga9yqs3is1k4f13hw0ligvhb58gas0";
rev = version;
sha256 = "16hma8rrkam6ngn5vbdaryn31vdixvii6920g9z928gylz9xkd3g";
};

nativeBuildInputs = [
@@ -38,10 +38,6 @@ stdenv.mkDerivation rec {
gnome3.adwaita-icon-theme
];

patches = [
./correct-post-install.patch
];

mesonFlags = [
"-Ddisable_pycompile=true"
];