Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7cd2e4ebe8ca
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f5493bf6145f
Choose a head ref
  • 15 commits
  • 13 files changed
  • 10 contributors

Commits on May 13, 2019

  1. awesome: add optional gtk3 support

    Add optional gtk3 support to Awesome so that the `beautiful.gtk` module can be
    used.
    
    The `beautiful.gtk` uses `lgi` to obtain Gtk via gobject-introspect:
    
        return require('lgi').Gtk
    
    Since the current build does not include the typelib files needed, the above
    call fails.
    
    It turns out that both `gtk3` and `atk` (Accessibility toolkit) are needed, so
    this commit adds them as optional build inputs.
    
    Setting `gtk3Support` to `true` e.g. in an overlay will make `beautiful.gtk`
    work at the cost of an increased closure size (currently 99.6M vs 223.4M).
    
    Fixes NixOS/nixpkgs#60538
    stefano-m committed May 13, 2019
    Copy the full SHA
    648cbeb View commit details

Commits on May 14, 2019

  1. kernel/common-config: PREEMPT -> PREEMPT_VOLUNTARY

    (sort of cherry picked from commit
    e4c2698)
    PR #61162
    lheckemann committed May 14, 2019
    Copy the full SHA
    2d44588 View commit details
  2. Merge pull request #61465 from stefano-m/release-19.03

    awesome: add optional gtk3 support (port to 19.03 branch)
    rasendubi authored May 14, 2019
    Copy the full SHA
    4ed066f View commit details
  3. pg_partman: init at 4.1.0

    ggPeti committed May 14, 2019
    Copy the full SHA
    d507935 View commit details
  4. gnome3.gnome-desktop: 3.30.2.1 -> 3.30.2.2 (#61496)

    - Fix thumbnailer sandbox escape, CVE-2019-11460
    
    closes #60836
    hedning authored May 14, 2019
    Copy the full SHA
    9afcb0b View commit details
  5. maintainers: add ggpeti

    ggPeti committed May 14, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    775addb View commit details
  6. Copy the full SHA
    36132f1 View commit details
  7. linux: 4.19.42 -> 4.19.43

    NeQuissimus committed May 14, 2019
    Copy the full SHA
    242fc88 View commit details
  8. linux: 4.9.175 -> 4.9.176

    NeQuissimus committed May 14, 2019
    Copy the full SHA
    5847af4 View commit details
  9. linux: 5.0.15 -> 5.0.16

    NeQuissimus committed May 14, 2019
    Copy the full SHA
    b8c3795 View commit details
  10. linux: 5.1.1 -> 5.1.2

    NeQuissimus committed May 14, 2019
    Copy the full SHA
    42f3827 View commit details
  11. kernel: Disable VirtualBox guest modules.

    These break the modules from VirtualBox additions. Fixes issue NixOS/nixpkgs#58127.
    
    (cherry picked from commit c6934f3)
    ambrop72 authored and flokli committed May 14, 2019
    Copy the full SHA
    bfdb124 View commit details

Commits on May 15, 2019

  1. pantheon.gala: 2019-02-09 -> 2019-05-14

    Fixes notification settings being broken[0] and
    many other things. See the changes[1]
    
    [0]: elementary/switchboard-plug-notifications#41
    [1]: https://github.com/elementary/gala/compare/1a96644c6aac405927499dacb308dea13512e919..3ae100da4bbd9dabe353f468778ef63ef2dcd5d7
    
    (cherry picked from commit f797e8a)
    worldofpeace committed May 15, 2019
    Copy the full SHA
    68c8b68 View commit details
  2. microcodeIntel: 20190312 -> 20190514

    (cherry picked from commit 84cdfb8)
    alyssais committed May 15, 2019
    Copy the full SHA
    570811b View commit details
  3. Merge pull request #61514 from ggPeti/release-19.03

    pg_partman: init at 4.1.0
    thoughtpolice authored May 15, 2019
    Copy the full SHA
    f5493bf View commit details
5 changes: 5 additions & 0 deletions maintainers/maintainer-list.nix
Original file line number Diff line number Diff line change
@@ -1766,6 +1766,11 @@
github = "Gerschtli";
name = "Tobias Happ";
};
ggpeti = {
email = "ggpeti@gmail.com";
github = "ggpeti";
name = "Peter Ferenczy";
};
gilligan = {
email = "tobias.pflug@gmail.com";
github = "gilligan";
9 changes: 7 additions & 2 deletions pkgs/applications/window-managers/awesome/default.nix
Original file line number Diff line number Diff line change
@@ -5,8 +5,12 @@
, xmlto, docbook_xml_dtd_45, docbook_xsl, findXMLCatalogs
, libxkbcommon, xcbutilxrm, hicolor-icon-theme
, asciidoctor
, gtk3Support ? false, gtk3 ? null
}:

