diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2020-12-11 15:56:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-11 15:56:17 +0100 |
| commit | 3b85d7d54f083f46cf06eddcd7694a9078ad13d3 (patch) | |
| tree | 3ca3aa73c4dff180850d9cec16db4c39a26ff3be /pkgs/servers | |
| parent | b9c76212fd8ea9e74ec9d8c288e16a2953eb25a6 (diff) | |
| parent | 9fa8c7670dc7ddbd67f41d5effa7848962a1c36a (diff) | |
Merge pull request #106321 from NixOS/staging-next
Staging next
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/pulseaudio/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/tarballs.list | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index c9e2c3aa6e5eb..70a964039fce1 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -31,11 +31,11 @@ stdenv.mkDerivation rec { name = "${if libOnly then "lib" else ""}pulseaudio-${version}"; - version = "13.0"; + version = "14.0"; src = fetchurl { url = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-${version}.tar.xz"; - sha256 = "0mw0ybrqj7hvf8lqs5gjzip464hfnixw453lr0mqzlng3b5266wn"; + sha256 = "0qf20rgg0ysrnvg3359j56ndls07qmfn5rsy9r85bc42jdfpfd58"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 27a2b47387ff0..42b2c69f688e5 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2744,11 +2744,11 @@ lib.makeScope newScope (self: with self; { }) {}; xrandr = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto, libXrandr, libXrender }: stdenv.mkDerivation { - name = "xrandr-1.5.0"; + name = "xrandr-1.5.1"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xrandr-1.5.0.tar.bz2"; - sha256 = "1kaih7rmzxr1vp5a5zzjhm5x7dn9mckya088sqqw026pskhx9ky1"; + url = "mirror://xorg/individual/app/xrandr-1.5.1.tar.xz"; + sha256 = "0ql75s1n3dm2m3g1ilb9l6hqh15r0v709bgghpwazy3jknpnvivv"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index d4773075a2510..4fc3f3304e131 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -61,7 +61,7 @@ mirror://xorg/individual/app/xmodmap-1.0.10.tar.bz2 mirror://xorg/individual/app/xmore-1.0.3.tar.bz2 mirror://xorg/individual/app/xpr-1.0.5.tar.bz2 mirror://xorg/individual/app/xprop-1.2.5.tar.bz2 -mirror://xorg/individual/app/xrandr-1.5.0.tar.bz2 +mirror://xorg/individual/app/xrandr-1.5.1.tar.xz mirror://xorg/individual/app/xrdb-1.2.0.tar.bz2 mirror://xorg/individual/app/xrefresh-1.0.6.tar.bz2 mirror://xorg/individual/app/xset-1.2.4.tar.bz2 |