diff options
Diffstat (limited to 'nixpkgs/pkgs/servers')
56 files changed, 1443 insertions, 465 deletions
diff --git a/nixpkgs/pkgs/servers/computing/slurm/default.nix b/nixpkgs/pkgs/servers/computing/slurm/default.nix index 7a01342e5ac0..477f340e067a 100644 --- a/nixpkgs/pkgs/servers/computing/slurm/default.nix +++ b/nixpkgs/pkgs/servers/computing/slurm/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { name = "slurm-${version}"; - version = "18.08.6.2"; + version = "18.08.7.1"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { repo = "slurm"; # The release tags use - instead of . rev = "${builtins.replaceStrings ["."] ["-"] name}"; - sha256 = "0py1795jrgip00k46gr9f9y49gpv5478kc3v68d90nl158fngixc"; + sha256 = "13asdirygkp0mmi2da0094c9h180nl7nb7nkj4j9d842xzw21454"; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/servers/dex/default.nix b/nixpkgs/pkgs/servers/dex/default.nix index 119d5f03f626..1f9c2c9cb77f 100644 --- a/nixpkgs/pkgs/servers/dex/default.nix +++ b/nixpkgs/pkgs/servers/dex/default.nix @@ -1,17 +1,16 @@ { lib, buildGoPackage, fetchFromGitHub }: -let version = "2.4.1"; in - buildGoPackage rec { - name = "dex-${version}"; + pname = "dex"; + version = "2.16.0"; - goPackagePath = "github.com/coreos/dex"; + goPackagePath = "github.com/dexidp/dex"; src = fetchFromGitHub { rev = "v${version}"; - owner = "coreos"; - repo = "dex"; - sha256 = "11qpn3wh74mq16xgl9l50n2v02ffqcd14xccf77j5il04xr764nx"; + owner = "dexidp"; + repo = pname; + sha256 = "0w8nl7inqp4grbaq320dgynmznbrln8vihd799dwb2cx86laxsi1"; }; subPackages = [ @@ -22,10 +21,15 @@ buildGoPackage rec { "-ldflags=-w -X ${goPackagePath}/version.Version=${src.rev}" ]; + postInstall = '' + mkdir -p $out/share + cp -r go/src/${goPackagePath}/web $out/share/web + ''; + meta = { description = "OpenID Connect and OAuth2 identity provider with pluggable connectors"; license = lib.licenses.asl20; - homepage = https://github.com/coreos/dex; + homepage = https://github.com/dexidp/dex; maintainers = with lib.maintainers; [benley]; platforms = lib.platforms.unix; }; diff --git a/nixpkgs/pkgs/servers/dico/default.nix b/nixpkgs/pkgs/servers/dico/default.nix index d64f59158815..d2a6dc9df157 100644 --- a/nixpkgs/pkgs/servers/dico/default.nix +++ b/nixpkgs/pkgs/servers/dico/default.nix @@ -2,25 +2,20 @@ , guile, python, pcre, libffi, groff }: stdenv.mkDerivation rec { - name = "dico-2.7"; + pname = "dico"; + version = "2.9"; src = fetchurl { - url = "mirror://gnu/dico/${name}.tar.xz"; - sha256 = "0dg4aacnmlf3ljssd7dwh8z5644xzq8k1501mbsx8nz8p8a9mbsq"; + url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz"; + sha256 = "0i9xqhy3h5nlizcmav4mv5ay8ivdgn4l4k0k7fxix3fsc87nijyr"; }; hardeningDisable = [ "format" ]; - # XXX: Add support for GNU SASL. buildInputs = [ libtool gettext zlib readline gsasl guile python pcre libffi groff ]; - # dicod fails to load modules, so the tests fail - doCheck = false; - - preBuild = '' - sed -i -e '/gets is a security/d' gnu/stdio.in.h - ''; + doCheck = true; meta = with stdenv.lib; { description = "Flexible dictionary server and client implementing RFC 2229"; diff --git a/nixpkgs/pkgs/servers/dns/bind/default.nix b/nixpkgs/pkgs/servers/dns/bind/default.nix index 39589b3698fb..068834140048 100644 --- a/nixpkgs/pkgs/servers/dns/bind/default.nix +++ b/nixpkgs/pkgs/servers/dns/bind/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, lib, fetchurl +{ config, stdenv, lib, fetchurl, fetchpatch , perl , libcap, libtool, libxml2, openssl , enablePython ? config.bind.enablePython or false, python3 ? null @@ -8,19 +8,29 @@ assert enableSeccomp -> libseccomp != null; assert enablePython -> python3 != null; -let version = "9.12.3-P4"; in +let version = "9.12.4-P1"; in stdenv.mkDerivation rec { name = "bind-${version}"; src = fetchurl { url = "https://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz"; - sha256 = "01pj47z5582rd538dmbzf1msw4jc8j4zr0zx4ciy88r6qr9l80fi"; + sha256 = "1if7zc5gzrfd28csc63v9bjwrc0rgvm1x9yx058946hc5gp5lyp2"; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; patches = [ ./dont-keep-configure-flags.patch ./remove-mkdir-var.patch ] ++ + [ + # Workaround for missing atomic operations on aarch64. Upstream added the + # below patch after the release. Can probably be dropped with the next + # version. + (fetchpatch { + name = "client-atomics-as-refcount.patch"; + url = https://gitlab.isc.org/isc-projects/bind9/commit/d72f436b7d7c697b262968c48c2d7643069ab17f.diff; + sha256 = "0sidlab9wcv21751fbq3h9m4wy6hk7frag9ar2jndw8rn3axr2qy"; + }) + ] ++ stdenv.lib.optional stdenv.isDarwin ./darwin-openssl-linking-fix.patch; nativeBuildInputs = [ perl ]; diff --git a/nixpkgs/pkgs/servers/documize-community/default.nix b/nixpkgs/pkgs/servers/documize-community/default.nix index 4f1a420c9109..2df905463117 100644 --- a/nixpkgs/pkgs/servers/documize-community/default.nix +++ b/nixpkgs/pkgs/servers/documize-community/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "documize-community"; - version = "2.2.1"; + version = "2.4.1"; src = fetchFromGitHub { owner = "documize"; repo = "community"; rev = "v${version}"; - sha256 = "09s5js0zb3mh3g5qz8f3l2cqjn01kjb35kinfv932nf2rfyrmyqz"; + sha256 = "1spj8awyv37gmrm49py3wz7590r7rz63qizgifdzjbvacadavm0c"; }; goPackagePath = "github.com/documize/community"; @@ -37,7 +37,7 @@ buildGoPackage rec { meta = with lib; { description = "Open source Confluence alternative for internal & external docs built with Golang + EmberJS"; license = licenses.agpl3; - maintainers = with maintainers; [ ma27 ]; + maintainers = with maintainers; [ ma27 elseym ]; homepage = https://www.documize.com/; }; } diff --git a/nixpkgs/pkgs/servers/emby/default.nix b/nixpkgs/pkgs/servers/emby/default.nix deleted file mode 100644 index 12b0dde0c9b4..000000000000 --- a/nixpkgs/pkgs/servers/emby/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ stdenv, fetchurl, unzip, sqlite, makeWrapper, dotnet-sdk, ffmpeg }: - -stdenv.mkDerivation rec { - name = "emby-${version}"; - version = "3.5.3.0"; - - # We are fetching a binary here, however, a source build is possible. - # See -> https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=emby-server-git#n43 - # Though in my attempt it failed with this error repeatedly - # The type 'Attribute' is defined in an assembly that is not referenced. You must add a reference to assembly 'netstandard, Version=2.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51'. - # This may also need msbuild (instead of xbuild) which isn't in nixpkgs - # See -> https://github.com/NixOS/nixpkgs/issues/29817 - src = fetchurl { - url = "https://github.com/MediaBrowser/Emby.Releases/releases/download/${version}/embyserver-netcore_${version}.zip"; - sha256 = "0311af3q813cx0ykbdk9vkmnyqi2l8rx66jnvdkw927q6invnnpj"; - }; - - buildInputs = [ - unzip - makeWrapper - ]; - - propagatedBuildInputs = [ - dotnet-sdk - sqlite - ]; - - preferLocalBuild = true; - - buildPhase = '' - rm -rf {electron,runtimes} - ''; - - installPhase = '' - install -dm 755 "$out/opt/emby-server" - cp -r * "$out/opt/emby-server" - - makeWrapper "${dotnet-sdk}/bin/dotnet" $out/bin/emby \ - --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ - sqlite - ]}" \ - --add-flags "$out/opt/emby-server/EmbyServer.dll -ffmpeg ${ffmpeg}/bin/ffmpeg -ffprobe ${ffmpeg}/bin/ffprobe" - ''; - - meta = with stdenv.lib; { - description = "MediaBrowser - Bring together your videos, music, photos, and live television"; - homepage = https://emby.media/; - license = licenses.gpl2; - maintainers = with maintainers; [ fadenb ]; - platforms = platforms.all; - }; -} diff --git a/nixpkgs/pkgs/servers/freeradius/default.nix b/nixpkgs/pkgs/servers/freeradius/default.nix index df2130777bb8..ed36b33bdebc 100644 --- a/nixpkgs/pkgs/servers/freeradius/default.nix +++ b/nixpkgs/pkgs/servers/freeradius/default.nix @@ -43,11 +43,11 @@ assert withRest -> curl != null && withJson; with stdenv.lib; stdenv.mkDerivation rec { name = "freeradius-${version}"; - version = "3.0.17"; + version = "3.0.19"; src = fetchurl { url = "ftp://ftp.freeradius.org/pub/freeradius/freeradius-server-${version}.tar.gz"; - sha256 = "0bc35knv46z729l4h22rirqns5v6jb0fzcffnjayhs8wjysfkfyy"; + sha256 = "0v5b46rq878093ff549ijccy98md1l7l4rvshjxs672il0zvq5i4"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/nixpkgs/pkgs/servers/ftp/pure-ftpd/default.nix b/nixpkgs/pkgs/servers/ftp/pure-ftpd/default.nix index 978e4fe109c0..5f6e7d466cfd 100644 --- a/nixpkgs/pkgs/servers/ftp/pure-ftpd/default.nix +++ b/nixpkgs/pkgs/servers/ftp/pure-ftpd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl }: stdenv.mkDerivation rec { - name = "pure-ftpd-1.0.48"; + name = "pure-ftpd-1.0.49"; src = fetchurl { url = "https://download.pureftpd.org/pub/pure-ftpd/releases/${name}.tar.gz"; - sha256 = "1xr1wlf08qaw93irsbdk4kvhqnkvmi6p0jb8kiiz0vr0h92pszxl"; + sha256 = "19cjr262n6h560fi9nm7l1srwf93k34bp8dp1c6gh90bqxcg8yvn"; }; buildInputs = [ openssl ]; diff --git a/nixpkgs/pkgs/servers/http/jetty/default.nix b/nixpkgs/pkgs/servers/http/jetty/default.nix index 70c48fc95f4b..80a3d6b105cb 100644 --- a/nixpkgs/pkgs/servers/http/jetty/default.nix +++ b/nixpkgs/pkgs/servers/http/jetty/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jetty-${version}"; - version = "9.4.14.v20181114"; + version = "9.4.16.v20190411"; src = fetchurl { url = "https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${version}/jetty-distribution-${version}.tar.gz"; name = "jetty-distribution-${version}.tar.gz"; - sha256 = "1i83jfd17d9sl9pjc8r9i8mx3nr9x0m5s50fd4l5ppzn4drvssn6"; + sha256 = "0vkcm68cp7z45pgfg5maxcxfjwy4xj30f2d0c7cfnw9d38wf5lpq"; }; phases = [ "unpackPhase" "installPhase" ]; diff --git a/nixpkgs/pkgs/servers/http/nginx/mainline.nix b/nixpkgs/pkgs/servers/http/nginx/mainline.nix index d2ec9aa6adf3..abbf171daa96 100644 --- a/nixpkgs/pkgs/servers/http/nginx/mainline.nix +++ b/nixpkgs/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix (args // { - version = "1.15.12"; - sha256 = "1giavdph0jqhywdkj4650s5qhz6qfd6nrv74k9q005yy2ym90nrx"; + version = "1.16.0"; + sha256 = "0i8krbi1pc39myspwlvb8ck969c8207hz84lh3qyg5w7syx7dlsg"; }) diff --git a/nixpkgs/pkgs/servers/http/nginx/stable.nix b/nixpkgs/pkgs/servers/http/nginx/stable.nix index f4cb22a38f61..ffc6f81fdc24 100644 --- a/nixpkgs/pkgs/servers/http/nginx/stable.nix +++ b/nixpkgs/pkgs/servers/http/nginx/stable.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "1.14.2"; - sha256 = "15wppq12qmq8acjs35xfj61czhf9cdc0drnl5mm8hcg3aihryb80"; + version = "1.16.0"; + sha256 = "0i8krbi1pc39myspwlvb8ck969c8207hz84lh3qyg5w7syx7dlsg"; }) diff --git a/nixpkgs/pkgs/servers/icingaweb2/default.nix b/nixpkgs/pkgs/servers/icingaweb2/default.nix index 5a6556f248af..11bfb99782d3 100644 --- a/nixpkgs/pkgs/servers/icingaweb2/default.nix +++ b/nixpkgs/pkgs/servers/icingaweb2/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, php }: with lib; stdenv.mkDerivation rec { name = "icingaweb2-${version}"; - version = "2.6.2"; + version = "2.6.3"; src = fetchFromGitHub { owner = "Icinga"; repo = "icingaweb2"; rev = "v${version}"; - sha256 = "1gf28nm94bq6r7i8yds5y9s59559i2zvj0swzb28zll6xbyprib0"; + sha256 = "0xcsf45m85d4ww5y2d5i73rjbp3hmc8lljc67lz9fl6f90y9gb22"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/servers/jackett/default.nix b/nixpkgs/pkgs/servers/jackett/default.nix index 30a6aa5aeec6..953300fd9a0a 100644 --- a/nixpkgs/pkgs/servers/jackett/default.nix +++ b/nixpkgs/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jackett-${version}"; - version = "0.11.170"; + version = "0.11.256"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "1qnlbndls62mvpllg8177l7mihldz5nwig63gfk7in2r0b0477l3"; + sha256 = "15rc49ql86anxylpfgvgbb1bv7faxy3g1qaskh7sqyncs4q2jc1h"; }; buildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/servers/jellyfin/default.nix b/nixpkgs/pkgs/servers/jellyfin/default.nix index d429da78a32f..d41c94eee562 100644 --- a/nixpkgs/pkgs/servers/jellyfin/default.nix +++ b/nixpkgs/pkgs/servers/jellyfin/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "jellyfin"; - version = "10.3.0"; + version = "10.3.2"; # Impossible to build anything offline with dotnet src = fetchurl { url = "https://github.com/jellyfin/jellyfin/releases/download/v${version}/jellyfin_${version}_portable.tar.gz"; - sha256 = "1q9rvyza5zi1kqg9301zrd0fnxzdwknyagpjc9r1cpqfx3yasnkc"; + sha256 = "0cwmaq61xhdb34f53m2vhnw8v4zrj266vjzfdm106gyychpr46vz"; }; buildInputs = [ @@ -37,6 +37,6 @@ stdenv.mkDerivation rec { description = "The Free Software Media System"; homepage = https://jellyfin.github.io/; license = licenses.gpl2; - maintainers = with maintainers; [ nyanloutre ]; + maintainers = with maintainers; [ nyanloutre minijackson ]; }; } diff --git a/nixpkgs/pkgs/servers/lidarr/default.nix b/nixpkgs/pkgs/servers/lidarr/default.nix index fb2fd42dd7da..03326ff3fd0c 100644 --- a/nixpkgs/pkgs/servers/lidarr/default.nix +++ b/nixpkgs/pkgs/servers/lidarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "lidarr-${version}"; - version = "0.6.0.815"; + version = "0.6.1.830"; src = fetchurl { url = "https://github.com/lidarr/Lidarr/releases/download/v${version}/Lidarr.develop.${version}.linux.tar.gz"; - sha256 = "08aa286y71pzn8wxjiag1bn5303i05jznqwmgrbqfb4jwz94pyjs"; + sha256 = "1pchz3dq8nfx7kp3dalkpi5rpwzkhn3d0a1djdja6yz5xgaiprqb"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/servers/mail/dovecot/default.nix b/nixpkgs/pkgs/servers/mail/dovecot/default.nix index 466cd5314e68..c639a9a26cb3 100644 --- a/nixpkgs/pkgs/servers/mail/dovecot/default.nix +++ b/nixpkgs/pkgs/servers/mail/dovecot/default.nix @@ -9,7 +9,7 @@ }: stdenv.mkDerivation rec { - name = "dovecot-2.3.5.2"; + name = "dovecot-2.3.6"; nativeBuildInputs = [ perl pkgconfig ]; buildInputs = @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dovecot.org/releases/2.3/${name}.tar.gz"; - sha256 = "1whvyg087sjhkd8r0xnk4ij105j135acnfxq6n58c6nqxwdf855s"; + sha256 = "1irnalplb47nlc26dn7zzdi95zhrxxi3miza7p3wdsgapv0qs7gd"; }; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix b/nixpkgs/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix index 0dc037a06ca7..6a812863f052 100644 --- a/nixpkgs/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix +++ b/nixpkgs/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "dovecot-pigeonhole-${version}"; - version = "0.5.5"; + version = "0.5.6"; src = fetchurl { url = "https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-${version}.tar.gz"; - sha256 = "19a9a6rdvdlrm00k2npprj6lrikjhngnmpgg412848rb3ip11anb"; + sha256 = "1f7m2213w4hvqr3lvr03bv4lh92k35gxl01c2x8q8akk7viffbvw"; }; buildInputs = [ dovecot openssl ]; diff --git a/nixpkgs/pkgs/servers/mail/rspamd/default.nix b/nixpkgs/pkgs/servers/mail/rspamd/default.nix index f14d36f1efb7..d4eb09220824 100644 --- a/nixpkgs/pkgs/servers/mail/rspamd/default.nix +++ b/nixpkgs/pkgs/servers/mail/rspamd/default.nix @@ -14,13 +14,13 @@ in stdenv.mkDerivation rec { name = "rspamd-${version}"; - version = "1.9.1"; + version = "1.9.2"; src = fetchFromGitHub { owner = "rspamd"; repo = "rspamd"; rev = version; - sha256 = "120944v0n2qh30ri5604h4xz38jm94f6s00gwhsjvs1sfm6csapz"; + sha256 = "1ygyqlm8x8d54g829pmd3x3qp4rsxj8nq25kgzrpkw73spi7bkkq"; }; nativeBuildInputs = [ cmake pkgconfig perl ]; diff --git a/nixpkgs/pkgs/servers/matrix-synapse/default.nix b/nixpkgs/pkgs/servers/matrix-synapse/default.nix index d942e5fa8d31..e181b850ea42 100644 --- a/nixpkgs/pkgs/servers/matrix-synapse/default.nix +++ b/nixpkgs/pkgs/servers/matrix-synapse/default.nix @@ -23,11 +23,11 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "0.99.3"; + version = "0.99.3.2"; src = fetchPypi { inherit pname version; - sha256 = "03300dplzckydwfvbn4w1sfc77b461cvgpi3qkhbv9jnnzz5y28g"; + sha256 = "0jcmav15ms3859174zpqf11hb7xdql4fgqmxlxpxjllzipq4fwiz"; }; patches = [ diff --git a/nixpkgs/pkgs/servers/memcached/default.nix b/nixpkgs/pkgs/servers/memcached/default.nix index 493bcde6a148..2fd18f381d99 100644 --- a/nixpkgs/pkgs/servers/memcached/default.nix +++ b/nixpkgs/pkgs/servers/memcached/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, cyrus_sasl, libevent}: stdenv.mkDerivation rec { - version = "1.5.13"; + version = "1.5.14"; name = "memcached-${version}"; src = fetchurl { url = "https://memcached.org/files/${name}.tar.gz"; - sha256 = "0qsdkjrns4f02lmabq8c7mzl5n4382q2p6a0dvmsjdcpjisagqb1"; + sha256 = "1agj198rm5kc64z8qxck65kdzvw30pdfxalygipnryw0lwlxynww"; }; configureFlags = [ diff --git a/nixpkgs/pkgs/servers/monitoring/grafana-reporter/default.nix b/nixpkgs/pkgs/servers/monitoring/grafana-reporter/default.nix index 03ed37b8b3f5..1004947d5b12 100644 --- a/nixpkgs/pkgs/servers/monitoring/grafana-reporter/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/grafana-reporter/default.nix @@ -4,7 +4,7 @@ with stdenv.lib; buildGoPackage rec { name = "reporter-${version}"; - version = "2.0.1"; + version = "2.1.0"; rev = "v${version}"; goPackagePath = "github.com/IzakMarais/reporter"; @@ -15,7 +15,7 @@ buildGoPackage rec { inherit rev; owner = "IzakMarais"; repo = "reporter"; - sha256 = "0yi7nx8ig5xgkwizddl0gdicnmcdp4qgg1fdxyq04l2y3qs176sg"; + sha256 = "1zindyypf634l4dd2rsvp67ryz9mmzq779x9d01apd04wivd9yf1"; }; postInstall = '' diff --git a/nixpkgs/pkgs/servers/monitoring/grafana/default.nix b/nixpkgs/pkgs/servers/monitoring/grafana/default.nix index ba5ba8725bc5..3ded244b9fbf 100644 --- a/nixpkgs/pkgs/servers/monitoring/grafana/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/grafana/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }: buildGoPackage rec { - version = "6.1.4"; + version = "6.1.6"; name = "grafana-${version}"; goPackagePath = "github.com/grafana/grafana"; @@ -11,12 +11,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "0a0k66vbsi2704pb5vr8mjr7n3v5dapnfhqxkrw6biicj8ahka30"; + sha256 = "12fj3j1w37nm8p2h4af38wbxkvm0pzf1zsjx8wpj0zrxanbigpjg"; }; srcStatic = fetchurl { url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "1wamnvv2jiyi6cyw9p65j2hm3si345asfwl7kjg7drx0vn08ks6g"; + sha256 = "1dg2gjmym06x8wj2xmygsww622k86cq07kbxvp8j8h17br4imj4k"; }; postPatch = '' diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix index 548049cdac5d..4475c16cde79 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix @@ -48,7 +48,7 @@ in rec { }; prometheus_2 = buildPrometheus { - version = "2.8.1"; - sha256 = "0x8w0qdh4lcf19nmdlhvgzpy08c2a932d3k49cjwhi5npcsf858n"; + version = "2.9.2"; + sha256 = "1nbvw9ia15ls3l2pydc9hdfs057kjlg0cm8h4w9sjjnsssbikl26"; }; } diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/fritzbox-exporter-deps.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/fritzbox-exporter-deps.nix new file mode 100644 index 000000000000..2d94ffeba26a --- /dev/null +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/fritzbox-exporter-deps.nix @@ -0,0 +1,93 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 +[ + { + goPackagePath = "github.com/123Haynes/go-http-digest-auth-client"; + fetch = { + type = "git"; + url = "https://github.com/123Haynes/go-http-digest-auth-client"; + rev = "4c2ff1556cab0c8c14069d8d116c34db59c50c54"; + sha256 = "0hpynnvwlxcdrrplvzibqk3179lzwkv8zlp03r6cd1vsd28b11ja"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "4b2b341e8d7715fae06375aa633dbb6e91b3fb46"; + sha256 = "1i1nz1f6g55xi2y3aiaz5kqfgvknarbfl4f0sx4nyyb4s7xb1z9x"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "e91709a02e0e8ff8b86b7aa913fdc9ae9498e825"; + sha256 = "16arbb7nwvs7lkpr7i9vrv8mk9h77zd3blzp3z9b0infqla4ddzc"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "c182affec369e30f25d3eb8cd8a478dee585ae7d"; + sha256 = "1xqsf9vpcrd4hp95rl6kgmjvkv1df4aicfw4l5vfcxcwxknfx2xs"; + }; + } + { + goPackagePath = "github.com/mxschmitt/golang-env-struct"; + fetch = { + type = "git"; + url = "https://github.com/mxschmitt/golang-env-struct"; + rev = "0c54aeca83972d1c7adf812b37dc53a6cbf58fb7"; + sha256 = "19h840xhkglxwfbwx6w1qyndzg775b14kpz3xpq0lfrkfxdq0w9l"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "27936f6d90f9c8e1145f11ed52ffffbfdb9e0af7"; + sha256 = "0yzmgi6g4ak4q8y7w6x0n5cbinlcn8yc3gwgzy4yck00qdn25d6y"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "3f6cbd95606771ac9f7b1c9247d2ca186cb72cb9"; + sha256 = "1d9qc9jwqsgh6r5x5qkf6c6pkfb5jfhxls431ilhawn05fbyyypq"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "fd36f4220a901265f90734c3183c5f0c91daa0b8"; + sha256 = "1bs5d72k361llflgl94c22n0w53j30rsfh84smgk8mbjbcmjsaa5"; + }; + } + { + goPackagePath = "github.com/prometheus/common"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/common"; + rev = "c873fb1f9420b83ee703b4361c61183b4619f74d"; + sha256 = "1fmigir3c35nxmsj4bqwfp69kaxy415qk0ssi4wplcyd1g656lbg"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "87a4384529e0652f5035fb5cc8095faf73ea9b0b"; + sha256 = "1rjd7hf5nvsdw2jpqpapfw6nv3w3zphfhkrh5p7nryakal6kcgmh"; + }; + } +] diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix index 1271b3d40e14..071035b2a4ac 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix @@ -2,23 +2,25 @@ buildGoPackage rec { name = "fritzbox-exporter-${version}"; - version = "1.0"; - rev = "v${version}"; + version = "v1.0-32-g90fc0c5"; + rev = "90fc0c572d3340803f7c2aafc4b097db7af1f871"; - goPackagePath = "github.com/ndecker/fritzbox_exporter"; - - src= fetchFromGitHub { + src = fetchFromGitHub { inherit rev; - owner = "ndecker"; + owner = "mxschmitt"; repo = "fritzbox_exporter"; - sha256 = "1qk3dgxxz3cnz52jzz0yvfkrkk4s5kdhc26nbfgdpn0ifzqj0awr"; + sha256 = "08gcc60g187x1d14vh7n7s52zkqgj3fvg5v84i6dw55rmb6zzxri"; }; + goPackagePath = "github.com/mxschmitt/fritzbox_exporter"; + + goDeps = ./fritzbox-exporter-deps.nix; + meta = with stdenv.lib; { - description = "FRITZ!Box UPnP statistics exporter for prometheus"; + description = "Prometheus Exporter for FRITZ!Box (TR64 and UPnP)"; homepage = https://github.com/ndecker/fritzbox_exporter; license = licenses.asl20; - maintainers = with maintainers; [ bachp ]; + maintainers = with maintainers; [ bachp flokli ]; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/servers/monitoring/riemann-dash/Gemfile b/nixpkgs/pkgs/servers/monitoring/riemann-dash/Gemfile index aecd1b9508c9..9abae119ca87 100644 --- a/nixpkgs/pkgs/servers/monitoring/riemann-dash/Gemfile +++ b/nixpkgs/pkgs/servers/monitoring/riemann-dash/Gemfile @@ -1,3 +1,3 @@ source 'https://rubygems.org' -gem "riemann-dash", "0.2.12" +gem "riemann-dash", "0.2.14" diff --git a/nixpkgs/pkgs/servers/monitoring/riemann-dash/Gemfile.lock b/nixpkgs/pkgs/servers/monitoring/riemann-dash/Gemfile.lock index 00375fa4e30f..ed780f6ce4b6 100644 --- a/nixpkgs/pkgs/servers/monitoring/riemann-dash/Gemfile.lock +++ b/nixpkgs/pkgs/servers/monitoring/riemann-dash/Gemfile.lock @@ -2,29 +2,37 @@ GEM remote: https://rubygems.org/ specs: erubis (2.7.0) + ffi (1.10.0) multi_json (1.3.6) rack (1.6.11) - rack-protection (1.5.3) + rack-protection (1.5.5) rack - riemann-dash (0.2.12) + rb-fsevent (0.10.3) + rb-inotify (0.10.0) + ffi (~> 1.0) + riemann-dash (0.2.14) erubis (>= 2.7.0) multi_json (= 1.3.6) sass (>= 3.1.14) sinatra (~> 1.4.5) webrick (~> 1.3.1) - sass (3.4.22) - sinatra (1.4.7) + sass (3.7.4) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + sinatra (1.4.8) rack (~> 1.5) rack-protection (~> 1.4) tilt (>= 1.3, < 3) - tilt (2.0.5) + tilt (2.0.9) webrick (1.3.1) PLATFORMS ruby DEPENDENCIES - riemann-dash (= 0.2.12) + riemann-dash (= 0.2.14) BUNDLED WITH - 1.16.4 + 1.17.2 diff --git a/nixpkgs/pkgs/servers/monitoring/riemann-dash/default.nix b/nixpkgs/pkgs/servers/monitoring/riemann-dash/default.nix index 2218edabe06b..6e0e97c7cc63 100644 --- a/nixpkgs/pkgs/servers/monitoring/riemann-dash/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/riemann-dash/default.nix @@ -1,14 +1,15 @@ -{ bundlerEnv, lib, ruby }: +{ bundlerApp, lib }: -bundlerEnv { - inherit ruby; +bundlerApp { pname = "riemann-dash"; gemdir = ./.; + exes = [ "riemann-dash" ]; meta = with lib; { description = "A javascript, websockets-powered dashboard for Riemann"; homepage = https://github.com/riemann/riemann-dash; license = licenses.mit; + maintainers = with maintainers; [ manveru ]; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/servers/monitoring/riemann-dash/gemset.nix b/nixpkgs/pkgs/servers/monitoring/riemann-dash/gemset.nix index 9298312f90e0..f2446be79f61 100644 --- a/nixpkgs/pkgs/servers/monitoring/riemann-dash/gemset.nix +++ b/nixpkgs/pkgs/servers/monitoring/riemann-dash/gemset.nix @@ -1,19 +1,37 @@ { erubis = { + groups = ["default"]; + platforms = []; source = { + remotes = ["https://rubygems.org"]; sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3"; type = "gem"; }; version = "2.7.0"; }; + ffi = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p"; + type = "gem"; + }; + version = "1.10.0"; + }; multi_json = { + groups = ["default"]; + platforms = []; source = { + remotes = ["https://rubygems.org"]; sha256 = "0q2zjfvd2ibds9g9nzf2p1b47fc1wqliwfywv5pw85w15lmy91yr"; type = "gem"; }; version = "1.3.6"; }; rack = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1g9926ln2lw12lfxm4ylq1h6nl0rafl10za3xvjzc87qvnqic87f"; @@ -23,48 +41,95 @@ }; rack-protection = { dependencies = ["rack"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0my0wlw4a5l3hs79jkx2xzv7djhajgf8d28k8ai1ddlnxxb0v7ss"; + type = "gem"; + }; + version = "1.5.5"; + }; + rb-fsevent = { + groups = ["default"]; + platforms = []; source = { - sha256 = "0cvb21zz7p9wy23wdav63z5qzfn4nialik22yqp6gihkgfqqrh5r"; + remotes = ["https://rubygems.org"]; + sha256 = "1lm1k7wpz69jx7jrc92w3ggczkjyjbfziq5mg62vjnxmzs383xx8"; + type = "gem"; + }; + version = "0.10.3"; + }; + rb-inotify = { + dependencies = ["ffi"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fs7hxm9g6ywv2yih83b879klhc4fs8i0p9166z795qmd77dk0a4"; type = "gem"; }; - version = "1.5.3"; + version = "0.10.0"; }; riemann-dash = { dependencies = ["erubis" "multi_json" "sass" "sinatra" "webrick"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1y2vh9vcl21b6k2wqgz1y8bbcrl07r43s6q2vkgp35z1b28xcszy"; + sha256 = "1h366knb1vx5l4a46ppfr2sb467bb4m448fh8q2al0ixw7wqncvr"; type = "gem"; }; - version = "0.2.12"; + version = "0.2.14"; }; sass = { + dependencies = ["sass-listen"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dkj6v26fkg1g0majqswwmhxva7cd6p3psrhdlx93qal72dssywy"; + sha256 = "0p95lhs0jza5l7hqci1isflxakz83xkj97lkvxl919is0lwhv2w0"; type = "gem"; }; - version = "3.4.22"; + version = "3.7.4"; + }; + sass-listen = { + dependencies = ["rb-fsevent" "rb-inotify"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xw3q46cmahkgyldid5hwyiwacp590zj2vmswlll68ryvmvcp7df"; + type = "gem"; + }; + version = "4.0.0"; }; sinatra = { dependencies = ["rack" "rack-protection" "tilt"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1b81kbr65mmcl9cdq2r6yc16wklyp798rxkgmm5pr9fvsj7jwmxp"; + sha256 = "0byxzl7rx3ki0xd7aiv1x8mbah7hzd8f81l65nq8857kmgzj1jqq"; type = "gem"; }; - version = "1.4.7"; + version = "1.4.8"; }; tilt = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lgk8bfx24959yq1cn55php3321wddw947mgj07bxfnwyipy9hqf"; + sha256 = "0ca4k0clwf0rkvy7726x4nxpjxkpv67w043i39saxgldxd97zmwz"; type = "gem"; }; - version = "2.0.5"; + version = "2.0.9"; }; webrick = { + groups = ["default"]; + platforms = []; source = { + remotes = ["https://rubygems.org"]; sha256 = "0s42mxihcl2bx0h9q0v2syl70qndydfkl39a06h9il17p895ya8g"; type = "gem"; }; diff --git a/nixpkgs/pkgs/servers/monitoring/sensu/Gemfile.lock b/nixpkgs/pkgs/servers/monitoring/sensu/Gemfile.lock index d12e17130b08..2d0b31e999fc 100644 --- a/nixpkgs/pkgs/servers/monitoring/sensu/Gemfile.lock +++ b/nixpkgs/pkgs/servers/monitoring/sensu/Gemfile.lock @@ -1,69 +1,86 @@ GEM remote: https://rubygems.org/ specs: + addressable (2.6.0) + public_suffix (>= 2.0.2, < 4.0) amq-protocol (2.0.1) amqp (1.6.0) amq-protocol (>= 2.0.1) eventmachine - aws-sdk (2.10.34) - aws-sdk-resources (= 2.10.34) - aws-sdk-core (2.10.34) + aws-eventstream (1.0.3) + aws-sdk (2.11.264) + aws-sdk-resources (= 2.11.264) + aws-sdk-core (2.11.264) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.10.34) - aws-sdk-core (= 2.10.34) - aws-sigv4 (1.0.1) + aws-sdk-resources (2.11.264) + aws-sdk-core (= 2.11.264) + aws-sigv4 (1.1.0) + aws-eventstream (~> 1.0, >= 1.0.2) cause (0.1) childprocess (0.5.8) ffi (~> 1.0, >= 1.0.11) + cookiejar (0.3.3) dentaku (2.0.9) - domain_name (0.5.20170404) + domain_name (0.5.20180417) unf (>= 0.0.5, < 1.0.0) + em-http-request (1.1.5) + addressable (>= 2.3.4) + cookiejar (!= 0.3.1) + em-socksify (>= 0.3) + eventmachine (>= 1.0.3) + http_parser.rb (>= 0.6.0) em-http-server (0.1.8) eventmachine + em-socksify (0.3.2) + eventmachine (>= 1.0.0.beta.4) em-worker (0.0.2) eventmachine - eventmachine (1.2.5) - ffi (1.9.18) + eventmachine (1.2.7) + ffi (1.9.21) http-cookie (1.0.3) domain_name (~> 0.5) + http_parser.rb (0.6.0) influxdb (0.3.13) cause json - jmespath (1.3.1) + jmespath (1.4.0) json (1.8.6) jsonpath (0.5.8) multi_json - mime-types (3.1) + mime-types (3.2.2) mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) + mime-types-data (3.2019.0331) mixlib-cli (1.7.0) - multi_json (1.12.1) + multi_json (1.13.1) netrc (0.11.0) oj (2.18.1) parse-cron (0.1.4) + public_suffix (3.0.3) rest-client (2.0.2) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - sensu (1.0.3) + sensu (1.7.0) + em-http-request (= 1.1.5) em-http-server (= 0.1.8) - eventmachine (= 1.2.5) + eventmachine (= 1.2.7) parse-cron (= 0.1.4) - sensu-extension (= 1.5.1) - sensu-extensions (= 1.9.0) - sensu-json (= 2.1.0) - sensu-logger (= 1.2.1) - sensu-redis (= 2.2.0) - sensu-settings (= 10.3.0) - sensu-spawn (= 2.2.1) - sensu-transport (= 7.0.2) - sensu-extension (1.5.1) + sensu-extension (= 1.5.2) + sensu-extensions (= 1.11.0) + sensu-json (= 2.1.1) + sensu-logger (= 1.2.2) + sensu-redis (= 2.4.0) + sensu-settings (= 10.15.0) + sensu-spawn (= 2.5.0) + sensu-transport (= 8.2.0) + sensu-extension (1.5.2) eventmachine - sensu-extensions (1.9.0) + sensu-extensions (1.11.0) sensu-extension - sensu-extensions-check-dependencies (= 1.0.1) + sensu-extensions-check-dependencies (= 1.1.0) sensu-extensions-debug (= 1.0.0) + sensu-extensions-deregistration (= 1.0.0) sensu-extensions-json (= 1.0.0) sensu-extensions-occurrences (= 1.2.0) sensu-extensions-only-check-output (= 1.0.0) @@ -71,10 +88,12 @@ GEM sensu-json (>= 1.1.0) sensu-logger sensu-settings - sensu-extensions-check-dependencies (1.0.1) + sensu-extensions-check-dependencies (1.1.0) sensu-extension sensu-extensions-debug (1.0.0) sensu-extension + sensu-extensions-deregistration (1.0.0) + sensu-extension sensu-extensions-json (1.0.0) sensu-extension sensu-extensions-occurrences (1.2.0) @@ -83,40 +102,41 @@ GEM sensu-extension sensu-extensions-ruby-hash (1.0.0) sensu-extension - sensu-json (2.1.0) + sensu-json (2.1.1) oj (= 2.18.1) - sensu-logger (1.2.1) + sensu-logger (1.2.2) eventmachine sensu-json - sensu-plugin (1.4.5) + sensu-plugin (1.4.7) json (< 2.0.0) - mixlib-cli (>= 1.5.0) - sensu-plugins-disk-checks (2.4.2) + mixlib-cli (~> 1.5) + sensu-plugins-disk-checks (4.0.1) sensu-plugin (~> 1.2) sys-filesystem (= 1.1.7) - sensu-plugins-http (2.6.0) + sensu-plugins-http (2.11.0) aws-sdk (~> 2.3) rest-client (~> 2.0.2) sensu-plugin (~> 1.2) - sensu-plugins-influxdb (1.2.0) + sensu-plugins-influxdb (1.4.0) dentaku (= 2.0.9) influxdb (= 0.3.13) jsonpath (= 0.5.8) sensu-plugin (~> 1.3) - sensu-plugins-logs (1.2.0) + sensu-plugins-logs (1.3.2) sensu-plugin (~> 1.2) - sensu-plugins-systemd (0.0.5) + sensu-plugins-systemd (0.1.0) sensu-plugin (~> 1.2) - sensu-redis (2.2.0) + sensu-redis (2.4.0) eventmachine - sensu-settings (10.3.0) + sensu-settings (10.15.0) parse-cron sensu-json (>= 1.1.0) - sensu-spawn (2.2.1) + sensu-spawn (2.5.0) childprocess (= 0.5.8) em-worker (= 0.0.2) eventmachine - sensu-transport (7.0.2) + ffi (= 1.9.21) + sensu-transport (8.2.0) amq-protocol (= 2.0.1) amqp (= 1.6.0) eventmachine @@ -125,7 +145,7 @@ GEM ffi unf (0.1.4) unf_ext - unf_ext (0.0.7.4) + unf_ext (0.0.7.6) PLATFORMS ruby @@ -139,4 +159,4 @@ DEPENDENCIES sensu-plugins-systemd BUNDLED WITH - 1.15.3 + 1.17.2 diff --git a/nixpkgs/pkgs/servers/monitoring/sensu/default.nix b/nixpkgs/pkgs/servers/monitoring/sensu/default.nix index dba0c32b353b..f1a6a08267d6 100644 --- a/nixpkgs/pkgs/servers/monitoring/sensu/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/sensu/default.nix @@ -1,17 +1,52 @@ -{ lib, bundlerEnv, ruby }: +{ lib, bundlerApp }: -bundlerEnv rec { - name = "sensu-${version}"; - version = (import ./gemset.nix).sensu.version; - - inherit ruby; +bundlerApp { + pname = "sensu"; gemdir = ./.; + exes = [ + "sensu-api" + "sensu-client" + "sensu-install" + "sensu-server" + + # indirect, but might be important + "check-disk-usage.rb" + "check-fstab-mounts.rb" + "check-smart.rb" + "check-smart-status.rb" + "check-smart-tests.rb" + "metrics-disk-capacity.rb" + "metrics-disk.rb" + "metrics-disk-usage.rb" + + "check-head-redirect.rb" + "check-http-cors.rb" + "check-http-json.rb" + "check-http.rb" + "check-https-cert.rb" + "check-last-modified.rb" + "metrics-curl.rb" + "metrics-http-json-deep.rb" + "metrics-http-json.rb" + + "check-influxdb-query.rb" + "check-influxdb.rb" + "metrics-influxdb.rb" + "mutator-influxdb-line-protocol.rb" + + "check-journal.rb" + "check-log.rb" + "handler-logevent.rb" + "handler-show-event-config.rb" + + "check-systemd.rb" + ]; meta = with lib; { description = "A monitoring framework that aims to be simple, malleable, and scalable"; homepage = https://sensuapp.org/; license = licenses.mit; - maintainers = with maintainers; [ theuni peterhoeg ]; + maintainers = with maintainers; [ theuni peterhoeg manveru ]; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/servers/monitoring/sensu/gemset.nix b/nixpkgs/pkgs/servers/monitoring/sensu/gemset.nix index cce9a45e9ed8..32134255711c 100644 --- a/nixpkgs/pkgs/servers/monitoring/sensu/gemset.nix +++ b/nixpkgs/pkgs/servers/monitoring/sensu/gemset.nix @@ -1,5 +1,18 @@ { + addressable = { + dependencies = ["public_suffix"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bcm2hchn897xjhqj9zzsxf3n9xhddymj4lsclz508f4vw3av46l"; + type = "gem"; + }; + version = "2.6.0"; + }; amq-protocol = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1rpn9vgh7y037aqhhp04smihzr73vp5i5g6xlqlha10wy3q0wp7x"; @@ -9,6 +22,8 @@ }; amqp = { dependencies = ["amq-protocol" "eventmachine"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0kbrqnpjgj9v0722p3n5rw589l4g26ry8mcghwc5yr20ggkpdaz9"; @@ -16,42 +31,63 @@ }; version = "1.6.0"; }; + aws-eventstream = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "100g77a5ixg4p5zwq77f28n2pdkk0y481f7v83qrlmnj22318qq6"; + type = "gem"; + }; + version = "1.0.3"; + }; aws-sdk = { dependencies = ["aws-sdk-resources"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09k367vs9gb640cr1afphxjfmlykw7knnb9xz0kl2x5f9yr3zz23"; + sha256 = "0mx4x4lxd584c9bsip68hfrw4lw5q04slx0w1a57yy2mlkcaz811"; type = "gem"; }; - version = "2.10.34"; + version = "2.11.264"; }; aws-sdk-core = { dependencies = ["aws-sigv4" "jmespath"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gfsph8kr59jdpvycq8qh0c0ah64k0n96ag5qbvy7mzq9292085w"; + sha256 = "0kjmflddmq5y2y5677z7y2fin6pxa7my5cq39dzc7hmwl7favjxj"; type = "gem"; }; - version = "2.10.34"; + version = "2.11.264"; }; aws-sdk-resources = { dependencies = ["aws-sdk-core"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0knip45mhx0dm8llp1akhhar2z007r7kjg3i3xbws7lhvms8fbjc"; + sha256 = "1blw7kazv1a5kpkk6sy0mhhbfkb38f93sp2mpxbhbbr6n08hq4q3"; type = "gem"; }; - version = "2.10.34"; + version = "2.11.264"; }; aws-sigv4 = { + dependencies = ["aws-eventstream"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cxl0yvmyl8d0yj4cx3p75iki4fqk8ckb6ajfj7mr3g4ihp5mryp"; + sha256 = "1dfc8i5cxjwlvi4b665lbpbwvks8a6wfy3vfmwr3pjdmxwdmc2cs"; type = "gem"; }; - version = "1.0.1"; + version = "1.1.0"; }; cause = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0digirxqlwdg79mkbn70yc7i9i1qnclm2wjbrc47kqv6236bpj00"; @@ -61,6 +97,8 @@ }; childprocess = { dependencies = ["ffi"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1lv7axi1fhascm9njxh3lx1rbrnsm8wgvib0g7j26v4h1fcphqg0"; @@ -68,7 +106,19 @@ }; version = "0.5.8"; }; + cookiejar = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0q0kmbks9l3hl0wdq744hzy97ssq9dvlzywyqv9k9y1p3qc9va2a"; + type = "gem"; + }; + version = "0.3.3"; + }; dentaku = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "11z4cw4lspx3rgmmd2hd4l1iikk6p17icxwn7xym92v1j825zpnr"; @@ -78,15 +128,30 @@ }; domain_name = { dependencies = ["unf"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0abdlwb64ns7ssmiqhdwgl27ly40x2l27l8hs8hn0z4kb3zd2x3v"; + type = "gem"; + }; + version = "0.5.20180417"; + }; + em-http-request = { + dependencies = ["addressable" "cookiejar" "em-socksify" "eventmachine" "http_parser.rb"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12hs8yijhak7p2hf1xkh98g0mnp5phq3mrrhywzaxpwz1gw5r3kf"; + sha256 = "13rxmbi0fv91n4sg300v3i9iiwd0jxv0i6xd0sp81dx3jlx7kasx"; type = "gem"; }; - version = "0.5.20170404"; + version = "1.1.5"; }; em-http-server = { dependencies = ["eventmachine"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0y8l4gymy9dzjjchjav90ck6has2i2zdjihlhcyrg3jgq6kjzyq5"; @@ -94,8 +159,21 @@ }; version = "0.1.8"; }; + em-socksify = { + dependencies = ["eventmachine"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rk43ywaanfrd8180d98287xv2pxyl7llj291cwy87g1s735d5nk"; + type = "gem"; + }; + version = "0.3.2"; + }; em-worker = { dependencies = ["eventmachine"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0z4jx9z2q5hxvdvik4yp0ahwfk69qsmdnyp72ln22p3qlkq2z5wk"; @@ -104,23 +182,29 @@ version = "0.0.2"; }; eventmachine = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "075hdw0fgzldgss3xaqm2dk545736khcvv1fmzbf1sgdlkyh1v8z"; + sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r"; type = "gem"; }; - version = "1.2.5"; + version = "1.2.7"; }; ffi = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "034f52xf7zcqgbvwbl20jwdyjwznvqnwpbaps9nk18v9lgb1dpx0"; + sha256 = "0c2dl10pi6a30kcvx2s6p2v1wb4kbm48iv38kmz2ff600nirhpb8"; type = "gem"; }; - version = "1.9.18"; + version = "1.9.21"; }; http-cookie = { dependencies = ["domain_name"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "004cgs4xg5n6byjs7qld0xhsjq3n6ydfh897myr2mibvh6fjc49g"; @@ -128,8 +212,20 @@ }; version = "1.0.3"; }; + "http_parser.rb" = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi"; + type = "gem"; + }; + version = "0.6.0"; + }; influxdb = { dependencies = ["cause" "json"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0jikl3iylbffsdmb4vr09ysqvpwxk133y6m9ylwcd0931ngsf0ks"; @@ -138,14 +234,18 @@ version = "0.3.13"; }; jmespath = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07w8ipjg59qavijq59hl82zs74jf3jsp7vxl9q3a2d0wpv5akz3y"; + sha256 = "1d4wac0dcd1jf6kc57891glih9w57552zgqswgy74d1xhgnk0ngf"; type = "gem"; }; - version = "1.3.1"; + version = "1.4.0"; }; json = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0qmj7fypgb9vag723w1a49qihxrcf5shzars106ynw2zk352gbv5"; @@ -155,6 +255,8 @@ }; jsonpath = { dependencies = ["multi_json"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1gwhrd7xlysq537yy8ma69jc83lblwiccajl5zvyqpnwyjjc93df"; @@ -164,22 +266,28 @@ }; mime-types = { dependencies = ["mime-types-data"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0087z9kbnlqhci7fxh9f6il63hj1k02icq2rs0c6cppmqchr753m"; + sha256 = "0fjxy1jm52ixpnv3vg9ld9pr9f35gy0jp66i1njhqjvmnvq0iwwk"; type = "gem"; }; - version = "3.1"; + version = "3.2.2"; }; mime-types-data = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04my3746hwa4yvbx1ranhfaqkgf6vavi1kyijjnw8w3dy37vqhkm"; + sha256 = "1m00pg19cm47n1qlcxgl91ajh2yq0fszvn1vy8fy0s1jkrp9fw4a"; type = "gem"; }; - version = "3.2016.0521"; + version = "3.2019.0331"; }; mixlib-cli = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0647msh7kp7lzyf6m72g6snpirvhimjm22qb8xgv9pdhbcrmcccp"; @@ -188,14 +296,18 @@ version = "1.7.0"; }; multi_json = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wpc23ls6v2xbk3l1qncsbz16npvmw8p0b38l8czdzri18mp51xk"; + sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv"; type = "gem"; }; - version = "1.12.1"; + version = "1.13.1"; }; netrc = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0gzfmcywp1da8nzfqsql2zqi648mfnx6qwkig3cv36n9m0yy676y"; @@ -204,6 +316,8 @@ version = "0.11.0"; }; oj = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "147whmq8h2n04chskl3v4a132xhz5i6kk6vhnz83jwng4vihin5f"; @@ -212,6 +326,8 @@ version = "2.18.1"; }; parse-cron = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "02fj9i21brm88nb91ikxwxbwv9y7mb7jsz6yydh82rifwq7357hg"; @@ -219,8 +335,20 @@ }; version = "0.1.4"; }; + public_suffix = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l"; + type = "gem"; + }; + version = "3.0.3"; + }; rest-client = { dependencies = ["http-cookie" "mime-types" "netrc"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1hzcs2r7b5bjkf2x2z3n8z6082maz0j8vqjiciwgg3hzb63f958j"; @@ -229,43 +357,53 @@ version = "2.0.2"; }; sensu = { - dependencies = ["em-http-server" "eventmachine" "parse-cron" "sensu-extension" "sensu-extensions" "sensu-json" "sensu-logger" "sensu-redis" "sensu-settings" "sensu-spawn" "sensu-transport"]; + dependencies = ["em-http-request" "em-http-server" "eventmachine" "parse-cron" "sensu-extension" "sensu-extensions" "sensu-json" "sensu-logger" "sensu-redis" "sensu-settings" "sensu-spawn" "sensu-transport"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07fa9rv7hdj2n58a0cm1i5nis309w7xbs9lmgckmrpj190q1gvdm"; + sha256 = "0wmwck53i207axhqm2r6dz8d7arww3mzd8pjx7m79svyj998hzjc"; type = "gem"; }; - version = "1.0.3"; + version = "1.7.0"; }; sensu-extension = { dependencies = ["eventmachine"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lgmjxfbq11v4yi3qanf1qxv0sgm1a8a7wj7qyn1nkva6zmimss3"; + sha256 = "0bpizp4n01rv72cryjjlrbfxxj3csish3mkxjzdy4inpi5j5h1dw"; type = "gem"; }; - version = "1.5.1"; + version = "1.5.2"; }; sensu-extensions = { - dependencies = ["sensu-extension" "sensu-extensions-check-dependencies" "sensu-extensions-debug" "sensu-extensions-json" "sensu-extensions-occurrences" "sensu-extensions-only-check-output" "sensu-extensions-ruby-hash" "sensu-json" "sensu-logger" "sensu-settings"]; + dependencies = ["sensu-extension" "sensu-extensions-check-dependencies" "sensu-extensions-debug" "sensu-extensions-deregistration" "sensu-extensions-json" "sensu-extensions-occurrences" "sensu-extensions-only-check-output" "sensu-extensions-ruby-hash" "sensu-json" "sensu-logger" "sensu-settings"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1r09mdbbnh5cg9yvqw78sxbhlb8xqld1vwbr4hsjw6k3x1xpnnr9"; + sha256 = "1313g6x3qwldk44p3v46sm3w1hz0pc89nslcwdw3v2j78a99a62y"; type = "gem"; }; - version = "1.9.0"; + version = "1.11.0"; }; sensu-extensions-check-dependencies = { dependencies = ["sensu-extension"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0clgvf2abvwz549f28ny3zd6q7z6y7m49i8pp91ll10jp1vsy4b2"; + sha256 = "1hc4kz7k983f6fk27ikg5drvxm4a85qf1k07hqssfyk3k75jyj1r"; type = "gem"; }; - version = "1.0.1"; + version = "1.1.0"; }; sensu-extensions-debug = { dependencies = ["sensu-extension"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "11abdgn2kkkbvxq4692yg6a27qnxz4349gfiq7d35biy7vrw34lp"; @@ -273,8 +411,21 @@ }; version = "1.0.0"; }; + sensu-extensions-deregistration = { + dependencies = ["sensu-extension"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1rarsd7vjflvzgs3hm6z3ypfp3rbzq2723wc0rqxnkpahzdrwr6c"; + type = "gem"; + }; + version = "1.0.0"; + }; sensu-extensions-json = { dependencies = ["sensu-extension"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1wnbn9sycdqdh9m0fhszaqkv0jijs3fkdbvcv8kdspx6irbv3m6g"; @@ -284,6 +435,8 @@ }; sensu-extensions-occurrences = { dependencies = ["sensu-extension"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0lx5wsbblfs0rvkxfg09bsz0g2mwmckrhga7idnarsnm8m565v1v"; @@ -293,6 +446,8 @@ }; sensu-extensions-only-check-output = { dependencies = ["sensu-extension"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0ds2i8wd4ji9ifig2zzr4jpxinvk5dm7j10pvaqy4snykxa3rqh3"; @@ -302,6 +457,8 @@ }; sensu-extensions-ruby-hash = { dependencies = ["sensu-extension"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1xyrj3gbmslbivcd5qcmyclgapn7qf7f5jwfvfpw53bxzib0h7s3"; @@ -311,114 +468,140 @@ }; sensu-json = { dependencies = ["oj"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02qkh86jddv7gha39vjx6g9hi7vkq7r433dr86bwmm9c7lqkgyl9"; + sha256 = "08zlxg5j3bhs72cc7wcllp026jbif0xiw6ib1cgawndlpsfl9fgx"; type = "gem"; }; - version = "2.1.0"; + version = "2.1.1"; }; sensu-logger = { dependencies = ["eventmachine" "sensu-json"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03kicjqz8a594bxnwyg6bcd4fipy2vxjl1gbaip4gpixxki32dx0"; + sha256 = "0jpw4kz36ilaknrzb3rbkhpbgv93w2d668z2cv395dq30d4d3iwm"; type = "gem"; }; - version = "1.2.1"; + version = "1.2.2"; }; sensu-plugin = { dependencies = ["json" "mixlib-cli"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z18zk04l9klbjmqvjg6cpv3k4w5hi1by8wnpkiwdwa2jdv61jyb"; + sha256 = "1x4zka4zia2wk3gp0sr4m4lzsf0m7s4a3gcgs936n2mgzsbcaa86"; type = "gem"; }; - version = "1.4.5"; + version = "1.4.7"; }; sensu-plugins-disk-checks = { dependencies = ["sensu-plugin" "sys-filesystem"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1m5pygdaf8xqrby61vcsq6ynhzcvjr2xgahwmkkcai8a4xqrpq9x"; + sha256 = "0q4f23ccvl6d0k26xph2fskk5pv2mmdrclr00m358m880sgkhyg1"; type = "gem"; }; - version = "2.4.2"; + version = "4.0.1"; }; sensu-plugins-http = { dependencies = ["aws-sdk" "rest-client" "sensu-plugin"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yg05x9dl4xwqi7lvglyv374a3hbp7ag0z9325jmc9bazm6i2q2d"; + sha256 = "1bjvg6vr0fy106bp50n6dfwbqf7k0z7ynrm17am7ggfbhzy7wi06"; type = "gem"; }; - version = "2.6.0"; + version = "2.11.0"; }; sensu-plugins-influxdb = { dependencies = ["dentaku" "influxdb" "jsonpath" "sensu-plugin"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18nk7c451df46xcjk97r3h8yhaj8bz138ih5y0z26sdiha58brv7"; + sha256 = "1rx0zfvv7c60vaqdwbpl5c3csg5zrrjy1jdl8saigpla133vbgxd"; type = "gem"; }; - version = "1.2.0"; + version = "1.4.0"; }; sensu-plugins-logs = { dependencies = ["sensu-plugin"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ycrf3967v5kavm58fj9db16l9wgyzac4h3r0f9hm32jy9qsxwq6"; + sha256 = "17shj4msc8bzqgqi5waw649hzzgl8q87z6flmpg0msnmv4r2h1cf"; type = "gem"; }; - version = "1.2.0"; + version = "1.3.2"; }; sensu-plugins-systemd = { dependencies = ["sensu-plugin"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1r7prvkf33j6qvvqq78186rn5g6wf0g3dqni34vnj8v1z287wkfh"; + sha256 = "0f0hdp2cvzs5wby2fkjg48siyjgdi83hf11ld1by2l0cn4s9ir24"; type = "gem"; }; - version = "0.0.5"; + version = "0.1.0"; }; sensu-redis = { dependencies = ["eventmachine"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1drmychc04fg2gs7zsxx6aidfyxf7cn7k8k1jy7dnfbnlr5aln3n"; + sha256 = "0widfmmj1h9ca2kk14wy1sqmlkq40linp89a73s3ghngnzri0xyk"; type = "gem"; }; - version = "2.2.0"; + version = "2.4.0"; }; sensu-settings = { dependencies = ["parse-cron" "sensu-json"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0y55bqvps06gk94zllamqr0fa5bc27q0k1b5sp5gxh1bkf4w8gb3"; + sha256 = "0cdlyhga9fj5hmchpb40fw9nh24qhax9djnqcxlj1fywyccycj69"; type = "gem"; }; - version = "10.3.0"; + version = "10.15.0"; }; sensu-spawn = { - dependencies = ["childprocess" "em-worker" "eventmachine"]; + dependencies = ["childprocess" "em-worker" "eventmachine" "ffi"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vz5kbqk3ld0s16zjl8m38l1m1xwcvjlfc1g4nfm45qxdyfn7la7"; + sha256 = "17yc8ivjpjbvig9r7yl6991d6ma0kcq75fbpz6i856ljvcr3lmd5"; type = "gem"; }; - version = "2.2.1"; + version = "2.5.0"; }; sensu-transport = { dependencies = ["amq-protocol" "amqp" "eventmachine" "sensu-redis"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15yib92hwyd8v04wcc0kaw0p8w2c2mwvi4ldya2jh3dqgs31mvhr"; + sha256 = "0x6vyfmg1jm1srf7xa5aka73by7qwcmry2rx8kq8phwa4g0v4mzr"; type = "gem"; }; - version = "7.0.2"; + version = "8.2.0"; }; sys-filesystem = { dependencies = ["ffi"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "10didky52nfapmybj6ipda18i8fcwf8bs9bbfbk5i7v1shzd36rf"; @@ -428,6 +611,8 @@ }; unf = { dependencies = ["unf_ext"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9"; @@ -436,11 +621,13 @@ version = "0.1.4"; }; unf_ext = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14hr2dzqh33kqc0xchs8l05pf3kjcayvad4z1ip5rdjxrkfk8glb"; + sha256 = "1ll6w64ibh81qwvjx19h8nj7mngxgffg7aigjx11klvf5k2g4nxf"; type = "gem"; }; - version = "0.0.7.4"; + version = "0.0.7.6"; }; } \ No newline at end of file diff --git a/nixpkgs/pkgs/servers/mqtt/mosquitto/default.nix b/nixpkgs/pkgs/servers/mqtt/mosquitto/default.nix index ee1277292767..20effd5bceb4 100644 --- a/nixpkgs/pkgs/servers/mqtt/mosquitto/default.nix +++ b/nixpkgs/pkgs/servers/mqtt/mosquitto/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "mosquitto-${version}"; - version = "1.6"; + version = "1.6.1"; src = fetchFromGitHub { owner = "eclipse"; repo = "mosquitto"; rev = "v${version}"; - sha256 = "1yvn0yj9hb502lvk2yrshpvrnq2fddjyarnw37ip34mhxynnz5gb"; + sha256 = "0mpllj719cmirynbcgiankdzyg7bn6vpvxxhg8zr18lic5dvgm3p"; }; postPatch = '' diff --git a/nixpkgs/pkgs/servers/nextcloud/default.nix b/nixpkgs/pkgs/servers/nextcloud/default.nix index 3138cc8ee1e3..3e3bd8a46532 100644 --- a/nixpkgs/pkgs/servers/nextcloud/default.nix +++ b/nixpkgs/pkgs/servers/nextcloud/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "nextcloud-${version}"; - version = "15.0.6"; + version = "15.0.7"; src = fetchurl { url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2"; - sha256 = "1k1c0wlrhdpkvwf7iq8yjxd8gqmmj7dyd913rqzrg9jbnvz5jc82"; + sha256 = "0jcxza0p1vc9dhf2mimvyy1j25nzv02srghdsp6108573yamhq9y"; }; installPhase = '' diff --git a/nixpkgs/pkgs/servers/nosql/eventstore/create-deps.sh b/nixpkgs/pkgs/servers/nosql/eventstore/create-deps.sh new file mode 100644 index 000000000000..da73bcf1e3b6 --- /dev/null +++ b/nixpkgs/pkgs/servers/nosql/eventstore/create-deps.sh @@ -0,0 +1,34 @@ +# 1. create a log with `dotnet restore -v m MyPackage.sln > mypackage-restore.log +# 2. then call ./create-deps.sh mypackage-restore.log + +urlbase="https://www.nuget.org/api/v2/package" +cat << EOL +{ fetchurl }: let + + fetchNuGet = { name, version, sha256 }: fetchurl { + inherit sha256; + url = "$urlbase/\${name}/\${version}"; + }; + +in [ +EOL +IFS='' +while read line; do + if echo $line | grep -q "Installing "; then + name=$(echo $line | sed -r 's/ Installing ([^ ]+) (.+)./\1/') + version=$(echo $line | sed -r 's/ Installing ([^ ]+) (.+)./\2/') + sha256=$(nix-prefetch-url "$urlbase/$name/$version" 2>/dev/null) + cat << EOL + + (fetchNuGet { + name = "$name"; + version = "$version"; + sha256 = "$sha256"; + }) +EOL + fi +done < $1 +cat << EOL + +] +EOL diff --git a/nixpkgs/pkgs/servers/nosql/eventstore/default.nix b/nixpkgs/pkgs/servers/nosql/eventstore/default.nix index 7880c6db7fd9..f3035e131409 100644 --- a/nixpkgs/pkgs/servers/nosql/eventstore/default.nix +++ b/nixpkgs/pkgs/servers/nosql/eventstore/default.nix @@ -1,43 +1,75 @@ -{ stdenv, fetchFromGitHub, git, mono, v8, runtimeShell }: +{ stdenv +, fetchFromGitHub +, fetchurl +, makeWrapper +, dotnet-sdk +, mono +, Nuget +}: -# There are some similarities with the pinta derivation. We should -# have a helper to make it easy to package these Mono apps. +let + + deps = import ./deps.nix { inherit fetchurl; }; + +in stdenv.mkDerivation rec { + name = "EventStore-${version}"; - version = "4.1.1"; + version = "5.0.0"; + src = fetchFromGitHub { - owner = "EventStore"; - repo = "EventStore"; - rev = "oss-v${version}"; - sha256 = "1069ncb9ps1wi71yw1fzkfd9rfsavccw8xj3a3miwd9x72w8636f"; + owner = "EventStore"; + repo = "EventStore"; + rev = "oss-v${version}"; + sha256 = "1qdnkaxiryyz8yhwqncmshsg8wi4v69dcxnvgvl4hn81zsj6fasw"; }; + buildInputs = [ + makeWrapper + dotnet-sdk + mono + Nuget + ]; + + # that dependency seems to not be required for building, but pulls in libcurl which fails to be located. + # see: https://github.com/EventStore/EventStore/issues/1897 + patchPhase = '' + for f in $(find . -iname "*.csproj"); do + sed -i '/Include="Microsoft.SourceLink.GitHub"/d' $f + done + ''; + buildPhase = '' - mkdir -p src/libs/x64/nixos - pushd src/EventStore.Projections.v8Integration - cc -o ../libs/x64/nixos/libjs1.so -fPIC -lv8 -shared -std=c++0x *.cpp - popd + mkdir home + export HOME=$PWD/home + export DOTNET_CLI_TELEMETRY_OPTOUT=1 + export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 + export FrameworkPathOverride=${mono}/lib/mono/4.7.1-api + + # disable default-source so nuget does not try to download from online-repo + nuget sources Disable -Name "nuget.org" + # add all dependencies to a source called 'nixos' + for package in ${toString deps}; do + nuget add $package -Source nixos + done - patchShebangs build.sh - ./build.sh ${version} release nixos + dotnet restore --source nixos src/EventStore.sln + dotnet build --no-restore -c Release src/EventStore.sln ''; installPhase = '' - mkdir -p $out/{bin,lib/eventstore/clusternode} - cp -r bin/clusternode/* $out/lib/eventstore/clusternode/ - cat > $out/bin/clusternode << EOF - #!${runtimeShell} - exec ${mono}/bin/mono $out/lib/eventstore/clusternode/EventStore.ClusterNode.exe "\$@" - EOF - chmod +x $out/bin/clusternode + mkdir -p $out/{bin,lib/eventstore} + cp -r bin/Release/* $out/lib/eventstore + makeWrapper "${mono}/bin/mono" $out/bin/eventstored \ + --add-flags "$out/lib/eventstore/EventStore.ClusterNode/net471/EventStore.ClusterNode.exe" ''; - nativeBuildInputs = [ git ]; - buildInputs = [ v8 mono ]; + doCheck = true; - phases = [ "unpackPhase" "buildPhase" "installPhase" ]; - dontStrip = true; + checkPhase = '' + dotnet test src/EventStore.Projections.Core.Tests/EventStore.Projections.Core.Tests.csproj -- RunConfiguration.TargetPlatform=x64 + ''; meta = { homepage = https://geteventstore.com/; @@ -46,4 +78,5 @@ stdenv.mkDerivation rec { maintainers = with stdenv.lib.maintainers; [ puffnfresh ]; platforms = [ "x86_64-linux" ]; }; + } diff --git a/nixpkgs/pkgs/servers/nosql/eventstore/deps.nix b/nixpkgs/pkgs/servers/nosql/eventstore/deps.nix new file mode 100644 index 000000000000..937bd8181441 --- /dev/null +++ b/nixpkgs/pkgs/servers/nosql/eventstore/deps.nix @@ -0,0 +1,532 @@ +{ fetchurl }: let + + fetchNuGet = { name, version, sha256 }: fetchurl { + inherit sha256; + url = "https://www.nuget.org/api/v2/package/${name}/${version}"; + }; + +in [ + + (fetchNuGet { + name = "YamlDotNet"; + version = "5.2.1"; + sha256 = "0nb34qcdhs5qn4783idg28f2kr89vaiyjn4v2barhv7i75zhym6y"; + }) + + (fetchNuGet { + name = "NLog"; + version = "4.5.10"; + sha256 = "0d4yqxrhqn2k36h3v1f5pn6qqlagbzg67v6gvxqhz3s4zyc3b8rg"; + }) + + (fetchNuGet { + name = "Newtonsoft.Json"; + version = "11.0.2"; + sha256 = "1784xi44f4k8v1fr696hsccmwpy94bz7kixxqlri98zhcxn406b2"; + }) + + (fetchNuGet { + name = "System.Threading.Tasks.Extensions"; + version = "4.3.0"; + sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; + }) + + (fetchNuGet { + name = "Microsoft.CodeCoverage"; + version = "15.9.0"; + sha256 = "10v5xrdilnm362g9545qxvlrbwc9vn65jhpb1i0jlhyqsj6bfwzg"; + }) + + (fetchNuGet { + name = "System.Text.Encoding.Extensions"; + version = "4.3.0"; + sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; + }) + + (fetchNuGet { + name = "protobuf-net"; + version = "2.4.0"; + sha256 = "106lxm9afga7ihlknyy7mlfplyq40mrndksqrsn8ia2a47fbqqld"; + }) + + (fetchNuGet { + name = "NUnit3TestAdapter"; + version = "3.10.0"; + sha256 = "0ahzfk9y2dq0wl91ll5hss89hqw7la85ndll5030nslizsgm5q2i"; + }) + + (fetchNuGet { + name = "System.Security.Principal.Windows"; + version = "4.5.0"; + sha256 = "0rmj89wsl5yzwh0kqjgx45vzf694v9p92r4x4q6yxldk1cv1hi86"; + }) + + (fetchNuGet { + name = "NUnit"; + version = "3.11.0"; + sha256 = "0mmc8snwjjmbkhk6cv5c0ha77czzy9bca4q59244rxciw9sxk1cz"; + }) + + (fetchNuGet { + name = "System.Reflection.DispatchProxy"; + version = "4.5.0"; + sha256 = "0v9sg38h91aljvjyc77m1y5v34p50hjdbxvvxwa1whlajhafadcn"; + }) + + (fetchNuGet { + name = "Microsoft.NET.Test.Sdk"; + version = "15.9.0"; + sha256 = "0g7wjgiigs4v8qa32g9ysqgx8bx55dzmbxfkc4ic95mpd1vkjqxw"; + }) + + (fetchNuGet { + name = "Microsoft.NETCore.Platforms"; + version = "2.1.0"; + sha256 = "0nmdnkmwyxj8cp746hs9an57zspqlmqdm55b00i7yk8a22s6akxz"; + }) + + (fetchNuGet { + name = "HdrHistogram"; + version = "2.5.0"; + sha256 = "1s2np7m3pp17rgambax9a3x5pd2grx74cr325q3xapjz2gd58sj1"; + }) + + (fetchNuGet { + name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; + version = "4.3.0"; + sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; + }) + + (fetchNuGet { + name = "System.Xml.XmlDocument"; + version = "4.3.0"; + sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; + }) + + (fetchNuGet { + name = "System.Xml.ReaderWriter"; + version = "4.3.0"; + sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; + }) + + (fetchNuGet { + name = "System.Text.RegularExpressions"; + version = "4.3.0"; + sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; + }) + + (fetchNuGet { + name = "System.Reflection.Extensions"; + version = "4.3.0"; + sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; + }) + + (fetchNuGet { + name = "System.Private.ServiceModel"; + version = "4.5.3"; + sha256 = "0nyw9m9dj327hn0qb0jmgwpch0f40jv301fk4mrchga8g99xbpng"; + }) + + (fetchNuGet { + name = "System.Reflection.Emit.ILGeneration"; + version = "4.3.0"; + sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; + }) + + (fetchNuGet { + name = "System.Security.Cryptography.Csp"; + version = "4.3.0"; + sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; + }) + + (fetchNuGet { + name = "System.Security.Cryptography.Cng"; + version = "4.3.0"; + sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; + }) + + (fetchNuGet { + name = "System.Globalization.Calendars"; + version = "4.3.0"; + sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; + }) + + (fetchNuGet { + name = "System.Linq"; + version = "4.3.0"; + sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; + }) + + (fetchNuGet { + name = "Microsoft.Build.Tasks.Git"; + version = "1.0.0-beta-63127-02"; + sha256 = "10avjhp4vjbmix4rwacbw6cim2d4kbmz64q4n7r6zz94395l61b6"; + }) + + (fetchNuGet { + name = "Microsoft.SourceLink.Common"; + version = "1.0.0-beta-63127-02"; + sha256 = "0y29xx3x9nd14n1sr8ycxhf6y1a83pv3sayfxjib8wi6s866lagb"; + }) + + (fetchNuGet { + name = "Microsoft.SourceLink.GitHub"; + version = "1.0.0-beta-63127-02"; + sha256 = "1096d5n7mfvgm1apdmafjkxkqray6r2cw6zjhhxj2zn98836w1n2"; + }) + + (fetchNuGet { + name = "System.Runtime.Numerics"; + version = "4.3.0"; + sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; + }) + + (fetchNuGet { + name = "runtime.native.System.Security.Cryptography.Apple"; + version = "4.3.0"; + sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; + }) + + (fetchNuGet { + name = "System.Reflection.Primitives"; + version = "4.3.0"; + sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; + }) + + (fetchNuGet { + name = "System.IO.FileSystem.Primitives"; + version = "4.3.0"; + sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; + }) + + (fetchNuGet { + name = "NETStandard.Library"; + version = "2.0.3"; + sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; + }) + + (fetchNuGet { + name = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + sha256 = "1x0g58pbpjrmj2x2qw17rdwwnrcl0wvim2hdwz48lixvwvp22n9c"; + }) + + (fetchNuGet { + name = "System.Net.Requests"; + version = "4.3.0"; + sha256 = "0pcznmwqqk0qzp0gf4g4xw7arhb0q8v9cbzh3v8h8qp6rjcr339a"; + }) + + (fetchNuGet { + name = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + sha256 = "0q0n5q1r1wnqmr5i5idsrd9ywl33k0js4pngkwq9p368mbxp8x1w"; + }) + + (fetchNuGet { + name = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + sha256 = "15gsm1a8jdmgmf8j5v1slfz8ks124nfdhk2vxs2rw3asrxalg8hi"; + }) + + (fetchNuGet { + name = "System.Net.Http"; + version = "4.3.4"; + sha256 = "0kdp31b8819v88l719j6my0yas6myv9d1viql3qz5577mv819jhl"; + }) + + (fetchNuGet { + name = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + sha256 = "1cpx56mcfxz7cpn57wvj18sjisvzq8b5vd9rw16ihd2i6mcp3wa1"; + }) + + (fetchNuGet { + name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + sha256 = "1m9z1k9kzva9n9kwinqxl97x2vgl79qhqjlv17k9s2ymcyv2bwr6"; + }) + + (fetchNuGet { + name = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + sha256 = "1dm8fifl7rf1gy7lnwln78ch4rw54g0pl5g1c189vawavll7p6rj"; + }) + + (fetchNuGet { + name = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + sha256 = "096ch4n4s8k82xga80lfmpimpzahd2ip1mgwdqgar0ywbbl6x438"; + }) + + (fetchNuGet { + name = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + sha256 = "0404wqrc7f2yc0wxv71y3nnybvqx8v4j9d47hlscxy759a525mc3"; + }) + + (fetchNuGet { + name = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + sha256 = "1n06gxwlinhs0w7s8a94r1q3lwqzvynxwd3mp10ws9bg6gck8n4r"; + }) + + (fetchNuGet { + name = "System.Net.Security"; + version = "4.3.2"; + sha256 = "1aw1ca1vssqrillrh4qkarx0lxwc8wcaqdkfdima8376wb98j2q8"; + }) + + (fetchNuGet { + name = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + sha256 = "0rwpqngkqiapqc5c2cpkj7idhngrgss5qpnqg0yh40mbyflcxf8i"; + }) + + (fetchNuGet { + name = "Microsoft.NETCore.Platforms"; + version = "1.1.0"; + sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; + }) + + (fetchNuGet { + name = "System.Reflection"; + version = "4.3.0"; + sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; + }) + + (fetchNuGet { + name = "System.Collections"; + version = "4.3.0"; + sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; + }) + + (fetchNuGet { + name = "System.Diagnostics.Debug"; + version = "4.3.0"; + sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; + }) + + (fetchNuGet { + name = "System.Diagnostics.Tracing"; + version = "4.3.0"; + sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; + }) + + (fetchNuGet { + name = "System.Globalization"; + version = "4.3.0"; + sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; + }) + + (fetchNuGet { + name = "Microsoft.NETCore.Targets"; + version = "1.1.0"; + sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; + }) + + (fetchNuGet { + name = "System.Threading.ThreadPool"; + version = "4.3.0"; + sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; + }) + + (fetchNuGet { + name = "System.IO"; + version = "4.3.0"; + sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; + }) + + (fetchNuGet { + name = "System.Security.Principal"; + version = "4.3.0"; + sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; + }) + + (fetchNuGet { + name = "System.Net.Primitives"; + version = "4.3.0"; + sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; + }) + + (fetchNuGet { + name = "System.Net.WebHeaderCollection"; + version = "4.3.0"; + sha256 = "0ms3ddjv1wn8sqa5qchm245f3vzzif6l6fx5k92klqpn7zf4z562"; + }) + + (fetchNuGet { + name = "System.Security.Claims"; + version = "4.3.0"; + sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; + }) + + (fetchNuGet { + name = "System.Resources.ResourceManager"; + version = "4.3.0"; + sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; + }) + + (fetchNuGet { + name = "System.Collections.Concurrent"; + version = "4.3.0"; + sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; + }) + + (fetchNuGet { + name = "System.Runtime"; + version = "4.3.0"; + sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; + }) + + (fetchNuGet { + name = "System.Threading"; + version = "4.3.0"; + sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; + }) + + (fetchNuGet { + name = "System.Threading.Tasks"; + version = "4.3.0"; + sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; + }) + + (fetchNuGet { + name = "Microsoft.NETCore.Platforms"; + version = "1.1.1"; + sha256 = "164wycgng4mi9zqi2pnsf1pq6gccbqvw6ib916mqizgjmd8f44pj"; + }) + + (fetchNuGet { + name = "runtime.native.System"; + version = "4.3.0"; + sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; + }) + + (fetchNuGet { + name = "runtime.native.System.Net.Http"; + version = "4.3.0"; + sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; + }) + + (fetchNuGet { + name = "runtime.native.System.Net.Security"; + version = "4.3.0"; + sha256 = "0dnqjhw445ay3chpia9p6vy4w2j6s9vy3hxszqvdanpvvyaxijr3"; + }) + + (fetchNuGet { + name = "runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + sha256 = "0zy5r25jppz48i2bkg8b9lfig24xixg6nm3xyr1379zdnqnpm8f6"; + }) + + (fetchNuGet { + name = "Microsoft.Win32.Primitives"; + version = "4.3.0"; + sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; + }) + + (fetchNuGet { + name = "System.Diagnostics.DiagnosticSource"; + version = "4.3.0"; + sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; + }) + + (fetchNuGet { + name = "System.Xml.XmlSerializer"; + version = "4.3.0"; + sha256 = "07pa4sx196vxkgl3csvdmw94nydlsm9ir38xxcs84qjn8cycd912"; + }) + + (fetchNuGet { + name = "System.Globalization.Extensions"; + version = "4.3.0"; + sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; + }) + + (fetchNuGet { + name = "System.IO.FileSystem"; + version = "4.3.0"; + sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; + }) + + (fetchNuGet { + name = "System.Runtime.Extensions"; + version = "4.3.0"; + sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; + }) + + (fetchNuGet { + name = "System.Runtime.Handles"; + version = "4.3.0"; + sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; + }) + + (fetchNuGet { + name = "System.Runtime.InteropServices"; + version = "4.3.0"; + sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; + }) + + (fetchNuGet { + name = "System.Security.Cryptography.Algorithms"; + version = "4.3.0"; + sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; + }) + + (fetchNuGet { + name = "System.Security.Cryptography.Encoding"; + version = "4.3.0"; + sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; + }) + + (fetchNuGet { + name = "System.ServiceModel.Primitives"; + version = "4.5.3"; + sha256 = "1v90pci049cn44y0km885k1vrilhb34w6q2zva4y6f3ay84klrih"; + }) + + (fetchNuGet { + name = "System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; + }) + + (fetchNuGet { + name = "System.Security.Cryptography.Primitives"; + version = "4.3.0"; + sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; + }) + + (fetchNuGet { + name = "System.Security.Cryptography.X509Certificates"; + version = "4.3.0"; + sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; + }) + + (fetchNuGet { + name = "System.Text.Encoding"; + version = "4.3.0"; + sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; + }) + + (fetchNuGet { + name = "System.Reflection.Emit"; + version = "4.3.0"; + sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; + }) + + (fetchNuGet { + name = "System.Reflection.TypeExtensions"; + version = "4.4.0"; + sha256 = "0n9r1w4lp2zmadyqkgp4sk9wy90sj4ygq4dh7kzamx26i9biys5h"; + }) + + (fetchNuGet { + name = "System.Reflection.Emit.Lightweight"; + version = "4.3.0"; + sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; + }) + +] diff --git a/nixpkgs/pkgs/servers/nosql/neo4j/default.nix b/nixpkgs/pkgs/servers/nosql/neo4j/default.nix index 73ec5038fe3d..c3f19a1cbe5b 100644 --- a/nixpkgs/pkgs/servers/nosql/neo4j/default.nix +++ b/nixpkgs/pkgs/servers/nosql/neo4j/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "neo4j-${version}"; - version = "3.5.4"; + version = "3.5.5"; src = fetchurl { url = "https://neo4j.com/artifact.php?name=neo4j-community-${version}-unix.tar.gz"; - sha256 = "0fqp3k0gr5qb2a7ck093fw581db9fmfvhsich740d588ik749jbh"; + sha256 = "1dphg1xyh8h7dx74nrcc9aspiylnskqnmysim9k39v8myf7a77mq"; }; buildInputs = [ makeWrapper jre8 which gawk ]; diff --git a/nixpkgs/pkgs/servers/oauth2_proxy/default.nix b/nixpkgs/pkgs/servers/oauth2_proxy/default.nix index d9919005e39d..2de69d5d9677 100644 --- a/nixpkgs/pkgs/servers/oauth2_proxy/default.nix +++ b/nixpkgs/pkgs/servers/oauth2_proxy/default.nix @@ -1,24 +1,23 @@ { stdenv, lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "oauth2_proxy-${version}"; - version = "20180325-${stdenv.lib.strings.substring 0 7 rev}"; - rev = "a94b0a8b25e553f7333f7b84aeb89d9d18ec259b"; + pname = "oauth2_proxy"; + version = "3.2.0"; - goPackagePath = "github.com/bitly/oauth2_proxy"; + goPackagePath = "github.com/pusher/${pname}"; src = fetchFromGitHub { - inherit rev; - repo = "oauth2_proxy"; - owner = "bitly"; - sha256 = "07m258s9fxjsgixggw0d1zicd7l6l2rkm5mh3zdjdaj20sqcj217"; + repo = pname; + owner = "pusher"; + sha256 = "0k73ggyh12g2vzjq91i9d3bxbqfvh5k6njzza1lvkzasgp07wisg"; + rev = "v${version}"; }; goDeps = ./deps.nix; meta = with lib; { description = "A reverse proxy that provides authentication with Google, Github or other provider"; - homepage = https://github.com/bitly/oauth2_proxy/; + homepage = https://github.com/pusher/oauth2_proxy/; license = licenses.mit; maintainers = [ maintainers.yorickvp ]; }; diff --git a/nixpkgs/pkgs/servers/oauth2_proxy/deps.nix b/nixpkgs/pkgs/servers/oauth2_proxy/deps.nix index 435c7d127821..dd10ab286689 100644 --- a/nixpkgs/pkgs/servers/oauth2_proxy/deps.nix +++ b/nixpkgs/pkgs/servers/oauth2_proxy/deps.nix @@ -1,129 +1,183 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) [ { - goPackagePath = "cloud.google.com/go"; + goPackagePath = "cloud.google.com/go"; fetch = { type = "git"; url = "https://code.googlesource.com/gocloud"; - rev = "d27f27d9b3cf75c9901d9981f9af50bbfd9002da"; - sha256 = "18vdhkymm4cqh5fjyz0ia0bc2mpmarjk6w6zh9ydm2d4nkj36cm5"; + rev = "2d3a6656c17a60b0815b7e06ab0be04eacb6e613"; + sha256 = "0fi3qj9fvc4bxbrwa1m5sxsb8yhvawiwigaddvmmizjykxbq5csq"; }; } { - goPackagePath = "github.com/BurntSushi/toml"; + goPackagePath = "github.com/BurntSushi/toml"; fetch = { type = "git"; url = "https://github.com/BurntSushi/toml"; - rev = "a368813c5e648fee92e5f6c30e3944ff9d5e8895"; - sha256 = "1sjxs2lwc8jpln80s4rlzp7nprbcljhy5mz4rf9995gq93wqnym5"; + rev = "b26d9c308763d68093482582cea63d69be07a0f0"; + sha256 = "0k7v2i1d2d6si8gswn83qb84czhhia53v2wdy33yz9ppdidxk0ry"; }; } { - goPackagePath = "github.com/bitly/go-simplejson"; + goPackagePath = "github.com/bitly/go-simplejson"; fetch = { type = "git"; url = "https://github.com/bitly/go-simplejson"; - rev = "0c965951289cce37dec52ad1f34200fefc816777"; - sha256 = "0ys37wshd430dizzbg39x5mw55daih2q4qj5l9gr3qbmq9qdn0f3"; + rev = "aabad6e819789e569bd6aabf444c935aa9ba1e44"; + sha256 = "0n9f9dz1jn1jx86d48569nznpjn9fmq3knn7r65xpy7jhih284jj"; }; } { - goPackagePath = "github.com/coreos/go-oidc"; + goPackagePath = "github.com/coreos/go-oidc"; fetch = { type = "git"; url = "https://github.com/coreos/go-oidc"; - rev = "065b426bd41667456c1a924468f507673629c46b"; - sha256 = "10xhrh70rccgydi708dc9xl4ivmjnzhh1skd1ij6xl1i3x8lk3g6"; + rev = "77e7f2010a464ade7338597afe650dfcffbe2ca8"; + sha256 = "0mh8fa7al9gfzx4k7rd623bpy14s06s96iz6lbf6psi5q2bnbs2r"; }; } { - goPackagePath = "github.com/mbland/hmacauth"; + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "346938d642f2ec3594ed81d874461961cd0faa76"; + sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; + }; + } + { + goPackagePath = "github.com/dgrijalva/jwt-go"; + fetch = { + type = "git"; + url = "https://github.com/dgrijalva/jwt-go"; + rev = "06ea1031745cb8b3dab3f6a236daf2b0aa468b7e"; + sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "1e59b77b52bf8e4b449a57e6f79f21226d571845"; + sha256 = "19bkh81wnp6njg3931wky6hsnnl2d1ig20vfjxpv450sd3k6yys8"; + }; + } + { + goPackagePath = "github.com/mbland/hmacauth"; fetch = { type = "git"; url = "https://github.com/mbland/hmacauth"; - rev = "44256dfd4bfa7594cfa73587a464ca890e85971a"; - sha256 = "1d5pbjgc5j8pi3frsjp5gqg7j12bxdbl55nhy01cv4c96hay2ij1"; + rev = "107c17adcc5eccc9935cd67d9bc2feaf5255d2cb"; + sha256 = "1zd9r8znhkxyl997lhjk8nrlxlfv5s1hn7ql87wrcyvlsszx3mzh"; }; } { - goPackagePath = "github.com/mreiferson/go-options"; + goPackagePath = "github.com/mreiferson/go-options"; fetch = { type = "git"; url = "https://github.com/mreiferson/go-options"; - rev = "77551d20752b54535462404ad9d877ebdb26e53d"; - sha256 = "02c18zrx038gbas58l90xzsz9m5q3gpjprdcwmnvxsn0zvld0vpj"; + rev = "20ba7d382d05facb01e02eb777af0c5f229c5c95"; + sha256 = "1vdz3wqkj885a0jkggaygl4k6k8b94fpspywr26snm4xnb8vgxsf"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "792786c7400a136282c1664665ae0a8db921c6c2"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; }; } { - goPackagePath = "github.com/pquerna/cachecontrol"; + goPackagePath = "github.com/pquerna/cachecontrol"; fetch = { type = "git"; url = "https://github.com/pquerna/cachecontrol"; - rev = "525d0eb5f91d30e3b1548de401b7ef9ea6898520"; - sha256 = "13r6qz9pghy9fapps5h9mhblggnjq2nfxysvf2jp4scanc5vw2y3"; + rev = "0dec1b30a0215bb68605dfc568e8855066c9202d"; + sha256 = "14yyfhrv60rvb983rqm7s916nwvn9kcmbvnrcna2md0s3mkzs3yh"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "69483b4bd14f5845b5a1e55bca19e954e827f1d0"; + sha256 = "11lzrwkdzdd8yyag92akncc008h2f9d1bpc489mxiwp0jrmz4ivb"; + }; + } + { + goPackagePath = "github.com/yhat/wsutil"; + fetch = { + type = "git"; + url = "https://github.com/yhat/wsutil"; + rev = "1d66fa95c997864ba4d8479f56609620fe542928"; + sha256 = "1agh4ss6y1laps8pg4mdl844ivmw2wrb7rnpfyag4gai4693i7bv"; }; } { - goPackagePath = "golang.org/x/crypto"; + goPackagePath = "golang.org/x/crypto"; fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "88942b9c40a4c9d203b82b3731787b672d6e809b"; - sha256 = "0jw1faq8krcxwf1fv3w75apk1ncnykwg8y5ahs5rasjmspvkv8cw"; + rev = "9f005a07e0d31d45e6656d241bb5c0f2efd4bc94"; + sha256 = "1mhmr6ljzl3iafsz4qy8vval7rmr828wh59dlqqqjqx6sqmcs1dv"; }; } { - goPackagePath = "golang.org/x/net"; + goPackagePath = "golang.org/x/net"; fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "6078986fec03a1dcc236c34816c71b0e05018fda"; - sha256 = "0qbl17mzpq7anwyzy6hdvxqk7f6q2xlm6f9dknkwlszfd4id2fwb"; + rev = "9dfe39835686865bff950a07b394c12a98ddc811"; + sha256 = "0z8mnl4mi88syafrgqys2ak2gg3yrbna25hpz88y3anl8x4jhg1a"; }; } { - goPackagePath = "golang.org/x/oauth2"; + goPackagePath = "golang.org/x/oauth2"; fetch = { type = "git"; url = "https://go.googlesource.com/oauth2"; - rev = "fdc9e635145ae97e6c2cb777c48305600cf515cb"; - sha256 = "0pznj7pb2rjar005dvppimdynarm8smj6vnqz9wvd9fxyn0q0yww"; + rev = "9ff8ebcc8e241d46f52ecc5bff0e5a2f2dbef402"; + sha256 = "035v5w1nad6r1l22cj6f73zzr6qi4jgq71yjywf2c6rvsa5147r2"; }; } { - goPackagePath = "golang.org/x/sys"; + goPackagePath = "google.golang.org/api"; fetch = { type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "13d03a9a82fba647c21a0ef8fba44a795d0f0835"; - sha256 = "1lmyd4mk7lbgnxyvr6ndfdfafazp9a4cc6c0a2q2j4n53g2vwbgk"; + url = "https://code.googlesource.com/google-api-go-client"; + rev = "8791354e7ab150705ede13637a18c1fcc16b62e8"; + sha256 = "0ps7y4m9787wvkqwrwqyb4nmmibhrihmg7xqh7sba2cyj397wngm"; }; } { - goPackagePath = "google.golang.org/api"; + goPackagePath = "google.golang.org/appengine"; fetch = { type = "git"; - url = "https://code.googlesource.com/google-api-go-client"; - rev = "e4126357c891acdef6dcd7805daa4c6533be6544"; - sha256 = "19c874pr7vhhiyw7zn6v625g8i70gqzi3rr645kai6pnd1w7s27n"; + url = "https://github.com/golang/appengine"; + rev = "150dc57a1b433e64154302bdc40b6bb8aefa313a"; + sha256 = "0w3knznv39k8bm85ri62f83czcrxknql7dv6p9hk1a5jx3xljgxq"; }; } { - goPackagePath = "gopkg.in/fsnotify.v1"; + goPackagePath = "gopkg.in/fsnotify/fsnotify.v1"; fetch = { type = "git"; - url = "https://gopkg.in/fsnotify/fsnotify.v1"; - rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"; - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; + url = "https://github.com/fsnotify/fsnotify"; + rev = "836bfd95fecc0f1511dd66bdbf2b5b61ab8b00b6"; + sha256 = "0470dznkcbabncskgr8hfilpj5w24ygg455pyggbfbssmfv1m9gg"; }; } { - goPackagePath = "gopkg.in/square/go-jose.v2"; + goPackagePath = "gopkg.in/square/go-jose.v2"; fetch = { type = "git"; - url = "https://gopkg.in/square/go-jose.v2"; - rev = "552e98edab5d620205ff1a8960bf52a5a10aad03"; - sha256 = "03w6rgxkvdv3vcfr23s6wbck431w7dwnw0jy7qnyl0qihxzn40rv"; + url = "https://github.com/square/go-jose"; + rev = "f8f38de21b4dcd69d0413faf231983f5fd6634b1"; + sha256 = "1bjrs3xq3m2ckfds0l4wqf81311ymm9agipmkllbvkadac156dsa"; }; } -] +] \ No newline at end of file diff --git a/nixpkgs/pkgs/servers/softether/4.18.nix b/nixpkgs/pkgs/servers/softether/4.18.nix deleted file mode 100644 index 5b0d15136f89..000000000000 --- a/nixpkgs/pkgs/servers/softether/4.18.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ stdenv, fetchurl -, openssl, readline, ncurses, zlib -, dataDir ? "/var/lib/softether" }: - -let - os = if stdenv.isLinux then "1" - else if stdenv.isFreeBSD then "2" - else if stdenv.isSunOS then "3" - else if stdenv.isDarwin then "4" - else if stdenv.isOpenBSD then "5" - else ""; - cpuBits = if stdenv.is64bit then "2" else "1"; - -in - -stdenv.mkDerivation rec { - name = "softether-${version}"; - version = "4.18"; - build = "9570"; - compiledDate = "2015.07.26"; - - src = fetchurl { - url = "http://www.softether-download.com/files/softether/v${version}-${build}-rtm-${compiledDate}-tree/Source_Code/softether-src-v${version}-${build}-rtm.tar.gz"; - sha256 = "585d61e524d3cad90806cbeb52ebe54b5144359e6c44676e8e7fb5683ffd4574"; - }; - - buildInputs = [ openssl readline ncurses zlib ]; - - preConfigure = '' - echo "${os} - ${cpuBits} - " | ./configure - rm configure - ''; - - buildPhase = '' - mkdir -p $out/bin - sed -i \ - -e "/INSTALL_BINDIR=/s|/usr/bin|/bin|g" \ - -e "/_DIR=/s|/usr|${dataDir}|g" \ - -e "s|\$(INSTALL|$out/\$(INSTALL|g" \ - -e "/echo/s|echo $out/|echo |g" \ - Makefile - ''; - - meta = with stdenv.lib; { - description = "An Open-Source Free Cross-platform Multi-protocol VPN Program"; - homepage = https://www.softether.org/; - license = licenses.gpl2; - maintainers = [ maintainers.rick68 ]; - platforms = filter (p: p != "aarch64-linux") platforms.linux; - }; -} diff --git a/nixpkgs/pkgs/servers/softether/4.20.nix b/nixpkgs/pkgs/servers/softether/4.20.nix deleted file mode 100644 index 91dd0d0411f8..000000000000 --- a/nixpkgs/pkgs/servers/softether/4.20.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ stdenv, fetchurl -, openssl, readline, ncurses, zlib -, dataDir ? "/var/lib/softether" }: - -let - os = if stdenv.isLinux then "1" - else if stdenv.isFreeBSD then "2" - else if stdenv.isSunOS then "3" - else if stdenv.isDarwin then "4" - else if stdenv.isOpenBSD then "5" - else ""; - cpuBits = if stdenv.is64bit then "2" else "1"; - -in - -stdenv.mkDerivation rec { - name = "softether-${version}"; - version = "4.20"; - build = "9608"; - compiledDate = "2016.04.17"; - - src = fetchurl { - url = "http://www.softether-download.com/files/softether/v${version}-${build}-rtm-${compiledDate}-tree/Source_Code/softether-src-v${version}-${build}-rtm.tar.gz"; - sha256 = "e559644e34ec6feba43d99f4083f77f9b082dd0574d0bb1e416a65f32ccbc51e"; - }; - - buildInputs = [ openssl readline ncurses zlib ]; - - preConfigure = '' - echo "${os} - ${cpuBits} - " | ./configure - rm configure - ''; - - buildPhase = '' - mkdir -p $out/bin - sed -i \ - -e "/INSTALL_BINDIR=/s|/usr/bin|/bin|g" \ - -e "/_DIR=/s|/usr|${dataDir}|g" \ - -e "s|\$(INSTALL|$out/\$(INSTALL|g" \ - -e "/echo/s|echo $out/|echo |g" \ - Makefile - ''; - - meta = with stdenv.lib; { - description = "An Open-Source Free Cross-platform Multi-protocol VPN Program"; - homepage = https://www.softether.org/; - license = licenses.gpl2; - maintainers = [ maintainers.rick68 ]; - platforms = filter (p: p != "aarch64-linux") platforms.linux; - }; -} diff --git a/nixpkgs/pkgs/servers/softether/4.25.nix b/nixpkgs/pkgs/servers/softether/4.25.nix index 04053174f4e4..7eaa5b3e8a05 100644 --- a/nixpkgs/pkgs/servers/softether/4.25.nix +++ b/nixpkgs/pkgs/servers/softether/4.25.nix @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { homepage = https://www.softether.org/; license = licenses.gpl2; maintainers = [ maintainers.rick68 ]; - platforms = filter (p: p != "aarch64-linux") platforms.linux; + platforms = [ "x86_64-linux" ]; }; } diff --git a/nixpkgs/pkgs/servers/softether/4.29.nix b/nixpkgs/pkgs/servers/softether/4.29.nix new file mode 100644 index 000000000000..e26e8f057b6d --- /dev/null +++ b/nixpkgs/pkgs/servers/softether/4.29.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl +, openssl, readline, ncurses, zlib +, dataDir ? "/var/lib/softether" }: + +stdenv.mkDerivation rec { + name = "softether-${version}"; + version = "4.29"; + build = "9680"; + + src = fetchurl { + url = "https://github.com/SoftEtherVPN/SoftEtherVPN_Stable/releases/download/v${version}-${build}-rtm/softether-src-v${version}-${build}-rtm.tar.gz"; + sha256 = "1r169s5dr31060r2mxkmm08riy6zrxgapmrc6kdrpxdav6kmy0z6"; + }; + + buildInputs = [ openssl readline ncurses zlib ]; + + preConfigure = '' + ./configure + ''; + + buildPhase = '' + mkdir -p $out/bin + sed -i \ + -e "/INSTALL_BINDIR=/s|/usr/bin|/bin|g" \ + -e "/_DIR=/s|/usr|${dataDir}|g" \ + -e "s|\$(INSTALL|$out/\$(INSTALL|g" \ + -e "/echo/s|echo $out/|echo |g" \ + Makefile + ''; + + meta = with stdenv.lib; { + description = "An Open-Source Free Cross-platform Multi-protocol VPN Program"; + homepage = https://www.softether.org/; + license = licenses.asl20; + maintainers = [ maintainers.rick68 ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/nixpkgs/pkgs/servers/sql/cockroachdb/default.nix b/nixpkgs/pkgs/servers/sql/cockroachdb/default.nix index 1f5ba6150edc..241ca9235c64 100644 --- a/nixpkgs/pkgs/servers/sql/cockroachdb/default.nix +++ b/nixpkgs/pkgs/servers/sql/cockroachdb/default.nix @@ -13,13 +13,13 @@ let in buildGoPackage rec { name = "cockroach-${version}"; - version = "2.1.5"; + version = "19.1.0"; goPackagePath = "github.com/cockroachdb/cockroach"; src = fetchurl { url = "https://binaries.cockroachdb.com/cockroach-v${version}.src.tgz"; - sha256 = "0bdbkz917175vp28kc513996ik0m61hfbvnqnv0alxv0mfx8djzn"; + sha256 = "1kb93jxgxc54c23v72ka116b2j7m82c1jghm7njd64qkbbcgrkkw"; }; inherit nativeBuildInputs buildInputs; diff --git a/nixpkgs/pkgs/servers/sql/monetdb/default.nix b/nixpkgs/pkgs/servers/sql/monetdb/default.nix index a25f720c3c40..287054a750b4 100644 --- a/nixpkgs/pkgs/servers/sql/monetdb/default.nix +++ b/nixpkgs/pkgs/servers/sql/monetdb/default.nix @@ -3,14 +3,14 @@ }: let - version = "11.31.13"; + version = "11.33.3"; in stdenv.mkDerivation rec { name = "monetdb-${version}"; src = fetchurl { url = "https://dev.monetdb.org/downloads/sources/archive/MonetDB-${version}.tar.bz2"; - sha256 = "1dvqhjxd2lmnqjzj14n4dnlflca0525kshl9abi7qjv0ipcc6a4l"; + sha256 = "0k0xcm3b5qq2arjfn8f1h020sjkk97qfynsimn848bnl01vscqh8"; }; postPatch = '' diff --git a/nixpkgs/pkgs/servers/sql/mssql/jdbc/builder.sh b/nixpkgs/pkgs/servers/sql/mssql/jdbc/builder.sh new file mode 100644 index 000000000000..a5ba86cb0808 --- /dev/null +++ b/nixpkgs/pkgs/servers/sql/mssql/jdbc/builder.sh @@ -0,0 +1,6 @@ +source $stdenv/setup + +set -e + +mkdir -p $out/share/java +cp $src $out/share/java/mssql-jdbc.jar diff --git a/nixpkgs/pkgs/servers/sql/mssql/jdbc/default.nix b/nixpkgs/pkgs/servers/sql/mssql/jdbc/default.nix new file mode 100644 index 000000000000..f6edfe388aca --- /dev/null +++ b/nixpkgs/pkgs/servers/sql/mssql/jdbc/default.nix @@ -0,0 +1,16 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation rec { + pname = "mssql-jdbc"; + version = "7.2.2"; + builder = ./builder.sh; + + src = fetchurl { + url = "https://github.com/Microsoft/mssql-jdbc/releases/download/v${version}/${pname}-${version}.jre8.jar"; + sha256 = "09psxjy1v3khq8lcq6h9mbgyijsgawf0z2qryk1l91ypnwl8s3pg"; + }; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix index a6e2c590f385..54fc891acecd 100644 --- a/nixpkgs/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix +++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { description = "Columnar storage for PostgreSQL"; homepage = https://www.citusdata.com/; maintainers = with maintainers; [ thoughtpolice ]; - platforms = platforms.linux; + platforms = postgresql.meta.platforms; license = licenses.asl20; }; } diff --git a/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_hll.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_hll.nix index f91a8b1bf252..16104e66b734 100644 --- a/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_hll.nix +++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_hll.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { description = "HyperLogLog for PostgreSQL"; homepage = https://www.citusdata.com/; maintainers = with maintainers; [ thoughtpolice ]; - platforms = platforms.linux; + platforms = postgresql.meta.platforms; license = licenses.asl20; }; } diff --git a/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_similarity.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_similarity.nix index 32945c9fa62b..ee50bee033b3 100644 --- a/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_similarity.nix +++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_similarity.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { is tightly integrated in the RDBMS in the sense that it defines operators so instead of the traditional operators (= and <>) you can use ~~~ and ~!~ (any of these operators represents a similarity function). ''; - platforms = stdenv.lib.platforms.linux; + platforms = postgresql.meta.platforms; license = stdenv.lib.licenses.gpl2; maintainers = with lib.maintainers; [ danbst ]; }; diff --git a/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_topn.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_topn.nix index 8ec2d6719a4e..1c1f3dcb87ed 100644 --- a/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_topn.nix +++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_topn.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { description = "Efficient querying of 'top values' for PostgreSQL"; homepage = https://github.com/citusdata/postgresql-topn; maintainers = with maintainers; [ thoughtpolice ]; - platforms = platforms.linux; + platforms = postgresql.meta.platforms; license = licenses.agpl3; }; } diff --git a/nixpkgs/pkgs/servers/sql/postgresql/ext/tds_fdw.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/tds_fdw.nix index dbffab79a13e..4b321bbbc4fb 100644 --- a/nixpkgs/pkgs/servers/sql/postgresql/ext/tds_fdw.nix +++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/tds_fdw.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { description = "A PostgreSQL foreign data wrapper to connect to TDS databases (Sybase and Microsoft SQL Server)"; homepage = https://github.com/tds-fdw/tds_fdw; maintainers = [ maintainers.steve-chavez ]; - platforms = platforms.linux; + platforms = postgresql.meta.platforms; license = licenses.postgresql; }; } diff --git a/nixpkgs/pkgs/servers/unifi/default.nix b/nixpkgs/pkgs/servers/unifi/default.nix index 1e9ce4a232b0..bad068245f3d 100644 --- a/nixpkgs/pkgs/servers/unifi/default.nix +++ b/nixpkgs/pkgs/servers/unifi/default.nix @@ -44,14 +44,18 @@ in rec { # https://help.ubnt.com/hc/en-us/articles/115000441548-UniFi-Current-Controller-Versions unifiLTS = generic { - version = "5.6.39"; - sha256 = "025qq517j32r1pnabg2q8lhy65c6qsk17kzw3aijhrc2gpgj2pa7"; + version = "5.6.42"; + sha256 = "0wxkv774pw43c15jk0sg534l5za4j067nr85r5fw58iar3w2l84x"; }; unifiStable = generic { - version = "5.10.19"; - sha256 = "01ylf11z4f86qrw9x0fn1mnxkb8iw0p2kslp7vgxgjp0i3mg3f2q"; + version = "5.10.23"; + sha256 = "0ak8crx3anxsx4r3b9k0rihgafkgsxj7f64z48nrk1l8m7f0wwxg"; }; - unifiTesting = unifiStable; + unifiTesting = generic { + version = "5.11.18"; + suffix = "-996baf2ca5"; + sha256 = "14yyfn39ix8bnn0cb6bn0ly6pqxg81lvy83y40bk0y8vxfg6maqc"; + }; } diff --git a/nixpkgs/pkgs/servers/web-apps/shaarli/default.nix b/nixpkgs/pkgs/servers/web-apps/shaarli/default.nix index 3083512e1b4e..ebca3eae4505 100644 --- a/nixpkgs/pkgs/servers/web-apps/shaarli/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/shaarli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "shaarli-${version}"; - version = "0.10.3"; + version = "0.10.4"; src = fetchurl { url = "https://github.com/shaarli/Shaarli/releases/download/v${version}/shaarli-v${version}-full.tar.gz"; - sha256 = "1jcjkyhqwh1pv0a98bidf8az6mc34l4snnsl6lc7m2gxr55099j8"; + sha256 = "00m41x3nlxcc8dspin61zx7lrv1hjzacjadm34afqrb21yxdp84f"; }; outputs = [ "out" "doc" ]; diff --git a/nixpkgs/pkgs/servers/web-apps/wallabag/default.nix b/nixpkgs/pkgs/servers/web-apps/wallabag/default.nix index 688c3cacc79e..ac0348482ead 100644 --- a/nixpkgs/pkgs/servers/web-apps/wallabag/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/wallabag/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "wallabag-${version}"; - version = "2.3.6"; + version = "2.3.7"; # remember to rm -r var/cache/* after a rebuild or unexpected errors will occur src = fetchurl { url = "https://static.wallabag.org/releases/wallabag-release-${version}.tar.gz"; - sha256 = "0m0dy3r94ks5pfxyb9vbgrsm0vrwdl3jd5wqwg4f5vd107lq90q1"; + sha256 = "1kv2jy47darj6lysyxyaw5d5z5kwqdalbpv0hsg8i7zav09dw8z2"; }; outputs = [ "out" ]; |