diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index ad10ba1d909..fd4d16cdc37 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -25,6 +25,8 @@ let clientRestrictions = concatStringsSep ", " (clientAccess ++ dnsBl); + smtpTlsSecurityLevel = if cfg.useDane then "dane" else "may"; + mainCf = let escape = replaceStrings ["$"] ["$$"]; mkList = items: "\n " + concatStringsSep ",\n " items; @@ -508,6 +510,14 @@ in ''; }; + useDane = mkOption { + type = types.bool; + default = false; + description = '' + Sets smtp_tls_security_level to "dane" rather than "may". See postconf(5) for details. + ''; + }; + sslCert = mkOption { type = types.str; default = ""; @@ -809,13 +819,13 @@ in // optionalAttrs cfg.enableHeaderChecks { header_checks = [ "regexp:/etc/postfix/header_checks" ]; } // optionalAttrs (cfg.tlsTrustedAuthorities != "") { smtp_tls_CAfile = cfg.tlsTrustedAuthorities; - smtp_tls_security_level = "may"; + smtp_tls_security_level = smtpTlsSecurityLevel; } // optionalAttrs (cfg.sslCert != "") { smtp_tls_cert_file = cfg.sslCert; smtp_tls_key_file = cfg.sslKey; - smtp_tls_security_level = "may"; + smtp_tls_security_level = smtpTlsSecurityLevel; smtpd_tls_cert_file = cfg.sslCert; smtpd_tls_key_file = cfg.sslKey; diff --git a/nixos/modules/services/misc/gollum.nix b/nixos/modules/services/misc/gollum.nix index f4a9c72b154..8842e1e4d90 100644 --- a/nixos/modules/services/misc/gollum.nix +++ b/nixos/modules/services/misc/gollum.nix @@ -98,7 +98,7 @@ in ${pkgs.gollum}/bin/gollum \ --port ${toString cfg.port} \ --host ${cfg.address} \ - --config ${builtins.toFile "gollum-config.rb" cfg.extraConfig} \ + --config ${pkgs.writeText "gollum-config.rb" cfg.extraConfig} \ --ref ${cfg.branch} \ ${optionalString cfg.mathjax "--mathjax"} \ ${optionalString cfg.emoji "--emoji"} \ diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix index 5c096d26d82..f298f831fa7 100644 --- a/nixos/modules/services/network-filesystems/ipfs.nix +++ b/nixos/modules/services/network-filesystems/ipfs.nix @@ -25,6 +25,15 @@ let then "/${lib.concatStringsSep "/" (lib.tail addr)}" else null; # not valid for listen stream, skip + multiaddrToListenDatagram = addrRaw: let + addr = splitMulitaddr addrRaw; + s = builtins.elemAt addr; + in if s 0 == "ip4" && s 2 == "udp" + then "${s 1}:${s 3}" + else if s 0 == "ip6" && s 2 == "udp" + then "[${s 1}]:${s 3}" + else null; # not valid for listen datagram, skip + in { ###### interface @@ -268,9 +277,14 @@ in { systemd.sockets.ipfs-gateway = { wantedBy = [ "sockets.target" ]; - socketConfig.ListenStream = let - fromCfg = multiaddrToListenStream cfg.gatewayAddress; - in [ "" ] ++ lib.optional (fromCfg != null) fromCfg; + socketConfig = { + ListenStream = let + fromCfg = multiaddrToListenStream cfg.gatewayAddress; + in [ "" ] ++ lib.optional (fromCfg != null) fromCfg; + ListenDatagram = let + fromCfg = multiaddrToListenDatagram cfg.gatewayAddress; + in [ "" ] ++ lib.optional (fromCfg != null) fromCfg; + }; }; systemd.sockets.ipfs-api = { diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 0579e58d1d6..d9660852528 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -531,81 +531,65 @@ in { environment.systemPackages = [ occ ]; - services.nginx = mkDefault { - enable = true; - virtualHosts.${cfg.hostName} = { - root = cfg.package; - locations = { - "= /robots.txt" = { - priority = 100; - extraConfig = '' - allow all; - log_not_found off; - access_log off; - ''; - }; - "/" = { - priority = 200; - extraConfig = "rewrite ^ /index.php;"; - }; - "~ ^/store-apps" = { - priority = 201; - extraConfig = "root ${cfg.home};"; - }; - "= /.well-known/carddav" = { - priority = 210; - extraConfig = "return 301 $scheme://$host/remote.php/dav;"; - }; - "= /.well-known/caldav" = { - priority = 210; - extraConfig = "return 301 $scheme://$host/remote.php/dav;"; - }; - "~ ^\\/(?:build|tests|config|lib|3rdparty|templates|data)\\/" = { - priority = 300; - extraConfig = "deny all;"; - }; - "~ ^\\/(?:\\.|autotest|occ|issue|indie|db_|console)" = { - priority = 300; - extraConfig = "deny all;"; - }; - "~ ^\\/(?:index|remote|public|cron|core/ajax\\/update|status|ocs\\/v[12]|updater\\/.+|ocs-provider\\/.+|ocm-provider\\/.+)\\.php(?:$|\\/)" = { - priority = 500; - extraConfig = '' - include ${config.services.nginx.package}/conf/fastcgi.conf; - fastcgi_split_path_info ^(.+\.php)(\\/.*)$; - try_files $fastcgi_script_name =404; - fastcgi_param PATH_INFO $fastcgi_path_info; - fastcgi_param HTTPS ${if cfg.https then "on" else "off"}; - fastcgi_param modHeadersAvailable true; - fastcgi_param front_controller_active true; - fastcgi_pass unix:${fpm.socket}; - fastcgi_intercept_errors on; - fastcgi_request_buffering off; - fastcgi_read_timeout 120s; - ''; - }; - "~ ^\\/(?:updater|ocs-provider|ocm-provider)(?:$|\\/)".extraConfig = '' - try_files $uri/ =404; - index index.php; - ''; - "~ \\.(?:css|js|woff2?|svg|gif)$".extraConfig = '' - try_files $uri /index.php$request_uri; - add_header Cache-Control "public, max-age=15778463"; - add_header X-Content-Type-Options nosniff; - add_header X-XSS-Protection "1; mode=block"; - add_header X-Robots-Tag none; - add_header X-Download-Options noopen; - add_header X-Permitted-Cross-Domain-Policies none; - add_header X-Frame-Options sameorigin; - add_header Referrer-Policy no-referrer; - access_log off; - ''; - "~ \\.(?:png|html|ttf|ico|jpg|jpeg|bcmap|mp4|webm)$".extraConfig = '' - try_files $uri /index.php$request_uri; + services.nginx.enable = mkDefault true; + services.nginx.virtualHosts.${cfg.hostName} = { + root = cfg.package; + locations = { + "= /robots.txt" = { + priority = 100; + extraConfig = '' + allow all; + log_not_found off; access_log off; ''; }; - extraConfig = '' + "/" = { + priority = 200; + extraConfig = "rewrite ^ /index.php;"; + }; + "~ ^/store-apps" = { + priority = 201; + extraConfig = "root ${cfg.home};"; + }; + "= /.well-known/carddav" = { + priority = 210; + extraConfig = "return 301 $scheme://$host/remote.php/dav;"; + }; + "= /.well-known/caldav" = { + priority = 210; + extraConfig = "return 301 $scheme://$host/remote.php/dav;"; + }; + "~ ^\\/(?:build|tests|config|lib|3rdparty|templates|data)\\/" = { + priority = 300; + extraConfig = "deny all;"; + }; + "~ ^\\/(?:\\.|autotest|occ|issue|indie|db_|console)" = { + priority = 300; + extraConfig = "deny all;"; + }; + "~ ^\\/(?:index|remote|public|cron|core/ajax\\/update|status|ocs\\/v[12]|updater\\/.+|ocs-provider\\/.+|ocm-provider\\/.+)\\.php(?:$|\\/)" = { + priority = 500; + extraConfig = '' + include ${config.services.nginx.package}/conf/fastcgi.conf; + fastcgi_split_path_info ^(.+\.php)(\\/.*)$; + try_files $fastcgi_script_name =404; + fastcgi_param PATH_INFO $fastcgi_path_info; + fastcgi_param HTTPS ${if cfg.https then "on" else "off"}; + fastcgi_param modHeadersAvailable true; + fastcgi_param front_controller_active true; + fastcgi_pass unix:${fpm.socket}; + fastcgi_intercept_errors on; + fastcgi_request_buffering off; + fastcgi_read_timeout 120s; + ''; + }; + "~ ^\\/(?:updater|ocs-provider|ocm-provider)(?:$|\\/)".extraConfig = '' + try_files $uri/ =404; + index index.php; + ''; + "~ \\.(?:css|js|woff2?|svg|gif)$".extraConfig = '' + try_files $uri /index.php$request_uri; + add_header Cache-Control "public, max-age=15778463"; add_header X-Content-Type-Options nosniff; add_header X-XSS-Protection "1; mode=block"; add_header X-Robots-Tag none; @@ -613,25 +597,39 @@ in { add_header X-Permitted-Cross-Domain-Policies none; add_header X-Frame-Options sameorigin; add_header Referrer-Policy no-referrer; - add_header Strict-Transport-Security "max-age=15552000; includeSubDomains" always; - error_page 403 /core/templates/403.php; - error_page 404 /core/templates/404.php; - client_max_body_size ${cfg.maxUploadSize}; - fastcgi_buffers 64 4K; - fastcgi_hide_header X-Powered-By; - gzip on; - gzip_vary on; - gzip_comp_level 4; - gzip_min_length 256; - gzip_proxied expired no-cache no-store private no_last_modified no_etag auth; - gzip_types application/atom+xml application/javascript application/json application/ld+json application/manifest+json application/rss+xml application/vnd.geo+json application/vnd.ms-fontobject application/x-font-ttf application/x-web-app-manifest+json application/xhtml+xml application/xml font/opentype image/bmp image/svg+xml image/x-icon text/cache-manifest text/css text/plain text/vcard text/vnd.rim.location.xloc text/vtt text/x-component text/x-cross-domain-policy; - - ${optionalString cfg.webfinger '' - rewrite ^/.well-known/host-meta /public.php?service=host-meta last; - rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last; - ''} + access_log off; + ''; + "~ \\.(?:png|html|ttf|ico|jpg|jpeg|bcmap|mp4|webm)$".extraConfig = '' + try_files $uri /index.php$request_uri; + access_log off; ''; }; + extraConfig = '' + add_header X-Content-Type-Options nosniff; + add_header X-XSS-Protection "1; mode=block"; + add_header X-Robots-Tag none; + add_header X-Download-Options noopen; + add_header X-Permitted-Cross-Domain-Policies none; + add_header X-Frame-Options sameorigin; + add_header Referrer-Policy no-referrer; + add_header Strict-Transport-Security "max-age=15552000; includeSubDomains" always; + error_page 403 /core/templates/403.php; + error_page 404 /core/templates/404.php; + client_max_body_size ${cfg.maxUploadSize}; + fastcgi_buffers 64 4K; + fastcgi_hide_header X-Powered-By; + gzip on; + gzip_vary on; + gzip_comp_level 4; + gzip_min_length 256; + gzip_proxied expired no-cache no-store private no_last_modified no_etag auth; + gzip_types application/atom+xml application/javascript application/json application/ld+json application/manifest+json application/rss+xml application/vnd.geo+json application/vnd.ms-fontobject application/x-font-ttf application/x-web-app-manifest+json application/xhtml+xml application/xml font/opentype image/bmp image/svg+xml image/x-icon text/cache-manifest text/css text/plain text/vcard text/vnd.rim.location.xloc text/vtt text/x-component text/x-cross-domain-policy; + + ${optionalString cfg.webfinger '' + rewrite ^/.well-known/host-meta /public.php?service=host-meta last; + rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last; + ''} + ''; }; } ]); diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 4c4b7f39e6b..461888c4cc4 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -704,7 +704,10 @@ in ''; serviceConfig = { ExecStart = execCommand; - ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + ExecReload = [ + "${execCommand} -t" + "${pkgs.coreutils}/bin/kill -HUP $MAINPID" + ]; Restart = "always"; RestartSec = "10s"; StartLimitInterval = "1min"; @@ -761,8 +764,7 @@ in serviceConfig.TimeoutSec = 60; script = '' if /run/current-system/systemd/bin/systemctl -q is-active nginx.service ; then - ${execCommand} -t && \ - /run/current-system/systemd/bin/systemctl reload nginx.service + /run/current-system/systemd/bin/systemctl reload nginx.service fi ''; serviceConfig.RemainAfterExit = true; diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 7f13f67e8ef..a04660fb56e 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -374,7 +374,8 @@ let ) config.boot.initrd.secrets) } - (cd "$tmp" && find . | cpio -H newc -o) | gzip >>"$1" + (cd "$tmp" && find . -print0 | sort -z | cpio -o -H newc -R +0:+0 --reproducible --null) | \ + ${config.boot.initrd.compressor} >> "$1" ''; in diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix index c6dbb96951a..ac6fed440a2 100644 --- a/nixos/modules/system/boot/systemd-unit-options.nix +++ b/nixos/modules/system/boot/systemd-unit-options.nix @@ -379,6 +379,16 @@ in rec { ''; }; + listenDatagrams = mkOption { + default = []; + type = types.listOf types.str; + example = [ "0.0.0.0:993" "/run/my-socket" ]; + description = '' + For each item in this list, a ListenDatagram + option in the [Socket] section will be created. + ''; + }; + socketConfig = mkOption { default = {}; example = { ListenStream = "/run/my-socket"; }; diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index a5f368c869a..d95f001a225 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -354,6 +354,7 @@ let [Socket] ${attrsToSection def.socketConfig} ${concatStringsSep "\n" (map (s: "ListenStream=${s}") def.listenStreams)} + ${concatStringsSep "\n" (map (s: "ListenDatagram=${s}") def.listenDatagrams)} ''; }; diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index 6c2a7d9fe33..23322ca5663 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -40,6 +40,8 @@ let mopidy-iris = callPackage ./iris.nix { }; + mopidy-tunein = callPackage ./tunein.nix { }; + }; in self diff --git a/pkgs/applications/audio/mopidy/tunein.nix b/pkgs/applications/audio/mopidy/tunein.nix new file mode 100644 index 00000000000..569d08fb4a0 --- /dev/null +++ b/pkgs/applications/audio/mopidy/tunein.nix @@ -0,0 +1,28 @@ +{ stdenv, python3Packages, mopidy }: + +python3Packages.buildPythonApplication rec { + pname = "mopidy-tunein"; + version = "1.0.0"; + + src = python3Packages.fetchPypi { + inherit version; + pname = "Mopidy-TuneIn"; + sha256 = "0insasf4w8ajsqjh5zmax7pkzmrk1p245vh4y8ddicldj45p6qfj"; + }; + + propagatedBuildInputs = [ + mopidy + ]; + + # tests fail with "ValueError: Namespace Gst not available" in mopidy itself + doCheck = false; + + pythonImportsCheck = [ "mopidy_tunein.tunein" ]; + + meta = with stdenv.lib; { + description = "Mopidy extension for playing music from tunein."; + homepage = "https://github.com/kingosticks/mopidy-tunein"; + license = licenses.asl20; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/applications/blockchains/bitcoin.nix b/pkgs/applications/blockchains/bitcoin.nix index 7a4386d2386..65feac9565b 100644 --- a/pkgs/applications/blockchains/bitcoin.nix +++ b/pkgs/applications/blockchains/bitcoin.nix @@ -20,16 +20,12 @@ with stdenv.lib; let - version = "0.20.0"; + version = "0.20.1"; majorMinorVersion = versions.majorMinor version; desktop = fetchurl { url = "https://raw.githubusercontent.com/bitcoin-core/packaging/${majorMinorVersion}/debian/bitcoin-qt.desktop"; sha256 = "0cpna0nxcd1dw3nnzli36nf9zj28d2g9jf5y0zl9j18lvanvniha"; }; - pixmap = fetchurl { - url = "https://raw.githubusercontent.com/bitcoin/bitcoin/v${version}/share/pixmaps/bitcoin128.png"; - sha256 = "08p7j7dg50jlj783kkgdw037klmx0spqjikaprmbkzgcb620r25d"; - }; in stdenv.mkDerivation rec { pname = if withGui then "bitcoin" else "bitcoind"; @@ -40,7 +36,7 @@ stdenv.mkDerivation rec { "https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" "https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" ]; - sha256 = "ec5a2358ee868d845115dc4fc3ed631ff063c57d5e0a713562d083c5c45efb28"; + sha256 = "4bbd62fd6acfa5e9864ebf37a24a04bc2dcfe3e3222f056056288d854c53b978"; }; nativeBuildInputs = @@ -53,7 +49,7 @@ stdenv.mkDerivation rec { postInstall = optional withGui '' install -Dm644 ${desktop} $out/share/applications/bitcoin-qt.desktop - install -Dm644 ${pixmap} $out/share/pixmaps/bitcoin128.png + install -Dm644 share/pixmaps/bitcoin128.png $out/share/pixmaps/bitcoin128.png ''; configureFlags = [ diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index 0ac90a8b345..e3c03c92e58 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -138,7 +138,7 @@ let ln -s ${rubyEnv}/bin/neovim-ruby-host $out/bin/nvim-ruby '' + optionalString withNodeJs '' - ln -s ${nodePackages.neovim}/bin/neovim-node $out/bin/nvim-node + ln -s ${nodePackages.neovim}/bin/neovim-node-host $out/bin/nvim-node '' + optionalString vimAlias '' ln -s $out/bin/nvim $out/bin/vim diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix index 20e1427ddef..4b032d48ebf 100644 --- a/pkgs/applications/editors/tiled/default.nix +++ b/pkgs/applications/editors/tiled/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "tiled"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "bjorn"; repo = pname; rev = "v${version}"; - sha256 = "1x8jymmc56di1c1wxalsp6qhcban2hahn70ndd097b8mx52gckjr"; + sha256 = "0b3xjcc86vs9lfxr7xann9d43dz3v3x1g7j1mcn31sy2n68a1wx3"; }; nativeBuildInputs = [ pkgconfig qmake ]; diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix index b1cdd5e86ea..65d7df72489 100644 --- a/pkgs/applications/misc/kitty/default.nix +++ b/pkgs/applications/misc/kitty/default.nix @@ -20,14 +20,14 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.18.2"; + version = "0.18.3"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "v${version}"; - sha256 = "0x6h8g017mbpjkpkb1y8asyfdc48bgjzmj5gachsp5cf5jcqwir2"; + sha256 = "0y05bw6d1m79dyhm7b6lk6wy82pmy2s9jhf01kf8gr2p0rjjp9yl"; }; buildInputs = [ diff --git a/pkgs/applications/misc/taskell/default.nix b/pkgs/applications/misc/taskell/default.nix index 2a083f45731..c8974c5c275 100644 --- a/pkgs/applications/misc/taskell/default.nix +++ b/pkgs/applications/misc/taskell/default.nix @@ -1,8 +1,8 @@ { lib, haskellPackages, fetchFromGitHub }: let - version = "1.9.4"; - sha256 = "0k8s1f0c99fz6jmqi6jqscsfxrrijnnpyw4jcj8zxpdf0sc07gca"; + version = "1.10.0"; + sha256 = "102iwn6011rypdlx07fzbdll3r5cd204qf96lzwkadvjb7h8clil"; in (haskellPackages.mkDerivation { pname = "taskell"; diff --git a/pkgs/applications/networking/cluster/nomad/0.11.nix b/pkgs/applications/networking/cluster/nomad/0.11.nix new file mode 100644 index 00000000000..9d0f2248ddc --- /dev/null +++ b/pkgs/applications/networking/cluster/nomad/0.11.nix @@ -0,0 +1,6 @@ +{ callPackage }: + +callPackage ./generic.nix { + version = "0.11.4"; + sha256 = "1sykp9sji6f564s7bz0cvnr9w5x92n0l1r1djf1bl7jvv2mi1mcb"; +} diff --git a/pkgs/applications/networking/cluster/nomad/0.12.nix b/pkgs/applications/networking/cluster/nomad/0.12.nix new file mode 100644 index 00000000000..ae131702df6 --- /dev/null +++ b/pkgs/applications/networking/cluster/nomad/0.12.nix @@ -0,0 +1,6 @@ +{ callPackage }: + +callPackage ./generic.nix { + version = "0.12.2"; + sha256 = "1gc286ag6plk5kxw7jzr32cp3n5rwydj1z7rds1rfd0fyq7an404"; +} diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/generic.nix similarity index 86% rename from pkgs/applications/networking/cluster/nomad/default.nix rename to pkgs/applications/networking/cluster/nomad/generic.nix index 990679a8668..0bfdb0b27f6 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/generic.nix @@ -1,8 +1,8 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub, version, sha256 }: buildGoPackage rec { pname = "nomad"; - version = "0.11.3"; + inherit version; rev = "v${version}"; goPackagePath = "github.com/hashicorp/nomad"; @@ -11,8 +11,7 @@ buildGoPackage rec { src = fetchFromGitHub { owner = "hashicorp"; repo = pname; - inherit rev; - sha256 = "1p7g7x2gl77h1w7aip3xji3s530fj46gspargz4j3i6h4wkyvafb"; + inherit rev sha256; }; # ui: diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix index 86e760d497c..52172bd8be7 100644 --- a/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, openssl , glibcLocales, expect, ncurses, libotr, curl, readline, libuuid -, cmocka, libmicrohttpd, stabber, expat, libmesode +, cmocka, libmicrohttpd, expat, sqlite, libmesode , autoconf-archive , autoAwaySupport ? true, libXScrnSaver ? null, libX11 ? null @@ -22,16 +22,18 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "profanity"; - version = "0.8.1"; + version = "0.9.5"; src = fetchFromGitHub { owner = "profanity-im"; repo = "profanity"; rev = version; - sha256 = "0fg5xcdlvhsi7a40w4jcxyj7m7wl42jy1cvsa8fi2gb6g9y568k8"; + sha256 = "14vbblf639f90bb4npg2xv53cpvk9am9ic4pmc1vnv4m3zsndjg5"; }; - patches = [ ./patches/packages-osx.patch ./patches/undefined-macros.patch ]; + patches = [ + ./patches/packages-osx.patch + ]; enableParallelBuilding = true; @@ -41,7 +43,7 @@ stdenv.mkDerivation rec { buildInputs = [ expect readline libuuid glib openssl expat ncurses libotr - curl libmesode cmocka libmicrohttpd stabber + curl libmesode cmocka libmicrohttpd sqlite ] ++ optionals autoAwaySupport [ libXScrnSaver libX11 ] ++ optionals notifySupport [ libnotify gdk-pixbuf ] ++ optionals traySupport [ gnome2.gtk ] diff --git a/pkgs/applications/networking/instant-messengers/profanity/patches/undefined-macros.patch b/pkgs/applications/networking/instant-messengers/profanity/patches/undefined-macros.patch deleted file mode 100644 index 9ef4e7bebe5..00000000000 --- a/pkgs/applications/networking/instant-messengers/profanity/patches/undefined-macros.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 1e55b1cc..0832a387 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -83,12 +81,12 @@ elif test "x$enable_python_plugins" != xno; then - AM_CONDITIONAL([BUILD_PYTHON_API], [true]) - AC_DEFINE([HAVE_PYTHON], [1], [Python support]) - else -- if test "x$enable_python_plugins" = xyes; then -- AC_MSG_ERROR([Python not found, cannot enable Python plugins.]) -- else -- AM_CONDITIONAL([BUILD_PYTHON_API], [false]) -- AC_MSG_NOTICE([Python development package not found, Python plugin support disabled.]) -- fi -+ AS_IF( -+ [test "x$enable_python_plugins" = xyes], -+ [], -+ [AM_CONDITIONAL([BUILD_PYTHON_API], [false]) -+ AC_MSG_NOTICE([Python development package not found, Python plugin support disabled.])] -+ ) - fi - AS_IF([test "x$PLATFORM" = xosx], [rm -f Python.framework]) - else -@@ -107,7 +105,7 @@ else - [AM_CONDITIONAL([BUILD_C_API], [true]) LIBS="$LIBS -ldl" AC_DEFINE([HAVE_C], [1], [C support])], - [AS_IF( - [test "x$enable_c_plugins" = xyes], -- [AC_MSG_ERROR([dl library needed to run C plugins])], -+ [], - [AM_CONDITIONAL([BUILD_C_API], [false])]) - ]) - else -@@ -116,7 +114,6 @@ else - fi - - # threading --ACX_PTHREAD([], [AC_MSG_ERROR([pthread is required])]) - LIBS="$PTHREAD_LIBS $LIBS" - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - AS_IF([test "x$PTHREAD_CC" != x], [ CC="$PTHREAD_CC" ]) diff --git a/pkgs/applications/networking/mailreaders/meli/default.nix b/pkgs/applications/networking/mailreaders/meli/default.nix index 719965455f9..2205c155575 100644 --- a/pkgs/applications/networking/mailreaders/meli/default.nix +++ b/pkgs/applications/networking/mailreaders/meli/default.nix @@ -15,15 +15,15 @@ rustPlatform.buildRustPackage rec { pname = "meli"; - version = "alpha-0.5.1"; + version = "alpha-0.6.1"; src = fetchgit { url = "https://git.meli.delivery/meli/meli.git"; rev = version; - sha256 = "1y5567hdm1s2s272drxvmp6x4y1jpyl7423iz58hgqcsjm9085zv"; + sha256 = "0fs3wccbdfxf4nmx9l5wy7qpjk4r11qg0fc59y0pdvjrrslcjsds"; }; - cargoSha256 = "040dfr09bg5z5pn68dy323hcppd599d3f6k7zxqw5f8n4whnlc9y"; + cargoSha256 = "sha256:19j7jrizp7yifmqwrmnv66pka7131jl7ks4zgs3nr5gbb28zvdrz"; cargoBuildFlags = lib.optional withNotmuch "--features=notmuch"; diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 72a799a8f6c..aec44c1bfd8 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -3,17 +3,17 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { - version = "1.7.1"; + version = "1.8.0"; name = "${stname}-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "1kb324diaq48z1vf36zlcsy9zckr0c3mrd3bmcdn28z2ivqnsc4a"; + sha256 = "047y2sy9zif19dlh098ihaski9f3b971q3mmqg97qgfzpa8z8fpr"; }; - vendorSha256 = "1gmdv0g0gymq6khrwvplw6yfp146kg5ar8vqdp5dlp0myxfzi22b"; + vendorSha256 = "0l08d96226l135cqbv1qqw0136f5nzw7likc0nmhcm6ynzv83kj2"; doCheck = false; @@ -43,7 +43,7 @@ let }; meta = with lib; { - homepage = "https://www.syncthing.net/"; + homepage = "https://syncthing.net/"; description = "Open Source Continuous File Synchronization"; license = licenses.mpl20; maintainers = with maintainers; [ pshendry joko peterhoeg andrew-d ]; diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 8fe04735657..6457ac3af0d 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { pname = "gitkraken"; - version = "7.1.0"; + version = "7.2.0"; src = fetchzip { url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz"; - sha256 = "1g7i7sq705x5jkp76z4car9na3qvklpi3a766yiv4h79kc5via48"; + sha256 = "0nrrcwikx6dx1j1s0b80gh1s932zvxmijpddqp6a1vh3ddc5v1mp"; }; dontBuild = true; diff --git a/pkgs/data/themes/jade1/default.nix b/pkgs/data/themes/jade1/default.nix index 7398c417933..47bb7242db3 100644 --- a/pkgs/data/themes/jade1/default.nix +++ b/pkgs/data/themes/jade1/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "theme-jade1"; - version = "1.7"; + version = "1.8"; src = fetchFromGitHub { owner = "madmaxms"; repo = "theme-jade-1"; rev = "v${version}"; - sha256 = "19vg95bf0ylmfhg0frs2k0k7c0wfn933h06wrklb9p5qy84hfig3"; + sha256 = "1nvn2ghkdhilrsjpvl7r92aldvbs0nx0xc82jwrfaahi87dgfs8x"; }; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; diff --git a/pkgs/data/themes/marwaita/default.nix b/pkgs/data/themes/marwaita/default.nix index 8a2300785b5..6426f2a222f 100644 --- a/pkgs/data/themes/marwaita/default.nix +++ b/pkgs/data/themes/marwaita/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "marwaita"; - version = "2020-07-01"; + version = "7.4.2"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; - rev = "310a3e596e95005752e14e2b96f55966cbb59d67"; - sha256 = "1r0jqv3hh74965dgc7qwvvhwzf548gb27z69lbpwz060k9di6zwj"; + rev = version; + sha256 = "0kq7d8nqp8m0kbh2k9s0yybfdkyfkhbkjsv22lplnzh1p84pnlx7"; }; buildInputs = [ diff --git a/pkgs/development/libraries/agda/agda-categories/default.nix b/pkgs/development/libraries/agda/agda-categories/default.nix index 9eb68b5a64a..13ca6c52d71 100644 --- a/pkgs/development/libraries/agda/agda-categories/default.nix +++ b/pkgs/development/libraries/agda/agda-categories/default.nix @@ -1,14 +1,14 @@ { lib, mkDerivation, fetchFromGitHub, standard-library }: mkDerivation rec { - version = "0.1"; + version = "0.1.3.1"; pname = "agda-categories"; src = fetchFromGitHub { owner = "agda"; repo = "agda-categories"; - rev = "release/v${version}"; - sha256 = "0m4pjy92jg6zfziyv0bxv5if03g8k4413ld8c3ii2xa8bzfn04m2"; + rev = "v${version}"; + sha256 = "08mc20qaz9vp5rhi60rh8wvjkg5aby3bgwwdhfnxha1663qf1q24"; }; buildInputs = [ standard-library ]; @@ -18,11 +18,6 @@ mkDerivation rec { description = "A new Categories library"; license = licenses.bsd3; platforms = platforms.unix; - # agda categories takes a lot of memory to build. - # This can be removed if this is eventually fixed upstream. - hydraPlatforms = []; - # Waiting for release 0.2 for this to work - broken = true; maintainers = with maintainers; [ alexarice turion ]; }; } diff --git a/pkgs/development/libraries/agda/generic/default.nix b/pkgs/development/libraries/agda/generic/default.nix new file mode 100644 index 00000000000..1287e08bda1 --- /dev/null +++ b/pkgs/development/libraries/agda/generic/default.nix @@ -0,0 +1,31 @@ +{ lib, mkDerivation, fetchFromGitHub, standard-library }: + +mkDerivation rec { + pname = "generic"; + version = "0.1"; + + src = fetchFromGitHub { + repo = "Generic"; + owner = "effectfully"; + rev = "v${version}"; + sha256 = "121121rg3daaqp91845fbyws6g28hyj1ywmh12n54r3nicb35g5q"; + }; + + buildInputs = [ + standard-library + ]; + + preBuild = '' + echo "module Everything where" > Everything.agda + find src -name '*.agda' | sed -e 's/src\///;s/\//./g;s/\.agda$//;s/^/import /' >> Everything.agda + ''; + + meta = with lib; { + description = + "A library for doing generic programming in Agda"; + homepage = src.meta.homepage; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ alexarice turion ]; + }; +} diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix index 12547bcb4c7..0b6c2ce064a 100644 --- a/pkgs/development/libraries/babl/default.nix +++ b/pkgs/development/libraries/babl/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "babl"; - version = "0.1.78"; + version = "0.1.80"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://download.gimp.org/pub/babl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "F9VJNjO/9VhdnzdbxN9ZJRV80ccMzXwipjW+dcFyUjo="; + sha256 = "13jgq2i1xkbqw9ijy8sy5iabf5jkviqi0wxlpjcm0n22mwwwqp7p"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix index 88d2f59f563..cbe628aaf4e 100644 --- a/pkgs/development/libraries/cpp-utilities/default.nix +++ b/pkgs/development/libraries/cpp-utilities/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "cpp-utilities"; - version = "5.5.0"; + version = "5.6.0"; src = fetchFromGitHub { owner = "Martchus"; repo = pname; rev = "v${version}"; - sha256 = "1kzwclf8l89dbw10ya0grhdj7dspmj7rg7rkaa8b7n5lgla968jr"; + sha256 = "0998pyrxicpalm2w1wmv7qrfhzgr45kl6xh9gv0zxhx2a4xjqq5v"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix index 4e7ce1d5ac8..60fc4067c0c 100644 --- a/pkgs/development/libraries/geos/default.nix +++ b/pkgs/development/libraries/geos/default.nix @@ -12,6 +12,9 @@ stdenv.mkDerivation rec { buildInputs = [ python ]; + # https://trac.osgeo.org/geos/ticket/993 + configureFlags = stdenv.lib.optional stdenv.isAarch32 "--disable-inline"; + meta = with stdenv.lib; { description = "C++ port of the Java Topology Suite (JTS)"; homepage = "https://trac.osgeo.org/geos"; diff --git a/pkgs/development/libraries/libmaxminddb/default.nix b/pkgs/development/libraries/libmaxminddb/default.nix index 493f1b5ce61..94a4b9ec57c 100644 --- a/pkgs/development/libraries/libmaxminddb/default.nix +++ b/pkgs/development/libraries/libmaxminddb/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libmaxminddb"; - version = "1.4.2"; + version = "1.4.3"; src = fetchurl { url = meta.homepage + "/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "0mnimbaxnnarlw7g1rh8lpxsyf7xnmzwcczcc3lxw8xyf6ljln6x"; + sha256 = "0fd4a4sxiiwzbd5h74wl1ijnb7xybjyybb7q41vdq3w8nk3zdzd5"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/mobile/cocoapods/Gemfile-beta.lock b/pkgs/development/mobile/cocoapods/Gemfile-beta.lock index 927265ce98b..98963ba4128 100644 --- a/pkgs/development/mobile/cocoapods/Gemfile-beta.lock +++ b/pkgs/development/mobile/cocoapods/Gemfile-beta.lock @@ -14,11 +14,10 @@ GEM json (>= 1.5.1) atomos (0.1.3) claide (1.0.3) - cocoapods (1.10.0.beta.1) - activesupport (> 5) + cocoapods (1.10.0.beta.2) addressable (~> 2.6) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.10.0.beta.1) + cocoapods-core (= 1.10.0.beta.2) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.4.0, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -33,7 +32,7 @@ GEM nap (~> 1.0) ruby-macho (~> 1.4) xcodeproj (>= 1.17.0, < 2.0) - cocoapods-core (1.10.0.beta.1) + cocoapods-core (1.10.0.beta.2) activesupport (> 5.0, < 6) addressable (~> 2.6) algoliasearch (~> 1.0) @@ -53,7 +52,7 @@ GEM netrc (~> 0.11) cocoapods-try (1.2.0) colored2 (3.1.2) - concurrent-ruby (1.1.6) + concurrent-ruby (1.1.7) escape (0.0.4) ethon (0.12.0) ffi (>= 1.3.0) @@ -77,7 +76,7 @@ GEM ethon (>= 0.9.0) tzinfo (1.2.7) thread_safe (~> 0.1) - xcodeproj (1.17.1) + xcodeproj (1.18.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) diff --git a/pkgs/development/mobile/cocoapods/gemset-beta.nix b/pkgs/development/mobile/cocoapods/gemset-beta.nix index 85df7053421..b456f728b4c 100644 --- a/pkgs/development/mobile/cocoapods/gemset-beta.nix +++ b/pkgs/development/mobile/cocoapods/gemset-beta.nix @@ -63,15 +63,15 @@ version = "1.0.3"; }; cocoapods = { - dependencies = ["activesupport" "addressable" "claide" "cocoapods-core" "cocoapods-deintegrate" "cocoapods-downloader" "cocoapods-plugins" "cocoapods-search" "cocoapods-trunk" "cocoapods-try" "colored2" "escape" "fourflusher" "gh_inspector" "molinillo" "nap" "ruby-macho" "xcodeproj"]; + dependencies = ["addressable" "claide" "cocoapods-core" "cocoapods-deintegrate" "cocoapods-downloader" "cocoapods-plugins" "cocoapods-search" "cocoapods-trunk" "cocoapods-try" "colored2" "escape" "fourflusher" "gh_inspector" "molinillo" "nap" "ruby-macho" "xcodeproj"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mx6gzs1d9za7crgwmk37ybmn395055kzya88iamgcj3yzvv3sqg"; + sha256 = "0jf5q75h410b6gymy86j4zy9yhb6n28wa7hrk8p7y2dsafdzbric"; type = "gem"; }; - version = "1.10.0.beta.1"; + version = "1.10.0.beta.2"; }; cocoapods-core = { dependencies = ["activesupport" "addressable" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "public_suffix" "typhoeus"]; @@ -79,10 +79,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ibc5sx2iqjwrgmd4y2cq6hyd6s37aqyh2w61vw71ap8khcjnwh4"; + sha256 = "0vrw6v5fp0m903ghvfwaw3mbxrr68x7hz9bj34rj4icirwp4ifyl"; type = "gem"; }; - version = "1.10.0.beta.1"; + version = "1.10.0.beta.2"; }; cocoapods-deintegrate = { groups = ["default"]; @@ -161,10 +161,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "094387x4yasb797mv07cs3g6f08y56virc2rjcpb1k79rzaj3nhl"; + sha256 = "1vnxrbhi7cq3p4y2v9iwd10v1c7l15is4var14hwnb2jip4fyjzz"; type = "gem"; }; - version = "1.1.6"; + version = "1.1.7"; }; escape = { groups = ["default"]; @@ -366,9 +366,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mv5rsbgwq4vzri31w2f1474arrsr5j69rdhklrci6jnjps8dmx9"; + sha256 = "18idiqfbvyrcyflccwy4qw125psckrnqy7ggci33m8f3zs8h7hnm"; type = "gem"; }; - version = "1.17.1"; + version = "1.18.0"; }; } \ No newline at end of file diff --git a/pkgs/development/python-modules/bids-validator/default.nix b/pkgs/development/python-modules/bids-validator/default.nix index 913ebeee326..bcf45aff832 100644 --- a/pkgs/development/python-modules/bids-validator/default.nix +++ b/pkgs/development/python-modules/bids-validator/default.nix @@ -12,7 +12,10 @@ buildPythonPackage rec { sha256 = "b8292f4efb3617532f93c60acfec242150406bfd9e298d7f01187d67c311aa91"; }; - propagatedBuildInputs = [ ]; + # needs packages which are not available in nixpkgs + doCheck = false; + + pythonImportsCheck = [ "bids_validator" ]; meta = with lib; { description = "Validator for the Brain Imaging Data Structure"; diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix index d900190a363..6ea7c8dd8ca 100644 --- a/pkgs/development/python-modules/cheroot/default.nix +++ b/pkgs/development/python-modules/cheroot/default.nix @@ -8,6 +8,7 @@ , pytest-mock , pytest-testmon , requests +, requests-toolbelt , requests-unixsocket , setuptools_scm , setuptools-scm-git-archive @@ -39,10 +40,15 @@ buildPythonPackage rec { pytest-mock pytest-testmon requests + requests-toolbelt requests-unixsocket trustme ]; + # avoid attempting to use 3 packages not available on nixpkgs + # (jaraco.apt, jaraco.context, yg.lockfile) + pytestFlagsArray = [ "--ignore=cheroot/test/test_wsgi.py" ]; + # Disable doctest plugin because times out # Disable xdist (-n arg) because it's incompatible with testmon # Deselect test_bind_addr_unix on darwin because times out diff --git a/pkgs/development/python-modules/construct/default.nix b/pkgs/development/python-modules/construct/default.nix index 59b3eb38afd..1f685360566 100644 --- a/pkgs/development/python-modules/construct/default.nix +++ b/pkgs/development/python-modules/construct/default.nix @@ -1,27 +1,24 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub -, six, pytest, arrow +{ stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder +, six, pytestCheckHook, pytest-benchmark, numpy, arrow, ruamel_yaml }: buildPythonPackage rec { pname = "construct"; - version = "2.9.45"; + version = "2.10.56"; + disabled = pythonOlder "3.6"; + + # no tests in PyPI tarball src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0ig66xrzswpkhhmw123p2nvr15a9lxz54a1fmycfdh09327c1d3y"; + sha256 = "1j4mqwyxkbdcsnnk5bbdcljv855w4fglaqc94q1xdzm8kgjxk4mr"; }; - propagatedBuildInputs = [ six ]; + checkInputs = [ pytestCheckHook pytest-benchmark numpy arrow ruamel_yaml ]; - checkInputs = [ pytest arrow ]; - - # TODO: figure out missing dependencies - doCheck = false; - checkPhase = '' - py.test -k 'not test_numpy and not test_gallery' tests - ''; + pytestFlagsArray = [ "--benchmark-disable" ]; meta = with stdenv.lib; { description = "Powerful declarative parser (and builder) for binary data"; diff --git a/pkgs/development/python-modules/jc/default.nix b/pkgs/development/python-modules/jc/default.nix index ae1cc51eab1..e37f5bc7e62 100644 --- a/pkgs/development/python-modules/jc/default.nix +++ b/pkgs/development/python-modules/jc/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "jc"; - version = "1.13.1"; + version = "1.13.4"; disabled = isPy27; src = fetchFromGitHub { owner = "kellyjonbrazil"; repo = "jc"; rev = "v${version}"; - sha256 = "1q5s81izfvxlifa0kzj2qih03d4d0gf7jxkilrcv40rsag5jfb16"; + sha256 = "0rwvyyrdnw43pixp8h51rncq2inc9pbbj1j2191y5si00pjw34zr"; }; propagatedBuildInputs = [ ruamel_yaml xmltodict pygments ]; diff --git a/pkgs/development/python-modules/pybids/default.nix b/pkgs/development/python-modules/pybids/default.nix index 01c0368662c..92c34c7bd4e 100644 --- a/pkgs/development/python-modules/pybids/default.nix +++ b/pkgs/development/python-modules/pybids/default.nix @@ -15,12 +15,12 @@ }: buildPythonPackage rec { - version = "0.10.2"; + version = "0.12.0"; pname = "pybids"; src = fetchPypi { inherit pname version; - sha256 = "6571ef82e03a958e56aa61cf5b15392f0b2d5dbca92f872061d81524e8da8525"; + sha256 = "0flvrb61hfyjjgdz07dlm8m9pqwb8qrx027zfrwa9d5nw1az7g28"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pykeepass/default.nix b/pkgs/development/python-modules/pykeepass/default.nix index 93f015e3a57..584c98f6cb0 100644 --- a/pkgs/development/python-modules/pykeepass/default.nix +++ b/pkgs/development/python-modules/pykeepass/default.nix @@ -1,5 +1,5 @@ { lib, fetchPypi, buildPythonPackage -, lxml, pycryptodome, construct +, lxml, pycryptodomex, construct , argon2_cffi, dateutil, future }: @@ -12,8 +12,12 @@ buildPythonPackage rec { sha256 = "b3e07eb2dd3aeb1dfa1a2d2d17be77066ee560c1e770f1c72d7ea5608117d284"; }; + postPatch = '' + substituteInPlace setup.py --replace "==" ">=" + ''; + propagatedBuildInputs = [ - lxml pycryptodome construct + lxml pycryptodomex construct argon2_cffi dateutil future ]; diff --git a/pkgs/development/python-modules/scikit-build/default.nix b/pkgs/development/python-modules/scikit-build/default.nix index 745723a01bc..6694c3abe4d 100644 --- a/pkgs/development/python-modules/scikit-build/default.nix +++ b/pkgs/development/python-modules/scikit-build/default.nix @@ -26,11 +26,11 @@ buildPythonPackage rec { pname = "scikit-build"; - version = "0.10.0"; + version = "0.11.1"; src = fetchPypi { inherit pname version; - sha256 = "7342017cc82dd6178e3b19377389b8a8d1f8b429d9cdb315cfb1094e34a0f526"; + sha256 = "0p4smkl2rbpl00m5va5qa8hp2hqb3284p2cs6k8zlmi4kgbdyh6s"; }; propagatedBuildInputs = [ @@ -59,15 +59,6 @@ buildPythonPackage rec { dontUseCmakeConfigure = true; - # scikit-build PR #458. Remove in version > 0.10.0 - patches = [ - (fetchpatch { - name = "python38-platform_linux_distribution-fix-458"; - url = "https://github.com/scikit-build/scikit-build/commit/faa7284e5bc4c72bc8744987acdf3297b5d2e7e4.patch"; - sha256 = "1hgl3cnkf266zaw534b64c88waxfz9721wha0m6j3hsnxk76ayjv"; - }) - ]; - disabledTests = lib.concatMapStringsSep " and " (s: "not " + s) ([ "test_hello_develop" # tries setuptools develop install "test_source_distribution" # pip has no way to install missing dependencies @@ -75,6 +66,7 @@ buildPythonPackage rec { "test_fortran_compiler" # passes if gfortran is available "test_install_command" # tries to alter out path "test_test_command" # tries to alter out path + "test_setup" # tries to install using distutils ]); checkPhase = '' diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index 72815750f21..61ed0e07af5 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "tfsec"; - version = "0.24.1"; + version = "0.25.0"; src = fetchFromGitHub { owner = "liamg"; repo = pname; rev = "v${version}"; - sha256 = "10sl3gpjvgjigkb0v35w96xm414widh0ygb6pnzgyz1ph8ilm86p"; + sha256 = "06sr20zrbhyj35cyw64bk6sjj9q9lh52kc8wg1ryaimr3dc6lrn1"; }; goPackagePath = "github.com/liamg/tfsec"; diff --git a/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix index 60c1662f9ff..845469e1c7d 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix @@ -419,6 +419,12 @@ stdenv.mkDerivation rec { # add nix environment vars to .bazelrc cat >> .bazelrc < -Date: Sun, 2 Aug 2020 23:05:53 +0000 -Subject: [PATCH] Fix flapping chained task logging test - -Creating 20 tasks was taking less than 0.0001 seconds which caused -the tests to fail. Increase the number of test tasks by two orders -of magnitude. ---- - tests/test_core.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tests/test_core.py b/tests/test_core.py -index 12ed00fde2c9..167eda3f6cb4 100644 ---- a/tests/test_core.py -+++ b/tests/test_core.py -@@ -1436,14 +1436,14 @@ async def test_chained_logging_hits_log_timeout(hass, caplog): - async def _task_chain_1(): - nonlocal created - created += 1 -- if created > 10: -+ if created > 1000: - return - hass.async_create_task(_task_chain_2()) - - async def _task_chain_2(): - nonlocal created - created += 1 -- if created > 10: -+ if created > 1000: - return - hass.async_create_task(_task_chain_1()) - diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 9f03633d62a..5c7227dc4e0 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20200716.0"; + version = "20200811.0"; src = fetchPypi { inherit pname version; - sha256 = "07h8llin0rx06c5v2skkij5756gqdq079ysxzmrm6xnzk9mcvfsk"; + sha256 = "0nrvfr4mw7h9py27hkak201jsfrvyxlgswfnda1l7k9ns9y4lpj8"; }; # no Python tests implemented diff --git a/pkgs/servers/home-assistant/relax-dependencies.patch b/pkgs/servers/home-assistant/relax-dependencies.patch index 03b488627d6..d06a37352f6 100644 --- a/pkgs/servers/home-assistant/relax-dependencies.patch +++ b/pkgs/servers/home-assistant/relax-dependencies.patch @@ -1,16 +1,7 @@ diff --git a/setup.py b/setup.py -index 7cf06942f3..b3dd1b3e1b 100755 +index 81f8727ed6..12200e0b9f 100755 --- a/setup.py +++ b/setup.py -@@ -32,7 +32,7 @@ PROJECT_URLS = { - PACKAGES = find_packages(exclude=["tests", "tests.*"]) - - REQUIRES = [ -- "aiohttp==3.6.1", -+ "aiohttp>=3.6.1", - "astral==1.10.1", - "async_timeout==3.0.1", - "attrs==19.3.0", @@ -43,13 +43,13 @@ REQUIRES = [ "jinja2>=2.11.1", "PyJWT==1.7.1", @@ -18,8 +9,7 @@ index 7cf06942f3..b3dd1b3e1b 100755 - "cryptography==2.9.2", + "cryptography>=2.9.2", "pip>=8.0.3", -- "python-slugify==4.0.0", -+ "python-slugify>=4.0.0", + "python-slugify==4.0.1", "pytz>=2020.1", "pyyaml==5.3.1", - "requests==2.24.0", diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index 8d8a0fceefb..867723018d3 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -16,12 +16,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null; assert http2Support -> nghttp2 != null; stdenv.mkDerivation rec { - version = "2.4.43"; + version = "2.4.46"; pname = "apache-httpd"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - sha256 = "0hqgw47r3p3521ygkkqs8s30s5crm683081avj6330gwncm6b5x4"; + sha256 = "1sj1rwgbcjgkzac3ybjy7j68c9b3dv3ap71m48mrjhf6w7vds3kl"; }; # FIXME: -dev depends on -doc diff --git a/pkgs/shells/zsh/pure-prompt/default.nix b/pkgs/shells/zsh/pure-prompt/default.nix index 5696ed61b97..bfcd3be5e9c 100644 --- a/pkgs/shells/zsh/pure-prompt/default.nix +++ b/pkgs/shells/zsh/pure-prompt/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "pure-prompt"; - version = "1.12.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "sindresorhus"; repo = "pure"; rev = "v${version}"; - sha256 = "1h04z7rxmca75sxdfjgmiyf1b5z2byfn6k4srls211l0wnva2r5y"; + sha256 = "16q9v4c8lagp4vxm7qhagilqnwf1g4pbds56x5wfj4cwc0x2gclw"; }; installPhase = '' @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Pretty, minimal and fast ZSH prompt"; - homepage = https://github.com/sindresorhus/pure; + homepage = "https://github.com/sindresorhus/pure"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ pacien pablovsky ]; diff --git a/pkgs/tools/admin/procs/default.nix b/pkgs/tools/admin/procs/default.nix index 5bfbb6d8c64..54bdf238e3f 100644 --- a/pkgs/tools/admin/procs/default.nix +++ b/pkgs/tools/admin/procs/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "procs"; - version = "0.10.3"; + version = "0.10.4"; src = fetchFromGitHub { owner = "dalance"; repo = pname; rev = "v${version}"; - sha256 = "0lg4v32jx0fxcjz6cj6cxxlg7rhj75k4p75izpkk4l11xpxqhgjm"; + sha256 = "1a28kkxcrdfmrq2mmsfkdxfp3msklwga5nbfhjb7a7s64xh8jmjv"; }; - cargoSha256 = "05qqy6l28ihn7hykkkh1x7z3q58cdrwv76fc22xjcg20985ac2nx"; + cargoSha256 = "1xlxjr0pkwlzm7f5xlrsf76in28r9jj41n6gn44vxqbh4x161gs1"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix index 1bfb2f88020..334cb00f3c1 100644 --- a/pkgs/tools/graphics/vips/default.nix +++ b/pkgs/tools/graphics/vips/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { pname = "vips"; - version = "8.9.2"; + version = "8.10.0"; outputs = [ "bin" "out" "man" "dev" ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { owner = "libvips"; repo = "libvips"; rev = "v${version}"; - sha256 = "0pgvcp5yjk96izh7kjfprjd9kddx7zqrwwhm8dyalhrwbmj6c2q5"; + sha256 = "1v5kfmv1vmzyvz1198jm1kl763s2i3mgnsn69vh6dslasbh769di"; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index bafe507a37c..ac315b2e816 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -1,4 +1,12 @@ -{ stdenv, rustPlatform, fetchFromGitHub, coreutils, libiconv, Security, installShellFiles }: +{ stdenv +, rustPlatform +, fetchFromGitHub +, installShellFiles +, makeWrapper +, coreutils +, libiconv +, Security +}: rustPlatform.buildRustPackage rec { pname = "broot"; @@ -13,7 +21,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "18b4lh5x25mbhpffva8ygzm5ad00svm1c3r83vfw0l2f61m7vyjh"; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ makeWrapper installShellFiles ]; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; @@ -27,6 +35,23 @@ rustPlatform.buildRustPackage rec { ''; postInstall = '' + # Do not nag users about installing shell integration, since + # it is impure. + wrapProgram $out/bin/broot \ + --set BR_INSTALL no + + # Install shell function for bash. + $out/bin/broot --print-shell-function bash > br.bash + install -Dm0444 -t $out/etc/profile.d br.bash + + # Install shell function for zsh. + $out/bin/broot --print-shell-function zsh > br.zsh + install -Dm0444 br.zsh $out/share/zsh/site-functions/br + + # Install shell function for fish + $out/bin/broot --print-shell-function fish > br.fish + install -Dm0444 -t $out/share/fish/vendor_functions.d br.fish + # install shell completion files OUT_DIR=$releaseDir/build/broot-*/out diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix index 4742aa41d7e..f4271e86b4c 100644 --- a/pkgs/tools/misc/lf/default.nix +++ b/pkgs/tools/misc/lf/default.nix @@ -17,17 +17,7 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; - # TODO: Setting buildFlags probably isn't working properly. I've tried a few - # variants, e.g.: - # - buildFlags = [ "-ldflags" "\"-s" "-w"" ""-X 'main.gVersion=${version}'\"" ]; - # - buildFlags = [ "-ldflags" "\\\"-X" "${goPackagePath}/main.gVersion=${version}\\\"" ]; - # Override the build phase (to set buildFlags): - buildPhase = '' - runHook preBuild - runHook renameImports - go install -ldflags="-s -w -X main.gVersion=r${version}" - runHook postBuild - ''; + buildFlagsArray = [ "-ldflags=-s -w -X main.gVersion=r${version}" ]; postInstall = '' install -D --mode=444 lf.desktop $out/share/applications/lf.desktop diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix index ff55ad6691d..4e087ee631e 100644 --- a/pkgs/tools/security/bitwarden/default.nix +++ b/pkgs/tools/security/bitwarden/default.nix @@ -16,11 +16,11 @@ let pname = "bitwarden"; version = { - x86_64-linux = "1.19.0"; + x86_64-linux = "1.20.1"; }.${system} or ""; sha256 = { - x86_64-linux = "16qlgnqyi0jwzlz8wg2628jhh83xsk46bl6p4dnwi0ay07lhab9w"; + x86_64-linux = "1lywslkpgg9rxwz7kwfknkgdi0r47j14i420r5yxgkaizb7ww27z"; }.${system} or ""; meta = with stdenv.lib; { diff --git a/pkgs/tools/security/ssh-audit/default.nix b/pkgs/tools/security/ssh-audit/default.nix index e615cec945d..884a3d90c4f 100644 --- a/pkgs/tools/security/ssh-audit/default.nix +++ b/pkgs/tools/security/ssh-audit/default.nix @@ -1,53 +1,44 @@ -{ fetchFromGitHub, python3Packages, stdenv }: +{ lib, fetchFromGitHub, python3Packages }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonApplication rec { pname = "ssh-audit"; - version = "1.7.0"; + version = "2.2.0"; src = fetchFromGitHub { - owner = "arthepsy"; + owner = "jtesta"; repo = pname; - rev = "refs/tags/v${version}"; - sha256 = "0akrychkdym9f6830ysq787c9nc0bkyqvy4h72498lyghwvwc2ms"; + rev = "v${version}"; + sha256 = "1z1h9nsgfaxdnkr9dvc0yzc23b3wz436rg2fycg2glwjhhal8az7"; }; - checkInputs = [ - python3Packages.pytest - python3Packages.pytestcov - ]; - - checkPhase = '' - py.test --cov-report= --cov=ssh-audit -v test - ''; - postPatch = '' - printf %s "$setupPy" > setup.py - mkdir scripts - cp ssh-audit.py scripts/ssh-audit - mkdir ssh_audit - cp ssh-audit.py ssh_audit/__init__.py + cp ./README.md pypi/sshaudit/ + cp ./ssh-audit.py pypi/sshaudit/sshaudit.py + mv pypi/* . + ls -lah ''; - setupPy = /* py */ '' - from distutils.core import setup - setup( - author='arthepsy', - description='${meta.description}', - license='${meta.license.spdxId}', - name='${pname}', - packages=['ssh_audit'], - scripts=['scripts/ssh-audit'], - url='${meta.homepage}', - version='${version}', - ) - ''; + checkInputs = with python3Packages; [ + pytestCheckHook + ]; - meta = { + disabledTests = [ + "test_resolve_error" + "test_resolve_hostname_without_records" + "test_resolve_ipv4" + "test_resolve_ipv6" + "test_resolve_ipv46_both" + "test_resolve_ipv46_order" + "test_invalid_host" + "test_invalid_port" + "test_not_connected_socket" + "test_ssh2_server_simple" + ]; + + meta = with lib; { description = "Tool for ssh server auditing"; - homepage = "https://github.com/arthepsy/ssh-audit"; - license = stdenv.lib.licenses.mit; - maintainers = [ - stdenv.lib.maintainers.tv - ]; + homepage = "https://github.com/jtesta/ssh-audit"; + license = licenses.mit; + maintainers = with maintainers; [ tv ]; }; } diff --git a/pkgs/tools/system/inxi/default.nix b/pkgs/tools/system/inxi/default.nix index a513a68c5f0..3f1e2d9a059 100644 --- a/pkgs/tools/system/inxi/default.nix +++ b/pkgs/tools/system/inxi/default.nix @@ -22,13 +22,13 @@ let ++ recommendedDisplayInformationPrograms; in stdenv.mkDerivation rec { pname = "inxi"; - version = "3.1.05-2"; + version = "3.1.05-4"; src = fetchFromGitHub { owner = "smxi"; repo = "inxi"; rev = version; - sha256 = "1a7nl2wk49yz5hcrph692xh5phv1mdg1m5cbvgv3ya12c6r32pa2"; + sha256 = "10x3rjydc9mlbfysj5mc6z9yfnhp9wllbza2cmjb1fz0x72rfrv7"; }; buildInputs = [ perl makeWrapper ]; diff --git a/pkgs/tools/text/mdbook/default.nix b/pkgs/tools/text/mdbook/default.nix index a36881f36b5..9dc0a7d443c 100644 --- a/pkgs/tools/text/mdbook/default.nix +++ b/pkgs/tools/text/mdbook/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mdbook"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "rust-lang-nursery"; repo = "mdBook"; rev = "v${version}"; - sha256 = "0rfcvcz3cawyzhdxqyasd9dwrb8c2j6annpl9jx2n6y3ysl345ry"; + sha256 = "0rkl5k7a9a0vx06jqvbgki2bwag0ar2pcbg3qi88xnjnnmphzpzj"; }; - cargoSha256 = "02vfdr1zlagjya5i9wf6ag9k01cf20jlm4yqvgrpjg9zrwv4xr4s"; + cargoSha256 = "1zhlb6wnjnayq833h62nm3ndlhiz1qajw8w5ccc88b8q8m4ipd7c"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/pkgs/tools/text/ugrep/default.nix b/pkgs/tools/text/ugrep/default.nix index 95399006dbb..3f3cbd8efcd 100644 --- a/pkgs/tools/text/ugrep/default.nix +++ b/pkgs/tools/text/ugrep/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ugrep"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "Genivia"; repo = pname; rev = "v${version}"; - sha256 = "0aps4srdss71p6riixcdk50f2484bmq6p2kg95gcb8wbcv3ad3c9"; + sha256 = "0z62rqcvcz8iy6ig7y05gn90m0pn99jc0ll9b82kdbr257kz91r1"; }; buildInputs = [ boost bzip2 lz4 pcre2 xz zlib ]; diff --git a/pkgs/top-level/agda-packages.nix b/pkgs/top-level/agda-packages.nix index 5b5b2d19181..3209aff9496 100644 --- a/pkgs/top-level/agda-packages.nix +++ b/pkgs/top-level/agda-packages.nix @@ -24,5 +24,7 @@ let agda-categories = callPackage ../development/libraries/agda/agda-categories { }; cubical = callPackage ../development/libraries/agda/cubical { }; + + generic = callPackage ../development/libraries/agda/generic { }; }; in mkAgdaPackages Agda diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 878615936ce..79a8951e8ab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5608,7 +5608,9 @@ in noip = callPackage ../tools/networking/noip { }; - nomad = callPackage ../applications/networking/cluster/nomad { }; + nomad = nomad_0_11; + nomad_0_11 = callPackage ../applications/networking/cluster/nomad/0.11.nix { }; + nomad_0_12 = callPackage ../applications/networking/cluster/nomad/0.12.nix { }; notable = callPackage ../applications/misc/notable { }; @@ -21462,6 +21464,7 @@ in mopidy-soundcloud mopidy-spotify mopidy-spotify-tunigo + mopidy-tunein mopidy-youtube; motif = callPackage ../development/libraries/motif { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 62488011644..3bfa780fe17 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12263,6 +12263,56 @@ let }; }; + Minion = buildPerlPackage { + pname = "Minion"; + version = "10.13"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SR/SRI/Minion-10.13.tar.gz"; + sha256 = "0nxk147v22lvc461923yv8fypqpbsajamvcvnlidk8bb54r33afj"; + }; + propagatedBuildInputs = [ Mojolicious ]; + meta = { + homepage = "https://github.com/mojolicious/minion"; + description = "A high performance job queue for Perl"; + license = stdenv.lib.licenses.artistic2; + maintainers = [ maintainers.sgo ]; + }; + }; + + MinionBackendSQLite = buildPerlModule { + pname = "Minion-Backend-SQLite"; + version = "5.0.3"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DB/DBOOK/Minion-Backend-SQLite-v5.0.3.tar.gz"; + sha256 = "1ch92846cgr1s1y6nlicjxlq9r4qh1a3fig0jlr7ligzw05mxib4"; + }; + buildInputs = [ ModuleBuildTiny ]; + propagatedBuildInputs = [ Minion MojoSQLite ]; + meta = { + homepage = "https://github.com/Grinnz/Minion-Backend-SQLite"; + description = "SQLite backend for Minion job queue"; + license = stdenv.lib.licenses.artistic2; + maintainers = [ maintainers.sgo ]; + }; + }; + + MinionBackendmysql = buildPerlPackage { + pname = "Minion-Backend-mysql"; + version = "0.21"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PR/PREACTION/Minion-Backend-mysql-0.21.tar.gz"; + sha256 = "0dbq0pmyjcrmdjpsrkr1pxvzvdphn6mb6lk5yyyhm380prwrjahn"; + }; + buildInputs = [ Testmysqld ]; + propagatedBuildInputs = [ Minion Mojomysql ]; + meta = { + homepage = "https://github.com/preaction/Minion-Backend-mysql"; + description = "MySQL backend for Minion job queue"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + MixinLinewise = buildPerlPackage { pname = "Mixin-Linewise"; version = "0.108"; @@ -19492,6 +19542,23 @@ let buildInputs = [ TestDeep TestDifferences TestException TestWarn ]; }; + Testmysqld = buildPerlModule { + pname = "Test-mysqld"; + version = "1.0013"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SO/SONGMU/Test-mysqld-1.0013.tar.gz"; + sha256 = "1vrybrh3is3xfwqdhxr1mvmmdyjhz9p0f6n8hasn7japj2h43bap"; + }; + buildInputs = [ pkgs.which ModuleBuildTiny TestSharedFork ]; + propagatedBuildInputs = [ ClassAccessorLite DBDmysql FileCopyRecursive ]; + meta = { + homepage = "https://github.com/kazuho/p5-test-mysqld"; + description = "Mysqld runner for tests"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + TestNeeds = buildPerlPackage { pname = "Test-Needs"; version = "0.002006";