diff options
Diffstat (limited to 'pkgs')
19 files changed, 183 insertions, 57 deletions
diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix index fb4b33ef71ab..42f454191989 100644 --- a/pkgs/applications/networking/browsers/lynx/default.nix +++ b/pkgs/applications/networking/browsers/lynx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, gzip +{ stdenv, fetchurl, ncurses, gzip, pkgconfig , sslSupport ? true, openssl ? null }: @@ -13,14 +13,10 @@ stdenv.mkDerivation rec { sha256 = "1cqm1i7d209brkrpzaqqf2x951ra3l67dw8x9yg10vz7rpr9441a"; }; - configureFlags = [] - ++ stdenv.lib.optionals sslSupport [ "--with-ssl=${openssl.dev}" ]; + configureFlags = [ "--enable-widec" ] ++ stdenv.lib.optional sslSupport "--with-ssl"; - buildInputs = [ ncurses gzip ]; - - crossAttrs = { - configureFlags = configureFlags ++ [ "--enable-widec" ]; - }; + nativeBuildInputs = stdenv.lib.optional sslSupport pkgconfig; + buildInputs = [ ncurses gzip ] ++ stdenv.lib.optional sslSupport openssl.dev; meta = with stdenv.lib; { homepage = http://lynx.isc.org/; diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 4443c8480663..2c9661c36fa5 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -87,12 +87,18 @@ let srcs = { "x86_64-linux" = fetchurl { - url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"; + urls = [ + "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz" + "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" + ]; sha256 = "0jn98arczlgjigpmql1qg5b7izabv4zy4mji6vvcg3b8g1ma108r"; }; "i686-linux" = fetchurl { - url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"; + urls = [ + "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz" + "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" + ]; sha256 = "0micxgkbys0py4bj6csbc8xz4gq0x5v2zirgi38krnm5x5riqj3w"; }; }; @@ -105,6 +111,7 @@ stdenv.mkDerivation rec { src = srcs."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}"); preferLocalBuild = true; + allowSubstitutes = false; desktopItem = makeDesktopItem { name = "torbrowser"; diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix index d1996b72154d..d38529e92e60 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "git-annex-remote-rclone-${version}"; - version = "0.4"; + version = "0.5"; rev = "v${version}"; src = fetchFromGitHub { inherit rev; owner = "DanielDent"; repo = "git-annex-remote-rclone"; - sha256 = "1myk307hqm8dlxhkmwr347rdd28niv5h0gyrxm30y77zlly30ddk"; + sha256 = "1353b6q3lnxhpdfy9yd2af65v7aypdhyvgn7ziksmsrbi12lb74i"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 653e5cd245ca..7d21996fe1cd 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -197,13 +197,11 @@ stdenv.mkDerivation ({ ${jailbreak-cabal}/bin/jailbreak-cabal ${pname}.cabal '' + postPatch; - # for ghcjs, we want to put ghcEnv on PATH so compiler plugins will be available. - # TODO(cstrahan): would the same be of benefit to native ghc? setupCompilerEnvironmentPhase = '' runHook preSetupCompilerEnvironment echo "Build with ${ghc}." - export PATH="${if ghc.isGhcjs or false then ghcEnv else ghc}/bin:$PATH" + export PATH="${ghc}/bin:$PATH" ${optionalString (hasActiveLibrary && hyperlinkSource) "export PATH=${hscolour}/bin:$PATH"} packageConfDir="$TMPDIR/package.conf.d" diff --git a/pkgs/development/ocaml-modules/cmdliner/default.nix b/pkgs/development/ocaml-modules/cmdliner/default.nix index 8be36a2a408f..9448610a3784 100644 --- a/pkgs/development/ocaml-modules/cmdliner/default.nix +++ b/pkgs/development/ocaml-modules/cmdliner/default.nix @@ -1,31 +1,34 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, result }: let pname = "cmdliner"; in -assert stdenv.lib.versionAtLeast ocaml.version "3.12"; +assert stdenv.lib.versionAtLeast ocaml.version "4.01.0"; stdenv.mkDerivation rec { - name = "ocaml-${pname}-${version}"; - version = "0.9.8"; + version = "1.0.0"; src = fetchurl { url = "http://erratique.ch/software/${pname}/releases/${pname}-${version}.tbz"; - sha256 = "0hdxlkgiwjml9dpaa80282a8350if7mc1m6yz2mrd7gci3fszykx"; + sha256 = "1ryn7qis0izg0wcal8zdlikzzl689l75y6f4zc6blrm93y5agy9x"; }; unpackCmd = "tar xjf $src"; - buildInputs = [ ocaml findlib ocamlbuild opam ]; + + nativeBuildInputs = [ ocamlbuild opam topkg ]; + buildInputs = [ ocaml findlib ]; + propagatedBuildInputs = [ result ]; createFindlibDestdir = true; - configurePhase = "ocaml pkg/git.ml"; - buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true"; - installPhase = '' - opam-installer --script --prefix=$out ${pname}.install > install.sh - sh install.sh + buildPhase = '' + ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib pkg/pkg.ml build + ''; + + installPhase = '' + opam-installer --script --prefix=$out | sh ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml.version}/site-lib/ ''; @@ -33,7 +36,7 @@ stdenv.mkDerivation rec { homepage = http://erratique.ch/software/cmdliner; description = "An OCaml module for the declarative definition of command line interfaces"; license = licenses.bsd3; - maintainers = [ maintainers.vbgl ]; platforms = ocaml.meta.platforms or []; + maintainers = [ maintainers.vbgl ]; }; } diff --git a/pkgs/development/python-modules/hypothesis.nix b/pkgs/development/python-modules/hypothesis.nix index b9f95d1a0313..cb0db6dc2e0c 100644 --- a/pkgs/development/python-modules/hypothesis.nix +++ b/pkgs/development/python-modules/hypothesis.nix @@ -1,6 +1,6 @@ { stdenv, buildPythonPackage, fetchFromGitHub, python , pythonOlder, pythonAtLeast, enum34 -, doCheck ? true, pytest, flake8, flaky +, doCheck ? true, pytest, pytest_xdist, flake8, flaky }: buildPythonPackage rec { # http://hypothesis.readthedocs.org/en/latest/packaging.html @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "1s911pd3y9hvk0hq2fr6i68dqv1ciagryhgp13wgyfqh8hz8j6zv"; }; - checkInputs = stdenv.lib.optionals doCheck [ pytest flake8 flaky ]; + checkInputs = stdenv.lib.optionals doCheck [ pytest pytest_xdist flake8 flaky ]; propagatedBuildInputs = stdenv.lib.optionals (pythonOlder "3.4") [ enum34 ]; inherit doCheck; diff --git a/pkgs/development/python-modules/ldap.nix b/pkgs/development/python-modules/ldap.nix index e2625e2bfbfa..3e715bbe419a 100644 --- a/pkgs/development/python-modules/ldap.nix +++ b/pkgs/development/python-modules/ldap.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, isPy3k, fetchurl +{ buildPythonPackage, isPy3k, fetchPypi , openldap, cyrus_sasl, openssl }: buildPythonPackage rec { @@ -7,8 +7,8 @@ buildPythonPackage rec { name = "${pname}-${version}"; disabled = isPy3k; - src = fetchurl { - url = "mirror://pypi/p/python-ldap/python-${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "88bab69e519dd8bd83becbe36bd141c174b0fe309e84936cf1bae685b31be779"; }; diff --git a/pkgs/development/python-modules/pylibmc/default.nix b/pkgs/development/python-modules/pylibmc/default.nix index ff53e3d304fe..7f57f17efeb1 100644 --- a/pkgs/development/python-modules/pylibmc/default.nix +++ b/pkgs/development/python-modules/pylibmc/default.nix @@ -1,11 +1,11 @@ -{ buildPythonPackage, fetchurl, stdenv, libmemcached, zlib }: +{ buildPythonPackage, fetchPypi, stdenv, libmemcached, zlib }: buildPythonPackage rec { version = "1.5.2"; pname = "pylibmc"; name = "${pname}-${version}"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/pylibmc/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "fc54e28a9f1b5b2ec0c030da29c7ad8a15c2755bd98aaa4142eaf419d5fabb33"; }; diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index 2922faafa7f7..130aef60f971 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, buildPythonPackage, python, astroid, isort, - pytest, mccabe, configparser, backports_functools_lru_cache }: + pytest, pytestrunner, mccabe, configparser, backports_functools_lru_cache }: buildPythonPackage rec { name = "${pname}-${version}"; @@ -11,7 +11,7 @@ sha256 = "8b4a7ab6cf5062e40e2763c0b4a596020abada1d7304e369578b522e46a6264a"; }; - buildInputs = [ pytest mccabe configparser backports_functools_lru_cache ]; + buildInputs = [ pytest pytestrunner mccabe configparser backports_functools_lru_cache ]; propagatedBuildInputs = [ astroid isort ]; diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix index a394105faf4b..ce9ca76a43b2 100644 --- a/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/pkgs/development/tools/analysis/cppcheck/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "cppcheck"; - version = "1.78"; + version = "1.79"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/${pname}/${name}.tar.bz2"; - sha256 = "1cc60y2vjq4g88183jkan91ybzqy0n6p5ncs8z5rh6rjsvvrc9p4"; + sha256 = "0vgh4zx191d7mcmiilkhcbd9jkspfkppl7l4y5451walvs9vd19b"; }; buildInputs = [ pcre ]; diff --git a/pkgs/development/tools/ocaml/ocp-indent/default.nix b/pkgs/development/tools/ocaml/ocp-indent/default.nix index d146dd5e9731..500002bed444 100644 --- a/pkgs/development/tools/ocaml/ocp-indent/default.nix +++ b/pkgs/development/tools/ocaml/ocp-indent/default.nix @@ -3,18 +3,21 @@ let inherit (stdenv.lib) getVersion versionAtLeast; in assert versionAtLeast (getVersion ocaml) "3.12.1"; +assert versionAtLeast (getVersion cmdliner) "1.0.0"; assert versionAtLeast (getVersion ocpBuild) "1.99.6-beta"; -stdenv.mkDerivation { +stdenv.mkDerivation rec { - name = "ocp-indent-1.5.2"; + name = "ocp-indent-${version}"; + version = "1.6.0"; src = fetchzip { - url = "https://github.com/OCamlPro/ocp-indent/archive/1.5.2.tar.gz"; - sha256 = "0ynv2yhm7akpvqp72pdabhddwr352s1k85q8m1khsvspgg1mkiqz"; + url = "https://github.com/OCamlPro/ocp-indent/archive/${version}.tar.gz"; + sha256 = "1h9y597s3ag8w1z32zzv4dfk3ppq557s55bnlfw5a5wqwvia911f"; }; - buildInputs = [ ocaml findlib ocpBuild opam cmdliner ]; + nativeBuildInputs = [ ocpBuild opam ]; + buildInputs = [ ocaml findlib cmdliner ]; createFindlibDestdir = true; diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix index f0de56b09538..861a44fea8c5 100644 --- a/pkgs/games/factorio/default.nix +++ b/pkgs/games/factorio/default.nix @@ -10,7 +10,7 @@ assert releaseType == "alpha" || releaseType == "headless" || releaseType == "de with stdenv.lib; let - version = if releaseType != "demo" then "0.15.1" else "0.14.23"; + version = if releaseType != "demo" then "0.15.16" else "0.14.23"; arch = if stdenv.system == "x86_64-linux" then { inUrl = "linux64"; @@ -27,8 +27,8 @@ let url = "https://www.factorio.com/get-download/${version}/${releaseType}/${arch.inUrl}"; name = "factorio_${releaseType}_${arch.inTar}-${version}.${extension}"; x64 = { - headless = fetchurl { inherit name url; sha256 = "1z84a9yzlld6fv53viwvswp52hlc9fkxzhb2pil7sidzkws3g49l"; }; - alpha = authenticatedFetch { inherit name url; sha256 = "11bxasghrhqb2yg1842v1608x3mjdjv3015jgifpv1xmcqak44jp"; }; + headless = fetchurl { inherit name url; sha256 = "0ig0nrvqllb9294qn2ci5j5s31ycsjn23bp6hc633xqkgfmklmic"; }; + alpha = authenticatedFetch { inherit name url; sha256 = "0bf0z6fi0cpbq487hz4sz8ljapchzhld01sj767wsldakjfkm9g9"; }; demo = fetchurl { inherit name url; sha256 = "10a2lwmspqviwgymn3zhjgpiynsa6dplgnikdirma5sl2hhcfb6s"; }; }; i386 = { diff --git a/pkgs/games/galaxis/default.nix b/pkgs/games/galaxis/default.nix new file mode 100644 index 000000000000..c0799e8fdf4c --- /dev/null +++ b/pkgs/games/galaxis/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchurl, ncurses, xmlto }: + +with stdenv.lib; +stdenv.mkDerivation rec{ + + name = "galaxis-${version}"; + version = "1.9"; + + src = fetchurl{ + url = "http://www.catb.org/~esr/galaxis/${name}.tar.gz"; + sha256 = "1dsypk5brfbc399pg4fk9myyh5yyln0ljl1aiqkypws8h4nsdphl"; + }; + + buildInputs = [ ncurses xmlto ]; + + patchPhase = '' + sed -i\ + -e 's|^install: galaxis\.6 uninstall|install: galaxis.6|'\ + -e 's|usr/||g' -e 's|ROOT|DESTDIR|g'\ + -e 's|install -m 755 -o 0 -g 0|install -m 755|' Makefile + ''; + + dontConfigure = true; + + makeFlags = [ "DESTDIR=$(out)" ]; + + meta = { + description = "Rescue lifeboats lost in interstellar space"; + longDescription = '' + Lifeboats from a crippled interstellar liner are adrift in a starfield. To + find them, you can place probes that look in all eight compass directions + and tell you how many lifeboats they see. If you drop a probe directly on + a lifeboat it will be revealed immediately. Your objective: find the + lifeboats as quickly as possible, before the stranded passengers run out + of oxygen! + + This is a UNIX-hosted, curses-based clone of the nifty little Macintosh + freeware game Galaxis. It doesn't have the super-simple, point-and-click + interface of the original, but compensates by automating away some of the + game's simpler deductions. + ''; + homepage = http://catb.org/~esr/galaxis/; + license = licenses.gpl2; + maintainers = [ maintainers.AndersonTorres ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix b/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix index 67648f9d4f2c..a99f081b24eb 100644 --- a/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix +++ b/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "mod_auth_mellon-${version}"; - version = "0.12.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "UNINETT"; repo = "mod_auth_mellon"; rev = "v${version}"; - sha256 = "1p6v6vgrfvgvc5y2ygqyyxi0klpm3nxaw3fg35zmpmw663w8skqn"; + sha256 = "16b43y5a5p8g1287x04rv923230cy8dfs2j18cx6208n4bv4dvnk"; }; patches = [ diff --git a/pkgs/servers/mail/dkimproxy/default.nix b/pkgs/servers/mail/dkimproxy/default.nix new file mode 100644 index 000000000000..9abf95fb6d60 --- /dev/null +++ b/pkgs/servers/mail/dkimproxy/default.nix @@ -0,0 +1,36 @@ +{ stdenv, perl, fetchurl, Error, MailDKIM, MIMEtools, NetServer }: + +let + pkg = "dkimproxy"; + version = "1.4.1"; +in +stdenv.mkDerivation rec { + name = "${pkg}-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/dkimproxy/${name}.tar.gz"; + sha256 = "1gc5c7lg2qrlck7b0lvjfqr824ch6jkrzkpsn0gjvlzg7hfmld75"; + }; + + # Idea taken from pkgs/development/perl-modules/generic/builder.sh + preFixup = '' + perlFlags= + for i in $(IFS=:; echo $PERL5LIB); do + perlFlags="$perlFlags -I$i" + done + for f in $(ls $out/bin); do + sed -i $out/bin/$f -e "s|#\!\(.*/perl.*\)$|#\! \1 $perlFlags|" + done + ''; + + buildInputs = [ perl ]; + propagatedBuildInputs = [ Error MailDKIM MIMEtools NetServer ]; + + meta = with stdenv.lib; { + description = "SMTP-proxy that signs and/or verifies emails"; + homepage = http://dkimproxy.sourceforge.net/; + license = licenses.gpl2Plus; + maintainers = [ maintainers.ekleog ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/misc/moreutils/default.nix b/pkgs/tools/misc/moreutils/default.nix index a232028976dc..51ac3249fed8 100644 --- a/pkgs/tools/misc/moreutils/default.nix +++ b/pkgs/tools/misc/moreutils/default.nix @@ -1,13 +1,14 @@ -{ stdenv, fetchurl, libxml2, libxslt, docbook-xsl, docbook_xml_dtd_44, perl, IPCRun, TimeDate, TimeDuration, makeWrapper }: +{ stdenv, fetchgit, libxml2, libxslt, docbook-xsl, docbook_xml_dtd_44, perl, IPCRun, TimeDate, TimeDuration, makeWrapper }: with stdenv.lib; stdenv.mkDerivation rec { name = "moreutils-${version}"; - version = "0.59"; + version = "0.61"; - src = fetchurl { - url = "http://ftp.de.debian.org/debian/pool/main/m/moreutils/moreutils_${version}.orig.tar.gz"; - sha256 = "1d6ik3j4lwp90vb93p7yv60k6vk2chz448d1z9xrmxvv371i33m4"; + src = fetchgit { + url = "git://git.joeyh.name/moreutils"; + rev = "refs/tags/${version}"; + sha256 = "1qvwlq0a2zs7qkjqc9c842979axkjfdr7nic1gsm4zc6jd72y7pr"; }; preBuild = '' @@ -25,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "Growing collection of the unix tools that nobody thought to write long ago when unix was young"; homepage = https://joeyh.name/code/moreutils/; - maintainers = with maintainers; [ koral ]; + maintainers = with maintainers; [ koral pSub ]; platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/pick/default.nix b/pkgs/tools/misc/pick/default.nix index a407a85d1a20..075949f47e1a 100644 --- a/pkgs/tools/misc/pick/default.nix +++ b/pkgs/tools/misc/pick/default.nix @@ -2,19 +2,23 @@ stdenv.mkDerivation rec { name = "pick-${version}"; - version = "1.4.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "thoughtbot"; repo = "pick"; rev = "v${version}"; - sha256 = "113if0jh7svwrwrxhrsbi7h1whfr5707v2ny4dc9kk2sjbv6b9pg"; + sha256 = "0iw3yqwg8j0pg56xx52xwn7n95vxlqbqh71zrc934v4mq971qlhd"; }; buildInputs = [ ncurses ]; nativeBuildInputs = [ autoreconfHook ]; + postPatch = '' + sed -i -e 's/\[curses]/\[ncurses]/g' configure.ac + ''; + meta = with stdenv.lib; { inherit (src.meta) homepage; description = "Fuzzy text selection utility"; diff --git a/pkgs/tools/security/cfssl/default.nix b/pkgs/tools/security/cfssl/default.nix new file mode 100644 index 000000000000..91a5fa4bdd24 --- /dev/null +++ b/pkgs/tools/security/cfssl/default.nix @@ -0,0 +1,23 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub, pkgs }: + +buildGoPackage rec { + name = "cfssl-${version}"; + version = "20170527"; + + goPackagePath = "github.com/cloudflare/cfssl"; + + src = fetchFromGitHub { + owner = "cloudflare"; + repo = "cfssl"; + rev = "114dc9691ec7bf3dac49d5953eccf7d91a0e0904"; + sha256 = "1ijq43mrzrf1gkgj5ssxq7sgy6sd4rl706dzqkq9krqv5f6kwhj1"; + }; + + meta = with stdenv.lib; { + homepage = https://cfssl.org/; + description = "Cloudflare's PKI and TLS toolkit"; + platforms = platforms.linux; + license = licenses.bsd2; + maintainers = with maintainers; [ mbrgm ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 62e5c24a11dc..2007e8262cd6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1386,6 +1386,8 @@ with pkgs; c14 = callPackage ../applications/networking/c14 { }; + cfssl = callPackage ../tools/security/cfssl { }; + checkbashisms = callPackage ../development/tools/misc/checkbashisms { }; clamav = callPackage ../tools/security/clamav { }; @@ -10874,6 +10876,10 @@ with pkgs; diod = callPackage ../servers/diod { lua = lua5_1; }; + dkimproxy = callPackage ../servers/mail/dkimproxy { + inherit (perlPackages) Error MailDKIM MIMEtools NetServer; + }; + dnschain = callPackage ../servers/dnschain { }; dovecot = callPackage ../servers/mail/dovecot { }; @@ -16934,6 +16940,8 @@ with pkgs; wxGTK = wxGTK28.override { unicode = false; }; }; + galaxis = callPackage ../games/galaxis { }; + gambatte = callPackage ../games/gambatte { }; garden-of-coloured-lights = callPackage ../games/garden-of-coloured-lights { allegro = allegro4; }; |