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

Commits on Mar 4, 2019

  1. xinit: 1.4.0 -> 1.4.1 (#56800) 

    https://lists.x.org/archives/xorg-announce/2019-March/002962.html
    @dtzWill @xeji
    dtzWill authored and xeji committed Mar 4, 2019
    Copy the full SHA
    6e3582c View commit details
Showing with 4 additions and 4 deletions.
  1. +3 −3 pkgs/servers/x11/xorg/default.nix
  2. +1 −1 pkgs/servers/x11/xorg/tarballs.list
6 changes: 3 additions & 3 deletions pkgs/servers/x11/xorg/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2419,11 +2419,11 @@ lib.makeScope newScope (self: with self; {
}) {};

xinit = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation {
name = "xinit-1.4.0";
name = "xinit-1.4.1";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/app/xinit-1.4.0.tar.bz2;
sha256 = "1vw2wlg74ig52naw0cha3pgzcwwk25l834j42cg8m5zmybp3a213";
url = mirror://xorg/individual/app/xinit-1.4.1.tar.bz2;
sha256 = "1fdbakx59vyh474skjydj1bbglpby3y03nl7mxn0z9v8gdhqz6yy";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
2 changes: 1 addition & 1 deletion pkgs/servers/x11/xorg/tarballs.list
View file
Original file line number Diff line number Diff line change
@@ -45,7 +45,7 @@ mirror://xorg/individual/app/xfs-1.2.0.tar.bz2
mirror://xorg/individual/app/xgamma-1.0.6.tar.bz2
mirror://xorg/individual/app/xgc-1.0.5.tar.bz2
mirror://xorg/individual/app/xhost-1.0.7.tar.bz2
mirror://xorg/individual/app/xinit-1.4.0.tar.bz2
mirror://xorg/individual/app/xinit-1.4.1.tar.bz2
mirror://xorg/individual/app/xinput-1.6.2.tar.bz2
mirror://xorg/individual/app/xkbcomp-1.4.2.tar.bz2
mirror://xorg/individual/app/xkbevd-1.1.4.tar.bz2