# needed for beautiful.gtk to work
assert gtk3Support -> gtk3 != null;

with luaPackages; stdenv.mkDerivation rec {
name = "awesome-${version}";
version = "4.3";
@@ -36,7 +40,8 @@ with luaPackages; stdenv.mkDerivation rec {
xorg.libXau xorg.libXdmcp xorg.libxcb xorg.libxshmfence
xorg.xcbutil xorg.xcbutilimage xorg.xcbutilkeysyms
xorg.xcbutilrenderutil xorg.xcbutilwm libxkbcommon
xcbutilxrm ];
xcbutilxrm ]
++ stdenv.lib.optional gtk3Support gtk3;

#cmakeFlags = "-DGENERATE_MANPAGES=ON";
cmakeFlags = "-DOVERRIDE_VERSION=${version}";
@@ -48,7 +53,7 @@ with luaPackages; stdenv.mkDerivation rec {
LUA_PATH = "${lgi}/share/lua/${lua.luaversion}/?.lua;;";

postInstall = ''
# Don't use wrapProgram or or the wrapper will duplicate the --search
# Don't use wrapProgram or the wrapper will duplicate the --search
# arguments every restart
mv "$out/bin/awesome" "$out/bin/.awesome-wrapped"
makeWrapper "$out/bin/.awesome-wrapped" "$out/bin/awesome" \
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
Original file line number Diff line number Diff line change
@@ -4,13 +4,13 @@

stdenv.mkDerivation rec {
name = "gnome-desktop-${version}";
version = "3.30.2.1";
version = "3.30.2.2";

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

src = fetchurl {
url = "mirror://gnome/sources/gnome-desktop/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "07s95fpfl3kjq51yxbrx6q87w812pq6bl0xdn0zzyi6qvg33m00v";
sha256 = "02ksmq2h4jjvjalp5x6d6v36qnp1h66qxwv2gl7kbx7dxqcp6ys3";
};

enableParallelBuilding = true;
6 changes: 3 additions & 3 deletions pkgs/desktops/pantheon/desktop/gala/default.nix
Original file line number Diff line number Diff line change
@@ -5,13 +5,13 @@

stdenv.mkDerivation rec {
pname = "gala";
version = "unstable-2019-02-09"; # Is tracking https://github.com/elementary/gala/commits/stable/juno
version = "unstable-2019-05-14"; # Is tracking https://github.com/elementary/gala/commits/stable/juno

src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = "1a96644c6aac405927499dacb308dea13512e919";
sha256 = "1zi7xyzhsypf52zzfwf7dwcxgd0skxbsssv1vsxgmswszg23p7i3";
rev = "3ae100da4bbd9dabe353f468778ef63ef2dcd5d7";
sha256 = "08xcj4z9mq511w8hdpr60nmd6j1cj7rs7rgs4s5ivyg11kg5w17b";
};

passthru = {
9 changes: 9 additions & 0 deletions pkgs/os-specific/linux/kernel/common-config.nix
Original file line number Diff line number Diff line change
@@ -426,6 +426,12 @@ let

VFIO_PCI_VGA = mkIf stdenv.is64bit yes;

# VirtualBox guest drivers in the kernel conflict with the ones in the
# official additions package and prevent the vboxsf module from loading,
# so disable them for now.
VBOXGUEST = option no;
DRM_VBOXVIDEO = option no;

} // optionalAttrs (stdenv.isx86_64 || stdenv.isi686) ({
XEN = option yes;

@@ -693,6 +699,9 @@ let
# Bump the maximum number of CPUs to support systems like EC2 x1.*
# instances and Xeon Phi.
NR_CPUS = freeform "384";
} // optionalAttrs (stdenv.hostPlatform.system == "aarch64-linux") {
PREEMPT = no;
PREEMPT_VOLUNTARY = yes;
};
};
in
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.14.nix
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
with stdenv.lib;

