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: 479f75d1e5dd
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 064ccfd19b68
Choose a head ref
  • 14 commits
  • 17 files changed
  • 6 contributors

Commits on Oct 16, 2019

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    c43c6cb View commit details
  2. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    df4170f View commit details
  3. Copy the full SHA
    5366676 View commit details

Commits on Oct 28, 2019

  1. Copy the full SHA
    460e2d2 View commit details
  2. nixos/networkd: add ipv4-fallback and fallback as valid options t…

    …o `LinkLocalAddressing`
    
    Both options were introduced in systemd v243[1]. Those options can be
    used to ensure that LinkLocalAddressing is only configured for a given
    interface if DHCPv4 fails. To quote `systemd.network(5)`:
    
    ```
    If "fallback" or "ipv4-fallback" is specified, then an IPv4
    link-local address is configured only when DHCPv4 fails. If "fallback", an IPv6 link-local
    address is always configured, and if "ipv4-fallback", the address is not configured. Note
    that, the fallback mechanism works only when DHCPv4 client is enabled, that is, it requires
    "DHCP=yes" or "DHCP=ipv4".
    ```
    
    [1] systemd/systemd@8bc17bb
    Ma27 committed Oct 28, 2019
    Copy the full SHA
    47724fc View commit details
  3. libcef: update to cef_binary_74.1.14+g50c3c5c+chromium-74.0.3729.131

    I chose that version because [1] suggested that CEF versions before 75.x
    worked, whereas newer versions don't compile due to API changes.
    
    [1] https://github.com/bazukas/obs-linuxbrowser/issues/108#issuecomment-513544091
    peti committed Oct 28, 2019
    Copy the full SHA
    6597ad2 View commit details
  4. obs-linuxbrowser: update to latest 'master' version from Github

    The version number corresponds to "git describe --tags".
    peti committed Oct 28, 2019
    Copy the full SHA
    fadb009 View commit details
  5. Copy the full SHA
    f661393 View commit details
  6. Merge pull request #72190 from peti/t/obs-linuxbrowser

    Fix build of obs-linuxbrowser
    peti authored Oct 28, 2019
    Copy the full SHA
    3e13d5e View commit details
  7. Merge pull request #72191 from Ma27/add-linklocal-option

    nixos/networkd: add `ipv4-fallback` and `fallback` as valid options to `LinkLocalAddressing`
    fpletz authored Oct 28, 2019
    Copy the full SHA
    b82026d View commit details
  8. lollypop: 1.2.1 -> 1.2.2

    worldofpeace committed Oct 28, 2019
    Copy the full SHA
    0557158 View commit details
  9. Merge pull request #71260 from worldofpeace/goa-meson

    gnome3.gnome-online-accounts: build with meson
    worldofpeace authored Oct 28, 2019
    Copy the full SHA
    d674b9e View commit details
  10. Copy the full SHA
    69653b4 View commit details
  11. Merge pull request #72148 from marsam/update-watchexec

    watchexec: 1.10.3 -> 1.11.0
    marsam authored Oct 28, 2019
    Copy the full SHA
    064ccfd View commit details
2 changes: 1 addition & 1 deletion nixos/modules/system/boot/networkd.nix
Original file line number Diff line number Diff line change
@@ -187,7 +187,7 @@ let
# Note: For DHCP the values both, none, v4, v6 are deprecated
(assertValueOneOf "DHCP" ["yes" "no" "ipv4" "ipv6" "both" "none" "v4" "v6"])
(assertValueOneOf "DHCPServer" boolValues)
(assertValueOneOf "LinkLocalAddressing" ["yes" "no" "ipv4" "ipv6"])
(assertValueOneOf "LinkLocalAddressing" ["yes" "no" "ipv4" "ipv6" "ipv4-fallback" "fallback"])
(assertValueOneOf "IPv4LLRoute" boolValues)
(assertValueOneOf "LLMNR" ["yes" "resolve" "no"])
(assertValueOneOf "MulticastDNS" ["yes" "resolve" "no"])
4 changes: 2 additions & 2 deletions pkgs/applications/audio/lollypop/default.nix
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@

