diff options
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/ftp/pure-ftpd/default.nix | 15 | ||||
-rw-r--r-- | pkgs/servers/hylafaxplus/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/mail/dovecot/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/pinnwand/default.nix | 24 | ||||
-rw-r--r-- | pkgs/servers/pinnwand/steck.nix | 31 | ||||
-rw-r--r-- | pkgs/servers/sql/dolt/default.nix | 6 | ||||
-rw-r--r-- | pkgs/servers/udpt/default.nix | 1 | ||||
-rw-r--r-- | pkgs/servers/web-apps/dokuwiki/default.nix | 4 |
9 files changed, 73 insertions, 20 deletions
diff --git a/pkgs/servers/ftp/pure-ftpd/default.nix b/pkgs/servers/ftp/pure-ftpd/default.nix index 020d2967f3e52..32e039f546b57 100644 --- a/pkgs/servers/ftp/pure-ftpd/default.nix +++ b/pkgs/servers/ftp/pure-ftpd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl }: +{ stdenv, fetchurl, openssl, fetchpatch }: stdenv.mkDerivation rec { name = "pure-ftpd-1.0.49"; @@ -8,6 +8,19 @@ stdenv.mkDerivation rec { sha256 = "19cjr262n6h560fi9nm7l1srwf93k34bp8dp1c6gh90bqxcg8yvn"; }; + patches = [ + (fetchpatch { + name = "CVE-2020-9274.patch"; + url = "https://github.com/jedisct1/pure-ftpd/commit/8d0d42542e2cb7a56d645fbe4d0ef436e38bcefa.patch"; + sha256 = "1yd84p6bd4rf21hg3kqpi2a02cac6dz5ag4xx3c2dl5vbzhr5a8k"; + }) + (fetchpatch { + name = "CVE-2020-9365.patch"; + url = "https://github.com/jedisct1/pure-ftpd/commit/bf6fcd4935e95128cf22af5924cdc8fe5c0579da.patch"; + sha256 = "003klx7j82qf92qr1dxg32v5r2bhhywplynd3xil1lbcd3s3mqhi"; + }) + ]; + buildInputs = [ openssl ]; configureFlags = [ "--with-tls" ]; diff --git a/pkgs/servers/hylafaxplus/default.nix b/pkgs/servers/hylafaxplus/default.nix index 21e39b5f2e20b..9585ac46e5a31 100644 --- a/pkgs/servers/hylafaxplus/default.nix +++ b/pkgs/servers/hylafaxplus/default.nix @@ -30,8 +30,8 @@ let name = "hylafaxplus-${version}"; - version = "7.0.2"; - sha256 = "17vym1gz5ppy3q6zbw2y4nkq1dspn31k12zcmva44fnw9diwvsfb"; + version = "7.0.3"; + sha256 = "139iwcwrn9i5lragxi33ilzah72w59wg4midfjjgx5cly3ah0iy4"; configSite = substituteAll { name = "hylafaxplus-config.site"; diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index a110df0fb42fe..a12c86cd3f0fe 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "dovecot"; - version = "2.3.10.1"; + version = "2.3.11.3"; nativeBuildInputs = [ perl pkgconfig ]; buildInputs = @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dovecot.org/releases/2.3/${pname}-${version}.tar.gz"; - sha256 = "035idr2j81s5mngnhd58rih79dhwwak7q01mqbx3rcmi4cpychk6"; + sha256 = "1p5gp8jbavcsaara5mfn5cbrnlxssajnchczbgmmfzr7228fmnfk"; }; enableParallelBuilding = true; diff --git a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix index 6b51aea6512e8..aca694f53d65d 100644 --- a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix +++ b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "dovecot-pigeonhole"; - version = "0.5.10"; + version = "0.5.11"; src = fetchurl { url = "https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-${version}.tar.gz"; - sha256 = "0pk0579ifl3ymfzn505396bsjlg29ykwr7ag8prcbafayg4rrj28"; + sha256 = "1w5mryv6izh1gv7davnl94rb0pvh5bxl2bydzbfla1b83x22m5qb"; }; buildInputs = [ dovecot openssl ]; diff --git a/pkgs/servers/pinnwand/default.nix b/pkgs/servers/pinnwand/default.nix index 563c539c825e8..360e39ab685d2 100644 --- a/pkgs/servers/pinnwand/default.nix +++ b/pkgs/servers/pinnwand/default.nix @@ -1,4 +1,4 @@ -{ lib, python3, fetchFromGitHub }: +{ lib, python3, fetchFromGitHub, poetry, nixosTests }: let python = python3.override { @@ -14,13 +14,20 @@ let }; in with python.pkgs; buildPythonApplication rec { pname = "pinnwand"; - version = "1.1.2"; + version = "1.2.1"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "0iincxkfyyx85ggx9ilms2f8aq4lcbg3rkqgrr4wlsflzhljqd0p"; + src = fetchFromGitHub { + owner = "supakeen"; + repo = pname; + rev = "v${version}"; + sha256 = "1rk7rpyb4vmqxqqv8k9jpjmgakr3mn1iaqxyj34r74p1n5vfzimq"; }; + nativeBuildInputs = [ + poetry + ]; + propagatedBuildInputs = [ click docutils @@ -30,11 +37,14 @@ in with python.pkgs; buildPythonApplication rec { sqlalchemy ]; - # tests are only available when fetching from GitHub, where they in turn don't have a setup.py :( + checkInputs = [ pytest ]; + checkPhase = '' - $out/bin/pinnwand --help > /dev/null + pytest ''; + passthru.tests = nixosTests.pinnwand; + meta = with lib; { homepage = "https://supakeen.com/project/pinnwand/"; license = licenses.mit; diff --git a/pkgs/servers/pinnwand/steck.nix b/pkgs/servers/pinnwand/steck.nix new file mode 100644 index 0000000000000..09b20efc36eec --- /dev/null +++ b/pkgs/servers/pinnwand/steck.nix @@ -0,0 +1,31 @@ +{ lib, pkgs, python3Packages, nixosTests }: + +python3Packages.buildPythonApplication rec { + pname = "steck"; + version = "0.6.0"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "07gc5iwbyprb8nihnjjl2zd06z8p4nl3a3drzh9a8ny35ig1khq0"; + }; + + propagatedBuildInputs = with python3Packages; [ + pkgs.git + appdirs + click + python_magic + requests + termcolor + toml + ]; + + passthru.tests = nixosTests.pinnwand; + + meta = with lib; { + homepage = "https://github.com/supakeen/steck"; + license = licenses.mit; + description = "Client for pinnwand pastebin."; + maintainers = with maintainers; [ hexa ]; + }; +} + diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/servers/sql/dolt/default.nix index a5d7a856b2d37..af95a8aa8e95f 100644 --- a/pkgs/servers/sql/dolt/default.nix +++ b/pkgs/servers/sql/dolt/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "dolt"; - version = "0.18.1"; + version = "0.18.2"; src = fetchFromGitHub { owner = "liquidata-inc"; repo = "dolt"; rev = "v${version}"; - sha256 = "106n4zlrs64vx09cm365jsymaa0949k0wjb845p2lp4794r9zkf7"; + sha256 = "054dy5n9b8ahfwsih4chqg83c5sp8ihc68y79kz4508d42r0zvxz"; }; modRoot = "./go"; subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ]; - vendorSha256 = "1pvf63cxwq4jj5gi2xalrsk2z1f7i53f0z6qc2p7aibwx9i1k9cz"; + vendorSha256 = "1dp1asi4iz9j0m8bqiap7m6ph0qf2bi9j2yn6q53539qspc5gkr2"; doCheck = false; diff --git a/pkgs/servers/udpt/default.nix b/pkgs/servers/udpt/default.nix index b807d1f0d267c..acf885ed0121a 100644 --- a/pkgs/servers/udpt/default.nix +++ b/pkgs/servers/udpt/default.nix @@ -12,7 +12,6 @@ rustPlatform.buildRustPackage rec { }; cargoSha256 = "1cmd80ndjxdmyfjpm1f04rwf64501nyi6wdsj7lxidgd1v92wy2c"; - verifyCargoDeps = true; postInstall = '' install -D udpt.toml $out/share/udpt/udpt.toml diff --git a/pkgs/servers/web-apps/dokuwiki/default.nix b/pkgs/servers/web-apps/dokuwiki/default.nix index 48eeddd5ea9b9..0374b747825ca 100644 --- a/pkgs/servers/web-apps/dokuwiki/default.nix +++ b/pkgs/servers/web-apps/dokuwiki/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "dokuwiki"; - version = "2018-04-22b"; + version = "2020-07-29"; src = fetchFromGitHub { owner = "splitbrain"; repo = "${pname}"; rev = "release_stable_${version}"; - sha256 = "1na5pn4j4mi2la80ywzg1krwqdxz57mjkw0id6ga9rws809gkdjp"; + sha256 = "09swcqyd06l3481k190gmlr3b33dlv1lw1kk9nyh5b4sa5p3k7kk"; }; preload = writeText "preload.php" '' |