buildLinux (args // rec {
version = "4.14.118";
version = "4.14.119";

# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "05csfas10b3kfj6pn72skxpk211y36bdzk5x63n6dbxrsjmp6zb8";
sha256 = "0z1vmpbjkn9vqf380dgdcdmi2a22cymjs0spm9708x4x709vf5an";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.19.nix
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
with stdenv.lib;

buildLinux (args // rec {
version = "4.19.42";
version = "4.19.43";

# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "09ns4qskl2drg0p9fajy7nbh55anj0qxl7smca9rfxfm21hdf2gq";
sha256 = "0myzsbajwvskiqdlqsahw87f0ppj9gj7kh05vbs8ndmjzahij5hi";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.9.nix
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:

buildLinux (args // rec {
version = "4.9.175";
version = "4.9.176";
extraMeta.branch = "4.9";

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "032h0zd3rxg34vyp642978pbx66gnx3sfv49qwvbzwlx3zwk916r";
sha256 = "0y5i0picww914ljynqjdpv7cld7380y9lrlgnza02zvkq04d151a";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-5.0.nix
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
with stdenv.lib;

buildLinux (args // rec {
version = "5.0.15";
version = "5.0.16";

# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {

src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "01zb8lz1lxcff2j8yxzm0ayfazi07c2n7v1i3v8wbq8k9r2vhgjw";
sha256 = "1b7wz577mdn2cdpn8mm8bl5kgxvm3rq7fzy0nc8cxl2j1wwwx9sw";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-5.1.nix
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
with stdenv.lib;

buildLinux (args // rec {
version = "5.1.1";
version = "5.1.2";

# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {

src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1pcd0npnrjbc01rzmm58gh135w9nm5mf649asqlw50772qa9jkd0";
sha256 = "0nzgkg4si0378pz6cv3hwj7qmmi5wdz1qvml0198b61n89xdcypc";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/microcode/intel.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
pname = "microcode-intel";
version = "20190312";
version = "20190514";

src = fetchFromGitHub {
owner = "intel";
repo = "Intel-Linux-Processor-Microcode-Data-Files";
rev = "microcode-${version}";
sha256 = "0n381dai2mv9indsbbr4nfbmp4y4qhshgflr095fyvq5a8acw94m";
sha256 = "1xdxkmsnic191g7kljmrdcvg8vlwiwcrcxy9fnhpqsbsp6mjylv7";
};

nativeBuildInputs = [ iucode-tool libarchive ];
33 changes: 33 additions & 0 deletions pkgs/servers/sql/postgresql/ext/pg_partman.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{ stdenv, fetchFromGitHub, postgresql }:

stdenv.mkDerivation rec {
pname = "pg_partman";
version = "4.1.0";

buildInputs = [ postgresql ];

src = fetchFromGitHub {
owner = "pgpartman";
repo = pname;
rev = "refs/tags/v${version}";
sha256 = "0bzv92x492jcwzhal9x4vc3vszixscdpxc6yq5rrqld26dhmsp06";
};

installPhase = ''
mkdir -p $out/bin # For buildEnv to setup proper symlinks. See #22653
mkdir -p $out/{lib,share/extension}
cp src/*.so $out/lib
cp updates/* $out/share/extension
cp -r sql/* $out/share/extension
cp *.control $out/share/extension
'';

meta = with stdenv.lib; {
description = "Partition management extension for PostgreSQL";
homepage = https://github.com/pgpartman/pg_partman;
maintainers = with maintainers; [ ggpeti ];
platforms = postgresql.meta.platforms;
license = licenses.postgresql;
};
}
4 changes: 3 additions & 1 deletion pkgs/servers/sql/postgresql/packages.nix
Original file line number Diff line number Diff line change
@@ -34,4 +34,6 @@ self: super: {
timescaledb = super.callPackage ./ext/timescaledb.nix { };

tsearch_extras = super.callPackage ./ext/tsearch_extras.nix { };
}

pg_partman = super.callPackage ./ext/pg_partman.nix { };
}