python3.pkgs.buildPythonApplication rec {
pname = "lollypop";
version = "1.2.1";
version = "1.2.2";

format = "other";
doCheck = false;
@@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication rec {
url = "https://gitlab.gnome.org/World/lollypop";
rev = "refs/tags/${version}";
fetchSubmodules = true;
sha256 = "0wmgs28ph9959lr6zhd2j7z2c3kpl64rng6s1xgzyhsgrcyvv4cd";
sha256 = "02dgp3b10yaw0yqzdzd15msjgxayvjkg9m652is0d7rwgjq1pk6v";
};

nativeBuildInputs = [
10 changes: 5 additions & 5 deletions pkgs/applications/video/obs-studio/linuxbrowser.nix
Original file line number Diff line number Diff line change
@@ -5,18 +5,19 @@
# mkdir -p ~/.config/obs-studio/plugins
# ln -s ~/.nix-profile/share/obs/obs-plugins/obs-linuxbrowser ~/.config/obs-studio/plugins/

{ stdenv, fetchFromGitHub, obs-studio, cmake, libcef
}:
{ stdenv, fetchFromGitHub, obs-studio, cmake, libcef }:

stdenv.mkDerivation rec {
pname = "obs-linuxbrowser";
version = "0.6.1";
version = "0.6.1-6-gf86dba6";

src = fetchFromGitHub {
owner = "bazukas";
repo = "obs-linuxbrowser";
rev = version;
sha256 = "1mi9pchy07ipnx1m2767n29d53v822yajcf6c3705dhz882z21zq";
sha256 = "08d7qz0721va88bcyia8p0ycw50f6x3yk97s3vzhsc9xpq691kpi";
};

nativeBuildInputs = [ cmake ];
buildInputs = [ obs-studio ];
postUnpack = ''
@@ -44,6 +45,5 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ puffnfresh ];
license = licenses.gpl2;
platforms = with platforms; linux;
broken = true;
};
}
103 changes: 79 additions & 24 deletions pkgs/development/libraries/gnome-online-accounts/default.nix
Original file line number Diff line number Diff line change
@@ -1,42 +1,94 @@
{ stdenv, fetchurl, pkgconfig, vala, glib, libxslt, gtk3, wrapGAppsHook
, webkitgtk, json-glib, librest, libsecret, gtk-doc, gobject-introspection
, gettext, icu, glib-networking
, libsoup, docbook_xsl, docbook_xml_dtd_412, gnome3, gcr, kerberos
{ stdenv
, fetchFromGitLab
, pkgconfig
, vala
, glib
, meson
, ninja
, python3
, libxslt
, gtk3
, webkitgtk
, json-glib
, librest
, libsecret
, gtk-doc
, gobject-introspection
, gettext
, icu
, glib-networking
, libsoup
, docbook_xsl
, docbook_xml_dtd_412
, gnome3
, gcr
, kerberos
, gvfs
, dbus
, wrapGAppsHook
}:

let
stdenv.mkDerivation rec {
pname = "gnome-online-accounts";
version = "3.34.0";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
version = "3.34.1";

src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0mvz6wrw03zyp5sm46znkipncagb257xam29mfi06ixmxvjbqky4";
# https://gitlab.gnome.org/GNOME/gnome-online-accounts/issues/87
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "GNOME";
repo = "gnome-online-accounts";
rev = version;
sha256 = "0ry06qw068rqn4y42953kwl6fkxpgfya58y87cd3zink6gj7q0fm";
};

outputs = [ "out" "man" "dev" "devdoc" ];

configureFlags = [
"--enable-media-server"
"--enable-kerberos"
"--enable-lastfm"
"--enable-todoist"
"--enable-gtk-doc"
"--enable-documentation"
mesonFlags = [
"-Dfedora=false" # not useful in NixOS or for NixOS users.
"-Dgtk_doc=true"
"-Dlastfm=true"
"-Dman=true"
"-Dmedia_server=true"
];

enableParallelBuilding = true;

nativeBuildInputs = [
pkgconfig gobject-introspection vala gettext wrapGAppsHook
libxslt docbook_xsl docbook_xml_dtd_412 gtk-doc
dbus # used for checks and pkgconfig to install dbus service/s
docbook_xml_dtd_412
docbook_xsl
gettext
gobject-introspection
gtk-doc
libxslt
meson
ninja
pkgconfig
python3
vala
wrapGAppsHook
];

buildInputs = [
glib gtk3 webkitgtk json-glib librest libsecret glib-networking icu libsoup
gcr kerberos
gcr
glib
glib-networking
gtk3
gvfs # OwnCloud, Google Drive
icu
json-glib
kerberos
librest
libsecret
libsoup
webkitgtk
];

NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";

postPatch = ''
chmod +x meson_post_install.py
patchShebangs meson_post_install.py
'';

passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
@@ -45,7 +97,10 @@ in stdenv.mkDerivation rec {
};

meta = with stdenv.lib; {
homepage = "https://wiki.gnome.org/Projects/GnomeOnlineAccounts";
description = "Single sign-on framework for GNOME";
platforms = platforms.linux;
license = licenses.lgpl2Plus;
maintainers = gnome3.maintainers;
};
}
16 changes: 10 additions & 6 deletions pkgs/development/libraries/libcef/default.nix
Original file line number Diff line number Diff line change
@@ -1,28 +1,33 @@
{ stdenv, fetchurl, cmake, alsaLib, atk, cairo, cups, dbus, expat, fontconfig
, GConf, gdk-pixbuf, glib, gtk2, libX11, libxcb, libXcomposite, libXcursor
, libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXScrnSaver
, libXtst, nspr, nss, pango, libpulseaudio, systemd }:
, libXtst, nspr, nss, pango, libpulseaudio, systemd, at-spi2-atk, at-spi2-core
}:

let
libPath =
stdenv.lib.makeLibraryPath [
alsaLib atk cairo cups dbus expat fontconfig GConf gdk-pixbuf glib gtk2
libX11 libxcb libXcomposite libXcursor libXdamage libXext libXfixes libXi
libXrandr libXrender libXScrnSaver libXtst nspr nss pango libpulseaudio
systemd
systemd at-spi2-core at-spi2-atk
];
in
stdenv.mkDerivation rec {
pname = "cef-binary";
version = "3.3497.1833.g13f506f";
version = "74.1.14-g50c3c5c";

src = fetchurl {
url = "http://opensource.spotify.com/cefbuilds/cef_binary_${version}_linux64.tar.bz2";
sha256 = "02v22yx1ga2yxagjblzkfw0ax7zkrdpc959l1a15m8nah3y7xf9p";
name = "cef_binary_74.1.14+g50c3c5c+chromium-74.0.3729.131_linux64_minimal.tar.bz2";
url = "http://opensource.spotify.com/cefbuilds/cef_binary_74.1.19%2Bgb62bacf%2Bchromium-74.0.3729.157_linux64_minimal.tar.bz2";
sha256 = "0v3540kq4y68gq7mb4d8a9issm363lm5ngrd6d96pcc7vckkw4wn";
};

nativeBuildInputs = [ cmake ];
makeFlags = "libcef_dll_wrapper";
dontStrip = true;
dontPatchELF = true;

installPhase = ''
mkdir -p $out/lib/ $out/share/cef/
cp libcef_dll_wrapper/libcef_dll_wrapper.a $out/lib/
@@ -39,6 +44,5 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ puffnfresh ];
license = licenses.bsd3;
platforms = with platforms; linux;
broken = true;
};
}
4 changes: 2 additions & 2 deletions pkgs/development/libraries/nsss/default.nix
Original file line number Diff line number Diff line change
@@ -4,8 +4,8 @@ with skawarePackages;

