diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-01-05 10:28:58 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-01-05 10:28:58 +0100 |
| commit | b1acaffe67afd838900fe22ad35cf0dda24eff63 (patch) | |
| tree | facc558b711b96b0d302fe070963e696e17fa2f3 /pkgs/servers | |
| parent | 556a28908e01ca1d44962d8570b5e73be949eca6 (diff) | |
| parent | b054851d18585daf67626d92b03fab418c590840 (diff) | |
| download | nixlib-b1acaffe67afd838900fe22ad35cf0dda24eff63.tar nixlib-b1acaffe67afd838900fe22ad35cf0dda24eff63.tar.gz nixlib-b1acaffe67afd838900fe22ad35cf0dda24eff63.tar.bz2 nixlib-b1acaffe67afd838900fe22ad35cf0dda24eff63.tar.lz nixlib-b1acaffe67afd838900fe22ad35cf0dda24eff63.tar.xz nixlib-b1acaffe67afd838900fe22ad35cf0dda24eff63.tar.zst nixlib-b1acaffe67afd838900fe22ad35cf0dda24eff63.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/mpd/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/owncloud/default.nix | 16 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/replacements.nix | 21 |
3 files changed, 10 insertions, 31 deletions
diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index b672083340eb..cce893d17eed 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -29,13 +29,13 @@ let opt = stdenv.lib.optional; mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}"; major = "0.19"; - minor = "11"; + minor = "12"; in stdenv.mkDerivation rec { name = "mpd-${major}.${minor}"; src = fetchurl { url = "http://www.musicpd.org/download/mpd/${major}/${name}.tar.xz"; - sha256 = "1iin50s8cnlsgjgjwkm1cbyxlwa0b79f6jfwydx5nyprbam6cp3s"; + sha256 = "0xg8w5vn6xd0yfw55qj6wnav7v14nmr00s3d4w5gixbjrv3ycvvv"; }; buildInputs = [ pkgconfig glib boost ] diff --git a/pkgs/servers/owncloud/default.nix b/pkgs/servers/owncloud/default.nix index 0351df9718b4..092e9c3ff3e5 100644 --- a/pkgs/servers/owncloud/default.nix +++ b/pkgs/servers/owncloud/default.nix @@ -37,23 +37,23 @@ in { }; owncloud70 = common { - versiona = "7.0.11"; - sha256 = "21dd75de4ed832f16f577eb6763d04c663ef13251153ba2e8847e3f5799d2ad2"; + versiona = "7.0.12"; + sha256 = "d1a0f73f5094ec1149b50e2409b5fea0a9bebb16d663789d4b8f98fed341aa91"; }; owncloud80 = common { - versiona = "8.0.9"; - sha256 = "0c1f915f4123dbe07d564cf0172930568690ab5257d2fca4fec4ec515858bef1"; + versiona = "8.0.10"; + sha256 = "3054b997f258178b57efc526e14384829ac8ab94757191f2d03c13fcb0a3cd93"; }; owncloud81 = common { - versiona = "8.1.4"; - sha256 = "e0f4bf0c85821fc1b6e7f6268080ad3ca3e98c41baa68a9d616809d74a77312d"; + versiona = "8.1.5"; + sha256 = "6d8687e40af32c5ca5adfea3fee556ed987b77ad15a1ead5d40cc87a8b76f4b4"; }; owncloud82 = common { - versiona = "8.2.1"; - sha256 = "5390b2172562a5bf97a46e9a621d1dd92f9b74efaccbb77978c39eb90d6988d4"; + versiona = "8.2.2"; + sha256 = "d5b935f904744b8b40b310f19679702387c852498d0dc7aaeda4555a3db9ad5b"; }; } diff --git a/pkgs/servers/x11/xorg/replacements.nix b/pkgs/servers/x11/xorg/replacements.nix deleted file mode 100644 index 175d05b0a364..000000000000 --- a/pkgs/servers/x11/xorg/replacements.nix +++ /dev/null @@ -1,21 +0,0 @@ -{stdenv, fetchurl, xorg, automake, autoconf, libtool, makeOverridable}: -{ - xf86videoati = {src, suffix}: - makeOverridable stdenv.mkDerivation { - name = "xf86-video-ati-${suffix}"; - buildInputs = xorg.xf86videoati.buildInputs ++ - [autoconf automake libtool]; - builder = ./builder.sh; - inherit src; - preConfigure = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -DPACKAGE_VERSION_MAJOR=6" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -DPACKAGE_VERSION_MINOR=9" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -DPACKAGE_VERSION_PATCHLEVEL=999" - - sed -e 's/@DRIVER_MAN_SUFFIX@/man/g' -i man/Makefile.am - export DRIVER_MAN_DIR=$out/share/man/man5 - - ./autogen.sh - ''; - }; -} |