diff options
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/foswiki/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/foundationdb/vsmake.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/jetbrains/youtrack.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/mail/postfix/pflogsumm.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/mail/spamassassin/default.nix | 5 | ||||
-rw-r--r-- | pkgs/servers/metabase/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/monitoring/fusion-inventory/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/openxpki/default.nix | 3 | ||||
-rw-r--r-- | pkgs/servers/search/elasticsearch/plugins.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/slimserver/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/sql/postgresql/default.nix | 20 | ||||
-rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 6 | ||||
-rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 3 | ||||
-rw-r--r-- | pkgs/servers/x11/xorg/tarballs.list | 2 | ||||
-rw-r--r-- | pkgs/servers/x11/xorg/xkeyboard-config-eo.patch | 69 |
15 files changed, 29 insertions, 99 deletions
diff --git a/pkgs/servers/foswiki/default.nix b/pkgs/servers/foswiki/default.nix index 572d1736755..67d460809e1 100644 --- a/pkgs/servers/foswiki/default.nix +++ b/pkgs/servers/foswiki/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, perlPackages }: perlPackages.buildPerlPackage rec { - name = "foswiki-${version}"; + pname = "foswiki"; version = "2.1.0"; src = fetchurl { @@ -17,7 +17,7 @@ perlPackages.buildPerlPackage rec { EmailMIME Encode Error FileCopyRecursive HTMLParser HTMLTree IOSocketSSL JSON LocaleMaketextLexicon LocaleMsgfmt - LWP URI perlPackages.version + LWP URI perlPackages.Version /*# optional dependencies libapreq2 DBI DBDmysql DBDPg DBDSQLite FCGI FCGIProcManager CryptSMIME CryptX509 ConvertPEM diff --git a/pkgs/servers/foundationdb/vsmake.nix b/pkgs/servers/foundationdb/vsmake.nix index 9871afb0de6..0eb71492be3 100644 --- a/pkgs/servers/foundationdb/vsmake.nix +++ b/pkgs/servers/foundationdb/vsmake.nix @@ -20,7 +20,7 @@ let sha256 = "14mc7gsnnahdjaxbbslzk79rc0d12h1i681cd3srdwr3fzynlar2"; }; - configurePhase = ":"; + dontConfigure = true; buildPhase = ":"; installPhase = "mkdir -p $out/include && cp -R boost $out/include/"; }; diff --git a/pkgs/servers/jetbrains/youtrack.nix b/pkgs/servers/jetbrains/youtrack.nix index 0518a78f9d6..bbf39e5be46 100644 --- a/pkgs/servers/jetbrains/youtrack.nix +++ b/pkgs/servers/jetbrains/youtrack.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper ]; - unpackPhase = ":"; + dontUnpack = true; installPhase = '' runHook preInstall diff --git a/pkgs/servers/mail/postfix/pflogsumm.nix b/pkgs/servers/mail/postfix/pflogsumm.nix index 82199938060..8f85bc5f6d6 100644 --- a/pkgs/servers/mail/postfix/pflogsumm.nix +++ b/pkgs/servers/mail/postfix/pflogsumm.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perlPackages }: perlPackages.buildPerlPackage rec { - name = "pflogsumm-${version}"; + pname = "pflogsumm"; version = "1.1.3"; src = fetchurl { - url = "https://jimsun.linxnet.com/downloads/${name}.tar.gz"; + url = "https://jimsun.linxnet.com/downloads/${pname}-${version}.tar.gz"; sha256 = "0hkim9s5f1yg5sfs5048jydhy3sbxafls496wcjk0cggxb113py4"; }; diff --git a/pkgs/servers/mail/spamassassin/default.nix b/pkgs/servers/mail/spamassassin/default.nix index e95fcaa03ef..186f4670153 100644 --- a/pkgs/servers/mail/spamassassin/default.nix +++ b/pkgs/servers/mail/spamassassin/default.nix @@ -1,10 +1,11 @@ { stdenv, fetchurl, perlPackages, makeWrapper, gnupg }: perlPackages.buildPerlPackage rec { - name = "SpamAssassin-3.4.2"; + pname = "SpamAssassin"; + version = "3.4.2"; src = fetchurl { - url = "mirror://apache/spamassassin/source/Mail-${name}.tar.bz2"; + url = "mirror://apache/spamassassin/source/Mail-${pname}-${version}.tar.bz2"; sha256 = "1np8h293bzg33i0xn9gj9krwgr7k6xbyf1yhxr2j2xci95d080yg"; }; diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix index f8a5ae31ffe..dde0a547693 100644 --- a/pkgs/servers/metabase/default.nix +++ b/pkgs/servers/metabase/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; - unpackPhase = "true"; + dontUnpack = true; installPhase = '' makeWrapper ${jre}/bin/java $out/bin/metabase --add-flags "-jar $src" diff --git a/pkgs/servers/monitoring/fusion-inventory/default.nix b/pkgs/servers/monitoring/fusion-inventory/default.nix index 33725cb6283..27e3cfdab9d 100644 --- a/pkgs/servers/monitoring/fusion-inventory/default.nix +++ b/pkgs/servers/monitoring/fusion-inventory/default.nix @@ -3,7 +3,7 @@ }: perlPackages.buildPerlPackage rec { - name = "FusionInventory-Agent-${version}"; + pname = "FusionInventory-Agent"; version = "2.3.21"; src = fetchFromGitHub { diff --git a/pkgs/servers/openxpki/default.nix b/pkgs/servers/openxpki/default.nix index 192951607bf..05ee7f34352 100644 --- a/pkgs/servers/openxpki/default.nix +++ b/pkgs/servers/openxpki/default.nix @@ -3,7 +3,8 @@ , extraDependencies1 ? false, extraDependencies2 ? false, extraDependencies3 ? false }: perlPackages.buildPerlPackage { - name = "openxpki-git20150807"; + pname = "openxpki"; + version = "git20150807"; src = fetchgit { url = "https://github.com/openxpki/openxpki"; diff --git a/pkgs/servers/search/elasticsearch/plugins.nix b/pkgs/servers/search/elasticsearch/plugins.nix index e76d0806114..3a480bd7467 100644 --- a/pkgs/servers/search/elasticsearch/plugins.nix +++ b/pkgs/servers/search/elasticsearch/plugins.nix @@ -16,7 +16,7 @@ let }: stdenv.mkDerivation (a // { inherit installPhase; - unpackPhase = "true"; + dontUnpack = true; buildInputs = [ unzip ]; meta = a.meta // { platforms = elasticsearch.meta.platforms; diff --git a/pkgs/servers/slimserver/default.nix b/pkgs/servers/slimserver/default.nix index 90c84ce1587..d755f864d4e 100644 --- a/pkgs/servers/slimserver/default.nix +++ b/pkgs/servers/slimserver/default.nix @@ -2,7 +2,7 @@ , perlPackages, flac, faad2, sox, lame, monkeysAudio, wavpack }: perlPackages.buildPerlPackage rec { - name = "slimserver-${version}"; + pname = "slimserver"; version = "7.9.1"; src = fetchurl { diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 701670187b6..440ee15a518 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -162,41 +162,41 @@ let in self: { postgresql_9_4 = self.callPackage generic { - version = "9.4.22"; + version = "9.4.23"; psqlSchema = "9.4"; - sha256 = "0sy66cl2nkqr1al66f3qy7zsyd3vjpjv0icqbda7bqq4j8mlrann"; + sha256 = "16qx4gfq7i2nnxm0i3zxpb3z1mmzx05a3fsh95414ay8n049q00d"; this = self.postgresql_9_4; inherit self; }; postgresql_9_5 = self.callPackage generic { - version = "9.5.17"; + version = "9.5.18"; psqlSchema = "9.5"; - sha256 = "01gp4d3ngl2809dl652md2n1q4nk27cdbl6i892gvwk901xf7yc8"; + sha256 = "1pgkz794wmp4f40843sbin49k5lgl59jvl6nazvdbb6mgr441jfz"; this = self.postgresql_9_5; inherit self; }; postgresql_9_6 = self.callPackage generic { - version = "9.6.13"; + version = "9.6.14"; psqlSchema = "9.6"; - sha256 = "197964wb5pc5fx81a6mh9hlcrr9sgr3nqlpmljv6asi9aq0d5gpc"; + sha256 = "08hsqczy1ixkjyf2vr3s9x69agfz9yr8lh31fir4z0dfr5jw421z"; this = self.postgresql_9_6; inherit self; }; postgresql_10 = self.callPackage generic { - version = "10.8"; + version = "10.9"; psqlSchema = "10.0"; # should be 10, but changing it is invasive - sha256 = "0pfdmy4w95b49w9rkn8dwvzmi2brpqfvbxd04y0k0s0xvymc565i"; + sha256 = "0m0gbf7nwgag6a1z5f9xszwzgf2xhx0ncakyxwxlzs87n1zk32wm"; this = self.postgresql_10; inherit self; }; postgresql_11 = self.callPackage generic { - version = "11.3"; + version = "11.4"; psqlSchema = "11.1"; # should be 11, but changing it is invasive - sha256 = "0baj61ym7jnl195qcq4hq6225kfz6879j8zx3n148n92zj1f119a"; + sha256 = "12ycjlqncijgmd5z078ybwda8ilas96lc7nxxmdq140mzpgjv002"; this = self.postgresql_11; inherit self; }; diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 2ae444597f4..a5869b21c58 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2510,11 +2510,11 @@ lib.makeScope newScope (self: with self; { }) {}; xkeyboardconfig = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { - name = "xkeyboard-config-2.24"; + name = "xkeyboard-config-2.27"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.24.tar.bz2; - sha256 = "1my4786pd7iv5x392r9skj3qclmbd26nqzvh2fllwkkbyj08bcci"; + url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.27.tar.bz2; + sha256 = "07wh443lhwv1j0q6xnxnji7f7ahh7xphxj90fv02cdd6zv4aw3b9"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 979577575a9..7b6299105b1 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -413,9 +413,6 @@ self: super: xkeyboardconfig = super.xkeyboardconfig.overrideAttrs (attrs: { nativeBuildInputs = attrs.nativeBuildInputs ++ [intltool]; - #TODO: resurrect patches for US_intl? - patches = [ ./xkeyboard-config-eo.patch ]; - configureFlags = [ "--with-xkb-rules-symlink=xorg" ]; # 1: compatibility for X11/xkb location diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 6ae5443f2ed..26c2721e240 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -77,7 +77,7 @@ mirror://xorg/individual/app/xwininfo-1.1.4.tar.bz2 mirror://xorg/individual/app/xwud-1.0.5.tar.bz2 mirror://xorg/individual/data/xbitmaps-1.1.2.tar.bz2 mirror://xorg/individual/data/xcursor-themes-1.0.6.tar.bz2 -mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.24.tar.bz2 +mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.27.tar.bz2 mirror://xorg/individual/doc/xorg-docs-1.7.1.tar.bz2 mirror://xorg/individual/doc/xorg-sgml-doctools-1.11.tar.bz2 mirror://xorg/individual/driver/xf86-input-evdev-2.10.6.tar.bz2 diff --git a/pkgs/servers/x11/xorg/xkeyboard-config-eo.patch b/pkgs/servers/x11/xorg/xkeyboard-config-eo.patch deleted file mode 100644 index 66f45a410f7..00000000000 --- a/pkgs/servers/x11/xorg/xkeyboard-config-eo.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff --git a/rules/base.xml.in b/rules/base.xml.in -index ec321f8..e9c3546 100644 ---- a/rules/base.xml.in -+++ b/rules/base.xml.in -@@ -1786,6 +1786,13 @@ - </layout> - <layout> - <configItem> -+ <name>eo</name> -+ <_shortDescription>Esp</_shortDescription> -+ <_description>Esperanto</_description> -+ </configItem> -+ </layout> -+ <layout> -+ <configItem> - <name>ir</name> - <_shortDescription>Irn</_shortDescription> - <_description>Iran</_description> -diff --git a/symbols/Makefile.am b/symbols/Makefile.am ---- a/symbols/Makefile.am -+++ b/symbols/Makefile.am -@@ -10,7 +10,7 @@ bt by braille \ - ca cd ch \ - ch cn cz \ - de dk dz \ --ee es et epo eu \ -+ee eo es et epo eu \ - fi fo fr \ - gb ge gh gn \ - gr hr hu \ -diff --git a/symbols/Makefile.in b/symbols/Makefile.in ---- a/symbols/Makefile.in -+++ b/symbols/Makefile.in -@@ -222,7 +222,7 @@ bt by braille \ - ca cd ch \ - ch cn cz \ - de dk dz \ --ee es et epo eu \ -+ee eo es et epo eu \ - fi fo fr \ - gb ge gh gn \ - gr hr hu \ -diff --git a/symbols/eo b/symbols/eo -new file mode 100644 -index 0000000..d6358c9 ---- /dev/null -+++ b/symbols/eo -@@ -0,0 +1,21 @@ -+// $XFree86$ -+ -+partial alphanumeric_keys -+xkb_symbols "basic" { -+ -+ // Describes the differences between a very simple en_US -+ // keyboard and a simple Esperanto keyboard -+ // Press AltGr or Windows Menu key together with C, H, J, S, U -+ // to get accented letters. -+ // 2001 by Radovan Garabik <garabik@melkor.dnp.fmph.uniba.sk> -+ -+ key.type = "FOUR_LEVEL"; -+ -+ key <AD02> { [w,W, ubreve,Ubreve ] }; -+ key <AD07> { [u,U, ubreve, Ubreve ] }; -+ key <AC02> { [s,S, scircumflex, Scircumflex ] }; -+ key <AC05> { [g,G, gcircumflex,Gcircumflex ] }; -+ key <AC06> { [h,H, hcircumflex,Hcircumflex ] }; -+ key <AC07> { [j,J, jcircumflex,Jcircumflex ] }; -+ key <AB03> { [c,C, ccircumflex,Ccircumflex ] }; -+}; |