buildPackage {
pname = "nsss";
version = "0.0.1.1";
sha256 = "14y1vl7n8vd5fh9bwiwwxxslisli8pz3a2f1sfv12l0p8ngpgm57";
version = "0.0.2.1";
sha256 = "1arzl4492wv42rvv6xs8h5d3qpy9nwxv5l84inzabs6s9f9nlxax";

description = "An implementation of a subset of the pwd.h, group.h and shadow.h family of functions.";

4 changes: 2 additions & 2 deletions pkgs/development/libraries/skalibs/default.nix
Original file line number Diff line number Diff line change
@@ -4,8 +4,8 @@ with skawarePackages;

buildPackage {
pname = "skalibs";
version = "2.8.1.0";
sha256 = "1fk6n402ywn4kpy6ng7sfnnqcg0mp6wq2hrv8sv3kxd0nh3na723";
version = "2.9.1.0";
sha256 = "19c6s3f7vxi96l2yqzjk9x9i4xkfg4fdzxhn1jg6bfb2qjph9cnk";

description = "A set of general-purpose C programming libraries";

4 changes: 2 additions & 2 deletions pkgs/development/libraries/utmps/default.nix
Original file line number Diff line number Diff line change
@@ -4,8 +4,8 @@ with skawarePackages;

buildPackage {
pname = "utmps";
version = "0.0.2.1";
sha256 = "1q90mcn50irhhrzl3h9bvhsn7hac0zgg67b6hfhmc5yvh4c8wnr4";
version = "0.0.3.1";
sha256 = "1h4hgjdrai51qkalgcx2ff60drpnw0ich66z90p8wk74am0vgc0h";

description = "A secure utmpx and wtmp implementation";

4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/s6-linux-utils/default.nix
Original file line number Diff line number Diff line change
@@ -4,8 +4,8 @@ with skawarePackages;

buildPackage {
pname = "s6-linux-utils";
version = "2.5.0.1";
sha256 = "0bpcaah3rbz4i013bkarr7wxmfvisjyxg0z78xg5zfbgajpgjxx1";
version = "2.5.1.1";
sha256 = "00nw2phd9prgv29hzqzwjnh4y0ivkzhx3srn6n1rlyr4ydhikxi5";

description = "A set of minimalistic Linux-specific system utilities";
platforms = stdenv.lib.platforms.linux;
4 changes: 2 additions & 2 deletions pkgs/shells/xonsh/default.nix
Original file line number Diff line number Diff line change
@@ -2,14 +2,14 @@

python3Packages.buildPythonApplication rec {
pname = "xonsh";
version = "0.9.11";
version = "0.9.13";

# fetch from github because the pypi package ships incomplete tests
src = fetchFromGitHub {
owner = "xonsh";
repo = "xonsh";
rev = "refs/tags/${version}";
sha256 = "0kvq1hlmlb8k9z6z385924fcqq3sf36pmi3aqczlb90m37rwzb6d";
sha256 = "0nk6rjdkbxli510iwqspvray48kdxvbdmq1k8nxn14kqfpqzlbcv";
};

LC_ALL = "en_US.UTF-8";
4 changes: 2 additions & 2 deletions pkgs/tools/misc/execline/default.nix
Original file line number Diff line number Diff line change
@@ -13,8 +13,8 @@ let
execline =
buildPackage {
pname = "execline";
version = "2.5.1.0";
sha256 = "0xr6yb50wm6amj1wc7jmxyv7hvlx2ypbnww1vc288j275625d9xi";
version = "2.5.3.0";
sha256 = "0czdrv9m8mnx94nf28dafij6z03k4mbhbs6hccfaardfd5l5q805";

description = "A small scripting language, to be used in place of a shell in non-interactive scripts";

4 changes: 2 additions & 2 deletions pkgs/tools/misc/s6-portable-utils/default.nix
Original file line number Diff line number Diff line change
@@ -7,8 +7,8 @@ let

in buildPackage {
pname = pname;
version = "2.2.1.3";
sha256 = "1ibjns1slyg1p7jl9irzlrjz8b01f506iw87g3s7db5arhf17vv2";
version = "2.2.2.1";
sha256 = "074kizkxjwvmxspxg69fr8r0lbiy61l2n5nzgbfvwvhc6lj34iqy";

description = "A set of tiny general Unix utilities optimized for simplicity and small size";

8 changes: 4 additions & 4 deletions pkgs/tools/misc/watchexec/default.nix
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{ stdenv, rustPlatform, fetchFromGitHub, CoreServices, darwin }:
{ stdenv, rustPlatform, fetchFromGitHub, CoreServices }:

rustPlatform.buildRustPackage rec {
pname = "watchexec";
version = "1.10.3";
version = "1.11.1";

src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
sha256 = "0iaxicghvfy85hrxn151hz8frgfknk3s1z0ngjn7cv5x5zvfxspf";
sha256 = "1iaib7yvxyn3l9kiys9x7wziixj13fmx1z3wgdy6h8c7jv6fpc0j";
};

cargoSha256 = "1sqwplvpg0n9j0h9j94m7a6ylgqi4y4wyx489y09z9gm7aqgrsjc";
cargoSha256 = "101p0qj7ydfhqfz402mxy4bs48vq3rzgj513f1kwv0ba4hn1sxkv";

buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ];

4 changes: 2 additions & 2 deletions pkgs/tools/networking/s6-dns/default.nix
Original file line number Diff line number Diff line change
@@ -4,8 +4,8 @@ with skawarePackages;

buildPackage {
pname = "s6-dns";
version = "2.3.0.2";
sha256 = "1y9bhvx8bqsb2xq5lmlfnc1hw2b3jyqg11i9r4lj0n6vvaqwh1j8";
version = "2.3.1.1";
sha256 = "0clib10dk3r9rcxv1yfr6gdvqqrx0arzivjpmhz9p8xaif53wpj1";

description = "A suite of DNS client programs and libraries for Unix systems";

4 changes: 2 additions & 2 deletions pkgs/tools/networking/s6-networking/default.nix
Original file line number Diff line number Diff line change
@@ -20,8 +20,8 @@ assert sslSupportEnabled -> sslLibs ? ${sslSupport};

buildPackage {
pname = "s6-networking";
version = "2.3.0.4";
sha256 = "00kqp0mcp8c7f0z5s4399rd1haxasxkqgd6ds0j0607hvi56mqqa";
version = "2.3.1.1";
sha256 = "127i7ig5wdgjbkjf0py0g96llc6cbxij22ns2j7bwa95figinhcx";

description = "A suite of small networking utilities for Unix systems";

4 changes: 2 additions & 2 deletions pkgs/tools/system/s6-rc/default.nix
Original file line number Diff line number Diff line change
@@ -4,8 +4,8 @@ with skawarePackages;

buildPackage {
pname = "s6-rc";
version = "0.5.0.0";
sha256 = "0p97p49i8m44lfiffycgn7xi08yzxkrs5dyb03svdhd6clwh6zyb";
version = "0.5.1.1";
sha256 = "0lmg517l8inn7bi57q35rjd7b4jmqlmkhrbvs5ybbhinhd12qzi5";

description = "A service manager for s6-based systems";
platforms = stdenv.lib.platforms.linux;
4 changes: 2 additions & 2 deletions pkgs/tools/system/s6/default.nix
Original file line number Diff line number Diff line change
@@ -4,8 +4,8 @@ with skawarePackages;

buildPackage {
pname = "s6";
version = "2.8.0.1";
sha256 = "1n1i3jm3kp9ii54cxj1sgh89m6nyna7vhy8714ma6py1frdqzq6v";
version = "2.9.0.1";
sha256 = "0mvcjrz8nlj9p2zclmcv22b4y6bqzd2iz38arhgc989vdvrbmkg0";

description = "skarnet.org's small & secure supervision software suite";