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

Commits on Sep 4, 2019

  1. xorg.{xbacklight,xlock,libICE}: bump

    @dtzWill
    dtzWill committed Sep 4, 2019
    Copy the full SHA
    d40a27b View commit details

Commits on Oct 7, 2019

  1. Merge pull request #68077 from dtzWill/update/x-misc-utils-2019 

    xorg.{xbacklight,xlock,libICE}: bump
    @dtzWill
    dtzWill authored Oct 7, 2019
    Copy the full SHA
    2f1111a View commit details
Showing with 12 additions and 12 deletions.
  1. +9 −9 pkgs/servers/x11/xorg/default.nix
  2. +3 −3 pkgs/servers/x11/xorg/tarballs.list
18 changes: 9 additions & 9 deletions pkgs/servers/x11/xorg/default.nix
View file
Original file line number Diff line number Diff line change
@@ -664,11 +664,11 @@ lib.makeScope newScope (self: with self; {
}) {};

libICE = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xtrans }: stdenv.mkDerivation {
name = "libICE-1.0.9";
name = "libICE-1.0.10";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/lib/libICE-1.0.9.tar.bz2;
sha256 = "00p2b6bsg6kcdbb39bv46339qcywxfl4hsrz8asm4hy6q7r34w4g";
url = mirror://xorg/individual/lib/libICE-1.0.10.tar.bz2;
sha256 = "0j638yvmyna2k4mz465jywgdybgdchdqppfx6xfazg7l5khxr1kg";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
@@ -1392,11 +1392,11 @@ lib.makeScope newScope (self: with self; {
}) {};

xbacklight = callPackage ({ stdenv, pkgconfig, fetchurl, libxcb, xcbutil }: stdenv.mkDerivation {
name = "xbacklight-1.2.2";
name = "xbacklight-1.2.3";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/app/xbacklight-1.2.2.tar.bz2;
sha256 = "0pmzaz4kp38qv2lqiw5rnqhwzmwrq65m1x5j001mmv99wh9isnk1";
url = mirror://xorg/individual/app/xbacklight-1.2.3.tar.bz2;
sha256 = "1plssg0s3pbslg6rfzxp9sx8ryvn8l32zyvc8zp9zsbsfwjg69rs";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
@@ -1535,11 +1535,11 @@ lib.makeScope newScope (self: with self; {
}) {};

xclock = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, libXft, libxkbfile, libXmu, xorgproto, libXrender, libXt }: stdenv.mkDerivation {
name = "xclock-1.0.8";
name = "xclock-1.0.9";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/app/xclock-1.0.8.tar.bz2;
sha256 = "0m92zhamh15my9f2rqa14q41d6k2cn468azm3g7g3w9n7942024k";
url = mirror://xorg/individual/app/xclock-1.0.9.tar.bz2;
sha256 = "1fr3q4rszgx7x2zxy2ip592a3fgx20hfwac49p2l5b7jqsr1ying";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
6 changes: 3 additions & 3 deletions pkgs/servers/x11/xorg/tarballs.list
View file
Original file line number Diff line number Diff line change
@@ -27,9 +27,9 @@ mirror://xorg/individual/app/twm-1.0.10.tar.bz2
mirror://xorg/individual/app/viewres-1.0.5.tar.bz2
mirror://xorg/individual/app/x11perf-1.6.1.tar.bz2
mirror://xorg/individual/app/xauth-1.1.tar.bz2
mirror://xorg/individual/app/xbacklight-1.2.2.tar.bz2
mirror://xorg/individual/app/xbacklight-1.2.3.tar.bz2
mirror://xorg/individual/app/xcalc-1.1.0.tar.bz2
mirror://xorg/individual/app/xclock-1.0.8.tar.bz2
mirror://xorg/individual/app/xclock-1.0.9.tar.bz2
mirror://xorg/individual/app/xcmsdb-1.0.5.tar.bz2
mirror://xorg/individual/app/xcompmgr-1.1.8.tar.bz2
mirror://xorg/individual/app/xconsole-1.0.7.tar.bz2
@@ -173,7 +173,7 @@ mirror://xorg/individual/lib/libAppleWM-1.4.1.tar.bz2
mirror://xorg/individual/lib/libdmx-1.1.4.tar.bz2
mirror://xorg/individual/lib/libfontenc-1.1.4.tar.bz2
mirror://xorg/individual/lib/libFS-1.0.8.tar.bz2
mirror://xorg/individual/lib/libICE-1.0.9.tar.bz2
mirror://xorg/individual/lib/libICE-1.0.10.tar.bz2
mirror://xorg/individual/lib/libpciaccess-0.16.tar.bz2
mirror://xorg/individual/lib/libSM-1.2.3.tar.bz2
mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2