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

Commits on Mar 22, 2019

  1. squash! nixos/gnome3: source-sans-pro is now default monospace font 

    nixos/gnome3: add new default fonts

- source-code-pro is now the default monospace font
- source-sans-pro seems to be used somewhere too:
  https://wiki.gnome.org/Engagement/BrandGuidelines
    @hedning
    hedning committed Mar 22, 2019
    Copy the full SHA
    80ba05b View commit details

  2. Revert "gtksourceview4: fixme: disable checks" 

    This reverts commit 054e5fe.
    @hedning
    hedning committed Mar 22, 2019
    Copy the full SHA
    5ee5aea View commit details
Showing with 3 additions and 2 deletions.
  1. +2 −1 nixos/modules/services/x11/desktop-managers/gnome3.nix
  2. +1 −1 pkgs/development/libraries/gtksourceview/4.x.nix
3 changes: 2 additions & 1 deletion nixos/modules/services/x11/desktop-managers/gnome3.nix
View file
Original file line number Diff line number Diff line change
@@ -162,7 +162,8 @@ in {

fonts.fonts = [
pkgs.dejavu_fonts pkgs.cantarell-fonts
pkgs.source-sans-pro # Default monospace font in 3.32
pkgs.source-sans-pro
pkgs.source-code-pro # Default monospace font in 3.32
];

services.xserver.displayManager.extraSessionFilePackages = [ pkgs.gnome3.gnome-session ]
2 changes: 1 addition & 1 deletion pkgs/development/libraries/gtksourceview/4.x.nix
View file
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {

enableParallelBuilding = true;

doCheck = false; # FIXME
doCheck = stdenv.isLinux;
checkPhase = ''
NO_AT_BRIDGE=1 \
XDG_DATA_DIRS="$XDG_DATA_DIRS:${shared-mime-info}/share" \