diff options
128 files changed, 728 insertions, 765 deletions
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 3e527f9529e2d..b69988a92b0c6 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -248,3 +248,6 @@ /pkgs/development/compilers/nim @ehmry /pkgs/development/nim-packages @ehmry /pkgs/top-level/nim-packages.nix @ehmry + +# terraform providers +/pkgs/applications/networking/cluster/terraform-providers @zowoq diff --git a/.gitignore b/.gitignore index 85b94d8825214..1411ef7e1c7ce 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ .*.swp .*.swo .idea/ +.vscode/ outputs/ result result-* diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 40c117f2c1852..f82c1ce6c267a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -12851,6 +12851,12 @@ githubId = 2242427; name = "Yoann Ono"; }; + yana = { + email = "yana@riseup.net"; + github = "alpakido"; + githubId = 1643293; + name = "Yana Timoshenko"; + }; yarny = { email = "41838844+Yarny0@users.noreply.github.com"; github = "Yarny0"; @@ -12870,12 +12876,6 @@ githubId = 73759599; name = "Lara A."; }; - yegortimoshenko = { - email = "yegortimoshenko@riseup.net"; - github = "yegortimoshenko"; - githubId = 1643293; - name = "Yegor Timoshenko"; - }; yesbox = { email = "jesper.geertsen.jonsson@gmail.com"; github = "yesbox"; @@ -13434,6 +13434,12 @@ github = "zeri42"; githubId = 68825133; }; + zombiezen = { + name = "Ross Light"; + email = "ross@zombiezen.com"; + github = "zombiezen"; + githubId = 181535; + }; zseri = { name = "zseri"; email = "zseri.devel@ytrizja.de"; diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index 82965ff187546..ea6c11b25d02d 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -111,6 +111,13 @@ </listitem> <listitem> <para> + The MoinMoin wiki engine + (<literal>services.moinmoin</literal>) has been removed, + because Python 2 is being retired from nixpkgs. + </para> + </listitem> + <listitem> + <para> The <literal>wafHook</literal> hook now honors <literal>NIX_BUILD_CORES</literal> when <literal>enableParallelBuilding</literal> is not set diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index be9b57d1afeaf..3a56acf9fa949 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -43,6 +43,8 @@ In addition to numerous new and upgraded packages, this release has the followin - `services.kubernetes.addons.dashboard` was removed due to it being an outdated version. +- The MoinMoin wiki engine (`services.moinmoin`) has been removed, because Python 2 is being retired from nixpkgs. + - The `wafHook` hook now honors `NIX_BUILD_CORES` when `enableParallelBuilding` is not set explicitly. Packages can restore the old behaviour by setting `enableParallelBuilding=false`. - `pkgs.claws-mail-gtk2`, representing Claws Mail's older release version three, was removed in order to get rid of Python 2. diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 6fe6b41c6098e..dfdac4251a493 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1029,7 +1029,6 @@ ./services/web-apps/pgpkeyserver-lite.nix ./services/web-apps/powerdns-admin.nix ./services/web-apps/matomo.nix - ./services/web-apps/moinmoin.nix ./services/web-apps/openwebrx.nix ./services/web-apps/restya-board.nix ./services/web-apps/sogo.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 8e1d6f7bc4a57..c290741da0430 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -24,6 +24,7 @@ with lib; (mkRemovedOptionModule [ "services" "firefox" "syncserver" "user" ] "") (mkRemovedOptionModule [ "services" "firefox" "syncserver" "group" ] "") (mkRemovedOptionModule [ "services" "marathon" ] "The corresponding package was removed from nixpkgs.") + (mkRemovedOptionModule [ "services" "moinmoin" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "mesos" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "winstone" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "networking" "vpnc" ] "Use environment.etc.\"vpnc/service.conf\" instead.") diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix index a47de7e04f7af..66a47bcaab6c9 100644 --- a/nixos/modules/security/wrappers/default.nix +++ b/nixos/modules/security/wrappers/default.nix @@ -244,8 +244,6 @@ in security.apparmor.includes."nixos/security.wrappers" = '' include "${pkgs.apparmorRulesFromClosure { name="security.wrappers"; } [ securityWrapper - pkgs.stdenv.cc.cc - pkgs.stdenv.cc.libc ]}" ''; diff --git a/nixos/modules/services/web-apps/moinmoin.nix b/nixos/modules/services/web-apps/moinmoin.nix deleted file mode 100644 index efb73124a2373..0000000000000 --- a/nixos/modules/services/web-apps/moinmoin.nix +++ /dev/null @@ -1,304 +0,0 @@ -{ config, lib, pkgs, ... }: -with lib; - -let - cfg = config.services.moinmoin; - python = pkgs.python27; - pkg = python.pkgs.moinmoin; - dataDir = "/var/lib/moin"; - usingGunicorn = cfg.webServer == "nginx-gunicorn" || cfg.webServer == "gunicorn"; - usingNginx = cfg.webServer == "nginx-gunicorn"; - user = "moin"; - group = "moin"; - - uLit = s: ''u"${s}"''; - indentLines = n: str: concatMapStrings (line: "${fixedWidthString n " " " "}${line}\n") (splitString "\n" str); - - moinCliWrapper = wikiIdent: pkgs.writeShellScriptBin "moin-${wikiIdent}" '' - ${pkgs.su}/bin/su -s ${pkgs.runtimeShell} -c "${pkg}/bin/moin --config-dir=/var/lib/moin/${wikiIdent}/config $*" ${user} - ''; - - wikiConfig = wikiIdent: w: '' - # -*- coding: utf-8 -*- - - from MoinMoin.config import multiconfig, url_prefix_static - - class Config(multiconfig.DefaultConfig): - ${optionalString (w.webLocation != "/") '' - url_prefix_static = '${w.webLocation}' + url_prefix_static - ''} - - sitename = u'${w.siteName}' - page_front_page = u'${w.frontPage}' - - data_dir = '${dataDir}/${wikiIdent}/data' - data_underlay_dir = '${dataDir}/${wikiIdent}/underlay' - - language_default = u'${w.languageDefault}' - ${optionalString (w.superUsers != []) '' - superuser = [${concatMapStringsSep ", " uLit w.superUsers}] - ''} - - ${indentLines 4 w.extraConfig} - ''; - wikiConfigFile = name: wiki: pkgs.writeText "${name}.py" (wikiConfig name wiki); - -in -{ - options.services.moinmoin = with types; { - enable = mkEnableOption "MoinMoin Wiki Engine"; - - webServer = mkOption { - type = enum [ "nginx-gunicorn" "gunicorn" "none" ]; - default = "nginx-gunicorn"; - example = "none"; - description = '' - Which web server to use to serve the wiki. - Use <literal>none</literal> if you want to configure this yourself. - ''; - }; - - gunicorn.workers = mkOption { - type = ints.positive; - default = 3; - example = 10; - description = '' - The number of worker processes for handling requests. - ''; - }; - - wikis = mkOption { - type = attrsOf (submodule ({ name, ... }: { - options = { - siteName = mkOption { - type = str; - default = "Untitled Wiki"; - example = "ExampleWiki"; - description = '' - Short description of your wiki site, displayed below the logo on each page, and - used in RSS documents as the channel title. - ''; - }; - - webHost = mkOption { - type = str; - description = "Host part of the wiki URL. If undefined, the name of the attribute set will be used."; - example = "wiki.example.org"; - }; - - webLocation = mkOption { - type = str; - default = "/"; - example = "/moin"; - description = "Location part of the wiki URL."; - }; - - frontPage = mkOption { - type = str; - default = "LanguageSetup"; - example = "FrontPage"; - description = '' - Front page name. Set this to something like <literal>FrontPage</literal> once languages are - configured. - ''; - }; - - superUsers = mkOption { - type = listOf str; - default = []; - example = [ "elvis" ]; - description = '' - List of trusted user names with wiki system administration super powers. - - Please note that accounts for these users need to be created using the <command>moin</command> command-line utility, e.g.: - <command>moin-<replaceable>WIKINAME</replaceable> account create --name=<replaceable>NAME</replaceable> --email=<replaceable>EMAIL</replaceable> --password=<replaceable>PASSWORD</replaceable></command>. - ''; - }; - - languageDefault = mkOption { - type = str; - default = "en"; - example = "de"; - description = "The ISO-639-1 name of the main wiki language. Languages that MoinMoin does not support are ignored."; - }; - - extraConfig = mkOption { - type = lines; - default = ""; - example = '' - show_hosts = True - search_results_per_page = 100 - acl_rights_default = u"Known:read,write,delete,revert All:read" - logo_string = u"<h2>\U0001f639</h2>" - theme_default = u"modernized" - - user_checkbox_defaults = {'show_page_trail': 0, 'edit_on_doubleclick': 0} - navi_bar = [u'SomePage'] + multiconfig.DefaultConfig.navi_bar - actions_excluded = multiconfig.DefaultConfig.actions_excluded + ['newaccount'] - - mail_smarthost = "mail.example.org" - mail_from = u"Example.Org Wiki <wiki@example.org>" - ''; - description = '' - Additional configuration to be appended verbatim to this wiki's config. - - See <link xlink:href='http://moinmo.in/HelpOnConfiguration' /> for documentation. - ''; - }; - - }; - config = { - webHost = mkDefault name; - }; - })); - example = literalExpression '' - { - "mywiki" = { - siteName = "Example Wiki"; - webHost = "wiki.example.org"; - superUsers = [ "admin" ]; - frontPage = "Index"; - extraConfig = "page_category_regex = ur'(?P<all>(Category|Kategorie)(?P<key>(?!Template)\S+))'" - }; - } - ''; - description = '' - Configurations of the individual wikis. Attribute names must be valid Python - identifiers of the form <literal>[A-Za-z_][A-Za-z0-9_]*</literal>. - - For every attribute <replaceable>WIKINAME</replaceable>, a helper script - moin-<replaceable>WIKINAME</replaceable> is created which runs the - <command>moin</command> command under the <literal>moin</literal> user (to avoid - file ownership issues) and with the right configuration directory passed to it. - ''; - }; - }; - - config = mkIf cfg.enable { - assertions = forEach (attrNames cfg.wikis) (wname: - { assertion = builtins.match "[A-Za-z_][A-Za-z0-9_]*" wname != null; - message = "${wname} is not valid Python identifier"; - } - ); - - users.users = { - moin = { - description = "MoinMoin wiki"; - home = dataDir; - group = group; - isSystemUser = true; - }; - }; - - users.groups = { - moin = { - members = mkIf usingNginx [ config.services.nginx.user ]; - }; - }; - - environment.systemPackages = [ pkg ] ++ map moinCliWrapper (attrNames cfg.wikis); - - systemd.services = mkIf usingGunicorn - (flip mapAttrs' cfg.wikis (wikiIdent: wiki: - nameValuePair "moin-${wikiIdent}" - { - description = "MoinMoin wiki ${wikiIdent} - gunicorn process"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - restartIfChanged = true; - restartTriggers = [ (wikiConfigFile wikiIdent wiki) ]; - - environment = let - penv = python.buildEnv.override { - # setuptools: https://github.com/benoitc/gunicorn/issues/1716 - extraLibs = [ python.pkgs.eventlet python.pkgs.setuptools pkg ]; - }; - in { - PYTHONPATH = "${dataDir}/${wikiIdent}/config:${penv}/${python.sitePackages}"; - }; - - preStart = '' - umask 0007 - rm -rf ${dataDir}/${wikiIdent}/underlay - cp -r ${pkg}/share/moin/underlay ${dataDir}/${wikiIdent}/ - chmod -R u+w ${dataDir}/${wikiIdent}/underlay - ''; - - startLimitIntervalSec = 30; - - serviceConfig = { - User = user; - Group = group; - WorkingDirectory = "${dataDir}/${wikiIdent}"; - ExecStart = ''${python.pkgs.gunicorn}/bin/gunicorn moin_wsgi \ - --name gunicorn-${wikiIdent} \ - --workers ${toString cfg.gunicorn.workers} \ - --worker-class eventlet \ - --bind unix:/run/moin/${wikiIdent}/gunicorn.sock - ''; - - Restart = "on-failure"; - RestartSec = "2s"; - - StateDirectory = "moin/${wikiIdent}"; - StateDirectoryMode = "0750"; - RuntimeDirectory = "moin/${wikiIdent}"; - RuntimeDirectoryMode = "0750"; - - NoNewPrivileges = true; - ProtectSystem = "strict"; - ProtectHome = true; - PrivateTmp = true; - PrivateDevices = true; - PrivateNetwork = true; - ProtectKernelTunables = true; - ProtectKernelModules = true; - ProtectControlGroups = true; - RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ]; - RestrictNamespaces = true; - LockPersonality = true; - MemoryDenyWriteExecute = true; - RestrictRealtime = true; - }; - } - )); - - services.nginx = mkIf usingNginx { - enable = true; - virtualHosts = flip mapAttrs' cfg.wikis (name: w: nameValuePair w.webHost { - forceSSL = mkDefault true; - enableACME = mkDefault true; - locations."${w.webLocation}" = { - extraConfig = '' - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header X-Forwarded-Host $host; - proxy_set_header X-Forwarded-Server $host; - - proxy_pass http://unix:/run/moin/${name}/gunicorn.sock; - ''; - }; - }); - }; - - systemd.tmpfiles.rules = [ - "d /run/moin 0750 ${user} ${group} - -" - "d ${dataDir} 0550 ${user} ${group} - -" - ] - ++ (concatLists (flip mapAttrsToList cfg.wikis (wikiIdent: wiki: [ - "d ${dataDir}/${wikiIdent} 0750 ${user} ${group} - -" - "d ${dataDir}/${wikiIdent}/config 0550 ${user} ${group} - -" - "L+ ${dataDir}/${wikiIdent}/config/wikiconfig.py - - - - ${wikiConfigFile wikiIdent wiki}" - # needed in order to pass module name to gunicorn - "L+ ${dataDir}/${wikiIdent}/config/moin_wsgi.py - - - - ${pkg}/share/moin/server/moin.wsgi" - # seed data files - "C ${dataDir}/${wikiIdent}/data 0770 ${user} ${group} - ${pkg}/share/moin/data" - # fix nix store permissions - "Z ${dataDir}/${wikiIdent}/data 0770 ${user} ${group} - -" - ]))); - }; - - meta.maintainers = with lib.maintainers; [ mmilata ]; -} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 0dbd367187716..db526df392b33 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -273,7 +273,6 @@ in misc = handleTest ./misc.nix {}; mjolnir = handleTest ./matrix/mjolnir.nix {}; mod_perl = handleTest ./mod_perl.nix {}; - moinmoin = handleTest ./moinmoin.nix {}; mongodb = handleTest ./mongodb.nix {}; moodle = handleTest ./moodle.nix {}; morty = handleTest ./morty.nix {}; diff --git a/nixos/tests/moinmoin.nix b/nixos/tests/moinmoin.nix deleted file mode 100644 index ac327498eba0f..0000000000000 --- a/nixos/tests/moinmoin.nix +++ /dev/null @@ -1,28 +0,0 @@ -import ./make-test-python.nix ({ pkgs, lib, ... }: { - name = "moinmoin"; - meta.maintainers = with lib.maintainers; [ mmilata ]; - - machine = - { ... }: - { services.moinmoin.enable = true; - services.moinmoin.wikis.ExampleWiki.superUsers = [ "admin" ]; - services.moinmoin.wikis.ExampleWiki.webHost = "localhost"; - - services.nginx.virtualHosts.localhost.enableACME = false; - services.nginx.virtualHosts.localhost.forceSSL = false; - }; - - testScript = '' - start_all() - - machine.wait_for_unit("moin-ExampleWiki.service") - machine.wait_for_unit("nginx.service") - machine.wait_for_file("/run/moin/ExampleWiki/gunicorn.sock") - - assert "If you have just installed" in machine.succeed("curl -L http://localhost/") - - assert "status success" in machine.succeed( - "moin-ExampleWiki account create --name=admin --email=admin@example.com --password=foo 2>&1" - ) - ''; -}) diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix index 4830476af2c8e..22d9b3fed976a 100644 --- a/pkgs/applications/audio/lmms/default.nix +++ b/pkgs/applications/audio/lmms/default.nix @@ -43,6 +43,6 @@ mkDerivation rec { homepage = "https://lmms.io"; license = licenses.gpl2Plus; platforms = [ "x86_64-linux" "i686-linux" ]; - maintainers = with maintainers; [ goibhniu yegortimoshenko ]; + maintainers = with maintainers; [ goibhniu yana ]; }; } diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index 564277562885d..7c93760d2ca31 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec { pname = "lollypop"; - version = "1.4.23"; + version = "1.4.26"; format = "other"; doCheck = false; @@ -34,7 +34,7 @@ python3.pkgs.buildPythonApplication rec { url = "https://gitlab.gnome.org/World/lollypop"; rev = "refs/tags/${version}"; fetchSubmodules = true; - sha256 = "sha256-wwdH3gMpYt40VGqrL1XfB1dOfg45zLKtTEI23AwjCis="; + sha256 = "sha256-Q/z9oET06DimMRZl03TgjEeheoVHtIkH+Z69qWZetcI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/milkytracker/default.nix b/pkgs/applications/audio/milkytracker/default.nix index 32e5cec9dd028..47fbd5794ea08 100644 --- a/pkgs/applications/audio/milkytracker/default.nix +++ b/pkgs/applications/audio/milkytracker/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Music tracker application, similar to Fasttracker II"; - homepage = "http://milkytracker.org"; + homepage = "https://milkytracker.org/"; license = licenses.gpl3Plus; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = with maintainers; []; diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index b44fc98722e90..412a6f7249568 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -32,13 +32,13 @@ let in stdenv.mkDerivation rec { pname = "neovim-unwrapped"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "neovim"; repo = "neovim"; rev = "v${version}"; - sha256 = "sha256-mVVZiDjAsAs4PgC8lHf0Ro1uKJ4OKonoPtF59eUd888="; + sha256 = "sha256-0XCW047WopPr3pRTy9rF3Ff6MvNRHT4FletzOERD41A="; }; patches = [ diff --git a/pkgs/applications/gis/gmt/dcw.nix b/pkgs/applications/gis/gmt/dcw.nix index 5672fe0905d74..627ca8088957c 100644 --- a/pkgs/applications/gis/gmt/dcw.nix +++ b/pkgs/applications/gis/gmt/dcw.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "dcw-gmt"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { url = "ftp://ftp.soest.hawaii.edu/gmt/dcw-gmt-${version}.tar.gz"; - sha256 = "sha256-XJCylo9Alc9epEo1TcnY+d0bj+VRTgM4/4W0jgNUeiU="; + sha256 = "sha256-KzAPAco1DbF6rdAmCuM7823GthvkFQ5mgpAzzsPWXDw="; }; installPhase = '' diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index a54f7197adb15..e229302bf5533 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "16.0.2"; + version = "16.1.2"; src = fetchurl { url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm"; - sha256 = "980af60ea53fd0c255cfa3faa9407b146658074ea411bc491f53a047352b5b66"; + sha256 = "b86ff3f77b17e7da66979fe8ea878685c0018273f5d0302f10d3094d502452ee"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/lightburn/default.nix b/pkgs/applications/graphics/lightburn/default.nix index 63dbbd791450b..4dc5506aed65b 100644 --- a/pkgs/applications/graphics/lightburn/default.nix +++ b/pkgs/applications/graphics/lightburn/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "lightburn"; - version = "1.0.04"; + version = "1.0.06"; nativeBuildInputs = [ p7zip @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/LightBurnSoftware/deployment/releases/download/${version}/LightBurn-Linux64-v${version}.7z"; - sha256 = "sha256-3uuYxDxlBlu3/4BhII36s+PsLJCmHDIE3fRAz6GO/js="; + sha256 = "sha256-2Wlyt9Xw/FNaFkN1Q6utXdGzp42piebESQARhfpvRhM="; }; buildInputs = [ diff --git a/pkgs/applications/graphics/pbrt/default.nix b/pkgs/applications/graphics/pbrt/default.nix index 9fdf92a4ae80a..587a078e0660a 100644 --- a/pkgs/applications/graphics/pbrt/default.nix +++ b/pkgs/applications/graphics/pbrt/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { buildInputs = [ zlib ]; meta = with lib; { - homepage = "http://pbrt.org"; + homepage = "https://pbrt.org/"; description = "The renderer described in the third edition of the book 'Physically Based Rendering: From Theory To Implementation'"; platforms = platforms.linux; license = licenses.bsd2; diff --git a/pkgs/applications/misc/heimer/default.nix b/pkgs/applications/misc/heimer/default.nix index dba3ef4ee8a88..1510c992f3548 100644 --- a/pkgs/applications/misc/heimer/default.nix +++ b/pkgs/applications/misc/heimer/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "heimer"; - version = "3.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "juzzlin"; repo = pname; rev = version; - sha256 = "sha256-Q1a+sGZTVUjViakBT3E7+AgqMSldAnp7UJcsSS6KZXs="; + sha256 = "sha256-F0Pl6Wk+sGfOegy7iljQH63kAMYlRYv7G9nBAAtDEkg="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 9340a6caccba3..34d565fdfeb59 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "hugo"; - version = "0.91.1"; + version = "0.91.2"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-TPJGRXiZQ7yEttGFpVdiFcyUL5emfjfuoq3k+dQmKCg="; + sha256 = "sha256-6bqtw0hUrRBhTwEDURaTjgl3aVVCbfxjoPRfhSd3LK8="; }; - vendorSha256 = "sha256-ViWbqWjlHd8yosxe+CF1GJ9oK+plOn9s7ruhgsX/v58="; + vendorSha256 = "sha256-CO+7WgoTsFCd9vkcALKcJP6Kj3CIWr5FF75/WgbK04g="; doCheck = false; diff --git a/pkgs/applications/misc/mkgmap/default.nix b/pkgs/applications/misc/mkgmap/default.nix index 668740acaf3a6..74926b252eb55 100644 --- a/pkgs/applications/misc/mkgmap/default.nix +++ b/pkgs/applications/misc/mkgmap/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Create maps for Garmin GPS devices from OpenStreetMap (OSM) data"; - homepage = "http://www.mkgmap.org.uk"; + homepage = "https://www.mkgmap.org.uk/"; downloadPage = "https://www.mkgmap.org.uk/download/mkgmap.html"; license = licenses.gpl2Only; maintainers = with maintainers; [ sikmir ]; diff --git a/pkgs/applications/misc/mkgmap/splitter/default.nix b/pkgs/applications/misc/mkgmap/splitter/default.nix index 564867712a67a..db89e538d51f6 100644 --- a/pkgs/applications/misc/mkgmap/splitter/default.nix +++ b/pkgs/applications/misc/mkgmap/splitter/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Utility for splitting OpenStreetMap maps into tiles"; - homepage = "http://www.mkgmap.org.uk"; + homepage = "https://www.mkgmap.org.uk/"; downloadPage = "https://www.mkgmap.org.uk/download/splitter.html"; license = licenses.gpl2Only; maintainers = with maintainers; [ sikmir ]; diff --git a/pkgs/applications/misc/nwg-panel/default.nix b/pkgs/applications/misc/nwg-panel/default.nix index 2b1e81720d834..6798e73c9314c 100644 --- a/pkgs/applications/misc/nwg-panel/default.nix +++ b/pkgs/applications/misc/nwg-panel/default.nix @@ -13,13 +13,13 @@ python3Packages.buildPythonApplication rec { pname = "nwg-panel"; - version = "0.5.1"; + version = "0.5.4"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-panel"; rev = "v${version}"; - sha256 = "0i3g6brw8y17lzq6yzqc91x5w8na8wpqj57zq72zhgdji39n0g0d"; + sha256 = "0vl9vfgpa1byf9vxn03j58h9zcbjd1y83b0kgv97cxm2mhqz12dg"; }; # No tests diff --git a/pkgs/applications/misc/redshift/575.patch b/pkgs/applications/misc/redshift/575.patch index d731d8ec43ad4..f5beeb6ce5187 100644 --- a/pkgs/applications/misc/redshift/575.patch +++ b/pkgs/applications/misc/redshift/575.patch @@ -1,5 +1,5 @@ From 467156efccc5e36a36bec8c0b64cc5a70f14d5ed Mon Sep 17 00:00:00 2001 -From: Yegor Timoshenko <yegortimoshenko@riseup.net> +From: Yana Timoshenko <yana@riseup.net> Date: Tue, 16 Jan 2018 11:43:46 +0000 Subject: [PATCH] Fix Autoconf script diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index 5798473db5e0f..311c28db556aa 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -108,7 +108,7 @@ rec { license = licenses.gpl3Plus; homepage = "http://jonls.dk/redshift"; platforms = platforms.unix; - maintainers = with maintainers; [ yegortimoshenko globin ]; + maintainers = with maintainers; [ globin yana ]; }; }; diff --git a/pkgs/applications/misc/snapmaker-luban/default.nix b/pkgs/applications/misc/snapmaker-luban/default.nix index 9d89a24f2423d..c6b178d75b03f 100644 --- a/pkgs/applications/misc/snapmaker-luban/default.nix +++ b/pkgs/applications/misc/snapmaker-luban/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "snapmaker-luban"; - version = "4.1.1"; + version = "4.1.2"; src = fetchurl { url = "https://github.com/Snapmaker/Luban/releases/download/v${version}/snapmaker-luban-${version}-linux-x64.tar.gz"; - sha256 = "sha256-M+e3dNK1Z1Nkswac04TkuYHFX/Y/Cz4Z6P1xGv99kOo="; + sha256 = "sha256-gS3MyXD5B9YQ+EXmIPZ+rDUE5H1AjRL64yXQX+5TM2Q="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/toggldesktop/default.nix b/pkgs/applications/misc/toggldesktop/default.nix index 44c46f7465505..dfd68fd5ac19c 100644 --- a/pkgs/applications/misc/toggldesktop/default.nix +++ b/pkgs/applications/misc/toggldesktop/default.nix @@ -16,7 +16,7 @@ let version = "20180522.005732"; src = fetchzip { - url = "https://github.com/yegortimoshenko/bugsnag-qt/archive/${version}.tar.gz"; + url = "https://github.com/alpakido/bugsnag-qt/archive/${version}.tar.gz"; sha256 = "02s6mlggh0i4a856md46dipy6mh47isap82jlwmjr7hfsk2ykgnq"; }; @@ -42,7 +42,7 @@ let version = "20190125.190943"; src = fetchzip { - url = "https://github.com/yegortimoshenko/qt-oauth-lib/archive/${version}.tar.gz"; + url = "https://github.com/alpakido/qt-oauth-lib/archive/${version}.tar.gz"; sha256 = "0zmfgvdf6n79mgfvbda7lkdxxlzjmy86436gqi2r5x05vq04sfrj"; }; @@ -143,7 +143,7 @@ buildEnv { description = "Client for Toggl time tracking service"; homepage = "https://github.com/toggl/toggldesktop"; license = licenses.bsd3; - maintainers = with maintainers; [ yegortimoshenko ]; + maintainers = with maintainers; [ yana ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index c53d4c132f4fa..642781d570a77 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -51,11 +51,11 @@ let in stdenv.mkDerivation rec { pname = "opera"; - version = "82.0.4227.23"; + version = "82.0.4227.43"; src = fetchurl { url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb"; - sha256 = "sha256-jA8fglRLH0aqhjsD65bsieplCLCJXgdBViPGrAu9sSQ="; + sha256 = "sha256-DFhf62dqk7qA2k+JgVqGLxF30UPwQwhXD105Qua25X0="; }; unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc ."; diff --git a/pkgs/applications/networking/cluster/terraform-providers/ansible/default.nix b/pkgs/applications/networking/cluster/terraform-providers/ansible/default.nix deleted file mode 100644 index b8e3c1540e94d..0000000000000 --- a/pkgs/applications/networking/cluster/terraform-providers/ansible/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, fetchFromGitHub, buildGoPackage }: -buildGoPackage rec { - pname = "terraform-provider-ansible"; - version = "1.0.3"; - - goPackagePath = "github.com/nbering/terraform-provider-ansible"; - goDeps = ./deps.nix; - - src = fetchFromGitHub { - owner = "nbering"; - repo = "terraform-provider-ansible"; - rev = "v${version}"; - sha256 = "0dqi9ym0xvnz3h73cmd1vf6k2qwfhxvj1mcakkpmsd4cpxq4l6pr"; - }; - - # Terraform allow checking the provider versions, but this breaks - # if the versions are not provided via file paths. - postBuild = "mv go/bin/terraform-provider-ansible{,_v${version}}"; - - meta = with lib; { - description = "A Terraform provider serving as an interop layer for an Ansible dynamic inventory script."; - homepage = "https://github.com/nbering/terraform-provider-ansible"; - license = licenses.mpl20; - maintainers = with maintainers; [ uskudnik ]; - }; -} diff --git a/pkgs/applications/networking/cluster/terraform-providers/ansible/deps.nix b/pkgs/applications/networking/cluster/terraform-providers/ansible/deps.nix deleted file mode 100644 index dc49f24afa590..0000000000000 --- a/pkgs/applications/networking/cluster/terraform-providers/ansible/deps.nix +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - goPackagePath = "github.com/hashicorp/terraform"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/terraform"; - rev = "v0.12.5"; - sha256 = "0p064rhaanwx4szs8hv6mdqad8d2bgfd94h2la11j58xbsxc7hap"; - }; - } -] diff --git a/pkgs/applications/networking/cluster/terraform-providers/cloudfoundry/default.nix b/pkgs/applications/networking/cluster/terraform-providers/cloudfoundry/default.nix deleted file mode 100644 index 05d46c079f834..0000000000000 --- a/pkgs/applications/networking/cluster/terraform-providers/cloudfoundry/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "terraform-provider-cloudfoundry"; - version = "0.14.2"; - - src = fetchFromGitHub { - owner = "cloudfoundry-community"; - repo = pname; - rev = "v${version}"; - sha256 = "12mx87dip6vn10zvkf4rgrd27k708lnl149j9xj7bmb8v9m1082v"; - }; - - vendorSha256 = "0kydjnwzj0fylizvk1vg42zyiy17qhz40z3iwa1r5bb20qkrlz93"; - - # needs a running cloudfoundry - doCheck = false; - - postInstall = "mv $out/bin/terraform-provider-cloudfoundry{,_v${version}}"; - - passthru = { provider-source-address = "registry.terraform.io/cloudfoundry-community/cloudfoundry"; }; - - meta = with lib; { - homepage = "https://github.com/cloudfoundry-community/terraform-provider-cloudfoundry"; - description = "Terraform provider for cloudfoundry"; - license = licenses.mpl20; - maintainers = with maintainers; [ ris ]; - }; -} diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index afcd55a2b54df..e58e5dfbd5114 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -13,11 +13,13 @@ let pname = data.repo; version = data.version; subPackages = [ "." ]; + doCheck = false; src = fetchFromGitHub { inherit (data) owner repo rev sha256; }; vendorSha256 = data.vendorSha256 or null; deleteVendor = data.deleteVendor or false; + proxyVendor = data.proxyVendor or false; # Terraform allow checking the provider versions, but this breaks # if the versions are not provided via file paths. @@ -31,6 +33,7 @@ let version = data.version; goPackagePath = "github.com/${data.owner}/${data.repo}"; subPackages = [ "." ]; + doCheck = false; src = fetchFromGitHub { inherit (data) owner repo rev sha256; }; @@ -51,16 +54,10 @@ let # These are the providers that don't fall in line with the default model special-providers = { # Packages that don't fit the default model - ansible = callPackage ./ansible { }; - cloudfoundry = callPackage ./cloudfoundry { }; gandi = callPackage ./gandi { }; - hcloud = callPackage ./hcloud { }; libvirt = callPackage ./libvirt { }; - linuxbox = callPackage ./linuxbox { }; - lxd = callPackage ./lxd { }; teleport = callPackage ./teleport { }; vpsadmin = callPackage ./vpsadmin { }; - vercel = callPackage ./vercel { }; } // (lib.optionalAttrs (config.allowAliases or false) { kubernetes-alpha = throw "This has been merged as beta into the kubernetes provider. See https://www.hashicorp.com/blog/beta-support-for-crds-in-the-terraform-provider-for-kubernetes for details"; }); diff --git a/pkgs/applications/networking/cluster/terraform-providers/hcloud/default.nix b/pkgs/applications/networking/cluster/terraform-providers/hcloud/default.nix deleted file mode 100644 index 5d0fcb13f179d..0000000000000 --- a/pkgs/applications/networking/cluster/terraform-providers/hcloud/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "terraform-provider-hcloud"; - version = "1.26.0"; - - src = fetchFromGitHub { - owner = "hetznercloud"; - repo = pname; - rev = "v${version}"; - sha256 = "04fa3qr65hg1ylq2933ark5q1za6k0a4ky36a6vrw2dcgpr4f9zs"; - }; - - vendorSha256 = "15gcnwylxkgjriqscd4lagmwfssagq0ksrlb2svidw9aahmr7hw0"; - - # Spends an awful time in other test folders, apparently tries to reach - # opencensus and fails. - checkPhase = '' - pushd hcloud - go test -v - popd - ''; - - postInstall = "mv $out/bin/terraform-provider-hcloud{,_v${version}}"; - - meta = with lib; { - homepage = "https://github.com/cloudfoundry-community/terraform-provider-cloudfoundry"; - description = "Terraform provider for cloudfoundry"; - license = licenses.mpl20; - maintainers = with maintainers; [ ris ]; - }; -} diff --git a/pkgs/applications/networking/cluster/terraform-providers/linuxbox/default.nix b/pkgs/applications/networking/cluster/terraform-providers/linuxbox/default.nix deleted file mode 100644 index 4f8c44aad3f1c..0000000000000 --- a/pkgs/applications/networking/cluster/terraform-providers/linuxbox/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "terraform-provider-linuxbox"; - version = "0.3.11"; - - src = fetchFromGitHub { - owner = "numtide"; - repo = pname; - rev = "v${version}"; - sha256 = "1sxb2iv4dl0rw3v1r7k5dfkyh14nmp19cprqafhb7ncarmvawq39"; - }; - - vendorSha256 = "16hp0pv1qpvr34ac1syjci39csvyj3c748inllypjwx76q6rwp7k"; - - postInstall = "mv $out/bin/terraform-provider-linuxbox{,_v${version}}"; - - passthru.provider-source-address = "registry.terraform.io/numtide/linuxbox"; - - meta = with lib; { - homepage = "https://github.com/numtide/terraform-provider-linuxbox"; - description = "Basic building block for Seed DevOps"; - license = licenses.bsd3; - maintainers = with maintainers; [ zimbatm ]; - }; -} diff --git a/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix b/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix deleted file mode 100644 index 4ea2194a03a3a..0000000000000 --- a/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "terraform-provider-lxd"; - version = "1.6.0"; - - src = fetchFromGitHub { - owner = "sl1pm4t"; - repo = "terraform-provider-lxd"; - rev = "v${version}"; - sha256 = "sha256-fl9sYoyrVV6LvnIrnyAXy18QLLazQajjcLO1JWsqAR4="; - }; - - vendorSha256 = "sha256-ervfG/BAaF4M+BXsp0eCDM6nPWQOS3pthClhArsUoYc="; - - doCheck = false; - - postBuild = "mv ../go/bin/terraform-provider-lxd{,_v${version}}"; - - meta = with lib; { - homepage = "https://github.com/sl1pm4t/terraform-provider-lxd"; - description = "Terraform provider for lxd"; - platforms = platforms.linux; - license = licenses.mpl20; - maintainers = with maintainers; [ gila ]; - }; -} diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 2dda8cee9ff31..6bcb2aa85bfa7 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -43,6 +43,15 @@ "vendorSha256": "18chs2723i2cxhhm649mz52pp6wrfqzxgk12zxq9idrhicchqnzg", "version": "1.149.0" }, + "ansible": { + "owner": "nbering", + "provider-source-address": "registry.terraform.io/nbering/ansible", + "repo": "terraform-provider-ansible", + "rev": "v1.0.4", + "sha256": "1djjcrcm9218rfn51kpzp3cbb5qbkfwpjqm9h9rhadibbvjmly6y", + "vendorSha256": "1kc47n1janmiwwjphvxpily3dwyy1axxh36aj3sb2kpawi4pq1rq", + "version": "1.0.4" + }, "archive": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/archive", @@ -188,6 +197,15 @@ "vendorSha256": "0qby6fa1x5fapgcy5i35dwwlkb2ggws9sxcssshzssy0fzpb3k87", "version": "3.6.0" }, + "cloudfoundry": { + "owner": "cloudfoundry-community", + "provider-source-address": "registry.terraform.io/cloudfoundry-community/cloudfoundry", + "repo": "terraform-provider-cloudfoundry", + "rev": "v0.15.0", + "sha256": "0kg9aivxlbkqgrwv0j02hfsaky5q4f0bmqihn589dsdk7jds66i7", + "vendorSha256": "19jnaazhdqagfx5wkpvrf0amf7d22kg6hzk0nsg888d0l4x93hna", + "version": "0.15.0" + }, "cloudinit": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/cloudinit", @@ -397,11 +415,12 @@ "google": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/google", + "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v3.76.0", - "sha256": "1j3q07v4r0a3mlkmpqw8nav5z09fwyms9xmlyk6k6xkkzr520xcp", - "vendorSha256": "1ffxfracj4545fzh6p6b0wal0j07807qc2q83qzchbalqvi7yhky", - "version": "3.76.0" + "rev": "v4.5.0", + "sha256": "173aqwrzqdb3y57wiq1dbgb74ksr063qqq1k178n4wrab4s1h3px", + "vendorSha256": "0f18fh0qi1v1hkq3j8nrc8x2rah7vk6njjgdakxr1g1xxv8f0nhx", + "version": "4.5.0" }, "google-beta": { "owner": "hashicorp", @@ -428,6 +447,15 @@ "sha256": "00l3cwvyyjk0n3j535qfj3bsf1s5l07786gnxycj0f8vz3a06bcq", "version": "1.6.0" }, + "hcloud": { + "owner": "hetznercloud", + "provider-source-address": "registry.terraform.io/hetznercloud/hcloud", + "repo": "terraform-provider-hcloud", + "rev": "v1.32.2", + "sha256": "0rr65bxd0w5r0zqgj975rzxw7j3wrav4dw9gl3ispfhkb9v1302f", + "vendorSha256": "0g8cbkg5kcddd1x3p6d8mb6mqwsayqby0mrrifkw5icf7rlaa0sl", + "version": "1.32.2" + }, "hedvig": { "owner": "terraform-providers", "repo": "terraform-provider-hedvig", @@ -607,6 +635,15 @@ "sha256": "17hnm7wivd75psap2qdmlnmmlf964s7jf4jrfgsm6njx32wwwfpp", "version": "1.12.3" }, + "linuxbox": { + "owner": "numtide", + "provider-source-address": "registry.terraform.io/numtide/linuxbox", + "repo": "terraform-provider-linuxbox", + "rev": "v0.4.2", + "sha256": "1ghlp0nnc67m5rsx6aixqxjd5vhpbi88gcfyv3710dvqxchdgscy", + "vendorSha256": "01d556pfaa2ycww5kgd1f3shp2i2r48kgwnls39lhplp5qmnkz4g", + "version": "0.4.2" + }, "local": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/local", @@ -630,6 +667,15 @@ "sha256": "00d8qx95cxaif636dyh935nv9nn6lmb1ybxy7n4myy9g80y50ap1", "version": "1.3.0" }, + "lxd": { + "owner": "terraform-lxd", + "provider-source-address": "registry.terraform.io/terraform-lxd/lxd", + "repo": "terraform-provider-lxd", + "rev": "v1.6.0", + "sha256": "07h159mjbddkf3ishhdknqn10pyb2wh9yavjps5mwmdbiii6qpvy", + "vendorSha256": "11x12jxh4q99hinpljqfchysgkhch93sgv0mz065ws20y0dxzfvs", + "version": "1.6.0" + }, "mailgun": { "owner": "terraform-providers", "repo": "terraform-provider-mailgun", @@ -1151,6 +1197,15 @@ "sha256": "06nk5c7lxs8fc04sz97lc3yk1zk1b9phkzw6fj9fnmpgaak87bj9", "version": "0.9.2" }, + "vercel": { + "owner": "ondrejsika", + "provider-source-address": "registry.terraform.io/ondrejsika/vercel", + "repo": "terraform-provider-vercel", + "rev": "v2.1.0", + "sha256": "06lskp3mmax7g0lchq6jaxavycj7snkhip9madzqkr552qvz5cgw", + "vendorSha256": "0s0kf1v2217q9hfmc7r2yybcfk33k566dfvs2jiq63kyjnadhb0k", + "version": "2.1.0" + }, "vra7": { "owner": "terraform-providers", "repo": "terraform-provider-vra7", diff --git a/pkgs/applications/networking/cluster/terraform-providers/vercel/default.nix b/pkgs/applications/networking/cluster/terraform-providers/vercel/default.nix deleted file mode 100644 index f37d1ac5d87af..0000000000000 --- a/pkgs/applications/networking/cluster/terraform-providers/vercel/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "terraform-provider-vercel"; - version = "2.1.0"; - - src = fetchFromGitHub { - owner = "ondrejsika"; - repo = pname; - rev = "v${version}"; - sha256 = "06lskp3mmax7g0lchq6jaxavycj7snkhip9madzqkr552qvz5cgw"; - }; - - vendorSha256 = "0s0kf1v2217q9hfmc7r2yybcfk33k566dfvs2jiq63kyjnadhb0k"; - - postInstall = "mv $out/bin/terraform-provider-vercel{,_v${version}}"; - - meta = with lib; { - homepage = "https://github.com/ondrejsika/terraform-provider-vercel"; - description = "Terraform provider for Vercel"; - maintainers = with maintainers; [ mmahut ]; - }; -} diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 92b52770e3355..a15305cba848a 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -65,6 +65,7 @@ let timstott zimbatm maxeaubrey + zowoq ]; }; } // attrs'); diff --git a/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix b/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix index bab9d12123df6..a150014daa7cd 100644 --- a/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix +++ b/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Temptin/SkypeExport"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ yegortimoshenko ]; + maintainers = with maintainers; [ yana ]; }; } diff --git a/pkgs/applications/networking/libcoap/default.nix b/pkgs/applications/networking/libcoap/default.nix index 643941b5fa897..ea4d27c6b412a 100644 --- a/pkgs/applications/networking/libcoap/default.nix +++ b/pkgs/applications/networking/libcoap/default.nix @@ -1,13 +1,16 @@ -{ fetchFromGitHub, automake, autoconf, which, pkg-config, libtool, lib, stdenv }: +{ fetchFromGitHub, automake, autoconf, which, pkg-config, libtool, lib, stdenv, gnutls, asciidoc, doxygen +, withTLS ? true +, withDocs ? true +}: stdenv.mkDerivation rec { pname = "libcoap"; - version = "4.2.1"; + version = "4.3.0"; src = fetchFromGitHub { repo = "libcoap"; owner = "obgm"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "1jkvha52lic13f13hnppizkl80bb2rciayb5hxici0gj6spphgha"; + sha256 = "1l031ys833gch600g9g3lvbsr4nysx6glbbj4lwvx3ywl0jr6l9k"; }; nativeBuildInputs = [ automake @@ -15,16 +18,15 @@ stdenv.mkDerivation rec { which libtool pkg-config - ]; + ] ++ lib.optional withTLS gnutls ++ lib.optionals withDocs [ doxygen asciidoc ] ; preConfigure = "./autogen.sh"; - configureFlags = [ - "--disable-documentation" - "--disable-shared" - ]; + configureFlags = [ "--disable-shared" ] + ++ lib.optional (!withDocs) "--disable-documentation" + ++ lib.optional withTLS "--enable-dtls"; meta = with lib; { homepage = "https://github.com/obgm/libcoap"; description = "A CoAP (RFC 7252) implementation in C"; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.bsd2; maintainers = [ maintainers.kmein ]; }; diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index 04c952cb63157..98298d854d5f4 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -27,11 +27,11 @@ with lib; stdenv.mkDerivation rec { pname = "mutt"; - version = "2.1.4"; + version = "2.1.5"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz"; - sha256 = "0yfvnjqw9l99kdcr995by3mx5vwad6b530x93yb8ipr3xa1bcq9k"; + sha256 = "1q1bq5qfv67s6ynbqga19ifaprgavhdbgg154kb9ffingvj0k8wj"; }; patches = optional smimeSupport (fetchpatch { diff --git a/pkgs/applications/science/machine-learning/streamlit/default.nix b/pkgs/applications/science/machine-learning/streamlit/default.nix index 26b241ff0ada9..f439b113d1ab3 100644..100755 --- a/pkgs/applications/science/machine-learning/streamlit/default.nix +++ b/pkgs/applications/science/machine-learning/streamlit/default.nix @@ -1,23 +1,79 @@ -{ lib, buildPythonApplication, fetchPypi - , altair, astor, base58, blinker, boto3, botocore, click, enum-compat - , future, pillow, protobuf, requests, toml, tornado_5, tzlocal, validators, watchdog - , jinja2, setuptools +{ + # Nix + lib, + buildPythonApplication, + fetchPypi, + + # Build inputs + altair, + astor, + base58, + blinker, + boto3, + botocore, + click, + cachetools, + enum-compat, + future, + GitPython, + jinja2, + pillow, + pyarrow, + pydeck, + pympler, + protobuf, + requests, + setuptools, + toml, + tornado, + tzlocal, + validators, + watchdog, }: -buildPythonApplication rec { +let + click_7 = click.overridePythonAttrs(old: rec { + version = "7.1.2"; + src = old.src.override { + inherit version; + sha256 = "d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a"; + }; + }); +in buildPythonApplication rec { pname = "streamlit"; - version = "0.50.2"; + version = "1.2.0"; format = "wheel"; # the only distribution available src = fetchPypi { inherit pname version format; - sha256 = "1wymv7qckafs0p2jdjlxjaf1xrhm3iyd185jkldanbb0na5n3ndz"; + sha256 = "1dzb68a8n8wvjppcmqdaqnh925b2dg6rywv51ac9q09zjxb6z11n"; }; propagatedBuildInputs = [ - altair astor base58 blinker boto3 botocore click enum-compat - future pillow protobuf requests toml tornado_5 tzlocal validators watchdog - jinja2 setuptools + altair + astor + base58 + blinker + boto3 + botocore + cachetools + click_7 + enum-compat + future + GitPython + jinja2 + pillow + protobuf + pyarrow + pydeck + pympler + requests + setuptools + toml + tornado + tzlocal + validators + watchdog ]; postInstall = '' @@ -30,5 +86,4 @@ buildPythonApplication rec { maintainers = with maintainers; [ yrashk ]; license = licenses.asl20; }; - } diff --git a/pkgs/applications/science/math/calc/default.nix b/pkgs/applications/science/math/calc/default.nix index 6b3dba0340fb3..5a9f1ef93fb82 100644 --- a/pkgs/applications/science/math/calc/default.nix +++ b/pkgs/applications/science/math/calc/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { pname = "calc"; - version = "2.14.0.8"; + version = "2.14.0.13"; src = fetchurl { urls = [ "https://github.com/lcn2/calc/releases/download/${version}/${pname}-${version}.tar.bz2" "http://www.isthe.com/chongo/src/calc/${pname}-${version}.tar.bz2" ]; - sha256 = "sha256-rWosRO7qfgbvylOE8Qf/rudWRAenR0181JKKU7Gig4Y="; + sha256 = "sha256-naNBismaWnzLjlUy49Rz9OfkhUcFdbnWxs917ogxTjk="; }; postPatch = '' diff --git a/pkgs/applications/version-management/git-and-tools/gg/default.nix b/pkgs/applications/version-management/git-and-tools/gg/default.nix new file mode 100644 index 0000000000000..a5ea070ec0f2a --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/gg/default.nix @@ -0,0 +1,55 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +, makeWrapper +, git +, pandoc +}: + +buildGoModule rec { + pname = "gg-scm"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "gg-scm"; + repo = "gg"; + rev = "v${version}"; + sha256 = "sha256-kLmu4h/EBbSFHrffvusKq38X3/ID9bOlLMvEUtnFGhk="; + }; + patches = [ ./skip-broken-revert-tests.patch ]; + subPackages = [ "cmd/gg" ]; + ldflags = [ + "-s" "-w" + "-X" "main.versionInfo=${version}" + "-X" "main.buildCommit=a0b348c9cef33fa46899f5e55e3316f382a09f6a+" + ]; + + vendorSha256 = "sha256-+ZmNXB+I6vPRbACwEkfl/vVmqoZy67Zn9SBrham5zRk="; + + nativeBuildInputs = [ git pandoc installShellFiles makeWrapper ]; + buildInputs = [ git ]; + + postInstall = '' + wrapProgram $out/bin/gg --suffix PATH : ${git}/bin + pandoc --standalone --to man misc/gg.1.md -o misc/gg.1 + installManPage misc/gg.1 + installShellCompletion --cmd gg \ + --bash misc/gg.bash \ + --zsh misc/_gg.zsh + ''; + + meta = with lib; { + mainProgram = "gg"; + description = "Git with less typing"; + longDescription = '' + gg is an alternative command-line interface for Git heavily inspired by Mercurial. + It's designed for less typing in common workflows, + making Git easier to use for both novices and advanced users alike. + ''; + homepage = "https://gg-scm.io/"; + changelog = "https://github.com/gg-scm/gg/blob/v${version}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ zombiezen ]; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/gg/skip-broken-revert-tests.patch b/pkgs/applications/version-management/git-and-tools/gg/skip-broken-revert-tests.patch new file mode 100644 index 0000000000000..f8540952ae7ca --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/gg/skip-broken-revert-tests.patch @@ -0,0 +1,12 @@ +diff --git a/cmd/gg/revert_test.go b/cmd/gg/revert_test.go +index 9420e9b..ff6ca93 100644 +--- a/cmd/gg/revert_test.go ++++ b/cmd/gg/revert_test.go +@@ -592,6 +592,7 @@ func TestRevert_LocalRename(t *testing.T) { + } + + func TestRevert_UnknownFile(t *testing.T) { ++ t.Skip("Broken in 1.1.0") + t.Parallel() + t.Run("EmptyRepo", func(t *testing.T) { + t.Parallel() diff --git a/pkgs/applications/version-management/p4/default.nix b/pkgs/applications/version-management/p4/default.nix index fd369601c6c4b..602d994998106 100644 --- a/pkgs/applications/version-management/p4/default.nix +++ b/pkgs/applications/version-management/p4/default.nix @@ -2,11 +2,12 @@ stdenv.mkDerivation rec { pname = "p4"; - version = "2020.1.2007551"; + version = "2021.2.2201121"; src = fetchurl { - url = "https://cdist2.perforce.com/perforce/r20.1/bin.linux26x86_64/helix-core-server.tgz"; - sha256 = "0ly9b838zrpp6841fzapizdd3xmria55bwfrh2j29qwxiwzqj80y"; + # actually https://cdist2.perforce.com/perforce/r21.2/bin.linux26x86_64/helix-core-server.tgz but upstream deletes releases + url = "http://web.archive.org/web/20211118024943/https://cdist2.perforce.com/perforce/r21.2/bin.linux26x86_64/helix-core-server.tgz"; + sha256 = "sha256-cmIMVek4lwVYJQbW8ziABftPZ0iIoAoSpR7cKuN4I7M="; }; sourceRoot = "."; @@ -16,8 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook ]; installPhase = '' - mkdir -p $out/bin - cp p4 p4broker p4d p4p $out/bin + install -D --target $out/bin p4 p4broker p4d p4p ''; meta = { diff --git a/pkgs/applications/window-managers/pekwm/default.nix b/pkgs/applications/window-managers/pekwm/default.nix index fcce16c08ba6e..5550e6f706e7b 100644 --- a/pkgs/applications/window-managers/pekwm/default.nix +++ b/pkgs/applications/window-managers/pekwm/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { appear as they should when starting applications. - Chainable Keygrabber, usability for everyone. ''; - homepage = "http://www.pekwm.org"; + homepage = "https://www.pekwm.org/"; license = licenses.gpl2Plus; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; diff --git a/pkgs/build-support/build-fhs-userenv/chrootenv/default.nix b/pkgs/build-support/build-fhs-userenv/chrootenv/default.nix index 15d7b31535803..b9d2de7277eb7 100644 --- a/pkgs/build-support/build-fhs-userenv/chrootenv/default.nix +++ b/pkgs/build-support/build-fhs-userenv/chrootenv/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Setup mount/user namespace for FHS emulation"; license = licenses.mit; - maintainers = with maintainers; [ yegortimoshenko ]; + maintainers = with maintainers; [ yana ]; platforms = platforms.linux; }; } diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 84222eca98bf2..e466ff7ecce8c 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -510,8 +510,7 @@ rec { tarball must contain an RPM specfile. */ buildRPM = attrs: runInLinuxImage (stdenv.mkDerivation ({ - prePhases = [ pkgs.prepareImagePhase pkgs.sysInfoPhase ]; - dontUnpack = true; + prePhases = [ "prepareImagePhase" "sysInfoPhase" ]; dontConfigure = true; outDir = "rpms/${attrs.diskImage.name}"; @@ -536,9 +535,7 @@ rec { buildPhase = '' eval "$preBuild" - # Hacky: RPM looks for <basename>.spec inside the tarball, so - # strip off the hash. - srcName="$(stripHash "$src")" + srcName="$(rpmspec --srpm -q --qf '%{source}' *.spec)" cp "$src" "$srcName" # `ln' doesn't work always work: RPM requires that the file is owned by root export HOME=/tmp/home diff --git a/pkgs/build-support/vm/test.nix b/pkgs/build-support/vm/test.nix index 384c920880839..ae6a10dea3b9c 100644 --- a/pkgs/build-support/vm/test.nix +++ b/pkgs/build-support/vm/test.nix @@ -9,20 +9,23 @@ with vmTools; buildHelloInVM = runInLinuxVM hello; - buildPanInVM = runInLinuxVM pan; + buildPcmanrmInVM = runInLinuxVM (pcmanfm.overrideAttrs (old: { + # goes out-of-memory with many cores + enableParallelBuilding = false; + })); - - testRPMImage = makeImageTestScript diskImages.fedora16x86_64; + testRPMImage = makeImageTestScript diskImages.fedora27x86_64; buildPatchelfRPM = buildRPM { name = "patchelf-rpm"; src = patchelf.src; - diskImage = diskImages.fedora16x86_64; + diskImage = diskImages.fedora27x86_64; + diskImageFormat = "qcow2"; }; - testUbuntuImage = makeImageTestScript diskImages.ubuntu810i386; + testUbuntuImage = makeImageTestScript diskImages.ubuntu1804i386; buildInDebian = runInLinuxImage (stdenv.mkDerivation { diff --git a/pkgs/data/fonts/victor-mono/default.nix b/pkgs/data/fonts/victor-mono/default.nix index 17ad7e23e8c9e..68f437a8fc8d0 100644 --- a/pkgs/data/fonts/victor-mono/default.nix +++ b/pkgs/data/fonts/victor-mono/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "1.5.0"; + version = "1.5.1"; in fetchzip { name = "victor-mono-${version}"; @@ -21,7 +21,7 @@ fetchzip { unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype ''; - sha256 = "1x3dnkq8awn5zniywap78qwp5nxmf14bq8snzsywk70ah0jmbawi"; + sha256 = "sha256-FHahUp/Ghjv6fwsjj1giVPlAIXRMSZCSLcVMiMHvV3A="; meta = with lib; { description = "Free programming font with cursive italics and ligatures"; diff --git a/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix b/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix new file mode 100644 index 0000000000000..22f9ac176aad5 --- /dev/null +++ b/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix @@ -0,0 +1,77 @@ +{ lib +, stdenv +, meson +, fetchurl +, python3 +, pkg-config +, gtk4 +, glib +, gtksourceview5 +, gsettings-desktop-schemas +, wrapGAppsHook4 +, ninja +, gnome +, enchant +, icu +, itstool +, libadwaita +, libxml2 +, pcre +, appstream-glib +, desktop-file-utils +}: + +stdenv.mkDerivation rec { + pname = "gnome-text-editor"; + version = "41.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-text-editor/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-YZ7FINbgkF1DEWcCTkPc4Nv2o0Xy1IaTUB1w3HYm+GE="; + }; + + nativeBuildInputs = [ + appstream-glib + desktop-file-utils + itstool + libxml2 # for xmllint + meson + ninja + pkg-config + python3 + wrapGAppsHook4 + ]; + + buildInputs = [ + enchant + icu + glib + gsettings-desktop-schemas + gtk4 + gtksourceview5 + libadwaita + pcre + ]; + + postPatch = '' + chmod +x build-aux/meson/postinstall.py + patchShebangs build-aux/meson/postinstall.py + substituteInPlace build-aux/meson/postinstall.py \ + --replace "gtk-update-icon-cache" "gtk4-update-icon-cache" + ''; + + + passthru = { + updateScript = gnome.updateScript { + packageName = "gnome-text-editor"; + }; + }; + + meta = with lib; { + homepage = "https://gitlab.gnome.org/GNOME/gnome-text-editor"; + description = "A Text Editor for GNOME"; + maintainers = teams.gnome.members; + license = licenses.gpl3Plus; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/compilers/go-jsonnet/default.nix b/pkgs/development/compilers/go-jsonnet/default.nix index 1d8b912a978b5..2b7c6a2f07154 100644 --- a/pkgs/development/compilers/go-jsonnet/default.nix +++ b/pkgs/development/compilers/go-jsonnet/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-jsonnet"; - version = "0.17.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "google"; repo = "go-jsonnet"; rev = "v${version}"; - sha256 = "1rprs8l15nbrx4dw4pdg81c5l22zhj80pl4zwqgsm4113wyyvc98"; + sha256 = "sha256-o/IjXskGaMhvQmTsAS745anGBMI2bwHf/EOEp57H8LU="; }; - vendorSha256 = "0nsm4gsbbn8myz4yfi6m7qc3iizhdambsr18iks0clkdn3mi2jn1"; + vendorSha256 = "sha256-fZBhlZrLcC4xj5uvb862lBOczGnJa9CceS3D8lUhBQo="; doCheck = false; diff --git a/pkgs/development/compilers/microscheme/default.nix b/pkgs/development/compilers/microscheme/default.nix index 1f3a98de821eb..fa65622ba0cdf 100644 --- a/pkgs/development/compilers/microscheme/default.nix +++ b/pkgs/development/compilers/microscheme/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder "out"}" ]; meta = with lib; { - homepage = "http://microscheme.org"; + homepage = "https://ryansuchocki.github.io/microscheme/"; description = "A Scheme subset for Atmel microcontrollers"; longDescription = '' Microscheme is a Scheme subset/variant designed for Atmel diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/development/libraries/CGAL/default.nix index d83560568121d..630ff8a6964f7 100644 --- a/pkgs/development/libraries/CGAL/default.nix +++ b/pkgs/development/libraries/CGAL/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "cgal"; - version = "5.3"; + version = "5.3.1"; src = fetchFromGitHub { owner = "CGAL"; repo = "releases"; rev = "CGAL-${version}"; - sha256 = "sha256-ogY47Ggtj9k2U5pop1DNFkTusgQi2nNLc5OGN45SBCk="; + sha256 = "sha256-atILY/d2b99v0Kk226KwJ/qEcJnWBhtge52wkz6Bgcg="; }; # note: optional component libCGAL_ImageIO would need zlib and opengl; diff --git a/pkgs/development/libraries/apache-activemq/default.nix b/pkgs/development/libraries/apache-activemq/default.nix index 745b9b562e4cb..b188754607d55 100644 --- a/pkgs/development/libraries/apache-activemq/default.nix +++ b/pkgs/development/libraries/apache-activemq/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "apache-activemq"; - version = "5.16.2"; + version = "5.16.3"; src = fetchurl { - sha256 = "sha256-IS/soe5Lx1C+/UWnNcv+8AwMmu5FHvURbpkTMMGrEFs="; + sha256 = "sha256-GEbaKYXsZCU+zEGlTxR3cx60dQ/oQKndn9/uiOXJQlI="; url = "mirror://apache/activemq/${version}/${pname}-${version}-bin.tar.gz"; }; diff --git a/pkgs/development/libraries/bctoolbox/default.nix b/pkgs/development/libraries/bctoolbox/default.nix index f03014b2cd701..2d8ddb27ad4aa 100644 --- a/pkgs/development/libraries/bctoolbox/default.nix +++ b/pkgs/development/libraries/bctoolbox/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "bctoolbox"; - version = "5.0.55"; + version = "5.0.58"; nativeBuildInputs = [ cmake bcunit ]; buildInputs = [ mbedtls ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-fZ+8XBTZ6/wNd8odzg20dAXtbjRudI6Nw0hKC9bopGo="; + sha256 = "sha256-N7XxGTZkMSL+zyKHteVeRoZ63ZdT5Pq60xi9v6QURxA="; }; # Do not build static libraries diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix index a860eed37a729..53409ec7f732b 100644 --- a/pkgs/development/libraries/glfw/3.x.nix +++ b/pkgs/development/libraries/glfw/3.x.nix @@ -6,14 +6,14 @@ }: stdenv.mkDerivation rec { - version = "3.3.5"; + version = "3.3.6"; pname = "glfw"; src = fetchFromGitHub { owner = "glfw"; repo = "GLFW"; rev = version; - sha256 = "sha256-1KkzYclOLGqiV1/8BsJ3e+pXMQ6a+sjLwZ7mjSuxxbA="; + sha256 = "sha256-mYcnucIRudLLySShKSDzsQfuoM2/0guKpeLSGuAWEkQ="; }; # Fix freezing on Wayland (https://github.com/glfw/glfw/pull/1711) diff --git a/pkgs/development/libraries/imgui/default.nix b/pkgs/development/libraries/imgui/default.nix index 94dd9f95d390e..038c5a0362005 100644 --- a/pkgs/development/libraries/imgui/default.nix +++ b/pkgs/development/libraries/imgui/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "imgui"; - version = "1.85"; + version = "1.86"; src = fetchFromGitHub { owner = "ocornut"; repo = "imgui"; rev = "v${version}"; - sha256 = "sha256-HQsGlsvmf3ikqhGnJHf/d6SRCY/QDeW7XUTwXQH/JYE="; + sha256 = "sha256-NuyWrtD+/bRkMlsvU0gNkQhDJVlSPPWhBELN/AtYRwk="; }; dontBuild = true; diff --git a/pkgs/development/libraries/libcacard/default.nix b/pkgs/development/libraries/libcacard/default.nix index 3585daefbf58d..1ab5b428f57a7 100644 --- a/pkgs/development/libraries/libcacard/default.nix +++ b/pkgs/development/libraries/libcacard/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { description = "Smart card emulation library"; homepage = "https://gitlab.freedesktop.org/spice/libcacard"; license = licenses.lgpl21; - maintainers = with maintainers; [ yegortimoshenko ]; + maintainers = with maintainers; [ yana ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libinotify-kqueue/default.nix b/pkgs/development/libraries/libinotify-kqueue/default.nix index ff74060d3d464..1f147b0ad5c57 100644 --- a/pkgs/development/libraries/libinotify-kqueue/default.nix +++ b/pkgs/development/libraries/libinotify-kqueue/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { description = "Inotify shim for macOS and BSD"; homepage = "https://github.com/libinotify-kqueue/libinotify-kqueue"; license = licenses.mit; - maintainers = with maintainers; [ yegortimoshenko ]; + maintainers = with maintainers; [ yana ]; platforms = with platforms; darwin ++ freebsd ++ netbsd ++ openbsd; }; } diff --git a/pkgs/development/libraries/liblcf/default.nix b/pkgs/development/libraries/liblcf/default.nix index 1e6f57368b788..50c41982450f9 100644 --- a/pkgs/development/libraries/liblcf/default.nix +++ b/pkgs/development/libraries/liblcf/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { description = "Library to handle RPG Maker 2000/2003 and EasyRPG projects"; homepage = "https://github.com/EasyRPG/liblcf"; license = licenses.mit; - maintainers = with maintainers; [ yegortimoshenko ]; + maintainers = with maintainers; [ yana ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/openfst/default.nix b/pkgs/development/libraries/openfst/default.nix index 08767680ffd6c..599d1cad0cc50 100644 --- a/pkgs/development/libraries/openfst/default.nix +++ b/pkgs/development/libraries/openfst/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { FSTs have key applications in speech recognition and synthesis, machine translation, optical character recognition, pattern matching, string processing, machine learning, information extraction and retrieval among others ''; - homepage = "http://www.openfst.org/twiki/bin/view/FST/WebHome"; + homepage = "https://www.openfst.org/twiki/bin/view/FST/WebHome"; license = licenses.asl20; maintainers = [ maintainers.dfordivam ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/opengrm-ngram/default.nix b/pkgs/development/libraries/opengrm-ngram/default.nix index 3b00ae17e9107..06f2e3542bba4 100644 --- a/pkgs/development/libraries/opengrm-ngram/default.nix +++ b/pkgs/development/libraries/opengrm-ngram/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Library to make and modify n-gram language models encoded as weighted finite-state transducers"; - homepage = "http://www.openfst.org/twiki/bin/view/GRM/NGramLibrary"; + homepage = "https://www.openfst.org/twiki/bin/view/GRM/NGramLibrary"; license = licenses.asl20; maintainers = with maintainers; [ mic92 ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/qrencode/default.nix b/pkgs/development/libraries/qrencode/default.nix index c005b835a9322..abab060bf2cd0 100644 --- a/pkgs/development/libraries/qrencode/default.nix +++ b/pkgs/development/libraries/qrencode/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ''; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ adolfogc yegortimoshenko ]; + maintainers = with maintainers; [ adolfogc yana ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/sentry-native/default.nix b/pkgs/development/libraries/sentry-native/default.nix index af2a5e64d119f..ba4c8fcd0efd4 100644 --- a/pkgs/development/libraries/sentry-native/default.nix +++ b/pkgs/development/libraries/sentry-native/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sentry-native"; - version = "0.4.12"; + version = "0.4.13"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-native"; rev = version; - sha256 = "sha256-ut864o4LHmuHYJszFz7LFoIiSvf6a0S42xmV51CVBQ0="; + sha256 = "sha256-btgv/GwwQhT/DtWhjM/g081UYLT7E76ZhqXZdMiIWsk="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/tdlib/default.nix b/pkgs/development/libraries/tdlib/default.nix index 089fd70f19d52..79895a63a34c6 100644 --- a/pkgs/development/libraries/tdlib/default.nix +++ b/pkgs/development/libraries/tdlib/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "tdlib"; - version = "1.7.12"; + version = "1.8.0"; src = fetchFromGitHub { owner = "tdlib"; repo = "td"; # https://github.com/tdlib/td/issues/1790 - rev = "a69030239c53951db8a1b0af6408f24d63f5dcb7"; - sha256 = "tqytmjij79YzvBP1abbA/Oavx28mvEGESn39b3HYAMg="; + rev = "b3ab664a18f8611f4dfcd3054717504271eeaa7a"; + sha256 = "OBgzFBi+lIBbKnHDm5D/F3Xi4s1x4geb+1OoBP3F+qY="; }; buildInputs = [ gperf openssl readline zlib ]; diff --git a/pkgs/development/mobile/imgpatchtools/default.nix b/pkgs/development/mobile/imgpatchtools/default.nix index 2b746423cfe99..f5725054bb5e6 100644 --- a/pkgs/development/mobile/imgpatchtools/default.nix +++ b/pkgs/development/mobile/imgpatchtools/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/erfanoabdi/imgpatchtools"; license = licenses.gpl3; - maintainers = with maintainers; [ yegortimoshenko ]; + maintainers = with maintainers; [ yana ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/php-packages/php-cs-fixer/default.nix b/pkgs/development/php-packages/php-cs-fixer/default.nix index 02461ca7188b4..8e3329ae0b114 100644 --- a/pkgs/development/php-packages/php-cs-fixer/default.nix +++ b/pkgs/development/php-packages/php-cs-fixer/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, makeWrapper, lib, php }: let pname = "php-cs-fixer"; - version = "3.3.2"; + version = "3.4.0"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar"; - sha256 = "sha256-iny2/L+RbwHUtCO3hQtEAbxocnUBG29DcyJnmk/EYT8="; + sha256 = "sha256-UlZ3L5JaFN988WaHeZZRdl9yif29zFO0LMiFDGkMFuQ="; }; dontUnpack = true; diff --git a/pkgs/development/python-modules/aiohue/default.nix b/pkgs/development/python-modules/aiohue/default.nix index fd15d3aa8f80b..1f479311af05b 100644 --- a/pkgs/development/python-modules/aiohue/default.nix +++ b/pkgs/development/python-modules/aiohue/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "aiohue"; - version = "3.0.10"; + version = "3.0.11"; src = fetchPypi { inherit pname version; - sha256 = "sha256-LwtE9F5ic0aZ9/q3dSWn20O27yW/QD/Yi1NPdFmiP10="; + sha256 = "sha256-McC5DX3Cti9eGpPniywNY2DvbAqHSFwhek85TJN/zn0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/deepdish/default.nix b/pkgs/development/python-modules/deepdish/default.nix new file mode 100644 index 0000000000000..6ae9316a0f6df --- /dev/null +++ b/pkgs/development/python-modules/deepdish/default.nix @@ -0,0 +1,41 @@ +{ lib +, fetchPypi +, buildPythonPackage +, numpy +, scipy +, tables +}: + +buildPythonPackage rec { + pname = "deepdish"; + version = "0.3.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "1wqzwh3y0mjdyba5kfbvlamn561d3afz50zi712c7klkysz3mzva"; + }; + + propagatedBuildInputs = [ + numpy + scipy + tables + ]; + + pythonImportsCheck = [ + "deepdish" + ]; + + # checkInputs = [ + # pandas + # ]; + + # The tests are broken: `ModuleNotFoundError: No module named 'deepdish.six.conf'` + doCheck = false; + + meta = with lib; { + description = "Flexible HDF5 saving/loading and other data science tools from the University of Chicago."; + homepage = "https://github.com/uchicago-cs/deepdish"; + license = licenses.asl20; + maintainers = with maintainers; [ ndl ]; + }; +} diff --git a/pkgs/development/python-modules/google-nest-sdm/default.nix b/pkgs/development/python-modules/google-nest-sdm/default.nix index 4a35812a19da0..93fa676f6f82f 100644 --- a/pkgs/development/python-modules/google-nest-sdm/default.nix +++ b/pkgs/development/python-modules/google-nest-sdm/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "google-nest-sdm"; - version = "0.4.9"; + version = "1.2.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "python-google-nest-sdm"; rev = version; - sha256 = "sha256-Y0p1Hu3hcJQzbHmwMaIC8l5W4GXuuX8LBLCOvQ1N0So="; + sha256 = "sha256-gg5JAkTUuch6HcRLl1Xm/LAoC32EcayG1w3Fk7GrZD8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/gruut-ipa/default.nix b/pkgs/development/python-modules/gruut-ipa/default.nix index 4fa9d62b7ac87..ad1da8b2917ab 100644 --- a/pkgs/development/python-modules/gruut-ipa/default.nix +++ b/pkgs/development/python-modules/gruut-ipa/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "gruut-ipa"; - version = "0.11.0"; + version = "0.12.0"; format = "setuptools"; src = fetchFromGitHub { owner = "rhasspy"; repo = pname; rev = "v${version}"; - sha256 = "08n79v60jhkz5vhychsicjz4bhz8v4gb2djmz5dfdaivyr0h3bsf"; + sha256 = "sha256-6pMdBKbp++/5321rc8A2euOSXZCHzHg+wmaEaMZ0egw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/gruut/default.nix b/pkgs/development/python-modules/gruut/default.nix index 75d0c365e610e..4718d8244d0c9 100644 --- a/pkgs/development/python-modules/gruut/default.nix +++ b/pkgs/development/python-modules/gruut/default.nix @@ -5,11 +5,15 @@ , fetchFromGitHub , Babel , gruut-ipa +, dateparser , jsonlines , num2words , python-crfsuite , dataclasses , python +, networkx +, glibcLocales +, pytestCheckHook }: let @@ -17,6 +21,7 @@ let "cs" "de" "es" + "en" "fr" "it" "nl" @@ -28,19 +33,21 @@ let in buildPythonPackage rec { pname = "gruut"; - version = "1.2.3"; + version = "2.2.0"; format = "setuptools"; src = fetchFromGitHub { owner = "rhasspy"; repo = pname; rev = "v${version}"; - sha256 = "sha256-qY4xsoVk1hyY9dYmVXaqDRjcShUQmp8VZOzAQNiC6EM="; + sha256 = "sha256-9vj3x2IjTso8ksN1cqe5frwg0Y3GhOB6bPWvaBSBOf8="; }; postPatch = '' substituteInPlace requirements.txt \ - --replace "Babel~=2.8.0" "Babel" + --replace "Babel~=2.8.0" "Babel" \ + --replace "dateparser~=1.0.0" "dateparser" \ + --replace "gruut_lang_en~=2.0.0" "gruut_lang_en" ''; propagatedBuildInputs = [ @@ -49,16 +56,28 @@ buildPythonPackage rec { jsonlines num2words python-crfsuite + dateparser + networkx ] ++ lib.optionals (pythonOlder "3.7") [ dataclasses ] ++ (map (lang: callPackage ./language-pack.nix { inherit lang version format src; }) langPkgs); - checkPhase = '' - runHook preCheck - ${python.interpreter} -m unittest discover - runHook postCheck + checkInputs = [ glibcLocales pytestCheckHook ]; + + disabledTests = [ + # https://github.com/rhasspy/gruut/issues/25 + "test_lexicon_external" + + # requires mishkal library + "test_fa" + "test_ar" + "test_lb" + ]; + + preCheck = '' + export LC_ALL=en_US.utf-8 ''; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 6f4e456d11bc7..287e12afe78e1 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "0.9.0"; + version = "0.9.1"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = version; - sha256 = "sha256-Tp8m5Kw+mubJXKgov+CbfwtzWYzmqyjK1Q9gRkivTxk="; + sha256 = "sha256-sxYa0SCsX1NZlCRMIpwyU1KPEteVH5HGLx1dFsbiu/E="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/libnacl/default.nix b/pkgs/development/python-modules/libnacl/default.nix index f8cb85ab41828..7ced26888b80e 100644 --- a/pkgs/development/python-modules/libnacl/default.nix +++ b/pkgs/development/python-modules/libnacl/default.nix @@ -2,6 +2,7 @@ , stdenv , buildPythonPackage , fetchFromGitHub +, fetchpatch , libsodium , pytestCheckHook }: @@ -17,6 +18,15 @@ buildPythonPackage rec { sha256 = "sha256-nttR9PQimhqd2pByJ5IJzJ4RmSI4y7lcX7a7jcK+vqc="; }; + patches = [ + # Fixes build on 32-bit platforms + (fetchpatch { + name = "fix-crypto_kdf_derive_from_key-32bit.patch"; + url = "https://github.com/saltstack/libnacl/commit/e8a1f95ee1d4d0806fb6aee793dcf308b05d485d.patch"; + sha256 = "sha256-z6TAVNfPcuWZ/hRgk6Aa8I1IGzne7/NYnUOOQ3TjGVU="; + }) + ]; + buildInputs = [ libsodium ]; postPatch = diff --git a/pkgs/development/python-modules/moinmoin/default.nix b/pkgs/development/python-modules/moinmoin/default.nix deleted file mode 100644 index b4ecf28724a46..0000000000000 --- a/pkgs/development/python-modules/moinmoin/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, buildPythonPackage, fetchurl, isPy3k -, pytest, werkzeug, pygments -}: - -buildPythonPackage rec { - pname = "moinmoin"; - version = "1.9.11"; - - # SyntaxError in setup.py - disabled = isPy3k; - - src = fetchurl { - url = "http://static.moinmo.in/files/moin-${version}.tar.gz"; - sha256 = "sha256-Ar4x1V851P4MYlPfi0ngG3bQlWNMvRtW0YX2bh4MPPU="; - }; - - patches = [ - # Recommended to install on their download page. - ./fix_tests.patch - ]; - - prePatch = '' - sed -i "s/\xfc/ü/" setup.cfg - ''; - - checkInputs = [ pytest werkzeug pygments ]; - - meta = with lib; { - description = "Advanced, easy to use and extensible WikiEngine"; - - homepage = "https://moinmo.in/"; - - license = licenses.gpl2Plus; - }; -} diff --git a/pkgs/development/python-modules/moinmoin/fix_tests.patch b/pkgs/development/python-modules/moinmoin/fix_tests.patch deleted file mode 100644 index e9856eeffca69..0000000000000 --- a/pkgs/development/python-modules/moinmoin/fix_tests.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -ru3 moin-1.9.9-old/MoinMoin/conftest.py moin-1.9.9-new/MoinMoin/conftest.py ---- moin-1.9.9-old/MoinMoin/conftest.py 2016-10-31 23:44:02.000000000 +0300 -+++ moin-1.9.9-new/MoinMoin/conftest.py 2018-02-18 12:13:19.551929093 +0300 -@@ -22,10 +22,11 @@ - - import atexit - import sys -+import os - - import py - --rootdir = py.magic.autopath().dirpath() -+rootdir = os.path.abspath(os.path.dirname(__file__)) - moindir = rootdir.join("..") - sys.path.insert(0, str(moindir)) - diff --git a/pkgs/development/python-modules/nltk/default.nix b/pkgs/development/python-modules/nltk/default.nix index df49f1d0f57b5..9267f70c2c016 100644 --- a/pkgs/development/python-modules/nltk/default.nix +++ b/pkgs/development/python-modules/nltk/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "3.6.6"; + version = "3.6.7"; pname = "nltk"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0f8ff4e261c78605bca284e8d2025e562304766156af32a1731f56b396ee364b"; + sha256 = "51bf1aef5304740a708be7c8e683f7798f03dc5c7a7e7feb758be9e95f4585e3"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/objax/default.nix b/pkgs/development/python-modules/objax/default.nix new file mode 100644 index 0000000000000..fb48f9141e2a8 --- /dev/null +++ b/pkgs/development/python-modules/objax/default.nix @@ -0,0 +1,46 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, jax +, jaxlib +, numpy +, parameterized +, pillow +, scipy +, tensorflow-tensorboard_2 ? null +}: + +buildPythonPackage rec { + pname = "objax"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "google"; + repo = "objax"; + rev = "v${version}"; + sha256 = "09gm61ghn5mi92q5mhx22mcv6aa6z78jsrnfar1hd3nwwyn9dq42"; + }; + + propagatedBuildInputs = [ + jax + jaxlib + numpy + parameterized + pillow + scipy + tensorflow-tensorboard_2 + ]; + + pythonImportsCheck = [ + "objax" + ]; + + meta = with lib; { + description = "Objax is a machine learning framework that provides an Object Oriented layer for JAX."; + homepage = "https://github.com/google/objax"; + license = licenses.asl20; + maintainers = with maintainers; [ ndl ]; + # Darwin doesn't have `tensorflow-tensorboard_2` which is required by wheel deps. + platforms = [ "aarch64-linux" "x86_64-linux" ]; + }; +} diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index feea54a77b22c..6f0f733c47235 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -8,6 +8,7 @@ , jbig2dec , lxml , mupdf +, packaging , pillow , psutil , pybind11 @@ -24,7 +25,7 @@ buildPythonPackage rec { pname = "pikepdf"; - version = "4.2.0"; + version = "4.3.0"; disabled = ! isPy3k; src = fetchFromGitHub { @@ -37,7 +38,7 @@ buildPythonPackage rec { extraPostFetch = '' rm "$out/.git_archival.txt" ''; - sha256 = "sha256-8ForstZzRpr2TnOgK/+y4aF3R7XMEYfcSQhntA765Co="; + hash = "sha256-9dSJ6+rZd49rFSQExYnFBGQGZ8MnFM+z/0Iz/nYkW4E="; }; patches = [ @@ -73,6 +74,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ defusedxml lxml + packaging pillow setuptools ]; diff --git a/pkgs/development/python-modules/plumbum/default.nix b/pkgs/development/python-modules/plumbum/default.nix index a99591c259d9e..e571f276f28f8 100644 --- a/pkgs/development/python-modules/plumbum/default.nix +++ b/pkgs/development/python-modules/plumbum/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "plumbum"; - version = "1.7.1"; + version = "1.7.2"; checkInputs = [ pytest ]; @@ -14,6 +14,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "3c0ac8c4ee57b2adddc82909d3c738a62ef5f77faf24ec7cb6f0a117e1679740"; + sha256 = "0d1bf908076bbd0484d16412479cb97d6843069ee19f99e267e11dd980040523"; }; } diff --git a/pkgs/development/python-modules/qtconsole/default.nix b/pkgs/development/python-modules/qtconsole/default.nix index b56e80eb80c7e..4cf9bd022daba 100644 --- a/pkgs/development/python-modules/qtconsole/default.nix +++ b/pkgs/development/python-modules/qtconsole/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "qtconsole"; - version = "5.2.1"; + version = "5.2.2"; src = fetchPypi { inherit pname version; - sha256 = "bb3b9f0d674055e627c1097779c0d5e028176706d3b6be39cf52235f6ddcc88e"; + sha256 = "8f9db97b27782184efd0a0f2d57ea3bd852d053747a2e442a9011329c082976d"; }; checkInputs = [ nose ] ++ lib.optionals isPy27 [mock]; diff --git a/pkgs/development/python-modules/vpk/default.nix b/pkgs/development/python-modules/vpk/default.nix index a65aacd4eb2cd..a39f0a47dfa8f 100644 --- a/pkgs/development/python-modules/vpk/default.nix +++ b/pkgs/development/python-modules/vpk/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "vpk"; - version = "1.3.3"; + version = "1.4.0"; src = fetchFromGitHub { owner = "ValvePython"; repo = "vpk"; rev = "v${version}"; - hash = "sha256-kFKu4fuclanMdlfA/2ZccglM7rSzaq9BbbSaKuIN+Pk="; + hash = "sha256-SPkPb8kveAR2cN9kd2plS+TjmBYBCfa6pJ0c22l69M0="; }; checkInputs = [ diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 2c03330ccbcd2..fdd6fefd76005 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -46,13 +46,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.695"; + version = "2.0.701"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - sha256 = "sha256-7ppEMlgdZrMWzKmJfivU6qLSHTgvC+WSiOLdjiRWKP8="; + sha256 = "sha256-jhMhi+72lB70WXzPRWfhZjqmkEjvBMjKcnVic41PDJk="; }; nativeBuildInputs = with py.pkgs; [ diff --git a/pkgs/development/tools/frugal/default.nix b/pkgs/development/tools/frugal/default.nix index 0fc0abca7b0c3..fb6a4f4962483 100644 --- a/pkgs/development/tools/frugal/default.nix +++ b/pkgs/development/tools/frugal/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "frugal"; - version = "3.14.11"; + version = "3.14.12"; src = fetchFromGitHub { owner = "Workiva"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XUG9Md6T0/+yn3KGqJO09FFlpuli2wJqOf/SEIVKXac="; + sha256 = "sha256-2fXefYvcclcxMeX6JtHjoVNRwJTsUAhxet646BDPHic="; }; subPackages = [ "." ]; - vendorSha256 = "sha256-Z42t9dGlNbSwNy2N/ZoEejkbIEeUUk87mcYhkTnxhpc="; + vendorSha256 = "sha256-4Ak+mh9ege38iO1QyxvGkYvRyU11QjphfLrit1qfu58="; meta = with lib; { description = "Thrift improved"; diff --git a/pkgs/development/tools/misc/premake/default.nix b/pkgs/development/tools/misc/premake/default.nix index ccd8a4574a1fc..192a7746203b0 100644 --- a/pkgs/development/tools/misc/premake/default.nix +++ b/pkgs/development/tools/misc/premake/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { setupHook = ./setup-hook.sh; meta = with lib; { - homepage = "http://industriousone.com/premake"; + homepage = "https://premake.github.io/"; description = "A simple build configuration and project generation tool using lua"; license = lib.licenses.bsd3; platforms = platforms.unix; diff --git a/pkgs/development/tools/perseus-cli/default.nix b/pkgs/development/tools/perseus-cli/default.nix new file mode 100644 index 0000000000000..9ec8aa21e2d31 --- /dev/null +++ b/pkgs/development/tools/perseus-cli/default.nix @@ -0,0 +1,28 @@ +{ lib, rustPlatform, fetchCrate, makeWrapper, wasm-pack }: + +rustPlatform.buildRustPackage rec { + pname = "perseus-cli"; + version = "0.3.0"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-YyQQjuxNUxuo2PFluGyT/CpG22tgjRCfmFKA5MFRgHo="; + }; + + cargoSha256 = "sha256-SKxPsltXFH+ENexn/KDD43hGLSTgvtU9hv9Vdi2oeFA="; + + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + wrapProgram $out/bin/perseus \ + --prefix PATH : "${lib.makeBinPath [ wasm-pack ]}" + ''; + + meta = with lib; { + homepage = "https://arctic-hen7.github.io/perseus"; + description = "A high-level web development framework for Rust with full support for server-side rendering and static generation"; + maintainers = with maintainers; [ max-niederman ]; + license = with licenses; [ mit ]; + mainProgram = "perseus"; + }; +} diff --git a/pkgs/development/tools/pup/default.nix b/pkgs/development/tools/pup/default.nix index 018232b3f40ad..8cdfddb7f0163 100644 --- a/pkgs/development/tools/pup/default.nix +++ b/pkgs/development/tools/pup/default.nix @@ -17,6 +17,6 @@ buildGoModule rec { description = "Parsing HTML at the command line"; homepage = "https://github.com/ericchiang/pup"; license = licenses.mit; - maintainers = with maintainers; [ yegortimoshenko SuperSandro2000 ]; + maintainers = with maintainers; [ SuperSandro2000 yana ]; }; } diff --git a/pkgs/games/easyrpg-player/default.nix b/pkgs/games/easyrpg-player/default.nix index 81968d25e3dc5..83e40a4c3407e 100644 --- a/pkgs/games/easyrpg-player/default.nix +++ b/pkgs/games/easyrpg-player/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { description = "RPG Maker 2000/2003 and EasyRPG games interpreter"; homepage = "https://easyrpg.org/"; license = licenses.gpl3; - maintainers = with maintainers; [ yegortimoshenko ]; + maintainers = with maintainers; [ yana ]; platforms = platforms.linux; }; } diff --git a/pkgs/games/fheroes2/default.nix b/pkgs/games/fheroes2/default.nix index bf40cd566cc28..287093354fc7a 100644 --- a/pkgs/games/fheroes2/default.nix +++ b/pkgs/games/fheroes2/default.nix @@ -1,5 +1,8 @@ { stdenv, lib, fetchFromGitHub , gettext, libpng, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, zlib + +# updater only +, nix-update-script }: stdenv.mkDerivation rec { @@ -29,6 +32,12 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + meta = with lib; { homepage = "https://github.com/ihhub/fheroes2"; description = "Free implementation of Heroes of Might and Magic II game engine"; diff --git a/pkgs/games/pokerth/default.nix b/pkgs/games/pokerth/default.nix index 1c9879f8beb9c..ffae1b5cd8f64 100644 --- a/pkgs/games/pokerth/default.nix +++ b/pkgs/games/pokerth/default.nix @@ -65,7 +65,7 @@ mkDerivation rec { homepage = "https://www.pokerth.net"; description = "Poker game ${target}"; license = licenses.gpl3; - maintainers = with maintainers; [ obadz yegortimoshenko ]; + maintainers = with maintainers; [ obadz yana ]; platforms = platforms.all; }; } diff --git a/pkgs/misc/emulators/epsxe/default.nix b/pkgs/misc/emulators/epsxe/default.nix index f70e90e987220..f39c2ae74ac46 100644 --- a/pkgs/misc/emulators/epsxe/default.nix +++ b/pkgs/misc/emulators/epsxe/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { homepage = "http://epsxe.com/"; description = "Enhanced PSX (PlayStation 1) emulator"; license = licenses.unfree; - maintainers = with maintainers; [ yegortimoshenko ]; + maintainers = with maintainers; [ yana ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/misc/emulators/mednaffe/default.nix b/pkgs/misc/emulators/mednaffe/default.nix index c8363b8d60417..4874d5efee7ae 100644 --- a/pkgs/misc/emulators/mednaffe/default.nix +++ b/pkgs/misc/emulators/mednaffe/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { description = "GTK-based frontend for mednafen emulator"; homepage = "https://github.com/AmatCoder/mednaffe"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ sheenobu yegortimoshenko AndersonTorres ]; + maintainers = with maintainers; [ sheenobu yana AndersonTorres ]; platforms = platforms.linux; }; } diff --git a/pkgs/misc/emulators/vice/default.nix b/pkgs/misc/emulators/vice/default.nix index 00819e3b35c47..bfe2cae5120f8 100644 --- a/pkgs/misc/emulators/vice/default.nix +++ b/pkgs/misc/emulators/vice/default.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { pname = "vice"; - version = "3.5"; + version = "3.6"; src = fetchurl { url = "mirror://sourceforge/vice-emu/vice-${version}.tar.gz"; - sha256 = "sha256-Vrl4+q64solgMr1gTQPDUBACGH7vHKWM7O1A8Rpl3A4="; + sha256 = "sha256-Zb/lXM5ifbm1oKx4dqkMCH6f6G6fVRfoCURsQGSi0/0="; }; nativeBuildInputs = [ diff --git a/pkgs/os-specific/windows/pthread-w32/default.nix b/pkgs/os-specific/windows/pthread-w32/default.nix index de909828f7a24..da0fe569a4800 100644 --- a/pkgs/os-specific/windows/pthread-w32/default.nix +++ b/pkgs/os-specific/windows/pthread-w32/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { description = "POSIX threads library for Windows"; homepage = "https://sourceware.org/pthreads-win32"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ yegortimoshenko ]; + maintainers = with maintainers; [ yana ]; platforms = platforms.windows; }; } diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix index 37ed309a61e02..e9f030dac7858 100644 --- a/pkgs/servers/dns/nsd/default.nix +++ b/pkgs/servers/dns/nsd/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "nsd"; - version = "4.3.8"; + version = "4.3.9"; src = fetchurl { url = "https://www.nlnetlabs.nl/downloads/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-EYl+JfcvWpj5ICvVN4yTaIbVQ3YFGmFNNojkUenLmeE="; + sha256 = "sha256-UxVJ8JKJ7L0Fgp4UuzRWMpTYW57d4sYToA9ZevITXo0="; }; prePatch = '' diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index a7612f855b88c..454b54886a88d 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2021.12.6"; + version = "2021.12.7"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index c9e06f1513837..b0d2063742391 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -265,7 +265,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2021.12.6"; + hassVersion = "2021.12.7"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -282,7 +282,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - hash = "sha256:0n01cjbbyb1i63z8zxkjlwssqpv6y41jzs7b7jk78w3qnbg15bk3"; + hash = "sha256:0jcnk43wm3xwvsfyvbswq681v2c3xmki1bakn0l12j6paida784y"; }; # leave this in, so users don't have to constantly update their downstream patch handling diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 30dee63f73ea2..a3ca2c07cdcf4 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 = "20211227.0"; + version = "20211229.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-HdjkquxQM3Vxl+avM0fGanUkCMoTlBHodXIfNhW2lC4="; + sha256 = "sha256-2hACC2542jz1DID7nV28keVVDDBOLW1QDYTLM4S1ZJ0="; }; # there is nothing to strip in this package diff --git a/pkgs/servers/meteor/default.nix b/pkgs/servers/meteor/default.nix index ac870a8d5d15b..fb9221b93964b 100644 --- a/pkgs/servers/meteor/default.nix +++ b/pkgs/servers/meteor/default.nix @@ -93,7 +93,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Complete open source platform for building web and mobile apps in pure JavaScript"; - homepage = "http://www.meteor.com"; + homepage = "https://www.meteor.com/"; license = licenses.mit; platforms = builtins.attrNames srcs; maintainers = with maintainers; [ cstrahan ]; diff --git a/pkgs/servers/sql/monetdb/default.nix b/pkgs/servers/sql/monetdb/default.nix index fe6e2cac92aaf..3a21676e710cf 100644 --- a/pkgs/servers/sql/monetdb/default.nix +++ b/pkgs/servers/sql/monetdb/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "monetdb"; - version = "11.41.11"; + version = "11.41.13"; src = fetchurl { url = "https://dev.monetdb.org/downloads/sources/archive/MonetDB-${version}.tar.bz2"; - sha256 = "sha256-SiZvAvsl2NPa5AxeLtpvWwDhl7ZC0Z/6H/l1hCGpWzw="; + sha256 = "sha256-42u/sWUEOlCGe9UaWnUQJJ39TIE6OBI/5P9sKxKvreM="; }; postPatch = '' diff --git a/pkgs/servers/sql/mysql/8.0.x.nix b/pkgs/servers/sql/mysql/8.0.x.nix index e37789e7ee6c2..58b264c9b1e2e 100644 --- a/pkgs/servers/sql/mysql/8.0.x.nix +++ b/pkgs/servers/sql/mysql/8.0.x.nix @@ -6,11 +6,11 @@ let self = stdenv.mkDerivation rec { pname = "mysql"; - version = "8.0.26"; + version = "8.0.27"; src = fetchurl { url = "https://dev.mysql.com/get/Downloads/MySQL-${self.mysqlVersion}/${pname}-${version}.tar.gz"; - sha256 = "sha256-293Nx3L4BscRo3MTY6UPPTWeqsnF0UgAhHKKHCzl2k0="; + sha256 = "sha256-Sn5y+Jnm8kvNR503jt0vMvWD5of5OiYpF3SBXVpUm5c="; }; patches = [ diff --git a/pkgs/servers/stayrtr/default.nix b/pkgs/servers/stayrtr/default.nix new file mode 100644 index 0000000000000..cee68bd2f61b9 --- /dev/null +++ b/pkgs/servers/stayrtr/default.nix @@ -0,0 +1,36 @@ +{ lib +, fetchFromGitHub +, buildGoModule +, stayrtr +, testVersion +}: + +buildGoModule rec { + pname = "stayrtr"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "bgp"; + repo = "stayrtr"; + rev = "v${version}"; + sha256 = "10ndb8p7znnjycwg56m63gzqf9zc6lq9mcvz4n48j0c4il5xyn8x"; + }; + vendorSha256 = "1nwrzbpqycr4ixk8a90pgaxcwakv5nlfnql6hmcc518qrva198wp"; + + ldflags = [ + "-s" + "-w" + "-X main.version=${version}" + ]; + + passthru.tests.version = testVersion { + package = stayrtr; + }; + + meta = with lib; { + description = "Simple RPKI-To-Router server. (Hard fork of GoRTR)"; + homepage = "https://github.com/bgp/stayrtr/"; + license = licenses.bsd3; + maintainers = with maintainers; [ _0x4A6F ]; + }; +} diff --git a/pkgs/tools/audio/tts/default.nix b/pkgs/tools/audio/tts/default.nix index 1a07d2f0c33e3..40399f26998ee 100644 --- a/pkgs/tools/audio/tts/default.nix +++ b/pkgs/tools/audio/tts/default.nix @@ -1,7 +1,6 @@ { lib , python3 , fetchFromGitHub -, fetchpatch }: # USAGE: @@ -16,18 +15,19 @@ python3.pkgs.buildPythonApplication rec { pname = "tts"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "coqui-ai"; repo = "TTS"; rev = "v${version}"; - sha256 = "sha256-ZcQUgr+1XTmXoyf2WNsP8Hept42JTFmKXdo0kcU6QWU="; + sha256 = "sha256-8a68iFbqqKwtZvufu1Vnv6hGHIQ3HU34wjuQsmr1NUA="; }; postPatch = '' sed -i requirements.txt \ -e 's!librosa==[^"]*!librosa!' \ + -e 's!gruut\[.*\]~=2.0.0!gruut!' \ -e 's!mecab-python3==[^"]*!mecab-python3!' \ -e 's!numba==[^"]*!numba!' \ -e 's!numpy==[^"]*!numpy!' \ @@ -86,6 +86,7 @@ python3.pkgs.buildPythonApplication rec { "test_multiscale_stft_loss" # Requires network acccess to download models "test_synthesize" + "test_run_all_models" ]; preCheck = '' diff --git a/pkgs/tools/bluetooth/blueberry/default.nix b/pkgs/tools/bluetooth/blueberry/default.nix index f139194e98b3e..2ef7fedefc406 100644 --- a/pkgs/tools/bluetooth/blueberry/default.nix +++ b/pkgs/tools/bluetooth/blueberry/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "blueberry"; - version = "1.4.5"; + version = "1.4.6"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-DDxrreo133DIn5XhXKgWvbhPV2NXdyyywC+e73W5aY4="; + sha256 = "sha256-4SKEkoIEflOX5WXJ7X3onrieecT2NoH/eV3H3Cx/SYQ="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/cd-dvd/ccd2iso/default.nix b/pkgs/tools/cd-dvd/ccd2iso/default.nix index ad3fee9792c6a..1fe606e6acc2c 100644 --- a/pkgs/tools/cd-dvd/ccd2iso/default.nix +++ b/pkgs/tools/cd-dvd/ccd2iso/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { description = "CloneCD to ISO converter"; homepage = "https://sourceforge.net/projects/ccd2iso/"; license = licenses.gpl2; - maintainers = with maintainers; [ yegortimoshenko ]; + maintainers = with maintainers; [ yana ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/filesystems/lfs/default.nix b/pkgs/tools/filesystems/lfs/default.nix index cae39cc471fd2..38746981588e6 100644 --- a/pkgs/tools/filesystems/lfs/default.nix +++ b/pkgs/tools/filesystems/lfs/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "lfs"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nRJ73j3l3xaFImhrHEGmfqESEEjVKhIwdNZNc/RqOcU="; + sha256 = "sha256-3zGCVT3SfQm72CF2MasT7k5r1Jx9DRUrXKHBSpvcv10="; }; - cargoSha256 = "sha256-iAz2s92hWkLCXoQ09mKCyI0yHvH55WaTSl+a5gz44bU="; + cargoSha256 = "sha256-Q4eNvOY5c4KybDKVhcOznxGPUgyjgEYPD8+9r6sECXA="; meta = with lib; { description = "Get information on your mounted disks"; diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index a0aea92ea4afa..50b9dba51d352 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -169,6 +169,6 @@ stdenv.mkDerivation rec { description = "Intelligent Input Bus, input method framework"; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = with maintainers; [ ttuegel yegortimoshenko ]; + maintainers = with maintainers; [ ttuegel yana ]; }; } diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix index 7b044fd0dd992..bf54d6a445efd 100644 --- a/pkgs/tools/misc/autorandr/default.nix +++ b/pkgs/tools/misc/autorandr/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "autorandr"; - version = "1.11"; + version = "1.12.1"; buildInputs = [ python3Packages.python ]; @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { owner = "phillipberndt"; repo = "autorandr"; rev = version; - sha256 = "0rmnqk2bi6bbd2if1rll37mlzlqxzmnazfffdhcpzskxwyaj4yn5"; + sha256 = "sha256-7SNnbgV6PeseBD6wdilEIOfOL2KVDpnlkSn9SBgRhhM="; }; meta = with lib; { diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix index fa9be5c84a67d..e9d38cbdcc2c8 100644 --- a/pkgs/tools/misc/direnv/default.nix +++ b/pkgs/tools/misc/direnv/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "direnv"; - version = "2.30.1"; + version = "2.30.2"; src = fetchFromGitHub { owner = "direnv"; repo = "direnv"; rev = "v${version}"; - sha256 = "sha256-4ojoV6BtPOaMnDierxlfkOuaP1KZGYNMImSURA33tfg="; + sha256 = "sha256-lQcy3EXl6KicAzRbypyX8sh39vNbZE2aUHBtwx07s9g="; }; vendorSha256 = "sha256-YhgQUl9fdictEtz6J88vEzznGd8Ipeb9AYo/p1ZLz5k="; diff --git a/pkgs/tools/misc/dpt-rp1-py/default.nix b/pkgs/tools/misc/dpt-rp1-py/default.nix index 75a95d1530352..5f1e53f8105fb 100644 --- a/pkgs/tools/misc/dpt-rp1-py/default.nix +++ b/pkgs/tools/misc/dpt-rp1-py/default.nix @@ -1,13 +1,13 @@ { lib, python3Packages, fetchFromGitHub }: python3Packages.buildPythonApplication rec { pname = "dpt-rp1-py"; - version = "0.1.15"; + version = "0.1.16"; src = fetchFromGitHub { owner = "janten"; repo = pname; rev = "v${version}"; - sha256 = "0kmhsx6n3wjzqcvfnpvdxiiwzxr51khgrl0kgaaas8hwq246l65d"; + sha256 = "0zvf09b9rzpx5b0w81ziqd7v321hfhgsgvshdx23karj2hf75bvj"; }; doCheck = false; diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix index b9ff4ad33d2c1..be24d3e2c0b71 100644 --- a/pkgs/tools/misc/mc/default.nix +++ b/pkgs/tools/misc/mc/default.nix @@ -17,6 +17,9 @@ , coreutils , autoreconfHook , autoSignDarwinBinariesHook + +# updater only +, writeScript }: stdenv.mkDerivation rec { @@ -69,6 +72,17 @@ stdenv.mkDerivation rec { $out/bin/mc ''; + passthru.updateScript = writeScript "update-mc" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl pcre common-updater-scripts + + set -eu -o pipefail + + # Expect the text in format of "Current version is: 4.8.27; ...". + new_version="$(curl -s https://midnight-commander.org/ | pcregrep -o1 'Current version is: (([0-9]+\.?)+);')" + update-source-version mc "$new_version" + ''; + meta = with lib; { description = "File Manager and User Shell for the GNU Project"; downloadPage = "https://www.midnight-commander.org/downloads/"; diff --git a/pkgs/tools/misc/mysqltuner/default.nix b/pkgs/tools/misc/mysqltuner/default.nix index d55d2971535d8..f4dbf2cef6e12 100644 --- a/pkgs/tools/misc/mysqltuner/default.nix +++ b/pkgs/tools/misc/mysqltuner/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Make recommendations for increased performance and stability of MariaDB/MySQL"; - homepage = "http://mysqltuner.com"; + homepage = "https://mysqltuner.com/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ peterhoeg shamilton ]; }; diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/tools/misc/rpm-ostree/default.nix index c4764923c7a96..bfc2ce2c0e99f 100644 --- a/pkgs/tools/misc/rpm-ostree/default.nix +++ b/pkgs/tools/misc/rpm-ostree/default.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation rec { pname = "rpm-ostree"; - version = "2021.9"; + version = "2021.14"; outputs = [ "out" "dev" "man" "devdoc" ]; src = fetchurl { url = "https://github.com/coreos/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-DvATvvAliJhEItbOlK1CA/ibhzImw651pkplqpRG+OQ="; + sha256 = "sha256-WOG21wSbjXMc/6OHJBEKFOhvnIt+SFpZikB8XkfN32Y="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/tio/default.nix b/pkgs/tools/misc/tio/default.nix index 9b8e76f10c435..b49cfa44c18dc 100644 --- a/pkgs/tools/misc/tio/default.nix +++ b/pkgs/tools/misc/tio/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { description = "Serial console TTY"; homepage = "https://tio.github.io/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ yegortimoshenko ]; + maintainers = with maintainers; [ yana ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/networking/wireguard-go/default.nix b/pkgs/tools/networking/wireguard-go/default.nix index 3fa487a7dc6d5..6f7bc6caa7f05 100644 --- a/pkgs/tools/networking/wireguard-go/default.nix +++ b/pkgs/tools/networking/wireguard-go/default.nix @@ -25,6 +25,6 @@ buildGoPackage rec { description = "Userspace Go implementation of WireGuard"; homepage = "https://git.zx2c4.com/wireguard-go/about/"; license = licenses.mit; - maintainers = with maintainers; [ elseym kirelagin yegortimoshenko zx2c4 ]; + maintainers = with maintainers; [ elseym kirelagin yana zx2c4 ]; }; } diff --git a/pkgs/tools/security/doppler/default.nix b/pkgs/tools/security/doppler/default.nix index 2bd087fe4a46f..27b44ce6042a7 100644 --- a/pkgs/tools/security/doppler/default.nix +++ b/pkgs/tools/security/doppler/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "doppler"; - version = "3.35.0"; + version = "3.36.2"; src = fetchFromGitHub { owner = "dopplerhq"; repo = "cli"; rev = version; - sha256 = "sha256-Eb6msMl5X8ct9XlVlrxbnkXSEouzK/jCW94qm3PTXBQ="; + sha256 = "sha256-T8WqQTB3ogxGiImkyZUUbKcXTdSgGM0Vb4OkckslzYE="; }; vendorSha256 = "sha256-VPxHxNtDeP5CFDMTeMsZYED9ZGWMquJdeupeCVldY/E="; diff --git a/pkgs/tools/security/qdigidoc/default.nix b/pkgs/tools/security/qdigidoc/default.nix index c0b2f73d5c177..b47a2455b672d 100644 --- a/pkgs/tools/security/qdigidoc/default.nix +++ b/pkgs/tools/security/qdigidoc/default.nix @@ -45,6 +45,6 @@ mkDerivation rec { homepage = "https://www.id.ee/"; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = with maintainers; [ yegortimoshenko mmahut ]; + maintainers = with maintainers; [ mmahut yana ]; }; } diff --git a/pkgs/tools/system/bpytop/default.nix b/pkgs/tools/system/bpytop/default.nix index 1c24537b02210..eb0630d33eea7 100644 --- a/pkgs/tools/system/bpytop/default.nix +++ b/pkgs/tools/system/bpytop/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "bpytop"; - version = "1.0.67"; + version = "1.0.68"; src = fetchFromGitHub { owner = "aristocratos"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nvpIqX16WP9kslFo1ne5+QAZcvG+WFm5kDVOLN4C+b0="; + sha256 = "sha256-NHfaWWwNpGhqu/ALcW4p4X6sktEyLbKQuNHpAUUw4LY="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/text/popfile/default.nix b/pkgs/tools/text/popfile/default.nix index 7cfb2d2d6a4bc..7dec478a63423 100644 --- a/pkgs/tools/text/popfile/default.nix +++ b/pkgs/tools/text/popfile/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = { description = "An email classification system that automatically sorts messages and fights spam"; - homepage = "http://getpopfile.org"; + homepage = "https://getpopfile.org/"; license = lib.licenses.gpl2; # Should work on macOS, but havent tested it. diff --git a/pkgs/tools/typesetting/htmldoc/default.nix b/pkgs/tools/typesetting/htmldoc/default.nix index e29447011bc30..cd48a3fd8765a 100644 --- a/pkgs/tools/typesetting/htmldoc/default.nix +++ b/pkgs/tools/typesetting/htmldoc/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "htmldoc"; - version = "1.9.13"; + version = "1.9.14"; src = fetchFromGitHub { owner = "michaelrsweet"; repo = "htmldoc"; rev = "v${version}"; - sha256 = "sha256-wAqH3BKNYbOXMbnaRhz4QZ/49stxC2Qf+yatKBv0i68="; + sha256 = "sha256-mPykntRKu2NrIIGYGNCATUC3k/dvRmVkjHyhBeFfQ2U="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/virtualization/cloudmonkey/default.nix b/pkgs/tools/virtualization/cloudmonkey/default.nix index 00ca3f09d393e..ca1c4caf03b3d 100644 --- a/pkgs/tools/virtualization/cloudmonkey/default.nix +++ b/pkgs/tools/virtualization/cloudmonkey/default.nix @@ -11,8 +11,6 @@ buildGoModule rec { sha256 = "sha256-C9e2KsnoggjWZp8gx757MbFdGxmfh+TtAd+luS3ycHU="; }; - runVend = true; - vendorSha256 = null; meta = with lib; { diff --git a/pkgs/tools/wayland/wluma/default.nix b/pkgs/tools/wayland/wluma/default.nix new file mode 100644 index 0000000000000..2921e3858b416 --- /dev/null +++ b/pkgs/tools/wayland/wluma/default.nix @@ -0,0 +1,35 @@ +{ lib +, fetchFromGitHub +, makeWrapper +, rustPlatform +, vulkan-loader +}: + +rustPlatform.buildRustPackage rec { + pname = "wluma"; + version = "2.0.1"; + + src = fetchFromGitHub { + owner = "maximbaz"; + repo = "wluma"; + rev = version; + sha256 = "sha256-fqBEJS+SQoPNNEw6jyoiZjq/chY73bQ+cM21F8RdNPE="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + wrapProgram $out/bin/wluma \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ vulkan-loader ]}" + ''; + + cargoSha256 = "sha256-dZBA6VeJRHmqpazRwjLP1kYcYYN5LCFWkIaXqp4/RkQ="; + + meta = with lib; { + description = "Automatic brightness adjustment based on screen contents and ALS"; + homepage = "https://github.com/maximbaz/wluma"; + license = licenses.isc; + maintainers = with maintainers; [ yevhenshymotiuk ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e43ad8707db83..e5ae544ba32c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -519,6 +519,8 @@ with pkgs; packr = callPackage ../development/libraries/packr { }; + perseus-cli = callPackage ../development/tools/perseus-cli { }; + pet = callPackage ../development/tools/pet { }; pkger = callPackage ../development/libraries/pkger { }; @@ -2628,6 +2630,8 @@ with pkgs; wlsunset = callPackage ../tools/wayland/wlsunset { }; + wluma = callPackage ../tools/wayland/wluma { }; + wob = callPackage ../tools/wayland/wob { }; wshowkeys = callPackage ../tools/wayland/wshowkeys { }; @@ -25119,6 +25123,8 @@ with pkgs; fnott = callPackage ../applications/misc/fnott { }; + gg-scm = callPackage ../applications/version-management/git-and-tools/gg { }; + gigalixir = with python3Packages; toPythonApplication gigalixir; go-libp2p-daemon = callPackage ../servers/go-libp2p-daemon { }; @@ -31299,6 +31305,8 @@ with pkgs; gnome-connections = callPackage ../desktops/gnome/apps/gnome-connections { }; + gnome-text-editor = callPackage ../desktops/gnome/apps/gnome-text-editor { }; + gnome-tour = callPackage ../desktops/gnome/core/gnome-tour { }; hhexen = callPackage ../games/hhexen { }; @@ -34101,6 +34109,8 @@ with pkgs; gortr = callPackage ../servers/gortr {}; + stayrtr = callPackage ../servers/stayrtr {}; + sentencepiece = callPackage ../development/libraries/sentencepiece {}; kcli = callPackage ../development/tools/kcli {}; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a8a2a6f0d8b9b..fbcb8f33be74c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2044,6 +2044,8 @@ in { deepdiff = callPackage ../development/python-modules/deepdiff { }; + deepdish = callPackage ../development/python-modules/deepdish { }; + deepmerge = callPackage ../development/python-modules/deepmerge { }; deeptoolsintervals = callPackage ../development/python-modules/deeptoolsintervals { }; @@ -5458,6 +5460,8 @@ in { obfsproxy = callPackage ../development/python-modules/obfsproxy { }; + objax = callPackage ../development/python-modules/objax { }; + objgraph = callPackage ../development/python-modules/objgraph { # requires both the graphviz package and python package graphvizPkgs = pkgs.graphviz; diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index 5efc400537382..1f894f3a14b63 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -288,9 +288,6 @@ with self; with super; { mock = callPackage ../development/python-modules/mock/2.nix { }; - # Needed here because moinmoin is loaded as a Python library. - moinmoin = callPackage ../development/python-modules/moinmoin { }; - monosat = disabled super.monosat; more-itertools = callPackage ../development/python-modules/more-itertools/2.7.nix { }; |