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

Commits on Nov 14, 2018

  1. gem-config: Add missing dependencies for gio and gtk2

    @midchildan
    midchildan committed Nov 14, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    zimbatm Jonas Chevalier
    GPG key ID: 71BAF6D40C1D63D7
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2ddcf18 View commit details

  2. squash! gnome-podcasts: init at 0.4.5 

    gnome-podcasts: init at 0.4.6
    @hedning
    hedning committed Nov 14, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    zimbatm Jonas Chevalier
    GPG key ID: 71BAF6D40C1D63D7
    Verified
    Learn about vigilant mode
    Copy the full SHA
    cb6034d View commit details

  3. squash! libhandy: init at 0.0.4 

    libhandy: init at 0.0.5
    @hedning
    hedning committed Nov 14, 2018

    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
    10fc84c View commit details

  4. gnome3.tracker: install systemd service files 

    tracker only install the user service file if it can find systemd at build time,
but doesn't otherwise depend on systemd so we set the install directory
explicitly.
    @hedning
    hedning committed Nov 14, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    zimbatm Jonas Chevalier
    GPG key ID: 71BAF6D40C1D63D7
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c481124 View commit details
6 changes: 3 additions & 3 deletions pkgs/applications/audio/gnome-podcasts/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,12 +4,12 @@
# TODO: build from git for easier updates
# rustPlatform.buildRustPackage rec {
stdenv.mkDerivation rec {
version = "0.4.5";
version = "0.4.6";
name = "gnome-podcasts-${version}";

src = fetchurl {
url = https://gitlab.gnome.org/World/podcasts/uploads/823f7abee51002ed803da87b31b92981/gnome-podcasts-0.4.5.tar.xz;
sha256 = "1fgrn09hk5nfdkg6v31qda05msyzw525spzqxc7y4iw9f7pm80wh";
url = https://gitlab.gnome.org/World/podcasts/uploads/e59ac5d618d7daf4c7f33ba72957c466/gnome-podcasts-0.4.6.tar.xz;
sha256 = "0g2rk3w251fp5jwbxs5ya1adv8nsgdqjy1vmfg8qqab6qyndhbrc";
};

# src = fetchFromGitLab {
1 change: 1 addition & 0 deletions pkgs/desktops/gnome-3/core/tracker/default.nix
View file
Original file line number Diff line number Diff line change
@@ -30,6 +30,7 @@ in stdenv.mkDerivation rec {

mesonFlags = [
"-Ddbus_services=share/dbus-1/services"
"-Dsystemd_user_services=lib/systemd/user"
# TODO: figure out wrapping unit tests, some of them fail on missing gsettings-desktop-schemas
"-Dfunctional_tests=false"
];
14 changes: 3 additions & 11 deletions pkgs/development/libraries/libhandy/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,32 +1,24 @@
{ stdenv, fetchFromGitLab, fetchpatch, meson, ninja, pkgconfig, gobjectIntrospection, vala
{ stdenv, fetchFromGitLab, meson, ninja, pkgconfig, gobjectIntrospection, vala
, gtk-doc, docbook_xsl, docbook_xml_dtd_43
, gtk3, gnome3
, dbus, xvfb_run, libxml2
}:

let
pname = "libhandy";
version = "0.0.4";
version = "0.0.5";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";

outputs = [ "out" "dev" "devdoc" "glade" ];
outputBin = "dev";

patches = [
# https://source.puri.sm/Librem5/libhandy/merge_requests/158
(fetchpatch {
url = https://source.puri.sm/Librem5/libhandy/commit/50865a07a94875f17d5ef04751ea5de80264407c.patch;
sha256 = "1xg4lb03b97s4wbiqgwhq6p87cmxi464dfv9xpxwm2najaxc66fq";
})
];

src = fetchFromGitLab {
domain = "source.puri.sm";
owner = "Librem5";
repo = pname;
rev = "v${version}";
sha256 = "1pxh04irdil90cik2vxw174vmfqvz380s3yqx33pym65h8nah8a8";
sha256 = "0h25ckdfx3slc2mn4vi06bhw42nrqpzn75i9d7wby9iq0cl13l08";
};

nativeBuildInputs = [
5 changes: 3 additions & 2 deletions pkgs/development/ruby-modules/gem-config/default.nix
View file
Original file line number Diff line number Diff line change
@@ -23,6 +23,7 @@
, cmake, libssh2, openssl, mysql, darwin, git, perl, pcre, gecode_3, curl
, msgpack, qt59, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem
, cairo, re2, rake, gobjectIntrospection, gdk_pixbuf, zeromq, graphicsmagick, libcxx, file
, libselinux ? null, libsepol ? null
}@args:

let
@@ -156,7 +157,7 @@ in

gio2 = attrs: {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gtk2 pcre gobjectIntrospection ];
buildInputs = [ gtk2 pcre gobjectIntrospection ] ++ lib.optionals stdenv.isLinux [ utillinux libselinux libsepol ];
};

gitlab-markup = attrs: { meta.priority = 1; };
@@ -167,7 +168,7 @@ in
};

gtk2 = attrs: {
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkgconfig ] ++ lib.optionals stdenv.isLinux [ utillinux libselinux libsepol ];
buildInputs = [ gtk2 pcre xorg.libpthreadstubs xorg.libXdmcp];
# CFLAGS must be set for this gem to detect gdkkeysyms.h correctly
CFLAGS = "-I${gtk2.dev}/include/gtk-2.0 -I/non-existent-path";