diff --git a/third_party/nixpkgs/maintainers/maintainer-list.nix b/third_party/nixpkgs/maintainers/maintainer-list.nix index 8f447405c2..487b394baa 100644 --- a/third_party/nixpkgs/maintainers/maintainer-list.nix +++ b/third_party/nixpkgs/maintainers/maintainer-list.nix @@ -1364,6 +1364,12 @@ githubId = 302429; name = "Marton Boros"; }; + branwright1 = { + email = "branwright@protonmail.com"; + github = "branwright1"; + githubId = 71175207; + name = "Brandon Wright"; + }; bramd = { email = "bram@bramd.nl"; github = "bramd"; @@ -2591,6 +2597,16 @@ githubId = 10198051; name = "Drew Risinger"; }; + dschrempf = { + name = "Dominik Schrempf"; + email = "dominik.schrempf@gmail.com"; + github = "dschrempf"; + githubId = 5596239; + keys = [{ + longkeyid = "rsa2048/0x875F2BCF163F1B29"; + fingerprint = "62BC E2BD 49DF ECC7 35C7 E153 875F 2BCF 163F 1B29"; + }]; + }; dsferruzza = { email = "david.sferruzza@gmail.com"; github = "dsferruzza"; @@ -2737,6 +2753,12 @@ githubId = 18535642; name = "Emily"; }; + enderger = { + email = "endergeryt@gmail.com"; + github = "enderger"; + githubId = 36283171; + name = "Daniel"; + }; endocrimes = { email = "dani@builds.terrible.systems"; github = "endocrimes"; @@ -3409,6 +3431,12 @@ githubId = 2129135; name = "Frederik Rietdijk"; }; + friedelino = { + email = "friede.mann@posteo.de"; + github = "friedelino"; + githubId = 46672819; + name = "Frido Friedemann"; + }; frlan = { email = "frank@frank.uvena.de"; github = "frlan"; @@ -5385,6 +5413,12 @@ githubId = 55911173; name = "Gwendolyn Quasebarth"; }; + larsr = { + email = "Lars.Rasmusson@gmail.com"; + github = "larsr"; + githubId = 182024; + name = "Lars Rasmusson"; + }; lasandell = { email = "lasandell@gmail.com"; github = "lasandell"; @@ -7557,6 +7591,12 @@ githubId = 28323; name = "Peter Simons"; }; + petrosagg = { + email = "petrosagg@gmail.com"; + github = "petrosagg"; + githubId = 939420; + name = "Petros Angelatos"; + }; petterstorvik = { email = "petterstorvik@gmail.com"; github = "storvik"; diff --git a/third_party/nixpkgs/nixos/doc/manual/development/settings-options.xml b/third_party/nixpkgs/nixos/doc/manual/development/settings-options.xml index c99c3af92f..7795d7c804 100644 --- a/third_party/nixpkgs/nixos/doc/manual/development/settings-options.xml +++ b/third_party/nixpkgs/nixos/doc/manual/development/settings-options.xml @@ -167,7 +167,7 @@ in { # We know that the `user` attribute exists because we set a default value # for it above, allowing us to use it without worries here - users.users.${cfg.settings.user} = {}; + users.users.${cfg.settings.user} = { isSystemUser = true; }; # ... }; diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2105.xml b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2105.xml index e493d03fba..ce3cfc573d 100644 --- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2105.xml +++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2105.xml @@ -845,6 +845,13 @@ environment.systemPackages = [ The option's description was incorrect regarding ownership management and has been simplified greatly. + + + When defining a new user, one of and is now required. + This is to prevent accidentally giving a UID above 1000 to system users, which could have unexpected consequences, like running user activation scripts for system users. + Note that users defined with an explicit UID below 500 are exempted from this check, as has no effect for those. + + The GNOME desktop manager once again installs gnome3.epiphany by default. @@ -941,6 +948,13 @@ environment.systemPackages = [ option. + + + Prior to this release, systemd would also read system units from an undocumented /etc/systemd-mutable/system path. + This path has been dropped from the defaults. That path (or others) can be re-enabled by adding it to the + boot.extraSystemdUnitPaths list. + + diff --git a/third_party/nixpkgs/nixos/modules/config/pulseaudio.nix b/third_party/nixpkgs/nixos/modules/config/pulseaudio.nix index c0e90a8c26..0266bbfb12 100644 --- a/third_party/nixpkgs/nixos/modules/config/pulseaudio.nix +++ b/third_party/nixpkgs/nixos/modules/config/pulseaudio.nix @@ -306,6 +306,7 @@ in { description = "PulseAudio system service user"; home = stateDir; createHome = true; + isSystemUser = true; }; users.groups.pulse.gid = gid; diff --git a/third_party/nixpkgs/nixos/modules/config/users-groups.nix b/third_party/nixpkgs/nixos/modules/config/users-groups.nix index 4a2647339c..2b6a61e9a8 100644 --- a/third_party/nixpkgs/nixos/modules/config/users-groups.nix +++ b/third_party/nixpkgs/nixos/modules/config/users-groups.nix @@ -92,6 +92,8 @@ let the user's UID is allocated in the range for system users (below 500) or in the range for normal users (starting at 1000). + Exactly one of isNormalUser and + isSystemUser must be true. ''; }; @@ -107,6 +109,8 @@ let to true, and to false. + Exactly one of isNormalUser and + isSystemUser must be true. ''; }; @@ -521,6 +525,7 @@ in { }; nobody = { uid = ids.uids.nobody; + isSystemUser = true; description = "Unprivileged account (don't use!)"; group = "nogroup"; }; @@ -608,17 +613,28 @@ in { Neither the root account nor any wheel user has a password or SSH authorized key. You must set one to prevent being locked out of your system.''; } - ] ++ flip mapAttrsToList cfg.users (name: user: - { + ] ++ flatten (flip mapAttrsToList cfg.users (name: user: + [ + { assertion = (user.hashedPassword != null) - -> (builtins.match ".*:.*" user.hashedPassword == null); + -> (builtins.match ".*:.*" user.hashedPassword == null); message = '' - The password hash of user "${user.name}" contains a ":" character. - This is invalid and would break the login system because the fields - of /etc/shadow (file where hashes are stored) are colon-separated. - Please check the value of option `users.users."${user.name}".hashedPassword`.''; - } - ); + The password hash of user "${user.name}" contains a ":" character. + This is invalid and would break the login system because the fields + of /etc/shadow (file where hashes are stored) are colon-separated. + Please check the value of option `users.users."${user.name}".hashedPassword`.''; + } + { + assertion = let + xor = a: b: a && !b || b && !a; + isEffectivelySystemUser = user.isSystemUser || (user.uid != null && user.uid < 500); + in xor isEffectivelySystemUser user.isNormalUser; + message = '' + Exactly one of users.users.${user.name}.isSystemUser and users.users.${user.name}.isNormalUser must be set. + ''; + } + ] + )); warnings = builtins.filter (x: x != null) ( diff --git a/third_party/nixpkgs/nixos/modules/programs/fish.nix b/third_party/nixpkgs/nixos/modules/programs/fish.nix index 392f06eb93..8dd7101947 100644 --- a/third_party/nixpkgs/nixos/modules/programs/fish.nix +++ b/third_party/nixpkgs/nixos/modules/programs/fish.nix @@ -8,6 +8,11 @@ let cfg = config.programs.fish; + fishAbbrs = concatStringsSep "\n" ( + mapAttrsFlatten (k: v: "abbr -ag ${k} ${escapeShellArg v}") + cfg.shellAbbrs + ); + fishAliases = concatStringsSep "\n" ( mapAttrsFlatten (k: v: "alias ${k} ${escapeShellArg v}") (filterAttrs (k: v: v != null) cfg.shellAliases) @@ -83,6 +88,18 @@ in ''; }; + shellAbbrs = mkOption { + default = {}; + example = { + gco = "git checkout"; + npu = "nix-prefetch-url"; + }; + description = '' + Set of fish abbreviations. + ''; + type = with types; attrsOf str; + }; + shellAliases = mkOption { default = {}; description = '' @@ -205,6 +222,7 @@ in # if we haven't sourced the interactive config, do it status --is-interactive; and not set -q __fish_nixos_interactive_config_sourced and begin + ${fishAbbrs} ${fishAliases} ${sourceEnv "interactiveShellInit"} diff --git a/third_party/nixpkgs/nixos/modules/services/backup/borgbackup.nix b/third_party/nixpkgs/nixos/modules/services/backup/borgbackup.nix index be661b201f..18fb29fd72 100644 --- a/third_party/nixpkgs/nixos/modules/services/backup/borgbackup.nix +++ b/third_party/nixpkgs/nixos/modules/services/backup/borgbackup.nix @@ -169,6 +169,7 @@ let (map (mkAuthorizedKey cfg false) cfg.authorizedKeys ++ map (mkAuthorizedKey cfg true) cfg.authorizedKeysAppendOnly); useDefaultShell = true; + isSystemUser = true; }; groups.${cfg.group} = { }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/cluster/k3s/default.nix b/third_party/nixpkgs/nixos/modules/services/cluster/k3s/default.nix index e62fbc9441..5ab0286a38 100644 --- a/third_party/nixpkgs/nixos/modules/services/cluster/k3s/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/cluster/k3s/default.nix @@ -83,7 +83,8 @@ in systemd.services.k3s = { description = "k3s service"; - after = mkIf cfg.docker [ "docker.service" ]; + after = [ "network.service" "firewall.service" ] ++ (optional cfg.docker "docker.service"); + wants = [ "network.service" "firewall.service" ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { # See: https://github.com/rancher/k3s/blob/dddbd16305284ae4bd14c0aade892412310d7edc/install.sh#L197 @@ -92,6 +93,10 @@ in Delegate = "yes"; Restart = "always"; RestartSec = "5s"; + LimitNOFILE = 1048576; + LimitNPROC = "infinity"; + LimitCORE = "infinity"; + TasksMax = "infinity"; ExecStart = concatStringsSep " \\\n " ( [ "${cfg.package}/bin/k3s ${cfg.role}" diff --git a/third_party/nixpkgs/nixos/modules/services/databases/pgmanage.nix b/third_party/nixpkgs/nixos/modules/services/databases/pgmanage.nix index 0f8634dab3..8508e76b5c 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/pgmanage.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/pgmanage.nix @@ -197,6 +197,7 @@ in { group = pgmanage; home = cfg.sqlRoot; createHome = true; + isSystemUser = true; }; groups.${pgmanage} = { name = pgmanage; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/bazarr.nix b/third_party/nixpkgs/nixos/modules/services/misc/bazarr.nix index d3fd5b08cc..99343a146a 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/bazarr.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/bazarr.nix @@ -64,6 +64,7 @@ in users.users = mkIf (cfg.user == "bazarr") { bazarr = { + isSystemUser = true; group = cfg.group; home = "/var/lib/${config.systemd.services.bazarr.serviceConfig.StateDirectory}"; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/nix-daemon.nix b/third_party/nixpkgs/nixos/modules/services/misc/nix-daemon.nix index 64bdbf159d..133e96da0e 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/nix-daemon.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/nix-daemon.nix @@ -21,6 +21,7 @@ let calls in `libstore/build.cc', don't add any supplementary group here except "nixbld". */ uid = builtins.add config.ids.uids.nixbld nr; + isSystemUser = true; group = "nixbld"; extraGroups = [ "nixbld" ]; }; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/tuptime.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/tuptime.nix index 8f79d91659..17c5c1f56e 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/tuptime.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/tuptime.nix @@ -34,7 +34,10 @@ in { users = { groups._tuptime.members = [ "_tuptime" ]; - users._tuptime.description = "tuptime database owner"; + users._tuptime = { + isSystemUser = true; + description = "tuptime database owner"; + }; }; systemd = { diff --git a/third_party/nixpkgs/nixos/modules/services/networking/bird.nix b/third_party/nixpkgs/nixos/modules/services/networking/bird.nix index 6d7e7760d9..1923afdf83 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/bird.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/bird.nix @@ -73,6 +73,7 @@ let users.${variant} = { description = "BIRD Internet Routing Daemon user"; group = variant; + isSystemUser = true; }; groups.${variant} = {}; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/ncdns.nix b/third_party/nixpkgs/nixos/modules/services/networking/ncdns.nix index c1832ad175..d30fe0f6f6 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/ncdns.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/ncdns.nix @@ -243,8 +243,10 @@ in xlog.journal = true; }; - users.users.ncdns = - { description = "ncdns daemon user"; }; + users.users.ncdns = { + isSystemUser = true; + description = "ncdns daemon user"; + }; systemd.services.ncdns = { description = "ncdns daemon"; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/pixiecore.nix b/third_party/nixpkgs/nixos/modules/services/networking/pixiecore.nix index 85aa40784a..d2642c82c2 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/pixiecore.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/pixiecore.nix @@ -93,6 +93,7 @@ in users.users.pixiecore = { description = "Pixiecore daemon user"; group = "pixiecore"; + isSystemUser = true; }; networking.firewall = mkIf cfg.openFirewall { diff --git a/third_party/nixpkgs/nixos/modules/services/networking/pleroma.nix b/third_party/nixpkgs/nixos/modules/services/networking/pleroma.nix index 9b2bf9f612..2687230a15 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/pleroma.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/pleroma.nix @@ -75,6 +75,7 @@ in { description = "Pleroma user"; home = cfg.stateDir; extraGroups = [ cfg.group ]; + isSystemUser = true; }; groups."${cfg.group}" = {}; }; diff --git a/third_party/nixpkgs/nixos/modules/services/security/privacyidea.nix b/third_party/nixpkgs/nixos/modules/services/security/privacyidea.nix index f7b40089a9..2696dca4c7 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/privacyidea.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/privacyidea.nix @@ -264,6 +264,7 @@ in users.users.privacyidea = mkIf (cfg.user == "privacyidea") { group = cfg.group; + isSystemUser = true; }; users.groups.privacyidea = mkIf (cfg.group == "privacyidea") {}; @@ -294,6 +295,7 @@ in users.users.pi-ldap-proxy = mkIf (cfg.ldap-proxy.user == "pi-ldap-proxy") { group = cfg.ldap-proxy.group; + isSystemUser = true; }; users.groups.pi-ldap-proxy = mkIf (cfg.ldap-proxy.group == "pi-ldap-proxy") {}; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix index 9a541aba6e..58e8e5a0a8 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix @@ -607,6 +607,7 @@ in { home = "${cfg.home}"; group = "nextcloud"; createHome = true; + isSystemUser = true; }; users.groups.nextcloud.members = [ "nextcloud" config.services.nginx.user ]; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix index ea745eabf7..7591ad0c3d 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix @@ -818,7 +818,7 @@ in ProtectControlGroups = true; RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ]; LockPersonality = true; - MemoryDenyWriteExecute = !(builtins.any (mod: (mod.allowMemoryWriteExecute or false)) (optionals (cfg.package ? modules) cfg.package.modules)); + MemoryDenyWriteExecute = !(builtins.any (mod: (mod.allowMemoryWriteExecute or false)) cfg.package.modules); RestrictRealtime = true; RestrictSUIDSGID = true; PrivateMounts = true; diff --git a/third_party/nixpkgs/nixos/tests/mysql/mariadb-galera-mariabackup.nix b/third_party/nixpkgs/nixos/tests/mysql/mariadb-galera-mariabackup.nix index 0a40c010a4..1c73bc854a 100644 --- a/third_party/nixpkgs/nixos/tests/mysql/mariadb-galera-mariabackup.nix +++ b/third_party/nixpkgs/nixos/tests/mysql/mariadb-galera-mariabackup.nix @@ -31,7 +31,7 @@ in { firewall.allowedTCPPorts = [ 3306 4444 4567 4568 ]; firewall.allowedUDPPorts = [ 4567 ]; }; - users.users.testuser = { }; + users.users.testuser = { isSystemUser = true; }; systemd.services.mysql = with pkgs; { path = [ mysqlenv-common mysqlenv-mariabackup ]; }; @@ -89,7 +89,7 @@ in { firewall.allowedTCPPorts = [ 3306 4444 4567 4568 ]; firewall.allowedUDPPorts = [ 4567 ]; }; - users.users.testuser = { }; + users.users.testuser = { isSystemUser = true; }; systemd.services.mysql = with pkgs; { path = [ mysqlenv-common mysqlenv-mariabackup ]; }; @@ -136,7 +136,7 @@ in { firewall.allowedTCPPorts = [ 3306 4444 4567 4568 ]; firewall.allowedUDPPorts = [ 4567 ]; }; - users.users.testuser = { }; + users.users.testuser = { isSystemUser = true; }; systemd.services.mysql = with pkgs; { path = [ mysqlenv-common mysqlenv-mariabackup ]; }; diff --git a/third_party/nixpkgs/nixos/tests/mysql/mariadb-galera-rsync.nix b/third_party/nixpkgs/nixos/tests/mysql/mariadb-galera-rsync.nix index 6fb3cfef8d..709a8b5085 100644 --- a/third_party/nixpkgs/nixos/tests/mysql/mariadb-galera-rsync.nix +++ b/third_party/nixpkgs/nixos/tests/mysql/mariadb-galera-rsync.nix @@ -31,7 +31,7 @@ in { firewall.allowedTCPPorts = [ 3306 4444 4567 4568 ]; firewall.allowedUDPPorts = [ 4567 ]; }; - users.users.testuser = { }; + users.users.testuser = { isSystemUser = true; }; systemd.services.mysql = with pkgs; { path = [ mysqlenv-common mysqlenv-rsync ]; }; @@ -84,7 +84,7 @@ in { firewall.allowedTCPPorts = [ 3306 4444 4567 4568 ]; firewall.allowedUDPPorts = [ 4567 ]; }; - users.users.testuser = { }; + users.users.testuser = { isSystemUser = true; }; systemd.services.mysql = with pkgs; { path = [ mysqlenv-common mysqlenv-rsync ]; }; @@ -130,7 +130,7 @@ in { firewall.allowedTCPPorts = [ 3306 4444 4567 4568 ]; firewall.allowedUDPPorts = [ 4567 ]; }; - users.users.testuser = { }; + users.users.testuser = { isSystemUser = true; }; systemd.services.mysql = with pkgs; { path = [ mysqlenv-common mysqlenv-rsync ]; }; diff --git a/third_party/nixpkgs/nixos/tests/mysql/mysql.nix b/third_party/nixpkgs/nixos/tests/mysql/mysql.nix index 50ad5c68ae..c21136416d 100644 --- a/third_party/nixpkgs/nixos/tests/mysql/mysql.nix +++ b/third_party/nixpkgs/nixos/tests/mysql/mysql.nix @@ -9,8 +9,8 @@ import ./../make-test-python.nix ({ pkgs, ...} : { { pkgs, ... }: { - users.users.testuser = { }; - users.users.testuser2 = { }; + users.users.testuser = { isSystemUser = true; }; + users.users.testuser2 = { isSystemUser = true; }; services.mysql.enable = true; services.mysql.initialDatabases = [ { name = "testdb3"; schema = ./testdb.sql; } @@ -44,8 +44,8 @@ import ./../make-test-python.nix ({ pkgs, ...} : { # Kernel panic - not syncing: Out of memory: compulsory panic_on_oom is enabled virtualisation.memorySize = 1024; - users.users.testuser = { }; - users.users.testuser2 = { }; + users.users.testuser = { isSystemUser = true; }; + users.users.testuser2 = { isSystemUser = true; }; services.mysql.enable = true; services.mysql.initialDatabases = [ { name = "testdb3"; schema = ./testdb.sql; } @@ -75,8 +75,8 @@ import ./../make-test-python.nix ({ pkgs, ...} : { { pkgs, ... }: { - users.users.testuser = { }; - users.users.testuser2 = { }; + users.users.testuser = { isSystemUser = true; }; + users.users.testuser2 = { isSystemUser = true; }; services.mysql.enable = true; services.mysql.initialScript = pkgs.writeText "mariadb-init.sql" '' ALTER USER root@localhost IDENTIFIED WITH unix_socket; diff --git a/third_party/nixpkgs/nixos/tests/redis.nix b/third_party/nixpkgs/nixos/tests/redis.nix index 79a7847414..28b6058c2c 100644 --- a/third_party/nixpkgs/nixos/tests/redis.nix +++ b/third_party/nixpkgs/nixos/tests/redis.nix @@ -22,11 +22,10 @@ in users.users."member" = { createHome = false; description = "A member of the redis group"; + isNormalUser = true; extraGroups = [ "redis" ]; - group = "users"; - shell = "/bin/sh"; }; }; }; diff --git a/third_party/nixpkgs/nixos/tests/rspamd.nix b/third_party/nixpkgs/nixos/tests/rspamd.nix index 7f41e1a795..f0ccfe7ea0 100644 --- a/third_party/nixpkgs/nixos/tests/rspamd.nix +++ b/third_party/nixpkgs/nixos/tests/rspamd.nix @@ -274,7 +274,10 @@ in I find cows to be evil don't you? ''; - users.users.tester.password = "test"; + users.users.tester = { + isNormalUser = true; + password = "test"; + }; services.postfix = { enable = true; destination = ["example.com"]; diff --git a/third_party/nixpkgs/nixos/tests/shadow.nix b/third_party/nixpkgs/nixos/tests/shadow.nix index e5755e8e08..c51961e1fc 100644 --- a/third_party/nixpkgs/nixos/tests/shadow.nix +++ b/third_party/nixpkgs/nixos/tests/shadow.nix @@ -13,14 +13,17 @@ in import ./make-test-python.nix ({ pkgs, ... }: { users = { mutableUsers = true; users.emma = { + isNormalUser = true; password = password1; shell = pkgs.bash; }; users.layla = { + isNormalUser = true; password = password2; shell = pkgs.shadow; }; users.ash = { + isNormalUser = true; password = password4; shell = pkgs.bash; }; diff --git a/third_party/nixpkgs/nixos/tests/systemd-confinement.nix b/third_party/nixpkgs/nixos/tests/systemd-confinement.nix index ebf6d218fd..d04e4a3f86 100644 --- a/third_party/nixpkgs/nixos/tests/systemd-confinement.nix +++ b/third_party/nixpkgs/nixos/tests/systemd-confinement.nix @@ -150,6 +150,7 @@ import ./make-test-python.nix { config.users.groups.chroot-testgroup = {}; config.users.users.chroot-testuser = { + isSystemUser = true; description = "Chroot Test User"; group = "chroot-testgroup"; }; diff --git a/third_party/nixpkgs/nixos/tests/unbound.nix b/third_party/nixpkgs/nixos/tests/unbound.nix index d4b8bb15ce..ca9718ac63 100644 --- a/third_party/nixpkgs/nixos/tests/unbound.nix +++ b/third_party/nixpkgs/nixos/tests/unbound.nix @@ -132,12 +132,15 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: users.users = { # user that is permitted to access the unix socket - someuser.extraGroups = [ - config.users.users.unbound.group - ]; + someuser = { + isSystemUser = true; + extraGroups = [ + config.users.users.unbound.group + ]; + }; # user that is not permitted to access the unix socket - unauthorizeduser = {}; + unauthorizeduser = { isSystemUser = true; }; }; environment.etc = { diff --git a/third_party/nixpkgs/pkgs/applications/audio/drumgizmo/default.nix b/third_party/nixpkgs/pkgs/applications/audio/drumgizmo/default.nix index dfaf7127f4..ef4970a160 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/drumgizmo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/drumgizmo/default.nix @@ -1,37 +1,29 @@ -{ lib, stdenv, fetchurl, fetchpatch, alsaLib, expat, glib, libjack2, libXext, libX11, libpng +{ lib, stdenv, fetchurl, alsaLib, expat, glib, libjack2, libXext, libX11, libpng , libpthreadstubs, libsmf, libsndfile, lv2, pkg-config, zita-resampler }: stdenv.mkDerivation rec { - version = "0.9.18.1"; + version = "0.9.19"; pname = "drumgizmo"; src = fetchurl { url = "https://www.drumgizmo.org/releases/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "0bpbkzcr3znbwfdk79c14n5k5hh80iqlk2nc03q95vhimbadk8k7"; + sha256 = "18x28vhif0c97xz02k22xwqxxig6fi6j0356mlz2vf7vb25z69kl"; }; - patches = [ - # Fix build for lv2 1.18.0 - (fetchpatch { - url = "http://cgit.drumgizmo.org/plugingizmo.git/patch/?id=be64ddf9da525cd5c6757464efc966052731ba71"; - sha256 = "17w8g78i5avssc7m8rpw64ka3rai8dff81wfzir9cpxp8s2h44qf"; - extraPrefix = "plugin/plugingizmo/"; - stripLen = 1; - }) - ]; - configureFlags = [ "--enable-lv2" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ alsaLib expat glib libjack2 libXext libX11 libpng libpthreadstubs - libsmf libsndfile lv2 pkg-config zita-resampler + libsmf libsndfile lv2 zita-resampler ]; meta = with lib; { description = "An LV2 sample based drum plugin"; homepage = "https://www.drumgizmo.org"; - license = licenses.lgpl3; + license = licenses.lgpl3Plus; platforms = platforms.linux; maintainers = [ maintainers.goibhniu maintainers.nico202 ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/midi-visualizer/default.nix b/third_party/nixpkgs/pkgs/applications/audio/midi-visualizer/default.nix index 37cfd0fac4..0213dc4af6 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/midi-visualizer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/midi-visualizer/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "MIDIVisualizer"; - version = "6.3"; + version = "6.4"; src = fetchFromGitHub { owner = "kosua20"; repo = pname; rev = "v${version}"; - sha256 = "sha256-U/YmxHD6e13I++aW+z1Y5xtZ+MN0KUJLSskrF4+UgTE="; + sha256 = "sha256-XR5xmQYVbBR6QWt/+PLeGqg0t4xl35MPrQNaPsmgAYA="; }; nativeBuildInputs = [ cmake pkg-config makeWrapper]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix index fb65351853..fff9c8a2de 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix @@ -144,7 +144,7 @@ let inherit name version src wmClass jdk; product = "MPS"; meta = with lib; { - homepage = https://www.jetbrains.com/mps/; + homepage = "https://www.jetbrains.com/mps/"; inherit license description; longDescription = '' A metaprogramming system which uses projectional editing @@ -386,12 +386,12 @@ in rider = buildRider rec { name = "rider-${version}"; - version = "2021.1"; /* updated by script */ + version = "2021.1.1"; /* updated by script */ description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz"; - sha256 = "089j52sig2ac21v6zl9mvb7x4sr9c428nn930b41y3qd6bg52xxx"; /* updated by script */ + sha256 = "00kdbsjw9hmq7x94pjscslv0b412g8l0jbvyi7jiyay8xc6wiaaj"; /* updated by script */ }; wmClass = "jetbrains-rider"; update-channel = "Rider RELEASE"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/generic.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/generic.nix index 370d5b1561..060078cd57 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/generic.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/generic.nix @@ -61,37 +61,40 @@ in }; buildInputs = [ libsecret libXScrnSaver libxshmfence ] - ++ lib.optionals (!stdenv.isDarwin) ([ gtk2 at-spi2-atk wrapGAppsHook ] ++ atomEnv.packages); + ++ lib.optionals (!stdenv.isDarwin) ([ gtk2 at-spi2-atk ] ++ atomEnv.packages); runtimeDependencies = lib.optional (stdenv.isLinux) [ (lib.getLib systemd) fontconfig.lib libdbusmenu ]; - nativeBuildInputs = [unzip] ++ lib.optional (!stdenv.isDarwin) autoPatchelfHook; + nativeBuildInputs = [unzip] ++ lib.optionals (!stdenv.isDarwin) [ autoPatchelfHook wrapGAppsHook ]; dontBuild = true; dontConfigure = true; - installPhase = - if system == "x86_64-darwin" then '' - mkdir -p "$out/Applications/${longName}.app" $out/bin - cp -r ./* "$out/Applications/${longName}.app" - ln -s "$out/Applications/${longName}.app/Contents/Resources/app/bin/code" $out/bin/${executableName} - '' else '' - mkdir -p $out/lib/vscode $out/bin - cp -r ./* $out/lib/vscode + installPhase = '' + runHook preInstall + '' + (if system == "x86_64-darwin" then '' + mkdir -p "$out/Applications/${longName}.app" $out/bin + cp -r ./* "$out/Applications/${longName}.app" + ln -s "$out/Applications/${longName}.app/Contents/Resources/app/bin/code" $out/bin/${executableName} + '' else '' + mkdir -p $out/lib/vscode $out/bin + cp -r ./* $out/lib/vscode - ln -s $out/lib/vscode/bin/${executableName} $out/bin + ln -s $out/lib/vscode/bin/${executableName} $out/bin - mkdir -p $out/share/applications - ln -s $desktopItem/share/applications/${executableName}.desktop $out/share/applications/${executableName}.desktop - ln -s $urlHandlerDesktopItem/share/applications/${executableName}-url-handler.desktop $out/share/applications/${executableName}-url-handler.desktop + mkdir -p $out/share/applications + ln -s $desktopItem/share/applications/${executableName}.desktop $out/share/applications/${executableName}.desktop + ln -s $urlHandlerDesktopItem/share/applications/${executableName}-url-handler.desktop $out/share/applications/${executableName}-url-handler.desktop - mkdir -p $out/share/pixmaps - cp $out/lib/vscode/resources/app/resources/linux/code.png $out/share/pixmaps/code.png + mkdir -p $out/share/pixmaps + cp $out/lib/vscode/resources/app/resources/linux/code.png $out/share/pixmaps/code.png - # Override the previously determined VSCODE_PATH with the one we know to be correct - sed -i "/ELECTRON=/iVSCODE_PATH='$out/lib/vscode'" $out/bin/${executableName} - grep -q "VSCODE_PATH='$out/lib/vscode'" $out/bin/${executableName} # check if sed succeeded - ''; + # Override the previously determined VSCODE_PATH with the one we know to be correct + sed -i "/ELECTRON=/iVSCODE_PATH='$out/lib/vscode'" $out/bin/${executableName} + grep -q "VSCODE_PATH='$out/lib/vscode'" $out/bin/${executableName} # check if sed succeeded + '') + '' + runHook postInstall + ''; inherit meta; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix index 09a58e7dfd..35637c8fc8 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix @@ -13,10 +13,10 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0z1diiiykv4ilsiljffz9sl2mlvrxq0xwm8ga2ralfvjwbhzr6dn"; - x86_64-darwin = "02gzw46w3kzw1ya9nx8fkhvzi0mbpz2fyp47n58jki2zkdsfiwzh"; - aarch64-linux = "0bkvgdxch95dqcb41ncsjkaaswmwv6zad4hzdsr3famjm2vym1ky"; - armv7l-linux = "0wdp97ihdnx9bcyn2dh6wzhb7qvdj6x730r7ng1q3i9jhd19wfi3"; + x86_64-linux = "08151qdhf4chg9gfbs0dl0v0k5vla2gz5dfy439jzdg1d022d5rw"; + x86_64-darwin = "1vlxxkv3wvds3xl3ir93l5q5yq2d7mcragsicfayj9x9r49ilqn3"; + aarch64-linux = "0rxw1wsi555z41ak817sxqyyan0rm7hma640zsh8dz0yvhzdv1h8"; + armv7l-linux = "1ijvd7r2fxxlw4zv3zx5h70b3d0b4gcq3aljsi02v1lr2zm8f8gb"; }.${system}; in callPackage ./generic.nix rec { @@ -25,7 +25,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.55.0"; + version = "1.55.2"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix index b11a8a8f10..4850a9cd7d 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix @@ -13,10 +13,10 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0zzdbknmljf1hizmxnrby17i8v3kp98rklinywnr632jwgjms81j"; - x86_64-darwin = "0mccq1b0l6r1ipxp5gvyam43c2hh8hxdvwqikkz6g7y93p29wz9g"; - aarch64-linux = "12gpday6gzl1adcykqhgz3xrdm9568a26gsndmplkn2n6l6agnp0"; - armv7l-linux = "0l886vdw7az0nvvhh14pjawz0yyib59ymychy7gbk8ay5g9vfv03"; + x86_64-linux = "12mdila9gspj6b9s6488j0ba264vm4a46546kplma7s6gkkpz4zx"; + x86_64-darwin = "15wdznihc2ra2fjy9p4j898vazjr4h5yighaxh7jk9kcvarg1658"; + aarch64-linux = "0plw1an1z3v333irbc53skrmq2klas21srriiqkvmkgkfvpx1rq2"; + armv7l-linux = "1ys82pa18qshpinaqqrskxvljzap20xwj5ncffn031yacg1y2qx2"; }.${system}; sourceRoot = { @@ -33,7 +33,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.55.0"; + version = "1.55.2"; pname = "vscodium"; executableName = "codium"; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/vimiv-qt/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/vimiv-qt/default.nix new file mode 100644 index 0000000000..8e0caff1d1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/graphics/vimiv-qt/default.nix @@ -0,0 +1,49 @@ +{ stdenv +, lib +, fetchFromGitHub +, python3 +, qt5 +, installShellFiles +}: + +python3.pkgs.buildPythonApplication rec { + pname = "vimiv-qt"; + version = "0.8.0"; + + src = fetchFromGitHub { + owner = "karlch"; + repo = pname; + rev = "v${version}"; + sha256 = "1pj3gak7nxkw9r9m71zsfvcaq8dk9crbk5rz4n7pravxkl5hs2bg"; + }; + + nativeBuildInputs = [ installShellFiles qt5.wrapQtAppsHook python3.pkgs.setuptools ]; + + propagatedBuildInputs = with python3.pkgs; [ pyqt5 py3exiv2 qt5.qtsvg ]; + + postInstall = '' + install -Dm644 misc/vimiv.desktop $out/share/applications/vimiv.desktop + install -Dm644 misc/org.karlch.vimiv.qt.metainfo.xml $out/metainfo/org.karlch.vimiv.qt.metainfo.xml + install -Dm644 LICENSE $out/licenses/vimiv/LICENSE + install -Dm644 icons/vimiv.svg $out/icons/hicolor/scalable/apps/vimiv.svg + installManPage misc/vimiv.1 + + for i in 16 32 64 128 256 512; do + install -Dm644 icons/vimiv_''${i}x''${i}.png $out/icons/hicolor/''${i}x''${i}/apps/vimiv.png + done + ''; + + # Vimiv has to be wrapped manually because it is a non-ELF executable. + dontWrapQtApps = true; + preFixup = '' + wrapQtApp $out/bin/vimiv + ''; + + meta = with lib; { + description = "Image viewer with Vim-like keybindings (Qt port)"; + license = licenses.gpl3Plus; + homepage = "https://github.com/karlch/vimiv-qt"; + maintainers = with maintainers; [ dschrempf ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/googleearth-pro/default.nix b/third_party/nixpkgs/pkgs/applications/misc/googleearth-pro/default.nix new file mode 100644 index 0000000000..e5192c9a73 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/googleearth-pro/default.nix @@ -0,0 +1,111 @@ +{ lib, stdenv, fetchurl, glibc, libGLU, libGL, freetype, glib, libSM, libICE, libXi, libXv +, libXrender, libXrandr, libXfixes, libXcursor, libXinerama, libXext, libX11, libXcomposite +, libxcb, sqlite, zlib, fontconfig, dpkg, libproxy, libxml2, gst_all_1, dbus, makeWrapper }: + +let + arch = + if stdenv.hostPlatform.system == "x86_64-linux" then "amd64" + else throw "Unsupported system ${stdenv.hostPlatform.system} "; + fullPath = lib.makeLibraryPath [ + glibc + glib + stdenv.cc.cc + libSM + libICE + libXi + libXv + libGLU libGL + libXrender + libXrandr + libXfixes + libXcursor + libXinerama + libXcomposite + freetype + libXext + libX11 + libxcb + sqlite + zlib + fontconfig + libproxy + libxml2 + dbus + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + ]; +in +stdenv.mkDerivation rec { + pname = "googleearth-pro"; + version = "7.3.3.7786"; + + src = fetchurl { + url = "https://dl.google.com/linux/earth/deb/pool/main/g/google-earth-pro-stable/google-earth-pro-stable_${version}-r0_${arch}.deb"; + sha256 = "1s3cakwrgf702g33rh8qs657d8bl68wgg8k89rksgvswwpd2zbb3"; + }; + + nativeBuildInputs = [ dpkg makeWrapper ]; + + doInstallCheck = true; + + dontBuild = true; + + dontPatchELF = true; + + unpackPhase = '' + # deb file contains a setuid binary, so 'dpkg -x' doesn't work here + dpkg --fsys-tarfile ${src} | tar --extract + ''; + + installPhase ='' + mkdir $out + mv usr/* $out/ + rmdir usr + mv * $out/ + rm $out/bin/google-earth-pro $out/opt/google/earth/pro/googleearth + + # patch and link googleearth binary + ln -s $out/opt/google/earth/pro/googleearth-bin $out/bin/googleearth-pro + patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${fullPath}:\$ORIGIN" \ + $out/opt/google/earth/pro/googleearth-bin + + # patch and link gpsbabel binary + ln -s $out/opt/google/earth/pro/gpsbabel $out/bin/gpsbabel + patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${fullPath}:\$ORIGIN" \ + $out/opt/google/earth/pro/gpsbabel + + # patch libraries + for a in $out/opt/google/earth/pro/*.so* ; do + patchelf --set-rpath "${fullPath}:\$ORIGIN" $a + done + + # Add desktop config file and icons + mkdir -p $out/share/{applications,icons/hicolor/{16x16,22x22,24x24,32x32,48x48,64x64,128x128,256x256}/apps,pixmaps} + ln -s $out/opt/google/earth/pro/google-earth-pro.desktop $out/share/applications/google-earth-pro.desktop + sed -i -e "s|Exec=.*|Exec=$out/bin/googleearth-pro|g" $out/opt/google/earth/pro/google-earth-pro.desktop + for size in 16 22 24 32 48 64 128 256; do + ln -s $out/opt/google/earth/pro/product_logo_"$size".png $out/share/icons/hicolor/"$size"x"$size"/apps/google-earth-pro.png + done + ln -s $out/opt/google/earth/pro/product_logo_256.png $out/share/pixmaps/google-earth-pro.png + ''; + + installCheckPhase = '' + $out/bin/gpsbabel -V > /dev/null + ''; + + # wayland is not supported by Qt included in binary package, so make sure it uses xcb + fixupPhase = '' + wrapProgram $out/bin/googleearth-pro --set QT_QPA_PLATFORM xcb + ''; + + + meta = with lib; { + description = "A world sphere viewer"; + homepage = "https://earth.google.com"; + license = licenses.unfree; + maintainers = with maintainers; [ friedelino ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/simplenote/default.nix b/third_party/nixpkgs/pkgs/applications/misc/simplenote/default.nix index 5032836ab9..675fe9cf1a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/simplenote/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/simplenote/default.nix @@ -17,10 +17,10 @@ let pname = "simplenote"; - version = "2.8.0"; + version = "2.9.0"; sha256 = { - x86_64-linux = "sha256-W8+LzWMPDCrFZCm9p/Gcj7OXqJw/gs7lMxTKjOQChQY="; + x86_64-linux = "sha256-uwd9fYqZepJ/BBttprqkJhswqMepGsHDTd5Md9gjI68="; }.${system} or throwSystem; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/get-commit-message.py b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/get-commit-message.py index 1aafc6147f..e14e364264 100755 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/get-commit-message.py +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/get-commit-message.py @@ -6,6 +6,8 @@ import re import textwrap +from collections import OrderedDict + import feedparser import requests @@ -30,6 +32,7 @@ for entry in feed.entries: fixes += " " + zero_days.group(0) print('\n' + '\n'.join(textwrap.wrap(fixes, width=72))) if cve_list := re.findall(r'CVE-[^: ]+', content): + cve_list = list(OrderedDict.fromkeys(cve_list)) # Remove duplicates but preserve the order cve_string = ' '.join(cve_list) print("\nCVEs:\n" + '\n'.join(textwrap.wrap(cve_string, width=72))) break # We only care about the most recent stable channel update diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json index f79f0afaf5..61cd10df3d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,8 +1,8 @@ { "stable": { - "version": "89.0.4389.114", - "sha256": "007df9p78bbmk3iyfi8qn57mmn68qqrdhx6z8n2hl8ksd7lspw7j", - "sha256bin64": "06wblyvyr93032fbzwm6qpzz4jjm6adziq4i4n6kmfdix2ajif8a", + "version": "89.0.4389.128", + "sha256": "0nysvsck91yxcb3wf6v3nzar77k7j9bby7xfzsvd7wlqxdmflx8s", + "sha256bin64": "07m43yqq6j7mfhdnm127p29b2611l8lmbq87iszlgg6dgkqxa0qr", "deps": { "gn": { "version": "2021-01-07", @@ -18,9 +18,9 @@ } }, "beta": { - "version": "90.0.4430.70", - "sha256": "0jnyqnqwdccv3i55grd12wr2w5ffxyzmj2l3c1i24xawf2zdzyym", - "sha256bin64": "1lv9gz6llphyvlvn92yw1cyhj4i6jzhy1l7hk01418prmhb4nfws", + "version": "90.0.4430.72", + "sha256": "0hw916j55lm3qnidfp92i8w6zywdd47rhihn9pn23b7ziz58ik55", + "sha256bin64": "1ddj2pk4m26dpl1ja0r56fvm67c1z1hq5rq5an8px6ixy78s2760", "deps": { "gn": { "version": "2021-02-09", diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/starboard/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/starboard/default.nix index 4fdcdf1ea2..1b83e982c7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/starboard/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/starboard/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "starboard"; - version = "0.9.2"; + version = "0.10.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-w+xaZPEMmJYDPQG4MuAlWMhwhEyeVcpaeDwqsnIbIHA="; + sha256 = "sha256-hieenhe3HsMqg7dMhvOUcvVGzBedYXqJRxEUkw4DG6o="; }; - vendorSha256 = "sha256-aVKQcRZgxhIph+y28HhR15DUjwiz/4+t1bMrYXjPW7Q="; + vendorSha256 = "sha256-Vj8t4v2o6x+tFLWy84W3tVaIf6WtFWXpvLQfeTbeGbM="; subPackages = [ "cmd/starboard" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix index a08a3d336b..d88602d75b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -3,7 +3,6 @@ , buildGoPackage , fetchFromGitHub , callPackage -, runtimeShell }: let list = lib.importJSON ./providers.json; @@ -58,7 +57,6 @@ let cloudfoundry = callPackage ./cloudfoundry {}; gandi = callPackage ./gandi {}; hcloud = callPackage ./hcloud {}; - keycloak = callPackage ./keycloak {}; libvirt = callPackage ./libvirt {}; linuxbox = callPackage ./linuxbox {}; lxd = callPackage ./lxd {}; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/keycloak/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/keycloak/default.nix deleted file mode 100644 index 043e081d94..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/keycloak/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib -, fetchFromGitHub -, buildGoModule -}: - -buildGoModule rec { - pname = "terraform-provider-keycloak"; - version = "1.20.0"; - - src = fetchFromGitHub { - owner = "mrparkers"; - repo = "terraform-provider-keycloak"; - rev = version; - sha256 = "1h8780k8345pf0s14k1pmwdjbv2j08h4rq3jwds81mmv6qgj1r2n"; - }; - - vendorSha256 = "12iary7p5qsbl4xdhfd1wh92mvf2fiylnb3m1d3m7cdcn32rfimq"; - - doCheck = false; - - postInstall = "mv $out/bin/terraform-provider-keycloak{,_v${version}}"; - - meta = with lib; { - description = "Terraform provider for keycloak"; - homepage = "https://github.com/mrparkers/terraform-provider-keycloak"; - license = licenses.mpl20; - maintainers = with maintainers; [ eonpatapon ]; - }; - -} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json index 329b1be682..290460e1e5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -493,6 +493,14 @@ "vendorSha256": "08wg16g4mvn6kl8xwn89195a826cb132ijvrgf32c6p7zp4lgmjd", "version": "0.2.12" }, + "keycloak": { + "owner": "mrparkers", + "repo": "terraform-provider-keycloak", + "rev": "v3.0.0", + "sha256": "1q9vzmj9c7mznv6al58d3rs5kk1fh28k1qccx46hcbk82z52da3a", + "vendorSha256": "0kh6lljvqd577s19gx0fmfsmx9wm3ikla3jz16lbwwb8ahbqcw1f", + "version": "3.0.0" + }, "ksyun": { "owner": "terraform-providers", "repo": "terraform-provider-ksyun", diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/convos/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/convos/default.nix index 4bbc1589ed..ba1837ee96 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/irc/convos/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/irc/convos/default.nix @@ -6,13 +6,13 @@ with lib; perlPackages.buildPerlPackage rec { pname = "convos"; - version = "6.06"; + version = "6.11"; src = fetchFromGitHub { owner = "convos-chat"; repo = pname; rev = "v${version}"; - sha256 = "0b3c8hj9cjmpzy9k949vdv1y3v7b94nh0mq15rcv3ax0sj3gd0qr"; + sha256 = "19nzm7f3glvj34nj9pvnp0h9xx6baq58c11ddkqfmq7w3sci49hi"; }; nativeBuildInputs = [ makeWrapper ] diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/frostwire/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/frostwire/default.nix index 4253969a30..b3b277bf13 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/frostwire/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/frostwire/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, gradle, perl, jre, makeWrapper, makeDesktopItem, mplayer }: +{ lib, stdenv, fetchFromGitHub, gradle_6, perl, jre, makeWrapper, makeDesktopItem, mplayer }: let version = "6.6.7-build-529"; @@ -25,7 +25,7 @@ let deps = stdenv.mkDerivation { name = "${name}-deps"; inherit src; - buildInputs = [ gradle perl ]; + buildInputs = [ gradle_6 perl ]; buildPhase = '' export GRADLE_USER_HOME=$(mktemp -d) ( cd desktop @@ -47,7 +47,7 @@ in stdenv.mkDerivation { inherit name src; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ gradle ]; + buildInputs = [ gradle_6 ]; buildPhase = '' export GRADLE_USER_HOME=$(mktemp -d) diff --git a/third_party/nixpkgs/pkgs/applications/networking/super-productivity/default.nix b/third_party/nixpkgs/pkgs/applications/networking/super-productivity/default.nix deleted file mode 100644 index 38d12710cc..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/super-productivity/default.nix +++ /dev/null @@ -1,106 +0,0 @@ -{ lib, stdenv, fetchurl, dpkg, makeWrapper -, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib -, gnome2, gtk3, gdk-pixbuf, libnotify, libxcb, nspr, nss, pango -, systemd, xorg, xprintidle-ng }: - -let - - version = "1.10.45"; - - rpath = lib.makeLibraryPath [ - alsaLib - atk - cairo - cups - curl - dbus - expat - fontconfig - freetype - glib - gnome2.GConf - gdk-pixbuf - gtk3 - pango - libnotify - libxcb - nspr - nss - stdenv.cc.cc - systemd - - xorg.libxkbfile - xorg.libX11 - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXtst - xorg.libXScrnSaver - ] + ":${stdenv.cc.cc.lib}/lib64"; - - src = - if stdenv.hostPlatform.system == "x86_64-linux" then - fetchurl { - url = "https://github.com/johannesjo/super-productivity/releases/download/v${version}/superProductivity_${version}_amd64.deb"; - sha256 = "0jfi0lfijnhij9jvkhxgyvq8m1jzaym8n1c7707fv3hjh1h0vxn1"; - } - else - throw "super-productivity is not supported on ${stdenv.hostPlatform.system}"; - -in stdenv.mkDerivation { - pname = "super-productivity"; - inherit version; - - inherit src; - - buildInputs = [ - dpkg - gtk3 # needed for GSETTINGS_SCHEMAS_PATH - ]; - - nativeBuildInputs = [ makeWrapper ]; - - unpackPhase = "dpkg -x $src ."; - - installPhase = '' - runHook preInstall - - mkdir -p $out - - cp -R usr/share $out/share - cp -R opt $out/libexec - - # Otherwise it looks "suspicious" - chmod -R g-w $out - - # set linker and rpath - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/libexec/superProductivity/superproductivity" - patchelf --set-rpath ${rpath}:$out/libexec/superProductivity "$out/libexec/superProductivity/superproductivity" - - # wrapper for xdg_data_dirs and xprintidle path - makeWrapper $out/libexec/superProductivity/superproductivity $out/bin/superproductivity \ - --prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH \ - --prefix PATH : "${xprintidle-ng}/bin" - - # Fix the desktop link - substituteInPlace $out/share/applications/superproductivity.desktop \ - --replace /opt/superProductivity/ $out/bin/ - - runHook postInstall - ''; - - dontStrip = true; - - meta = with lib; { - description = "To Do List / Time Tracker with Jira Integration"; - homepage = "https://super-productivity.com"; - license = licenses.mit; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ offline ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/office/super-productivity/default.nix b/third_party/nixpkgs/pkgs/applications/office/super-productivity/default.nix new file mode 100644 index 0000000000..7793db2138 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/office/super-productivity/default.nix @@ -0,0 +1,55 @@ +{ stdenv , lib , fetchurl , appimageTools , makeWrapper , electron_11 }: + +let + electron = electron_11; +in +stdenv.mkDerivation rec { + pname = "super-productivity"; + version = "6.5.2"; + + src = fetchurl { + url = "https://github.com/johannesjo/super-productivity/releases/download/v${version}/superProductivity-${version}.AppImage"; + sha256 = "1ivl7chsv9axgk6nqkf580pav651hchi3di0mrp0pylpsqgk6f1f"; + name = "${pname}-${version}.AppImage"; + }; + + appimageContents = appimageTools.extractType2 { + name = "${pname}-${version}"; + inherit src; + }; + + dontUnpack = true; + dontConfigure = true; + dontBuild = true; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/share/${pname} $out/share/applications + + cp -a ${appimageContents}/{locales,resources} $out/share/${pname} + cp -a ${appimageContents}/superproductivity.desktop $out/share/applications/${pname}.desktop + cp -a ${appimageContents}/usr/share/icons $out/share + + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + + runHook postInstall + ''; + + postFixup = '' + makeWrapper ${electron}/bin/electron $out/bin/${pname} \ + --add-flags $out/share/${pname}/resources/app.asar \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ]}" + ''; + + meta = with lib; { + description = "To Do List / Time Tracker with Jira Integration"; + homepage = "https://super-productivity.com"; + license = licenses.mit; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ offline ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/office/todofi.sh/default.nix b/third_party/nixpkgs/pkgs/applications/office/todofi.sh/default.nix new file mode 100644 index 0000000000..afdbceb341 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/office/todofi.sh/default.nix @@ -0,0 +1,42 @@ +{ lib +, stdenv +, fetchFromGitHub +, makeWrapper +, coreutils +, gawk +, gnugrep +, gnused +, rofi +, todo-txt-cli +}: + +stdenv.mkDerivation rec { + pname = "todofi.sh"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "hugokernel"; + repo = "todofi.sh"; + rev = "v${version}"; + sha256 = "1gmy5inlghycsxiwnyyjyv81jn2fmfk3s9x78kcgyf7khzb5kwvj"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + install -Dm 755 todofi.sh -t $out/bin + ''; + + postFixup = '' + patchShebangs $out/bin + wrapProgram $out/bin/todofi.sh --prefix PATH : "${lib.makeBinPath [ coreutils gawk gnugrep gnused rofi todo-txt-cli ]}" + ''; + + meta = with lib; { + description = "Todo-txt + Rofi = Todofi.sh"; + homepage = "https://github.com/hugokernel/todofi.sh"; + license = licenses.mit; + maintainers = with maintainers; [ ewok ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/MACS2/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/MACS2/default.nix new file mode 100644 index 0000000000..cc398608ce --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/biology/MACS2/default.nix @@ -0,0 +1,25 @@ +{ lib, python3, fetchurl }: + +python3.pkgs.buildPythonPackage rec { + pname = "MACS2"; + version = "2.2.7.1"; + + src = python3.pkgs.fetchPypi { + inherit pname version; + sha256 = "1rcxj943kgzs746f5jrb72x1cp4v50rk3qmad0m99a02vndscb5d"; + }; + + propagatedBuildInputs = with python3.pkgs; [ numpy ]; + + # To prevent ERROR: diffpeak_cmd (unittest.loader._FailedTest) for obsolete + # function (ImportError: Failed to import test module: diffpeak_cmd) + doCheck = false; + pythonImportsCheck = [ "MACS2" ]; + + meta = with lib; { + description = "Model-based Analysis for ChIP-Seq"; + license = licenses.bsd3; + maintainers = with maintainers; [ gschwartz ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/wezterm/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/wezterm/default.nix index 8db5152137..8b1031bb5b 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/wezterm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/wezterm/default.nix @@ -22,7 +22,7 @@ , libGL , freetype , zlib -# Apple frameworks + # Apple frameworks , CoreGraphics , Cocoa , Foundation @@ -68,6 +68,10 @@ rustPlatform.buildRustPackage rec { fetchSubmodules = true; }; + postPatch = '' + echo ${version} > .tag + ''; + cargoSha256 = "sha256-UaXeeuRuQk+CWF936mEAaWTjZuTSRPmxbQ/9E2oZIqg="; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/video/jellyfin-media-player/default.nix b/third_party/nixpkgs/pkgs/applications/video/jellyfin-media-player/default.nix new file mode 100644 index 0000000000..bac7619c33 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/jellyfin-media-player/default.nix @@ -0,0 +1,108 @@ +{ lib +, fetchFromGitHub +, fetchzip +, mkDerivation +, stdenv +, Cocoa +, CoreAudio +, CoreFoundation +, MediaPlayer +, SDL2 +, cmake +, libGL +, libX11 +, libXrandr +, libvdpau +, mpv +, ninja +, pkg-config +, python3 +, qtbase +, qtwayland +, qtwebchannel +, qtwebengine +, qtx11extras +}: + +mkDerivation rec { + pname = "jellyfin-media-player"; + version = "1.3.1"; + + src = fetchFromGitHub { + owner = "iwalton3"; + repo = "jellyfin-media-player"; + rev = "v${version}"; + sha256 = "sha256-rXW6vC0Ow8xFblXjGYaDExAZM8RgqLkDHiX7R8vAWjI="; + }; + + jmpDist = fetchzip { + url = "https://github.com/iwalton3/jellyfin-web-jmp/releases/download/jwc-10.7.2/dist.zip"; + sha256 = "sha256-EpNAN4nzINiwMrmg0e4x3uJRTy5ovx4ZkmP83Kbn4S0="; + }; + + patches = [ + # the webclient-files are not copied in the regular build script. Copy them just like the linux build + ./fix-osx-resources.patch + ]; + + buildInputs = [ + SDL2 + libGL + libX11 + libXrandr + libvdpau + mpv + qtbase + qtwebchannel + qtwebengine + qtx11extras + ] ++ lib.optionals stdenv.isLinux [ + qtwayland + ] ++ lib.optionals stdenv.isDarwin [ + Cocoa + CoreAudio + CoreFoundation + MediaPlayer + ]; + + nativeBuildInputs = [ + cmake + ninja + pkg-config + python3 + ]; + + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + "-DQTROOT=${qtbase}" + "-GNinja" + ]; + + preBuild = '' + # copy the webclient-files to the expected "dist" directory + mkdir -p dist + cp -a ${jmpDist}/* dist + ''; + + postInstall = lib.optionalString stdenv.isDarwin '' + mkdir -p $out/bin $out/Applications + mv "$out/Jellyfin Media Player.app" $out/Applications + + # move web-client resources + mv $out/Resources/* "$out/Applications/Jellyfin Media Player.app/Contents/Resources/" + rmdir $out/Resources + + # fix 'Could not find the Qt platform plugin "cocoa" in ""' error + wrapQtApp "$out/Applications/Jellyfin Media Player.app/Contents/MacOS/Jellyfin Media Player" + + ln -s "$out/Applications/Jellyfin Media Player.app/Contents/MacOS/Jellyfin Media Player" $out/bin/jellyfinmediaplayer + ''; + + meta = with lib; { + homepage = "https://github.com/iwalton3/jellyfin-media-player"; + description = "Jellyfin Desktop Client based on Plex Media Player"; + license = with licenses; [ gpl2Plus mit ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; + maintainers = with maintainers; [ jojosch ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/video/jellyfin-media-player/fix-osx-resources.patch b/third_party/nixpkgs/pkgs/applications/video/jellyfin-media-player/fix-osx-resources.patch new file mode 100644 index 0000000000..5c562295b4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/jellyfin-media-player/fix-osx-resources.patch @@ -0,0 +1,15 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 780c0d3..d9c2341 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -108,8 +108,8 @@ endif() + set(RESOURCE_ROOT .) + if(APPLE) + set(RESOURCE_ROOT Resources) +- add_resources(TARGET ${MAIN_TARGET} SOURCES ${CMAKE_CURRENT_BINARY_DIR}/../dist/ DEST ${RESOURCE_ROOT}/web-client/desktop) +- add_resources(TARGET ${MAIN_TARGET} SOURCES ${CMAKE_SOURCE_DIR}/native/ DEST ${RESOURCE_ROOT}/web-client/extension) ++ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../dist/ DESTINATION ${RESOURCE_ROOT}/web-client/desktop) ++ install(DIRECTORY ${CMAKE_SOURCE_DIR}/native/ DESTINATION ${RESOURCE_ROOT}/web-client/extension) + endif() + + if(NOT APPLE) diff --git a/third_party/nixpkgs/pkgs/applications/video/jellyfin-mpv-shim/default.nix b/third_party/nixpkgs/pkgs/applications/video/jellyfin-mpv-shim/default.nix index e577abda95..346841eabf 100644 --- a/third_party/nixpkgs/pkgs/applications/video/jellyfin-mpv-shim/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/jellyfin-mpv-shim/default.nix @@ -20,11 +20,11 @@ buildPythonApplication rec { pname = "jellyfin-mpv-shim"; - version = "1.10.3"; + version = "1.10.4"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Tl7P8SJ/ZuwIi8RxDWkhfd7LUd63xv5Ehg1UqaYHb1g="; + sha256 = "sha256-QMyb69S8Ln4X0oUuLpL6vtgxJwq8f+Q4ReNckrN4E+E="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/video/lbry/default.nix b/third_party/nixpkgs/pkgs/applications/video/lbry/default.nix new file mode 100644 index 0000000000..479616ee3e --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/lbry/default.nix @@ -0,0 +1,49 @@ +{ lib, fetchurl, appimageTools}: + +let + pname = "lbry-desktop"; + version = "0.50.2"; +in appimageTools.wrapAppImage rec { + name = "${pname}-${version}"; + + # Fetch from GitHub Releases and extract + src = appimageTools.extract { + inherit name; + src = fetchurl { + url = "https://github.com/lbryio/lbry-desktop/releases/download/v${version}/LBRY_${version}.AppImage"; + # Gotten from latest-linux.yml + sha512 = "br6HvVRz+ybmAhmQh3vOC5wgLmOCVrGHDn59ueWk6rFoKOCbm8WdmdadOZvHeN1ld2nlvPzEy+KXMOEfF1LeQg=="; + }; + }; + + # At runtime, Lbry likes to have access to Ffmpeg + extraPkgs = pkgs: with pkgs; [ + ffmpeg + ]; + + # General fixup + extraInstallCommands = '' + # Firstly, rename the executable to lbry for convinence + mv $out/bin/${name} $out/bin/lbry + + # Now, install assets such as the desktop file and icons + install -m 444 -D ${src}/lbry.desktop -t $out/share/applications + substituteInPlace $out/share/applications/lbry.desktop \ + --replace 'AppRun' '$out/bin/lbry' + cp -r ${src}/usr/share/icons $out/share + ''; + + meta = with lib; { + description = "A browser and wallet for LBRY, the decentralized, user-controlled content marketplace"; + longDescription = '' + The LBRY app is a graphical browser for the decentralized content marketplace provided by the LBRY protocol. + It is essentially the lbry daemon bundled with a UI using Electron. + ''; + license = licenses.mit; + homepage = "https://lbry.com/"; + downloadPage = "https://lbry.com/get/"; + changelog = "https://github.com/lbryio/lbry-desktop/blob/master/CHANGELOG.md"; + maintainers = with maintainers; [ enderger ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpvacious.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpvacious.nix index 5bfcd2ac32..0995d976e6 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpvacious.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpvacious.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mpvacious"; - version = "0.12"; + version = "0.14"; src = fetchFromGitHub { owner = "Ajatt-Tools"; repo = "mpvacious"; rev = "v${version}"; - sha256 = "1xz4qh2ibfv03m3pfdasim9byvlm78wigx1linmih19vgg99vky2"; + sha256 = "0r031hh3hpim9dli15m9q4cwka4ljvwg0hdgyp36r1n097q44r5f"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix index d3a440fefc..28e52a639e 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "cri-o"; - version = "1.20.1"; + version = "1.21.0"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - sha256 = "sha256-cli/ipWxZgAeDMBUMuOU3l2mKv4POvOhi7ctbVdU6jc="; + sha256 = "sha256-qhS1RLkM7xDsH3qDVL+ORXmwULYz8UK1oJM29oRqJ0M="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/river/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/river/default.nix new file mode 100644 index 0000000000..5c20bd17fc --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/window-managers/river/default.nix @@ -0,0 +1,44 @@ +{ lib, stdenv ,fetchFromGitHub +, zig, wayland, pkg-config, scdoc +, xwayland, wayland-protocols, wlroots +, libxkbcommon, pixman, udev, libevdev, libX11, libGL +}: + +stdenv.mkDerivation rec { + pname = "river"; + version = "unstable-2021-04-08"; + + src = fetchFromGitHub { + owner = "ifreund"; + repo = "river"; + rev = "9e3e92050e04320949c6cd995273c30319ebd515"; + sha256 = "1v8dpbadsb3c7bc84sai09dbqv5s5s5d77vs12kdkd45x0ppmk3j"; + fetchSubmodules = true; + }; + + buildInputs = [ xwayland wayland-protocols wlroots pixman + libxkbcommon pixman udev libevdev libX11 libGL + ]; + + preBuild = '' + export HOME=$TMPDIR + ''; + installPhase = '' + zig build -Drelease-safe -Dxwayland -Dman-pages --prefix $out install + ''; + + nativeBuildInputs = [ zig wayland scdoc pkg-config ]; + + installFlags = [ "DESTDIR=$(out)" ]; + + meta = with lib; { + description = "A dynamic tiling wayland compositor"; + longDescription = '' + river is a dynamic tiling wayland compositor that takes inspiration from dwm and bspwm. + ''; + homepage = "https://github.com/ifreund/river"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ branwright1 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix b/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix index e46c7a4289..7fe16f016c 100644 --- a/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "numix-icon-theme-circle"; - version = "20.09.19"; + version = "21.04.14"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "1rqlq5ssxqj0nc0i8av7zprj94km5645xzqi5j5i0sxd3jbmyfjx"; + sha256 = "1z8c0179r8g0y9zh4383brsfhkcyfy79dc8hw94p9zjn5a66547w"; }; nativeBuildInputs = [ gtk3 ]; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Numix icon theme (circle version)"; homepage = "https://numixproject.github.io"; - license = licenses.gpl3; + license = licenses.gpl3Only; # darwin cannot deal with file names differing only in case platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-square/default.nix b/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-square/default.nix index bc243b95af..9c7b1786a6 100644 --- a/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-square/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-square/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "numix-icon-theme-square"; - version = "20.09.19"; + version = "21.04.14"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "0afraarfcd66mpidmn0l90wif8kmwzdj3s09g704kwszyijxs80z"; + sha256 = "0ndxjp173dwz78m41mn818mh4bdsxa2ypv4wrwicx0v4d8z90ddj"; }; nativeBuildInputs = [ gtk3 ]; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Numix icon theme (square version)"; homepage = "https://numixproject.github.io"; - license = licenses.gpl3; + license = licenses.gpl3Only; # darwin cannot deal with file names differing only in case platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme/default.nix index d8e583b4bb..194a36021a 100644 --- a/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "numix-icon-theme"; - version = "20.06.07"; + version = "21.04.14"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "1yp9parc8ihmai8pswf4qzrqd88qpls87ipq8ylx38yqns7wsn4h"; + sha256 = "1ilzqh9f7skdfg5sl97zfgwrzvwa1zna22dpq0954gyyzvy7k7lg"; }; nativeBuildInputs = [ gtk3 ]; @@ -18,18 +18,22 @@ stdenv.mkDerivation rec { dontDropIconThemeCache = true; installPhase = '' + runHook preInstall + mkdir -p $out/share/icons cp -a Numix{,-Light} $out/share/icons/ for theme in $out/share/icons/*; do gtk-update-icon-cache $theme done + + runHook postInstall ''; meta = with lib; { description = "Numix icon theme"; homepage = "https://numixproject.github.io"; - license = licenses.gpl3; + license = licenses.gpl3Only; # darwin cannot deal with file names differing only in case platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/applications/xfdashboard/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/applications/xfdashboard/default.nix index 8373616694..bef18e3e50 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/applications/xfdashboard/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/applications/xfdashboard/default.nix @@ -17,11 +17,11 @@ mkXfceDerivation { category = "apps"; pname = "xfdashboard"; - version = "0.9.1"; + version = "0.9.2"; rev-prefix = ""; odd-unstable = false; - sha256 = "14k774wxbk3w0ci2mmm6bhq4i742qahd0j0dr40iwmld55473zgd"; + sha256 = "06pvzhhkr2mimsrzlkpsrzf5fxag4fhabyb3cpmgpyp5hcbgvaj3"; buildInputs = [ clutter diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/core/exo/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/core/exo/default.nix index d9afdfe0d9..962170a176 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/core/exo/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/core/exo/default.nix @@ -4,9 +4,9 @@ mkXfceDerivation { category = "xfce"; pname = "exo"; - version = "4.16.1"; + version = "4.16.2"; - sha256 = "1220mq8gs5s8l0d1p92j6icldzqj6zaisp27ss5jm7hwkkcnms9n"; + sha256 = "0rsp92j4hkr5jrkrj8anzw9fwd96xbxzpzqzqiyjjwdiq7b29l1v"; nativeBuildInputs = [ libxslt diff --git a/third_party/nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix b/third_party/nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix index c94df83009..4012aa260f 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix @@ -2,12 +2,12 @@ openjdk11.overrideAttrs (oldAttrs: rec { pname = "jetbrains-jdk"; - version = "11.0.10-b37"; + version = "11.0.10-b1427"; src = fetchFromGitHub { owner = "JetBrains"; repo = "JetBrainsRuntime"; rev = "jb${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "0bcvwnwi29z000b1bk5dhfkd33xfp9899zc3idzifdwl7q42zi02"; + sha256 = "sha256-2cn+FiFfGpp7CBeQMAASVZwTm6DOFaXaWxAL/nVC2Nk="; }; patches = []; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/llvm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/llvm/default.nix index fc64451e01..ee2fe9c90b 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/llvm/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/llvm/default.nix @@ -70,7 +70,7 @@ in stdenv.mkDerivation (rec { --replace "Path.cpp" "" rm unittests/Support/Path.cpp '' + optionalString stdenv.hostPlatform.isMusl '' - patch -p1 -i ${../TLI-musl.patch} + patch -p1 -i ${../../TLI-musl.patch} substituteInPlace unittests/Support/CMakeLists.txt \ --replace "add_subdirectory(DynamicLibrary)" "" rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/ITree/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/ITree/default.nix new file mode 100644 index 0000000000..95174d9547 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/coq-modules/ITree/default.nix @@ -0,0 +1,17 @@ +{ lib, mkCoqDerivation, coq, version ? null , paco, coq-ext-lib }: + +with lib; mkCoqDerivation rec { + pname = "InteractionTrees"; + owner = "DeepSpec"; + inherit version; + defaultVersion = with versions; switch coq.coq-version [ + { case = range "8.10" "8.13"; out = "4.0.0"; } + ] null; + release."4.0.0".sha256 = "0h5rhndl8syc24hxq1gch86kj7mpmgr89bxp2hmf28fd7028ijsm"; + releaseRev = v: "${v}"; + propagatedBuildInputs = [ coq-ext-lib paco ]; + meta = { + description = "A Library for Representing Recursive and Impure Programs in Coq"; + maintainers = with maintainers; [ larsr ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/coq-ext-lib/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/coq-ext-lib/default.nix index 8acb064378..6ba798ac32 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/coq-ext-lib/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/coq-ext-lib/default.nix @@ -5,7 +5,7 @@ with lib; mkCoqDerivation rec { owner = "coq-ext-lib"; inherit version; defaultVersion = with versions; switch coq.coq-version [ - { case = range "8.8" "8.12"; out = "0.11.3"; } + { case = range "8.8" "8.13"; out = "0.11.3"; } { case = "8.7"; out = "0.9.7"; } { case = "8.6"; out = "0.9.5"; } { case = "8.5"; out = "0.9.4"; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/equations/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/equations/default.nix index 352222e8aa..d19d3826c7 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/equations/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/equations/default.nix @@ -6,8 +6,9 @@ with lib; mkCoqDerivation { repo = "Coq-Equations"; inherit version; defaultVersion = switch coq.coq-version [ - { case = "8.12"; out = "1.2.3+coq8.12"; } - { case = "8.11"; out = "1.2.3+coq8.11"; } + { case = "8.13"; out = "1.2.4+coq8.13"; } + { case = "8.12"; out = "1.2.4+coq8.12"; } + { case = "8.11"; out = "1.2.4+coq8.11"; } { case = "8.10"; out = "1.2.1+coq8.10-2"; } { case = "8.9"; out = "1.2.1+coq8.9"; } { case = "8.8"; out = "1.2+coq8.8"; } @@ -36,6 +37,12 @@ with lib; mkCoqDerivation { release."1.2.3+coq8.12".version = "1.2.3"; release."1.2.3+coq8.12".rev = "v1.2.3-8.12"; release."1.2.3+coq8.12".sha256 = "1y0jkvzyz5ssv5vby41p1i8zs7nsdc8g3pzyq73ih9jz8h252643"; + release."1.2.4+coq8.11".rev = "v1.2.4-8.11"; + release."1.2.4+coq8.11".sha256 = "01fihyav8jbjinycgjc16adpa0zy5hcav5mlkf4s9zvqxka21i52"; + release."1.2.4+coq8.12".rev = "v1.2.4-8.12"; + release."1.2.4+coq8.12".sha256 = "1n0w8is464qcq8mk2mv7amaf0khbjz5mpc9phf0rhpjm0lb22cb3"; + release."1.2.4+coq8.13".rev = "v1.2.4-8.13"; + release."1.2.4+coq8.13".sha256 = "0i014lshsdflzw6h0qxra9d2f0q82vffxv2f29awbb9ad0p4rq4q"; mlPlugin = true; preBuild = "coq_makefile -f _CoqProject -o Makefile"; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/simple-io/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/simple-io/default.nix index 42d4f782f1..3631bdd54b 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/simple-io/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/simple-io/default.nix @@ -5,7 +5,7 @@ with lib; mkCoqDerivation { owner = "Lysxia"; repo = "coq-simple-io"; inherit version; - defaultVersion = if versions.range "8.7" "8.12" coq.coq-version then "1.3.0" else null; + defaultVersion = if versions.range "8.7" "8.13" coq.coq-version then "1.3.0" else null; release."1.3.0".sha256 = "1yp7ca36jyl9kz35ghxig45x6cd0bny2bpmy058359p94wc617ax"; extraBuildInputs = (with coq.ocamlPackages; [ ocaml ocamlbuild ]); propagatedBuildInputs = [ coq-ext-lib ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/fcft/default.nix b/third_party/nixpkgs/pkgs/development/libraries/fcft/default.nix index fd6f26c978..e9cd3571c7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/fcft/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/fcft/default.nix @@ -6,12 +6,12 @@ stdenv.mkDerivation rec { pname = "fcft"; - version = "2.3.2"; + version = "2.3.3"; src = fetchgit { url = "https://codeberg.org/dnkl/fcft.git"; rev = version; - sha256 = "0k2i57rakm4g86f7hbhkby8af0vv7v63a70lk3m58mkycpy5q2rm"; + sha256 = "0314r038jl17hrhc9nrbx30jk0pz8ckbdnizws4r46b1rf4h0b1f"; }; nativeBuildInputs = [ pkg-config meson ninja scdoc ]; @@ -29,7 +29,10 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://codeberg.org/dnkl/fcft"; description = "Simple library for font loading and glyph rasterization"; - maintainers = with maintainers; [ fionera ]; + maintainers = with maintainers; [ + fionera + sternenseemann + ]; license = licenses.mit; platforms = with platforms; linux; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsearpc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libsearpc/default.nix index 1ac5cef7c5..199ae0b685 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libsearpc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libsearpc/default.nix @@ -1,4 +1,5 @@ -{lib, stdenv, fetchFromGitHub, automake, autoconf, pkg-config, libtool, python2Packages, glib, jansson}: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, python3Packages +, glib, jansson }: stdenv.mkDerivation rec { version = "3.2.0"; @@ -11,21 +12,15 @@ stdenv.mkDerivation rec { sha256 = "18i5zvrp6dv6vygxx5nc93mai2p2x786n5lnf5avrin6xiz2j6hd"; }; - patches = [ ./libsearpc.pc.patch ]; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ automake autoconf libtool python2Packages.python python2Packages.simplejson ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; + buildInputs = with python3Packages; [ python simplejson ]; propagatedBuildInputs = [ glib jansson ]; - postPatch = "patchShebangs autogen.sh"; - - preConfigure = "./autogen.sh"; - meta = with lib; { homepage = "https://github.com/haiwen/libsearpc"; - description = "A simple and easy-to-use C language RPC framework (including both server side & client side) based on GObject System"; + description = "A simple and easy-to-use C language RPC framework based on GObject System"; license = licenses.lgpl3; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ greizgh ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsearpc/libsearpc.pc.patch b/third_party/nixpkgs/pkgs/development/libraries/libsearpc/libsearpc.pc.patch deleted file mode 100644 index 6f30932ba6..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/libsearpc/libsearpc.pc.patch +++ /dev/null @@ -1,10 +0,0 @@ -From: Aaron Lindsay - ---- a/libsearpc.pc.in 2013-01-10 01:35:24.000000000 -0500 -+++ b/libsearpc.pc.in 2013-01-19 11:31:50.479301798 -0500 -@@ -1,4 +1,4 @@ --prefix=(DESTDIR)@prefix@ -+prefix=@prefix@ - exec_prefix=@exec_prefix@ - libdir=@libdir@ - includedir=@includedir@ diff --git a/third_party/nixpkgs/pkgs/development/node-packages/default.nix b/third_party/nixpkgs/pkgs/development/node-packages/default.nix index 2023cbfbfa..b0bd2afd14 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/default.nix +++ b/third_party/nixpkgs/pkgs/development/node-packages/default.nix @@ -13,6 +13,19 @@ let export NG_CLI_ANALYTICS=false ''; }; + + aws-azure-login = super.aws-azure-login.override { + meta.platforms = pkgs.lib.platforms.linux; + nativeBuildInputs = [ pkgs.makeWrapper ]; + prePatch = '' + export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1 + ''; + postInstall = '' + wrapProgram $out/bin/aws-azure-login \ + --set PUPPETEER_EXECUTABLE_PATH ${pkgs.chromium}/bin/chromium + ''; + }; + bower2nix = super.bower2nix.override { buildInputs = [ pkgs.makeWrapper ]; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json index 56acc29b94..9ee15fcc4d 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json +++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json @@ -12,6 +12,7 @@ , "@webassemblyjs/wast-refmt" , "alloy" , "asar" +, "aws-azure-login" , "balanceofsatoshis" , "bash-language-server" , "bower" diff --git a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix index 044ece3dd5..7b5c0a1507 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix +++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix @@ -1525,13 +1525,13 @@ let sha512 = "htzFO1Zc57S8kgdRK9mLcPVTW1BY2ijfH7Dk2CeZmspTWKdKqSo1iwmqrq2WtRjFlo8aRZYgLX0wFrDXF/9DLA=="; }; }; - "@cdktf/hcl2json-0.2.1" = { + "@cdktf/hcl2json-0.2.2" = { name = "_at_cdktf_slash_hcl2json"; packageName = "@cdktf/hcl2json"; - version = "0.2.1"; + version = "0.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/hcl2json/-/hcl2json-0.2.1.tgz"; - sha512 = "fn2ZA+Fxdk+QfDleT7GOiZozHdic5kVR0MhFHPzTEipXw7tJlrrbqd1fH+GJFu090uzIagdUM3Y+j4w1GTOz7g=="; + url = "https://registry.npmjs.org/@cdktf/hcl2json/-/hcl2json-0.2.2.tgz"; + sha512 = "C/IOl8ARTRiafC9mdZiIuJbqys6LRmaVM/grux7OASkVbkyYy2RHKPVXRBsD5mtfLBXQaL/NGjLLJ4aSC7jFZQ=="; }; }; "@chemzqm/neovim-5.2.13" = { @@ -3055,13 +3055,13 @@ let sha512 = "4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg=="; }; }; - "@jsii/spec-1.27.1" = { + "@jsii/spec-1.28.0" = { name = "_at_jsii_slash_spec"; packageName = "@jsii/spec"; - version = "1.27.1"; + version = "1.28.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.27.1.tgz"; - sha512 = "L5Hqv5g9TSnHsNsOhaIS/gpd1N+1dLao5e6EISF6oyh0JzZFffi2IjQbvE3Xb7GPaCfb5R9+ENO/iX/e5SvK+w=="; + url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.28.0.tgz"; + sha512 = "5mcupuCCXyhZwNmX/RDBn3WUYtd0oPXEDa3E+qOSjT30vaO8u9ZQ+mxwl4qsecx3m51LhXKnR1C9U9t4VlAmqA=="; }; }; "@kwsites/file-exists-1.1.1" = { @@ -3973,13 +3973,13 @@ let sha512 = "oN3y7FAROHhrAt7Rr7PnTSwrHrZVRTS2ZbyxeQwSSYD0ifwM3YNgQqbaRmjcWoPyq77MjchusjJDspbzMmip1Q=="; }; }; - "@npmcli/git-2.0.6" = { + "@npmcli/git-2.0.7" = { name = "_at_npmcli_slash_git"; packageName = "@npmcli/git"; - version = "2.0.6"; + version = "2.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/git/-/git-2.0.6.tgz"; - sha512 = "a1MnTfeRPBaKbFY07fd+6HugY1WAkKJzdiJvlRub/9o5xz2F/JtPacZZapx5zRJUQFIzSL677vmTSxEcDMrDbg=="; + url = "https://registry.npmjs.org/@npmcli/git/-/git-2.0.7.tgz"; + sha512 = "HUSqNDWYsTpboc7yV1C4yPd/jbaGXfWVmGoTyB+h3QQSKMpYPzTXLrqUMpz+LEA6Dt9usUeRtjytwcrfoBMJpg=="; }; }; "@npmcli/installed-package-contents-1.0.7" = { @@ -5332,6 +5332,15 @@ let sha512 = "T3xfDqrEFKclHGdJx4/5+D5F7e76/99f33guE4RTlVITBhy7VVnjz4t/NDr3UYqcC0MgAmiC4bSVYHnlshuwJw=="; }; }; + "@snyk/cloud-config-parser-1.9.2" = { + name = "_at_snyk_slash_cloud-config-parser"; + packageName = "@snyk/cloud-config-parser"; + version = "1.9.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@snyk/cloud-config-parser/-/cloud-config-parser-1.9.2.tgz"; + sha512 = "m8Y2+3l4fxj96QMrTfiCEaXgCpDkCkJIX/5wv0V0RHuxpUiyh+KxC2yJ8Su4wybBj6v6hB9hB7h5/L+Gy4V4PA=="; + }; + }; "@snyk/cocoapods-lockfile-parser-3.6.2" = { name = "_at_snyk_slash_cocoapods-lockfile-parser"; packageName = "@snyk/cocoapods-lockfile-parser"; @@ -10750,13 +10759,13 @@ let sha512 = "+KBkqH7t/XE91Fqn8eyJeNIWsnhSWL8bSUqFD7TfE3FN07MTlC0nprGYp+2WfcYNz5i8Bus1vY2DHNVhtTImnw=="; }; }; - "aws-sdk-2.885.0" = { + "aws-sdk-2.886.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.885.0"; + version = "2.886.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.885.0.tgz"; - sha512 = "V7fS53HkLYap+mt00frWB516HZV34C5pHNhBs/Het3Vgl7A0GbCpJs07G4FOIT9ioJ38+k9McscOzXG++1rWMQ=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.886.0.tgz"; + sha512 = "GK2TiijM/sX3PMOvPbZFPBeL7hW5S0RstwgplEABVxCMPXLkk8ws5ENOwS/c74nrTQKSxZMn/3sThNEtb3J7Ew=="; }; }; "aws-sign2-0.6.0" = { @@ -14242,13 +14251,13 @@ let sha512 = "G6SIJSg6mxeEzWEWNY8NAn/jqysTPegV79mOQ6eYj1uyKYggyzP5MzuWt8fKmYShM5BTDadnCRajwDnku9LZeQ=="; }; }; - "cdktf-0.2.1" = { + "cdktf-0.2.2" = { name = "cdktf"; packageName = "cdktf"; - version = "0.2.1"; + version = "0.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/cdktf/-/cdktf-0.2.1.tgz"; - sha512 = "yz2eoeiSWDjf98ackXw6D0bWvdsmJ7EIxuTHbkn7hzaIJ9sDrXhVLpcTP0rolBVZ/FR8/mtFLoEdHnthIg5IcA=="; + url = "https://registry.npmjs.org/cdktf/-/cdktf-0.2.2.tgz"; + sha512 = "SMiDV99ruSGhjBm+dj30XmtV20BKesjY75SGGB3sTcFeaqn5d1Gf8gAaG69QTm3zqI8SbYO12MDslkoX1BY5Zw=="; }; }; "center-align-0.1.3" = { @@ -15709,13 +15718,13 @@ let sha512 = "3WQV/Fpa77nvzjUlc+0u53uIroJyyMB2Qwl++aXpAiDIsrsiAQq4uCURwdRBRX+eLkOTIAmT0L4qna3T7+2pUg=="; }; }; - "codemaker-1.27.1" = { + "codemaker-1.28.0" = { name = "codemaker"; packageName = "codemaker"; - version = "1.27.1"; + version = "1.28.0"; src = fetchurl { - url = "https://registry.npmjs.org/codemaker/-/codemaker-1.27.1.tgz"; - sha512 = "0Ypru4bovWAqZY+giAMIFQh1aJlTJLU7rbNPzkAW7U9mPoja2IE4KLWNlSEYvP7hpamY51Nrz/VfcazsB6a/rg=="; + url = "https://registry.npmjs.org/codemaker/-/codemaker-1.28.0.tgz"; + sha512 = "TlpvV3q/68cZk7aljYW6b/5EvyB4uw523xJISTATrCrQu/UTA79/mxpA2ug8uhPcJoGYcfWXH4BHVVLNIuEtrg=="; }; }; "codepage-1.4.0" = { @@ -17501,13 +17510,13 @@ let sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6"; }; }; - "create-gatsby-1.2.0" = { + "create-gatsby-1.3.0" = { name = "create-gatsby"; packageName = "create-gatsby"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-1.2.0.tgz"; - sha512 = "CXvs1wxGqU1m8PMGmcuJfi9x8koFZZu0JwQr+e7MNnUL33wQEnaLSdwFDBUT4cEqFVWXWAcGErBOZT7/XEgh7Q=="; + url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-1.3.0.tgz"; + sha512 = "c78VG3AIqUg/sJCvxzFL5tGwO8MsDICRvyQ/FXS81Kf/QTr0ON9VvDjodEiM9AmtcyU5vRnM/GspEt1YfHo38A=="; }; }; "create-graphback-1.0.1" = { @@ -24136,6 +24145,15 @@ let sha1 = "25c7c89cb1f9077f8891bbe61d8f390eae256f1e"; }; }; + "fecha-2.3.3" = { + name = "fecha"; + packageName = "fecha"; + version = "2.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/fecha/-/fecha-2.3.3.tgz"; + sha512 = "lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg=="; + }; + }; "fecha-4.2.1" = { name = "fecha"; packageName = "fecha"; @@ -25279,13 +25297,13 @@ let sha512 = "ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww=="; }; }; - "form-urlencoded-4.5.0" = { + "form-urlencoded-4.5.1" = { name = "form-urlencoded"; packageName = "form-urlencoded"; - version = "4.5.0"; + version = "4.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/form-urlencoded/-/form-urlencoded-4.5.0.tgz"; - sha512 = "iv4Vc+xD37MULhC7DBgSq/GBp2mZMh7Q19ErhAqCX9trPc7Ix8P7x+KZojTmEpxtajzpCm153sxrXKDbNxkBNQ=="; + url = "https://registry.npmjs.org/form-urlencoded/-/form-urlencoded-4.5.1.tgz"; + sha512 = "Rkd/RdMaprsMJEGzEbxolwacp78WupH7u369KEyIY3pEZ1fhL6HtyQ1FX+4HSfA1VVhET18UwCUcr5DVaDIaqg=="; }; }; "format-0.2.2" = { @@ -25864,31 +25882,31 @@ let sha1 = "cbed2d20a40c1f5679a35908e2b9415733e78db9"; }; }; - "gatsby-core-utils-2.2.0" = { + "gatsby-core-utils-2.3.0" = { name = "gatsby-core-utils"; packageName = "gatsby-core-utils"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-2.2.0.tgz"; - sha512 = "7T6aVJAj0u/VUg+zKOLuxyZLS/8KDQcDeEFCkKY0d7Pd4wV/QqKRLljr0TRVkivRZHXyWQI9fM3ox5DzfkHdCQ=="; + url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-2.3.0.tgz"; + sha512 = "M7RlR6jL2dtkUu4AoKBoQaPTsbpByzWHc7HBgeYdwzuqbk4VuMe6K76pFDvFSNj0+LvVhWoRGHO7OEtpfb2bEA=="; }; }; - "gatsby-recipes-0.13.0" = { + "gatsby-recipes-0.14.0" = { name = "gatsby-recipes"; packageName = "gatsby-recipes"; - version = "0.13.0"; + version = "0.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-recipes/-/gatsby-recipes-0.13.0.tgz"; - sha512 = "ni3J7wu45XfktDyxjL42zgjRzDqGQZX4/l541P5UbcAjdPAQJBP3qUgyPt2qhtenPYP/iZdbutXKxKjfkckcsQ=="; + url = "https://registry.npmjs.org/gatsby-recipes/-/gatsby-recipes-0.14.0.tgz"; + sha512 = "f8vZtHA7mCWqLE/xxEs4gpKxfM53L4dPic6hkALMlNfg8040eu05D6YbNT3i3QLsyqpvX1vKH88SBHk7swwW8w=="; }; }; - "gatsby-telemetry-2.2.0" = { + "gatsby-telemetry-2.3.0" = { name = "gatsby-telemetry"; packageName = "gatsby-telemetry"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-2.2.0.tgz"; - sha512 = "Zx/MP+By8QHgm2fikfq6egmcrwREsWAg2wfqTo0CRax5WUQQWl57zX3b0bIJ+k0sFCvU4XuxP0XrytvzxkVViQ=="; + url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-2.3.0.tgz"; + sha512 = "dr7pILAnEtoG9ZUyPRljSwB/fGBDM4OCoM0mGw3DYr6HFlvrsbIl7AVL4LVJIr4TrtVUrhTjC/crSw+bTzO42A=="; }; }; "gauge-1.2.7" = { @@ -32157,13 +32175,13 @@ let sha512 = "pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ=="; }; }; - "js-beautify-1.13.5" = { + "js-beautify-1.13.8" = { name = "js-beautify"; packageName = "js-beautify"; - version = "1.13.5"; + version = "1.13.8"; src = fetchurl { - url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.13.5.tgz"; - sha512 = "MsXlH6Z/BiRYSkSRW3clNDqDjSpiSNOiG8xYVUBXt4k0LnGvDhlTGOlHX1VFtAdoLmtwjxMG5qiWKy/g+Ipv5w=="; + url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.13.8.tgz"; + sha512 = "nTlinr+SgOkFXT984l+Lyj/vrqU5D8W6Szdipq4+H1dWvNOp35CUnrBRCLNZpxseIyJnB1VTgI+on4j9tmU5OQ=="; }; }; "js-git-0.7.8" = { @@ -32427,40 +32445,40 @@ let sha512 = "xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g=="; }; }; - "jsii-1.27.1" = { + "jsii-1.28.0" = { name = "jsii"; packageName = "jsii"; - version = "1.27.1"; + version = "1.28.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii/-/jsii-1.27.1.tgz"; - sha512 = "2VIZwLytVRsOnqhdZNqZPPKrAPYIAmqxest7YcrwgFbTK+Zyxsa2FQyWyD2nNVzdxWqVUqALvuV3RMKMEHWv7g=="; + url = "https://registry.npmjs.org/jsii/-/jsii-1.28.0.tgz"; + sha512 = "B6CbHi60fabeQZJYNea8wSUsrILJzN7ng+yx69GmMJ4C6NtCVt7Oc/CITfhY/cYTwdhN3FAJf01e5/v8qj6bUA=="; }; }; - "jsii-pacmak-1.27.1" = { + "jsii-pacmak-1.28.0" = { name = "jsii-pacmak"; packageName = "jsii-pacmak"; - version = "1.27.1"; + version = "1.28.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.27.1.tgz"; - sha512 = "OA9lPxOFHyGmLsGWe8VjbTnIsAjZo8vHHB7RVHZeZ5pwKZJxV3ND2SBgb8cvzbu9rwLi/eFD0aAadq9fRFrDLA=="; + url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.28.0.tgz"; + sha512 = "QAW8rq7M9rA/QSXwaJKMVpttkNW/BJgE9GT6i9UahobQMkmp+zsXCJUENeRg2mndLqX0DDyxO1in/fuIeCeR3A=="; }; }; - "jsii-reflect-1.27.1" = { + "jsii-reflect-1.28.0" = { name = "jsii-reflect"; packageName = "jsii-reflect"; - version = "1.27.1"; + version = "1.28.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.27.1.tgz"; - sha512 = "I2jc7Gv26N9MUyVhewjLS9vZJL4aPOcKCjgsmpDCX4Pz7ny9Op7iHNST9LpicY0Vqv81gi8OnsM0mWBPUM2nOA=="; + url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.28.0.tgz"; + sha512 = "jFu9dUy5D0PrxVnaDilb50agbSr0wZRya6StwHyw8Wly3ruzS8uuSB1aWmEwN371m5ewDD4m9nPEQ9zMmKFvMQ=="; }; }; - "jsii-rosetta-1.27.1" = { + "jsii-rosetta-1.28.0" = { name = "jsii-rosetta"; packageName = "jsii-rosetta"; - version = "1.27.1"; + version = "1.28.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.27.1.tgz"; - sha512 = "GLoKI5iRvqhcDYxtgXReVEbBChyGbUvTy8n344UkVNvIPHnq0bhLPGArttnrbbHmIZcxrAoYd+6o5sqZ2fUZNQ=="; + url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.28.0.tgz"; + sha512 = "lttDhXiBuWaN0DwsWakD5o7GxyVP8yMCRvpmpXOqz1eK+MMlZp654R6o39M7RksXhhxipCNwfbIY3T7Y7N85qQ=="; }; }; "jsii-srcmak-0.1.255" = { @@ -35947,6 +35965,15 @@ let sha512 = "Mc8jNuSFImQUIateBFwdOQcmC6Q5maU0VVvdC2R6XMb66/VnT+7WS4D/0EeNMZu1YODmJe5NIn2XftCzEocUgw=="; }; }; + "logform-1.10.0" = { + name = "logform"; + packageName = "logform"; + version = "1.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/logform/-/logform-1.10.0.tgz"; + sha512 = "em5ojIhU18fIMOw/333mD+ZLE2fis0EzXl1ZwHx4iQzmpQi6odNiY/t+ITNr33JZhT9/KEaH+UPIipr6a9EjWg=="; + }; + }; "logform-2.2.0" = { name = "logform"; packageName = "logform"; @@ -41818,13 +41845,13 @@ let sha512 = "kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg=="; }; }; - "oo-ascii-tree-1.27.1" = { + "oo-ascii-tree-1.28.0" = { name = "oo-ascii-tree"; packageName = "oo-ascii-tree"; - version = "1.27.1"; + version = "1.28.0"; src = fetchurl { - url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.27.1.tgz"; - sha512 = "bCX2YoRGOhWh/CUi2e38gw5D+ixcpuMjMEJ1VJ9oAE40burZO8CVLq2noqvU3/EmaO2R9ifaM+0xnxJzBkII/A=="; + url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.28.0.tgz"; + sha512 = "lCeBgtQutG2+K7BOJDurYNfCepvckj7jWtq2VVP1kseLry/VbLzE/oLiXEeK6iWUXJbBE2IzmxwGuUwee293yw=="; }; }; "opal-runtime-1.0.11" = { @@ -44122,13 +44149,13 @@ let sha512 = "wmUyoQM/Xzmo62wgOdQAn5tl7u+IA1ZYK7qbuppi+3E+Gj4hlUxVHjInulieWrd0SfHi/ADriTb5ILJ/lsJrSg=="; }; }; - "pg-connection-string-2.4.0" = { + "pg-connection-string-2.5.0" = { name = "pg-connection-string"; packageName = "pg-connection-string"; - version = "2.4.0"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.4.0.tgz"; - sha512 = "3iBXuv7XKvxeMrIgym7njT+HlZkwZqqGX4Bu9cci8xHZNT+Um1gWKqCsAzcC0d95rcKMU5WBg6YRUcHyV0HZKQ=="; + url = "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.5.0.tgz"; + sha512 = "r5o/V/ORTA6TmUnyWZR9nCj1klXCO2CEKNRlVuJptZe85QuhFayC7WeMic7ndayT5IRIR0S0xFxFi2ousartlQ=="; }; }; "pg-int8-1.0.1" = { @@ -44140,22 +44167,22 @@ let sha512 = "WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw=="; }; }; - "pg-pool-3.2.2" = { + "pg-pool-3.3.0" = { name = "pg-pool"; packageName = "pg-pool"; - version = "3.2.2"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/pg-pool/-/pg-pool-3.2.2.tgz"; - sha512 = "ORJoFxAlmmros8igi608iVEbQNNZlp89diFVx6yV5v+ehmpMY9sK6QgpmgoXbmkNaBAx8cOOZh9g80kJv1ooyA=="; + url = "https://registry.npmjs.org/pg-pool/-/pg-pool-3.3.0.tgz"; + sha512 = "0O5huCql8/D6PIRFAlmccjphLYWC+JIzvUhSzXSpGaf+tjTZc4nn+Lr7mLXBbFJfvwbP0ywDv73EiaBsxn7zdg=="; }; }; - "pg-protocol-1.4.0" = { + "pg-protocol-1.5.0" = { name = "pg-protocol"; packageName = "pg-protocol"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.4.0.tgz"; - sha512 = "El+aXWcwG/8wuFICMQjM5ZSAm6OWiJicFdNYo+VY3QP+8vI4SvLIWVe51PppTzMhikUJR+PsyIFKqfdXPz/yxA=="; + url = "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.5.0.tgz"; + sha512 = "muRttij7H8TqRNu/DxrAJQITO4Ac7RmX3Klyr/9mJEOBeIpgnF8f9jAfRz5d3XwQZl5qBjF9gLsUtMPJE0vezQ=="; }; }; "pg-types-2.2.0" = { @@ -48596,13 +48623,13 @@ let sha1 = "8984b5815d99cb220469c99eeeffe38913e6cc0b"; }; }; - "redis-3.1.0" = { + "redis-3.1.1" = { name = "redis"; packageName = "redis"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/redis/-/redis-3.1.0.tgz"; - sha512 = "//lAOcEtNIKk2ekZibes5oyWKYUVWMvMB71lyD/hS9KRePNkB7AU3nXGkArX6uDKEb2N23EyJBthAv6pagD0uw=="; + url = "https://registry.npmjs.org/redis/-/redis-3.1.1.tgz"; + sha512 = "QhkKhOuzhogR1NDJfBD34TQJz2ZJwDhhIC6ZmvpftlmfYShHHQXjjNspAJ+Z2HH5NwSBVYBVganbiZ8bgFMHjg=="; }; }; "redis-commands-1.7.0" = { @@ -61873,6 +61900,15 @@ let sha512 = "TWoamHt5yYvsMarGlGEQE59SbJHqGsZV8/lwC+iCcGeAe0vUaOh+Lv6SYM17ouzC/a/LB1/hz/7sxFBtlu1l4A=="; }; }; + "winston-3.1.0" = { + name = "winston"; + packageName = "winston"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/winston/-/winston-3.1.0.tgz"; + sha512 = "FsQfEE+8YIEeuZEYhHDk5cILo1HOcWkGwvoidLrDgPog0r4bser1lEIOco2dN9zpDJ1M88hfDgZvxe5z4xNcwg=="; + }; + }; "winston-3.2.1" = { name = "winston"; packageName = "winston"; @@ -62990,6 +63026,15 @@ let sha1 = "87cfa5a9613f48e26005420d6a8ee0da6fe8daec"; }; }; + "yaml-js-0.3.0" = { + name = "yaml-js"; + packageName = "yaml-js"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yaml-js/-/yaml-js-0.3.0.tgz"; + sha512 = "JbTUdsPiCkOyz+JOSqAVc19omTnUBnBQglhuclYov5HpWbEOz8y+ftqWjiMa9Pe/eF/dmCUeNgVs/VWg53GlgQ=="; + }; + }; "yaml-language-server-0.13.1-d0f9b44.0" = { name = "yaml-language-server"; packageName = "yaml-language-server"; @@ -63555,9 +63600,13 @@ in sources."@angular-devkit/core-11.2.8" sources."@angular-devkit/schematics-11.2.8" sources."@npmcli/ci-detect-1.3.0" - (sources."@npmcli/git-2.0.6" // { + (sources."@npmcli/git-2.0.7" // { dependencies = [ + sources."hosted-git-info-4.0.2" + sources."npm-package-arg-8.1.2" + sources."npm-pick-manifest-6.1.1" sources."promise-retry-2.0.1" + sources."semver-7.3.5" ]; }) sources."@npmcli/installed-package-contents-1.0.7" @@ -66277,6 +66326,213 @@ in bypassCache = true; reconstructLock = true; }; + aws-azure-login = nodeEnv.buildNodePackage { + name = "aws-azure-login"; + packageName = "aws-azure-login"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws-azure-login/-/aws-azure-login-3.3.0.tgz"; + sha512 = "gwcHKwovQOpVY4F87M46ppqop2/KXgvJGFqZDZvtGALvFihP1olhna5lnJk/Gbl5topHZj8oXefNoWhj/L19aA=="; + }; + dependencies = [ + sources."@tootallnate/once-1.1.2" + sources."@types/node-14.14.37" + sources."@types/yauzl-2.9.1" + sources."agent-base-6.0.2" + sources."ansi-escapes-4.3.2" + sources."ansi-regex-5.0.0" + sources."ansi-styles-4.3.0" + (sources."ast-types-0.13.4" // { + dependencies = [ + sources."tslib-2.2.0" + ]; + }) + (sources."aws-sdk-2.886.0" // { + dependencies = [ + sources."uuid-3.3.2" + ]; + }) + sources."balanced-match-1.0.2" + sources."base64-js-1.5.1" + (sources."bl-4.1.0" // { + dependencies = [ + sources."buffer-5.7.1" + sources."readable-stream-3.6.0" + sources."string_decoder-1.3.0" + ]; + }) + sources."bluebird-3.7.2" + sources."boolbase-1.0.0" + sources."brace-expansion-1.1.11" + sources."buffer-4.9.2" + sources."buffer-crc32-0.2.13" + sources."bytes-3.1.0" + sources."chalk-4.1.0" + sources."chardet-0.7.0" + sources."cheerio-1.0.0-rc.5" + sources."cheerio-select-tmp-0.1.1" + sources."chownr-1.1.4" + sources."cli-cursor-3.1.0" + sources."cli-width-3.0.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."commander-6.2.1" + sources."concat-map-0.0.1" + sources."core-util-is-1.0.2" + sources."css-select-3.1.2" + sources."css-what-4.0.0" + sources."data-uri-to-buffer-3.0.1" + sources."debug-4.3.2" + sources."deep-is-0.1.3" + sources."degenerator-2.2.0" + sources."depd-1.1.2" + sources."devtools-protocol-0.0.854822" + sources."dom-serializer-1.2.0" + sources."domelementtype-2.2.0" + sources."domhandler-4.1.0" + sources."domutils-2.5.2" + sources."emoji-regex-8.0.0" + sources."end-of-stream-1.4.4" + sources."entities-2.1.0" + sources."escape-string-regexp-1.0.5" + sources."escodegen-1.14.3" + sources."esprima-4.0.1" + sources."estraverse-4.3.0" + sources."esutils-2.0.3" + sources."events-1.1.1" + sources."external-editor-3.1.0" + sources."extract-zip-2.0.1" + sources."fast-levenshtein-2.0.6" + sources."fd-slicer-1.1.0" + sources."figures-3.2.0" + sources."file-uri-to-path-2.0.0" + sources."find-up-4.1.0" + sources."fs-constants-1.0.0" + sources."fs-extra-8.1.0" + sources."fs.realpath-1.0.0" + sources."ftp-0.3.10" + sources."get-stream-5.2.0" + sources."get-uri-3.0.2" + sources."glob-7.1.6" + sources."graceful-fs-4.2.6" + sources."has-flag-4.0.0" + sources."htmlparser2-6.1.0" + sources."http-errors-1.7.3" + sources."http-proxy-agent-4.0.1" + sources."https-proxy-agent-5.0.0" + sources."iconv-lite-0.4.24" + sources."ieee754-1.1.13" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."ini-2.0.0" + sources."inquirer-7.3.3" + sources."ip-1.1.5" + sources."is-fullwidth-code-point-3.0.0" + sources."isarray-1.0.0" + sources."jmespath-0.15.0" + sources."jsonfile-4.0.0" + sources."levn-0.3.0" + sources."locate-path-5.0.0" + sources."lodash-4.17.21" + sources."lru-cache-5.1.1" + sources."mimic-fn-2.1.0" + sources."minimatch-3.0.4" + sources."mkdirp-1.0.4" + sources."mkdirp-classic-0.5.3" + sources."ms-2.1.2" + sources."mute-stream-0.0.8" + sources."netmask-2.0.2" + sources."node-fetch-2.6.1" + sources."nth-check-2.0.0" + sources."once-1.4.0" + sources."onetime-5.1.2" + sources."optionator-0.8.3" + sources."os-tmpdir-1.0.2" + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" + sources."p-try-2.2.0" + sources."pac-proxy-agent-4.1.0" + sources."pac-resolver-4.2.0" + sources."parse5-6.0.1" + sources."parse5-htmlparser2-tree-adapter-6.0.1" + sources."path-exists-4.0.0" + sources."path-is-absolute-1.0.1" + sources."pend-1.2.0" + sources."pkg-dir-4.2.0" + sources."prelude-ls-1.1.2" + sources."progress-2.0.3" + sources."proxy-agent-4.0.1" + sources."proxy-from-env-1.1.0" + sources."pump-3.0.0" + sources."punycode-1.3.2" + sources."puppeteer-8.0.0" + sources."querystring-0.2.0" + sources."raw-body-2.4.1" + (sources."readable-stream-1.1.14" // { + dependencies = [ + sources."isarray-0.0.1" + ]; + }) + sources."restore-cursor-3.1.0" + sources."rimraf-3.0.2" + sources."run-async-2.4.1" + sources."rxjs-6.6.7" + sources."safe-buffer-5.2.1" + sources."safer-buffer-2.1.2" + sources."sax-1.2.1" + sources."setprototypeof-1.1.1" + sources."signal-exit-3.0.3" + sources."smart-buffer-4.1.0" + sources."socks-2.6.0" + sources."socks-proxy-agent-5.0.0" + sources."source-map-0.6.1" + sources."statuses-1.5.0" + sources."string-width-4.2.2" + sources."string_decoder-0.10.31" + sources."strip-ansi-6.0.0" + sources."supports-color-7.2.0" + sources."tar-fs-2.1.1" + (sources."tar-stream-2.2.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + sources."string_decoder-1.3.0" + ]; + }) + sources."through-2.3.8" + sources."tmp-0.0.33" + sources."toidentifier-1.0.0" + sources."tslib-1.14.1" + sources."type-check-0.3.2" + sources."type-fest-0.21.3" + (sources."unbzip2-stream-1.4.3" // { + dependencies = [ + sources."buffer-5.7.1" + ]; + }) + sources."universalify-0.1.2" + sources."unpipe-1.0.0" + sources."url-0.10.3" + sources."util-deprecate-1.0.2" + sources."uuid-8.3.2" + sources."word-wrap-1.2.3" + sources."wrappy-1.0.2" + sources."ws-7.4.4" + sources."xml2js-0.4.19" + sources."xmlbuilder-9.0.7" + sources."xregexp-2.0.0" + sources."yallist-3.1.1" + sources."yauzl-2.10.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Use Azure AD SSO to log into the AWS CLI."; + homepage = "https://github.com/sportradar/aws-azure-login#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; balanceofsatoshis = nodeEnv.buildNodePackage { name = "balanceofsatoshis"; packageName = "balanceofsatoshis"; @@ -67826,7 +68082,7 @@ in }) sources."readable-stream-3.6.0" sources."redent-3.0.0" - sources."redis-3.1.0" + sources."redis-3.1.1" sources."redis-commands-1.7.0" sources."redis-errors-1.2.0" sources."redis-parser-3.0.0" @@ -68367,7 +68623,7 @@ in sha512 = "Oo/tO5aqmjsBORN93dSnidF7+2u77Q9zwUn9VbCQkZqCNfeZZcwIV9AG108hMYwtcXqtKQC7wevX6rmi9l8lng=="; }; dependencies = [ - sources."@jsii/spec-1.27.1" + sources."@jsii/spec-1.28.0" sources."@types/node-10.17.56" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" @@ -68380,7 +68636,7 @@ in sources."cdk8s-1.0.0-beta.11" sources."cliui-7.0.4" sources."clone-2.1.2" - (sources."codemaker-1.27.1" // { + (sources."codemaker-1.28.0" // { dependencies = [ sources."fs-extra-9.1.0" ]; @@ -68438,25 +68694,25 @@ in sources."is-weakmap-2.0.1" sources."is-weakset-2.0.1" sources."isarray-2.0.5" - (sources."jsii-1.27.1" // { + (sources."jsii-1.28.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-pacmak-1.27.1" // { + (sources."jsii-pacmak-1.28.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-reflect-1.27.1" // { + (sources."jsii-reflect-1.28.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-rosetta-1.27.1" // { + (sources."jsii-rosetta-1.28.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" @@ -68484,7 +68740,7 @@ in sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object.assign-4.1.2" - sources."oo-ascii-tree-1.27.1" + sources."oo-ascii-tree-1.28.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" @@ -68554,14 +68810,14 @@ in cdktf-cli = nodeEnv.buildNodePackage { name = "cdktf-cli"; packageName = "cdktf-cli"; - version = "0.2.1"; + version = "0.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/cdktf-cli/-/cdktf-cli-0.2.1.tgz"; - sha512 = "DcAkiIy8oA3GIUG8/zqO7oBYyER7WxC4ylVNkQFqq/k7m+x+YCk18JvHkZHX4uK2xxQyttQ0lxHMNyZyA5y1oA=="; + url = "https://registry.npmjs.org/cdktf-cli/-/cdktf-cli-0.2.2.tgz"; + sha512 = "tkUGs4+739C+3lklwQQM/wLgp41maVlJUK/2cCzuNxVBgobLXBxn55lHxbmEuh2Ddc8PtNV31uzHzn1f2ZzdfQ=="; }; dependencies = [ - sources."@cdktf/hcl2json-0.2.1" - sources."@jsii/spec-1.27.1" + sources."@cdktf/hcl2json-0.2.2" + sources."@jsii/spec-1.28.0" sources."@skorfmann/ink-confirm-input-3.0.0" sources."@skorfmann/terraform-cloud-1.9.1" sources."@types/node-14.14.37" @@ -68598,7 +68854,7 @@ in sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" sources."case-1.6.3" - sources."cdktf-0.2.1" + sources."cdktf-0.2.2" sources."chalk-4.1.0" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" @@ -68700,7 +68956,7 @@ in sources."is-wsl-2.2.0" sources."isarray-1.0.0" sources."js-tokens-4.0.0" - (sources."jsii-1.27.1" // { + (sources."jsii-1.28.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -68708,10 +68964,10 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-pacmak-1.27.1" // { + (sources."jsii-pacmak-1.28.0" // { dependencies = [ sources."camelcase-6.2.0" - sources."codemaker-1.27.1" + sources."codemaker-1.28.0" sources."decamelize-5.0.0" sources."escape-string-regexp-4.0.0" sources."fs-extra-9.1.0" @@ -68720,7 +68976,7 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-reflect-1.27.1" // { + (sources."jsii-reflect-1.28.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -68728,7 +68984,7 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-rosetta-1.27.1" // { + (sources."jsii-rosetta-1.28.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -68778,7 +69034,7 @@ in sources."object.assign-4.1.2" sources."once-1.4.0" sources."onetime-5.1.2" - sources."oo-ascii-tree-1.27.1" + sources."oo-ascii-tree-1.28.0" sources."open-7.4.2" sources."p-limit-2.3.0" sources."p-locate-4.1.0" @@ -71700,7 +71956,7 @@ in sources."@nodelib/fs.stat-2.0.4" sources."@nodelib/fs.walk-1.2.6" sources."@npmcli/ci-detect-1.3.0" - sources."@npmcli/git-2.0.6" + sources."@npmcli/git-2.0.7" sources."@npmcli/installed-package-contents-1.0.7" sources."@npmcli/move-file-1.1.2" sources."@npmcli/node-gyp-1.0.2" @@ -76090,10 +76346,10 @@ in sources."semver-4.3.2" ]; }) - sources."pg-connection-string-2.4.0" + sources."pg-connection-string-2.5.0" sources."pg-int8-1.0.1" - sources."pg-pool-3.2.2" - sources."pg-protocol-1.4.0" + sources."pg-pool-3.3.0" + sources."pg-protocol-1.5.0" sources."pg-types-2.2.0" sources."pgpass-1.0.4" sources."picomatch-2.2.3" @@ -77250,9 +77506,10 @@ in sources."@nodelib/fs.stat-2.0.4" sources."@nodelib/fs.walk-1.2.6" sources."@npmcli/ci-detect-1.3.0" - (sources."@npmcli/git-2.0.6" // { + (sources."@npmcli/git-2.0.7" // { dependencies = [ sources."mkdirp-1.0.4" + sources."semver-7.3.5" sources."which-2.0.2" ]; }) @@ -81991,10 +82248,10 @@ in gatsby-cli = nodeEnv.buildNodePackage { name = "gatsby-cli"; packageName = "gatsby-cli"; - version = "3.2.0"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-3.2.0.tgz"; - sha512 = "MOj7LgwNX/O30LNdZ1WDUQ4Wiyn3uXFGND7QQepfWpaHvrgtposhy/vseAAR54N5pyehcdLhQkNQkbd4Zw9olA=="; + url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-3.3.0.tgz"; + sha512 = "zqVRm6QzMNGFPv3iSjSiysNuSBYJmvPoWWR/BdXyFU8mWP3Fou3d7HdxxIQak25GVRYlMGU5ryuM9mfN/k/Jdg=="; }; dependencies = [ (sources."@ardatan/aggregate-error-0.0.6" // { @@ -82221,7 +82478,7 @@ in sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."cors-2.8.5" - sources."create-gatsby-1.2.0" + sources."create-gatsby-1.3.0" (sources."cross-spawn-6.0.5" // { dependencies = [ sources."semver-5.7.1" @@ -82332,8 +82589,8 @@ in sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."function-bind-1.1.1" - sources."gatsby-core-utils-2.2.0" - (sources."gatsby-recipes-0.13.0" // { + sources."gatsby-core-utils-2.3.0" + (sources."gatsby-recipes-0.14.0" // { dependencies = [ sources."cross-spawn-7.0.3" sources."execa-4.1.0" @@ -82347,7 +82604,7 @@ in sources."which-2.0.2" ]; }) - sources."gatsby-telemetry-2.2.0" + sources."gatsby-telemetry-2.3.0" sources."gensync-1.0.0-beta.2" sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.1" @@ -83574,7 +83831,7 @@ in sources."foreach-2.0.5" sources."forever-agent-0.6.1" sources."form-data-2.3.3" - sources."form-urlencoded-4.5.0" + sources."form-urlencoded-4.5.1" sources."fs-capacitor-6.2.0" sources."fs-extra-9.0.1" sources."fs-minipass-2.1.0" @@ -86645,7 +86902,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.885.0" // { + (sources."aws-sdk-2.886.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -87319,10 +87576,10 @@ in js-beautify = nodeEnv.buildNodePackage { name = "js-beautify"; packageName = "js-beautify"; - version = "1.13.5"; + version = "1.13.6"; src = fetchurl { - url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.13.5.tgz"; - sha512 = "MsXlH6Z/BiRYSkSRW3clNDqDjSpiSNOiG8xYVUBXt4k0LnGvDhlTGOlHX1VFtAdoLmtwjxMG5qiWKy/g+Ipv5w=="; + url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.13.6.tgz"; + sha512 = "xS23BW6AVCIpxtUPJRXjTG/KhFGJyDR1TAT2l/sC+m7oFiLMLkU/QShmd3Z0p4WcZXj+MnjhBkA9ljtq8/OkhQ=="; }; dependencies = [ sources."abbrev-1.1.1" @@ -88963,7 +89220,7 @@ in sources."@nodelib/fs.stat-2.0.4" sources."@nodelib/fs.walk-1.2.6" sources."@npmcli/ci-detect-1.3.0" - sources."@npmcli/git-2.0.6" + sources."@npmcli/git-2.0.7" sources."@npmcli/installed-package-contents-1.0.7" sources."@npmcli/move-file-1.1.2" sources."@npmcli/node-gyp-1.0.2" @@ -92765,10 +93022,10 @@ in neovim = nodeEnv.buildNodePackage { name = "neovim"; packageName = "neovim"; - version = "4.9.0"; + version = "4.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/neovim/-/neovim-4.9.0.tgz"; - sha512 = "48hDy0Dheo5qFF+cwhj7qaWoXfbiKOQ0CLNE0/aiA41rhn/Z1m0OKQqlp9SqbSMr/PnY5QdiLdbs0xh2UudEfA=="; + url = "https://registry.npmjs.org/neovim/-/neovim-4.10.0.tgz"; + sha512 = "MMtsyjCPYXy45I8TZTz0iYJUIJhaDSO0zfHOJeidGuLUCeY6WLQiwZteJ9tmCveNWMjT1r2QO9nq135mUDgbtw=="; }; dependencies = [ sources."@msgpack/msgpack-1.12.2" @@ -92785,7 +93042,7 @@ in sources."enabled-1.0.2" sources."env-variable-0.0.6" sources."fast-safe-stringify-2.0.7" - sources."fecha-4.2.1" + sources."fecha-2.3.3" sources."inherits-2.0.4" sources."is-arrayish-0.3.2" sources."is-stream-1.1.0" @@ -92794,28 +93051,22 @@ in sources."lodash-4.17.21" sources."lodash.defaults-4.2.0" sources."lodash.omit-4.5.0" - sources."logform-2.2.0" + sources."logform-1.10.0" sources."lru-cache-6.0.0" sources."ms-2.1.3" sources."one-time-0.0.4" sources."process-nextick-args-2.0.1" - sources."readable-stream-3.6.0" - sources."safe-buffer-5.2.1" + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" sources."semver-7.3.5" sources."simple-swizzle-0.2.2" sources."stack-trace-0.0.10" - sources."string_decoder-1.3.0" + sources."string_decoder-1.1.1" sources."text-hex-1.0.0" sources."triple-beam-1.3.0" sources."util-deprecate-1.0.2" - sources."winston-3.2.1" - (sources."winston-transport-4.4.0" // { - dependencies = [ - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) + sources."winston-3.1.0" + sources."winston-transport-4.4.0" sources."yallist-4.0.0" ]; buildInputs = globalBuildInputs; @@ -92831,10 +93082,10 @@ in netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "3.17.1"; + version = "3.17.2"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-3.17.1.tgz"; - sha512 = "C9mWo2ijxnh09mscYb0F96V76g71MrVJNPgbjMobYnHPbJP3zqNG/3CBmLHyX9RLQI6RRcqND05ATdj2itL1rg=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-3.17.2.tgz"; + sha512 = "PhSxSj/VvDEBSWwWSGY9xpDtxJjTUej8Ak1MZJFpRevtH/v4/RbuhUeapTTidDWO5bbzG+hyes0sa7R6oQySEg=="; }; dependencies = [ sources."@babel/code-frame-7.12.13" @@ -93294,7 +93545,7 @@ in sources."at-least-node-1.0.0" sources."atob-2.1.2" sources."atob-lite-2.0.0" - (sources."aws-sdk-2.885.0" // { + (sources."aws-sdk-2.886.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -96715,7 +96966,7 @@ in sources."@nodelib/fs.stat-2.0.4" sources."@nodelib/fs.walk-1.2.6" sources."@npmcli/ci-detect-1.3.0" - sources."@npmcli/git-2.0.6" + sources."@npmcli/git-2.0.7" sources."@npmcli/installed-package-contents-1.0.7" sources."@npmcli/move-file-1.1.2" sources."@npmcli/node-gyp-1.0.2" @@ -100659,10 +100910,10 @@ in redoc-cli = nodeEnv.buildNodePackage { name = "redoc-cli"; packageName = "redoc-cli"; - version = "0.11.3"; + version = "0.11.4"; src = fetchurl { - url = "https://registry.npmjs.org/redoc-cli/-/redoc-cli-0.11.3.tgz"; - sha512 = "PqC0gPEh8iYxIrpZN1bSBma+pTjCOOChyxCH9/Zwm4YewIk4wASG2mjZgsvN4kUqTNHzS38twl3fG1P+13ZwYQ=="; + url = "https://registry.npmjs.org/redoc-cli/-/redoc-cli-0.11.4.tgz"; + sha512 = "Ke/Lvy9fwLuZGpeILZfJOyBtwGhgOFLQdptAf0LdGt9l44DfwGVw7ppaqXoJEr1rXyu2eO0UtH2UnG5/CCigVw=="; }; dependencies = [ sources."@babel/code-frame-7.12.13" @@ -101947,7 +102198,7 @@ in sources."async-2.6.3" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.885.0" // { + (sources."aws-sdk-2.886.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -103316,10 +103567,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.535.0"; + version = "1.538.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.535.0.tgz"; - sha512 = "NQpGzXb66WvMGkZ2vye58LST1lJFN+diEQ76dlTdh/e2KgFb/qmevo/VgDqAsMsFW6h0rE8V6tFqVBDb8mfEBw=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.538.0.tgz"; + sha512 = "lq2/Ykzec9XacniZpkZaJPQDyBDWqgUsdugn6Kcm+ba2RJU72Dr6VSnIQPQ9ebe9nbNriABmURnLmH9aApiWew=="; }; dependencies = [ sources."@arcanis/slice-ansi-1.0.2" @@ -103331,6 +103582,7 @@ in sources."@open-policy-agent/opa-wasm-1.2.0" sources."@sindresorhus/is-2.1.1" sources."@snyk/cli-interface-2.11.0" + sources."@snyk/cloud-config-parser-1.9.2" sources."@snyk/cocoapods-lockfile-parser-3.6.2" (sources."@snyk/code-client-3.4.0" // { dependencies = [ @@ -104028,6 +104280,7 @@ in sources."xtend-4.0.2" sources."yallist-4.0.0" sources."yaml-1.10.2" + sources."yaml-js-0.3.0" ]; buildInputs = globalBuildInputs; meta = { @@ -105314,7 +105567,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.885.0" // { + (sources."aws-sdk-2.886.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -111584,7 +111837,7 @@ in sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-3.0.1" - (sources."js-beautify-1.13.5" // { + (sources."js-beautify-1.13.8" // { dependencies = [ sources."mkdirp-1.0.4" ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/postgresql/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/postgresql/default.nix index 82875dbd8b..a63876ec5b 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/postgresql/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/postgresql/default.nix @@ -1,8 +1,10 @@ -{ lib, fetchFromGitHub, buildDunePackage, postgresql }: +{ lib, fetchFromGitHub, buildDunePackage, dune-configurator, postgresql }: buildDunePackage rec { pname = "postgresql"; - version = "4.6.3"; + version = "5.0.0"; + + useDune2 = true; minimumOCamlVersion = "4.08"; @@ -10,10 +12,10 @@ buildDunePackage rec { owner = "mmottl"; repo = "postgresql-ocaml"; rev = version; - sha256 = "0fd96qqwkwjhv6pawk4wivwncszkif0sq05f0g5gd28jzwrsvpqr"; + sha256 = "1i4pnh2v00i0s7s9pcwz1x6s4xcd77d08gjjkvy0fmda6mqq6ghn"; }; - buildInputs = [ postgresql ]; + buildInputs = [ dune-configurator postgresql ]; meta = { description = "Bindings to the PostgreSQL library"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiodiscover/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiodiscover/default.nix index e724d53bfe..8a7f72f8b8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiodiscover/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiodiscover/default.nix @@ -2,22 +2,23 @@ , async-dns , buildPythonPackage , fetchFromGitHub -, fetchpatch , ifaddr , pyroute2 +, pytest-asyncio +, pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "aiodiscover"; - version = "1.3.3"; + version = "1.3.4"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "bdraco"; repo = pname; rev = "v${version}"; - sha256 = "186agrjx818vn00d3pqlka5ir48rgpbfyn1cifkn9ylsxg9cz3ph"; + sha256 = "sha256-TmWl5d5HwyqWPUjwtEvc5FzVfxV/K1pekljcMkGN0Ag="; }; propagatedBuildInputs = [ @@ -30,9 +31,21 @@ buildPythonPackage rec { substituteInPlace setup.py --replace '"pytest-runner>=5.2",' "" ''; - # Tests require access to /etc/resolv.conf - # pythonImportsCheck doesn't work as async-dns wants to create its CONFIG_DIR - doCheck = false; + checkInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + preBuild = '' + export HOME=$TMPDIR + ''; + + disabledTests = [ + # Tests require access to /etc/resolv.conf + "test_async_discover_hosts" + ]; + + pythonImportsCheck = ["aiodiscover"]; meta = with lib; { description = "Python module to discover hosts via ARP and PTR lookup"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/clickhouse-cli/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clickhouse-cli/default.nix new file mode 100644 index 0000000000..07ddca0680 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/clickhouse-cli/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, click +, prompt_toolkit +, pygments +, requests +, sqlparse +}: + +buildPythonPackage rec { + pname = "clickhouse-cli"; + version = "0.3.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-fDvUdL6LzgCv6LDmB0R0M7v6BbnbL68p9pHMebP58h8="; + }; + + propagatedBuildInputs = [ + click + prompt_toolkit + pygments + requests + sqlparse + ]; + + pythonImportsCheck = [ "clickhouse_cli" ]; + + meta = with lib; { + description = "A third-party client for the Clickhouse DBMS server"; + homepage = "https://github.com/hatarist/clickhouse-cli"; + license = licenses.mit; + maintainers = with maintainers; [ ivan-babrou ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipfsapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipfsapi/default.nix deleted file mode 100644 index c97eafb605..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipfsapi/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, isPy27 -, six -, requests -}: - -buildPythonPackage { - pname = "ipfsapi"; - version = "0.4.2.post1"; - disabled = isPy27; - - src = fetchFromGitHub { - owner = "ipfs"; - repo = "py-ipfs-api"; - rev = "0c485544a114f580c65e2ffbb5782efbf7fd9f61"; - sha256 = "1v7f77cv95yv0v80gisdh71mj7jcq41xcfip6bqm57zfdbsa0xpn"; - }; - - propagatedBuildInputs = [ six requests ]; - - meta = with lib; { - description = "A python client library for the IPFS API"; - license = licenses.mit; - maintainers = with maintainers; [ mguentner ]; - homepage = "https://pypi.python.org/pypi/ipfsapi"; - }; - -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipfshttpclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipfshttpclient/default.nix new file mode 100644 index 0000000000..aec8f1ec11 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipfshttpclient/default.nix @@ -0,0 +1,82 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, python +, py-multiaddr +, requests +, pytestCheckHook +, pytest-cov +, pytest-dependency +, pytest-localserver +, pytest-mock +, pytest-order +, pytest-cid +, mock +, ipfs +, httpx +, httpcore +}: + +buildPythonPackage rec { + pname = "ipfshttpclient"; + version = "0.7.0"; + format = "flit"; + disabled = pythonOlder "3.5"; + + src = fetchFromGitHub { + owner = "ipfs-shipyard"; + repo = "py-ipfs-http-client"; + rev = version; + sha256 = "sha256-0lMoZo/9kZUXkaKvD9ZAZDQdGX7eNLzJVszZdlM/3Qs="; + }; + + propagatedBuildInputs = [ + py-multiaddr + requests + ]; + + checkInputs = [ + pytestCheckHook + pytest-cov + pytest-dependency + pytest-localserver + pytest-mock + pytest-order + pytest-cid + mock + ipfs + httpcore + httpx + ]; + + postPatch = '' + # Remove when the package supports the latest IPFS version by default + substituteInPlace ipfshttpclient/client/__init__.py \ + --replace 'VERSION_MAXIMUM = "0.8.0"' \ + 'VERSION_MAXIMUM = "0.9.0"' + + # Use pytest-order instead of pytest-ordering since the latter is unmaintained and broken + substituteInPlace test/run-tests.py \ + --replace 'pytest_ordering' 'pytest_order' + substituteInPlace test/functional/test_miscellaneous.py \ + --replace '@pytest.mark.last' '@pytest.mark.order("last")' + ''; + + checkPhase = '' + runHook preCheck + + ${python.interpreter} -X utf8 test/run-tests.py + + runHook postCheck + ''; + + pythonImportsCheck = [ "ipfshttpclient" ]; + + meta = with lib; { + description = "A python client library for the IPFS API"; + homepage = "https://github.com/ipfs-shipyard/py-ipfs-http-client"; + license = licenses.mit; + maintainers = with maintainers; [ mguentner Luflosi ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/karton-yaramatcher/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/karton-yaramatcher/default.nix new file mode 100644 index 0000000000..afe6f2aaa4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/karton-yaramatcher/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, karton-core +, python +, yara-python +}: + +buildPythonPackage rec { + pname = "karton-yaramatcher"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "CERT-Polska"; + repo = pname; + rev = "v${version}"; + sha256 = "093h5hbx2ss4ly523gvf10a5ky3vvin6wipigvhx13y1rdxl6c9n"; + }; + + propagatedBuildInputs = [ + karton-core + yara-python + ]; + + postPatch = '' + substituteInPlace requirements.txt \ + --replace "karton-core==4.0.5" "karton-core" \ + --replace "yara-python==4.0.2" "yara-python" \ + ''; + + checkPhase = '' + runHook preCheck + ${python.interpreter} -m unittest discover + runHook postCheck + ''; + + pythonImportsCheck = [ "karton.yaramatcher" ]; + + meta = with lib; { + description = "File and analysis artifacts yara matcher for the Karton framework"; + homepage = "https://github.com/CERT-Polska/karton-yaramatcher"; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mcstatus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mcstatus/default.nix index 7ed7a0ff32..1ea14c3551 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mcstatus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mcstatus/default.nix @@ -5,6 +5,7 @@ , dnspython , fetchFromGitHub , mock +, pytest-asyncio , pytestCheckHook , pythonOlder , six @@ -12,14 +13,14 @@ buildPythonPackage rec { pname = "mcstatus"; - version = "5.1.2"; + version = "5.1.4"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Dinnerbone"; repo = pname; - rev = "release-${version}"; - sha256 = "16k5vcqpd9r7mm1cg9khzba42rcxs491h8gk2klymav249yzrwk7"; + rev = "v${version}"; + sha256 = "1k8hjv965svbm95m7jaawlhdbxqpkjchlwvjwn1n7z90dfgn5kih"; }; propagatedBuildInputs = [ @@ -31,6 +32,7 @@ buildPythonPackage rec { checkInputs = [ mock + pytest-asyncio pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/oci/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oci/default.nix new file mode 100644 index 0000000000..41c6ffb722 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/oci/default.nix @@ -0,0 +1,45 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, certifi +, configparser +, cryptography +, pyopenssl +, dateutil +, pytz +}: + +buildPythonPackage rec { + pname = "oci"; + version = "2.36.0"; + + src = fetchFromGitHub { + owner = "oracle"; + repo = "oci-python-sdk"; + rev = "v${version}"; + hash = "sha256-scG/ZhWeiCgXp7iD6arWIN8KZecSjKLsCW4oXeJvx6M="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "configparser==4.0.2" "configparser" \ + --replace "cryptography==3.2.1" "cryptography" \ + --replace "pyOpenSSL>=17.5.0,<=19.1.0" "pyOpenSSL" + ''; + + propagatedBuildInputs = [ + certifi configparser cryptography pyopenssl dateutil pytz + ]; + + # Tests fail: https://github.com/oracle/oci-python-sdk/issues/164 + doCheck = false; + + pythonImportsCheck = [ "oci" ]; + + meta = with lib; { + description = "Oracle Cloud Infrastructure Python SDK"; + homepage = "https://oracle-cloud-infrastructure-python-sdk.readthedocs.io/en/latest/index.html"; + maintainers = with maintainers; [ ilian ]; + license = with licenses; [ asl20 upl ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix index 565822c335..c536f4c69f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix @@ -17,18 +17,19 @@ , python-dateutil , python-xmp-toolkit , qpdf +, setuptools , setuptools-scm , setuptools-scm-git-archive }: buildPythonPackage rec { pname = "pikepdf"; - version = "2.8.0"; + version = "2.11.1"; disabled = ! isPy3k; src = fetchPypi { inherit pname version; - sha256 = "74ff96fddd21cd4c0830eb549137ea9eccbdbff8cef4f684322b9afb8e42ccb5"; + sha256 = "0vs7qa3s4scfhyldfw99hhxpna6rj49rsbr2k0j6b4qx1bw8h141"; }; buildInputs = [ @@ -58,6 +59,7 @@ buildPythonPackage rec { defusedxml lxml pillow + setuptools ]; preBuild = '' @@ -71,5 +73,6 @@ buildPythonPackage rec { description = "Read and write PDFs with Python, powered by qpdf"; license = licenses.mpl20; maintainers = [ maintainers.kiwi ]; + changelog = "https://github.com/pikepdf/pikepdf/blob/${version}/docs/release_notes.rst"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pulsectl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pulsectl/default.nix index 2a66357f84..6b05f383ec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pulsectl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pulsectl/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pulsectl"; - version = "20.5.1"; + version = "21.3.4"; src = fetchPypi { inherit pname version; - sha256 = "39b0a0e7974a7d6468d826a838822f78b00ac9c3803f0d7bfa9b1cad08ee22db"; + sha256 = "sha256-+qi5M2I3VlmQKY8ghw4T3RZ4pFhoR8paf/Kr8QdS81Y="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyroute2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyroute2/default.nix index e5c87a94b0..00ce008d6c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyroute2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyroute2/default.nix @@ -1,22 +1,27 @@ -{lib, buildPythonPackage, fetchPypi}: +{ lib +, buildPythonPackage +, fetchPypi +}: buildPythonPackage rec { pname = "pyroute2"; - version = "0.5.14"; + version = "0.5.18"; src = fetchPypi { inherit pname version; - sha256 = "774c5ecf05fe40f0f601a7ab33c19ca0b24f00bf4a094e58deaa5333b7ca49b5"; + sha256 = "sha256-CKxAytUsC7Lg8gCHUgWZqpH8zgsiHdJukEIzBCiBC8U="; }; - # requires root priviledges + # Requires root privileges, https://github.com/svinota/pyroute2/issues/778 doCheck = false; + pythonImportsCheck = [ "pyroute2" ]; + meta = with lib; { description = "Python Netlink library"; homepage = "https://github.com/svinota/pyroute2"; license = licenses.asl20; - maintainers = [maintainers.mic92]; + maintainers = with maintainers; [ mic92 ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pywemo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pywemo/default.nix index c7f36fec35..807d08cbc1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pywemo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pywemo/default.nix @@ -38,6 +38,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # https://github.com/pywemo/pywemo/issues/264 + "test_rules_db_from_device" + ]; + pythonImportsCheck = [ "pywemo" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/slither-analyzer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/slither-analyzer/default.nix index 0b320e7902..43583416bb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/slither-analyzer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/slither-analyzer/default.nix @@ -1,7 +1,15 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, makeWrapper, pythonOlder -, crytic-compile, prettytable, setuptools -# solc is currently broken on Darwin, default to false -, solc, withSolc ? !stdenv.isDarwin +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, makeWrapper +, pythonOlder +, crytic-compile +, prettytable +, setuptools +, solc + # solc is currently broken on Darwin, default to false +, withSolc ? !stdenv.isDarwin }: buildPythonPackage rec { @@ -35,6 +43,6 @@ buildPythonPackage rec { ''; homepage = "https://github.com/trailofbits/slither"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ asymmetric arturcygan ]; + maintainers = with maintainers; [ arturcygan ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spotipy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spotipy/default.nix index 6f29db2581..4493eb3d97 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spotipy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spotipy/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "spotipy"; - version = "2.17.1"; + version = "2.18.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-KcYMi5naHEufDXIhabwx5iS4wH1xhrjq3ZwC6NLULL8="; + sha256 = "sha256-9yk7gIaWgH6azsa9z/Y/fcw8wbFIwMS0KZ70PJZvcXc="; }; propagatedBuildInputs = [ requests six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/systembridge/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/systembridge/default.nix new file mode 100644 index 0000000000..94d41b7b67 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/systembridge/default.nix @@ -0,0 +1,32 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "systembridge"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "timmo001"; + repo = "system-bridge-connector-py"; + rev = "v${version}"; + sha256 = "0vyfi7nyzkzsgg84n5wh4hzwvx6fybgqdzbabnsmvszb9sm1vlb2"; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "systembridge" ]; + + meta = with lib; { + description = "Python module for connecting to System Bridge"; + homepage = "https://github.com/timmo001/system-bridge-connector-py"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/twitterapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/twitterapi/default.nix index a53a3fda61..11f596e01d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/twitterapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/twitterapi/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "twitterapi"; - version = "2.6.10"; + version = "2.7.1"; src = fetchFromGitHub { owner = "geduldig"; repo = "TwitterAPI"; rev = "v${version}"; - sha256 = "sha256-ylxjeIK9cjT4r71j+sULYs6yyYWfKDkpm0bESMo7s3o="; + sha256 = "sha256-fLexFlnoh58b9q4mo9atGQmMttKytTfAYmaPj6xmPj8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/weasyprint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/weasyprint/default.nix index a7188a3103..8f946c4778 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/weasyprint/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/weasyprint/default.nix @@ -1,5 +1,6 @@ { buildPythonPackage, fetchPypi, + fetchpatch, cairosvg, pyphen, cffi, @@ -7,7 +8,6 @@ lxml, html5lib, tinycss, - pygobject2, glib, pango, fontconfig, @@ -43,9 +43,15 @@ buildPythonPackage rec { FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf"; - propagatedBuildInputs = [ cairosvg pyphen cffi cssselect lxml html5lib tinycss pygobject2 ]; + propagatedBuildInputs = [ cairosvg pyphen cffi cssselect lxml html5lib tinycss ]; + # 47043a1fd7e50a892b9836466f521df85d597c4.patch can be removed after next release of weasyprint, see: + # https://github.com/Kozea/WeasyPrint/issues/1333#issuecomment-818062970 patches = [ + (fetchpatch { + url = "https://github.com/Kozea/WeasyPrint/commit/47043a1fd7e50a892b9836466f521df85d597c44.patch"; + sha256 = "0l9z0hrav3bcdajlg3vbzljq0lkw7hlj8ppzrq3v21hbj1il1nsb"; + }) (substituteAll { src = ./library-paths.patch; fontconfig = "${fontconfig.lib}/lib/libfontconfig${stdenv.hostPlatform.extensions.sharedLibrary}"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/woob/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/woob/default.nix new file mode 100644 index 0000000000..15f2faa200 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/woob/default.nix @@ -0,0 +1,82 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy27 +, Babel +, colorama +, cssselect +, dateutil +, feedparser +, futures +, gdata +, gnupg +, google-api-python-client +, html2text +, libyaml +, lxml +, mechanize +, nose +, pdfminer +, pillow +, prettytable +, pyqt5 +, pyyaml +, requests +, simplejson +, termcolor +, unidecode +}: + +buildPythonPackage rec { + pname = "woob"; + version = "3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "09hpxy5zhn2b8li0xjf3zd7s46lawb0315p5mdcsci3bj3s4v1j7"; + }; + + patches = [ + # Disable doctests that require networking: + ./no-test-requiring-network.patch + ]; + + checkInputs = [ nose ]; + + nativeBuildInputs = [ pyqt5 ]; + + propagatedBuildInputs = [ + Babel + colorama + cssselect + dateutil + feedparser + gdata + gnupg + google-api-python-client + html2text + libyaml + lxml + mechanize + pdfminer + pillow + prettytable + pyqt5 + pyyaml + requests + simplejson + termcolor + unidecode + ] ++ lib.optionals isPy27 [ futures ]; + + checkPhase = '' + nosetests + ''; + + meta = with lib; { + homepage = "https://woob.tech"; + description = "Collection of applications and APIs to interact with websites without requiring the user to open a browser"; + license = licenses.lgpl3Plus; + maintainers = [ maintainers.DamienCassou ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/woob/no-test-requiring-network.patch b/third_party/nixpkgs/pkgs/development/python-modules/woob/no-test-requiring-network.patch new file mode 100644 index 0000000000..7095019d05 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/woob/no-test-requiring-network.patch @@ -0,0 +1,54 @@ +--- a/woob/browser/browsers.py ++++ b/woob/browser/browsers.py +@@ -930,23 +930,6 @@ + + :class:`NextPage` constructor can take an url or a Request object. + +- >>> from .pages import HTMLPage +- >>> class Page(HTMLPage): +- ... def iter_values(self): +- ... for el in self.doc.xpath('//li'): +- ... yield el.text +- ... for next in self.doc.xpath('//a'): +- ... raise NextPage(next.attrib['href']) +- ... +- >>> class Browser(PagesBrowser): +- ... BASEURL = 'https://woob.tech' +- ... list = URL('/tests/list-(?P\d+).html', Page) +- ... +- >>> b = Browser() +- >>> b.list.go(pagenum=1) # doctest: +ELLIPSIS +- +- >>> list(b.pagination(lambda: b.page.iter_values())) +- ['One', 'Two', 'Three', 'Four'] + """ + while True: + try: +--- a/woob/browser/pages.py ++++ b/woob/browser/pages.py +@@ -49,25 +49,6 @@ + + :class:`NextPage` constructor can take an url or a Request object. + +- >>> class Page(HTMLPage): +- ... @pagination +- ... def iter_values(self): +- ... for el in self.doc.xpath('//li'): +- ... yield el.text +- ... for next in self.doc.xpath('//a'): +- ... raise NextPage(next.attrib['href']) +- ... +- >>> from .browsers import PagesBrowser +- >>> from .url import URL +- >>> class Browser(PagesBrowser): +- ... BASEURL = 'https://woob.tech' +- ... list = URL('/tests/list-(?P\d+).html', Page) +- ... +- >>> b = Browser() +- >>> b.list.go(pagenum=1) # doctest: +ELLIPSIS +- +- >>> list(b.page.iter_values()) +- ['One', 'Two', 'Three', 'Four'] + """ + + @wraps(func) diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix index 993bd66846..0013eb4e2e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix @@ -61,13 +61,12 @@ in rec { }; }; - # NOTE: Gradle 7 is a release candidate, so point to 6.8. - gradle_latest = gradle_6_8; + gradle_latest = gradle_7; gradle_7 = gradleGen (gradleSpec { - version = "7.0-rc-2"; + version = "7.0"; nativeVersion = "0.22-milestone-11"; - sha256 = "0gzvigyvwwizx90vnzhdnbm5rdaki11inxna11s4y67xkn8hrnx5"; + sha256 = "01f3bjn8pbpni8kmxvx1dpwpf4zz04vj7cpm6025n0k188c8k2zb"; }); gradle_6_8 = gradleGen (gradleSpec { diff --git a/third_party/nixpkgs/pkgs/development/tools/buildah/default.nix b/third_party/nixpkgs/pkgs/development/tools/buildah/default.nix index cebd80ff83..b1491bfa48 100644 --- a/third_party/nixpkgs/pkgs/development/tools/buildah/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/buildah/default.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "buildah"; - version = "1.20.0"; + version = "1.20.1"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - sha256 = "12gmn61mfrr58071x3cdsksad6swn1b23ghih128hjdpdzk1zxs3"; + sha256 = "sha256-nlZblUPS0678dR0hyp+V9uH/nHL9YH81+O1Zzq8T8Pw="; }; outputs = [ "out" "man" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/fedora-coreos-config-transpiler/default.nix b/third_party/nixpkgs/pkgs/development/tools/butane/default.nix similarity index 52% rename from third_party/nixpkgs/pkgs/development/tools/fedora-coreos-config-transpiler/default.nix rename to third_party/nixpkgs/pkgs/development/tools/butane/default.nix index acbdf431fe..fc42f311af 100644 --- a/third_party/nixpkgs/pkgs/development/tools/fedora-coreos-config-transpiler/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/butane/default.nix @@ -3,14 +3,14 @@ with lib; buildGoModule rec { - pname = "fcct"; - version = "0.10.0"; + pname = "butane"; + version = "0.11.0"; src = fetchFromGitHub { owner = "coreos"; - repo = "fcct"; + repo = "butane"; rev = "v${version}"; - sha256 = "0gxaj2fy889fl5vhb4s89rhih9a65aqjsz2yffhi5z4fa2im8szv"; + sha256 = "1s4rkq7mj1lyi8h47jyfy3qygfxhrmpihdy8rcnn55gcy04lm0qc"; }; vendorSha256 = null; @@ -20,17 +20,17 @@ buildGoModule rec { subPackages = [ "internal" ]; buildFlagsArray = '' - -ldflags=-X github.com/coreos/fcct/internal/version.Raw=v${version} + -ldflags=-X github.com/coreos/butane/internal/version.Raw=v${version} ''; postInstall = '' - mv $out/bin/{internal,fcct} + mv $out/bin/{internal,butane} ''; meta = { - description = "Translates Fedora CoreOS configs into Ignition configs"; + description = "Translates human-readable Butane configs into machine-readable Ignition configs"; license = licenses.asl20; - homepage = "https://github.com/coreos/fcct"; + homepage = "https://github.com/coreos/butane"; maintainers = with maintainers; [ elijahcaine ruuda ]; platforms = platforms.unix; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/godot/default.nix b/third_party/nixpkgs/pkgs/development/tools/godot/default.nix index 217717d3e7..d5eb7a9b0e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/godot/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/godot/default.nix @@ -58,11 +58,11 @@ in stdenv.mkDerivation rec { --replace "Exec=godot" "Exec=$out/bin/godot" ''; - meta = { + meta = with lib; { homepage = "https://godotengine.org"; description = "Free and Open Source 2D and 3D game engine"; - license = lib.licenses.mit; + license = licenses.mit; platforms = [ "i686-linux" "x86_64-linux" ]; - maintainers = [ lib.maintainers.twey ]; + maintainers = with maintainers; [ twey ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/scenebuilder/default.nix b/third_party/nixpkgs/pkgs/development/tools/scenebuilder/default.nix index 3d3b6bbe9d..97c03fb457 100644 --- a/third_party/nixpkgs/pkgs/development/tools/scenebuilder/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/scenebuilder/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, jdk, gradleGen, makeDesktopItem, copyDesktopItems, perl, writeText, runtimeShell, makeWrapper, glib, wrapGAppsHook }: let # The default one still uses jdk8 (#89731) - gradle = (gradleGen.override (old: { java = jdk; })).gradle_latest; + gradle = (gradleGen.override (old: { java = jdk; })).gradle_6_8; pname = "scenebuilder"; version = "15.0.1"; diff --git a/third_party/nixpkgs/pkgs/development/web/deno/default.nix b/third_party/nixpkgs/pkgs/development/web/deno/default.nix index cdb34aab45..6faba30bf7 100644 --- a/third_party/nixpkgs/pkgs/development/web/deno/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/deno/default.nix @@ -15,15 +15,15 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.8.3"; + version = "1.9.0"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QkVDIpJ4VW3DpcwhydDnt68zxVXwkitIiN8blGlqX1g="; + sha256 = "sha256-LrJGwsP+P8zXYwboF5791YuWGVdhcQJLOoBv+VzrYzs="; }; - cargoSha256 = "sha256-pf/4/H3wNORNvAswz8+7B3x5T5MyQgW7HgtDLBhfE/o="; + cargoSha256 = "sha256-JDapls3nRNETri6nZPRjZFlAFVN1Owhp965zf0Rn3ug="; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/web/deno/librusty_v8.nix b/third_party/nixpkgs/pkgs/development/web/deno/librusty_v8.nix index 41c06fbf7c..c1dbd0f773 100644 --- a/third_party/nixpkgs/pkgs/development/web/deno/librusty_v8.nix +++ b/third_party/nixpkgs/pkgs/development/web/deno/librusty_v8.nix @@ -11,11 +11,11 @@ let }; in fetch_librusty_v8 { - version = "0.21.0"; + version = "0.22.1"; shas = { - x86_64-linux = "sha256-oxGCM6jlqafjAfTtFwARxBv/8tiUaD9A2TlLyj/3LlQ="; - aarch64-linux = "sha256-yeDcrxEp3qeE6/NWEc1v7VoHjlgppIOkcHTNVksXNsM="; - x86_64-darwin = "sha256-QqdBa59xPxM8eDRzvPxvv9HFVgp2rt+5jiwIOgsi8JE="; - aarch64-darwin = "sha256-aq2Kjn8QSDMhNg8pEbXkJCHUKmDTNnitq42SDDVyRd4="; + x86_64-linux = "sha256-rHI5qzwmDvlIdjUCZwvl6/s2Oe6d3/V7TJwfP1AFjik="; + aarch64-linux = "sha256-7VhrOkzWayZFTsq0II5uh+TxXaIDSkc0E19ZwT3Hl6c="; + x86_64-darwin = "sha256-zXXL2YqgjFmuDHGReIGWVxfSS3PMND0J0qlHRV/rKs8="; + aarch64-darwin = "sha256-X/CCJn5yWJH2x6lCGAFllrQUj7XLA3TICRP3aiWytjk="; }; } diff --git a/third_party/nixpkgs/pkgs/games/factorio/versions.json b/third_party/nixpkgs/pkgs/games/factorio/versions.json index 6460e262d0..c8a441aaec 100644 --- a/third_party/nixpkgs/pkgs/games/factorio/versions.json +++ b/third_party/nixpkgs/pkgs/games/factorio/versions.json @@ -2,12 +2,12 @@ "x86_64-linux": { "alpha": { "experimental": { - "name": "factorio_alpha_x64-1.1.30.tar.xz", + "name": "factorio_alpha_x64-1.1.32.tar.xz", "needsAuth": true, - "sha256": "14mcf9pj6s5ms2hl68n3r5jk1q5y2qzw88wiahsb5plkv9qyqyp6", + "sha256": "0ciz7y8xqlk9vg3akvflq1aabzgbqpazfnihyk4gsadk12b6a490", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.30/alpha/linux64", - "version": "1.1.30" + "url": "https://factorio.com/get-download/1.1.32/alpha/linux64", + "version": "1.1.32" }, "stable": { "name": "factorio_alpha_x64-1.1.30.tar.xz", @@ -38,12 +38,12 @@ }, "headless": { "experimental": { - "name": "factorio_headless_x64-1.1.30.tar.xz", + "name": "factorio_headless_x64-1.1.32.tar.xz", "needsAuth": false, - "sha256": "1rac6d8v8swiw1nn2hl53rhjfhsyv98qg8hfnwhfqn76jgspspdl", + "sha256": "0dg98ycs7m8rm996pk0p1iajalpmiy30p0pwr9dw2chf1d887kvz", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.30/headless/linux64", - "version": "1.1.30" + "url": "https://factorio.com/get-download/1.1.32/headless/linux64", + "version": "1.1.32" }, "stable": { "name": "factorio_headless_x64-1.1.30.tar.xz", diff --git a/third_party/nixpkgs/pkgs/games/scummvm/default.nix b/third_party/nixpkgs/pkgs/games/scummvm/default.nix index 20d781db23..68ccb894d9 100644 --- a/third_party/nixpkgs/pkgs/games/scummvm/default.nix +++ b/third_party/nixpkgs/pkgs/games/scummvm/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchurl, nasm , alsaLib, curl, flac, fluidsynth, freetype, libjpeg, libmad, libmpeg2, libogg, libvorbis, libGLU, libGL, SDL2, zlib +, Cocoa, AudioToolbox, Carbon, CoreMIDI, AudioUnit, cctools }: stdenv.mkDerivation rec { @@ -13,8 +14,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ nasm ]; - buildInputs = [ - alsaLib curl freetype flac fluidsynth libjpeg libmad libmpeg2 libogg libvorbis libGLU libGL SDL2 zlib + buildInputs = lib.optionals stdenv.isLinux [ + alsaLib + ] ++ lib.optionals stdenv.isDarwin [ + Cocoa AudioToolbox Carbon CoreMIDI AudioUnit + ] ++ [ + curl freetype flac fluidsynth libjpeg libmad libmpeg2 libogg libvorbis libGLU libGL SDL2 zlib ]; dontDisableStatic = true; @@ -30,6 +35,8 @@ stdenv.mkDerivation rec { # They use 'install -s', that calls the native strip instead of the cross postConfigure = '' sed -i "s/-c -s/-c -s --strip-program=''${STRIP@Q}/" ports.mk + '' + lib.optionalString stdenv.isDarwin '' + substituteInPlace config.mk --replace x86_64-apple-darwin-ranlib ${cctools}/bin/ranlib ''; meta = with lib; { @@ -37,6 +44,6 @@ stdenv.mkDerivation rec { homepage = "https://www.scummvm.org/"; license = licenses.gpl2; maintainers = [ maintainers.peterhoeg ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/games/shattered-pixel-dungeon/default.nix b/third_party/nixpkgs/pkgs/games/shattered-pixel-dungeon/default.nix index 8d92c88e1b..2ced60ef89 100644 --- a/third_party/nixpkgs/pkgs/games/shattered-pixel-dungeon/default.nix +++ b/third_party/nixpkgs/pkgs/games/shattered-pixel-dungeon/default.nix @@ -2,7 +2,7 @@ , makeWrapper , fetchFromGitHub , nixosTests -, gradle +, gradle_6 , perl , jre , libpulseaudio @@ -33,7 +33,7 @@ let deps = stdenv.mkDerivation { pname = "${pname}-deps"; inherit version src postPatch; - nativeBuildInputs = [ gradle perl ]; + nativeBuildInputs = [ gradle_6 perl ]; buildPhase = '' export GRADLE_USER_HOME=$(mktemp -d) # https://github.com/gradle/gradle/issues/4426 @@ -54,7 +54,7 @@ let in stdenv.mkDerivation rec { inherit pname version src postPatch; - nativeBuildInputs = [ gradle perl makeWrapper ]; + nativeBuildInputs = [ gradle_6 perl makeWrapper ]; buildPhase = '' export GRADLE_USER_HOME=$(mktemp -d) diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix b/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix index 0b68563a28..3a7c6f06a3 100644 --- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix +++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix @@ -390,6 +390,21 @@ let }; }; + foxundermoon.shell-format = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "shell-format"; + publisher = "foxundermoon"; + version = "7.1.0"; + sha256 = "09z72mdr5bfdcb67xyzlv7lb9vyjlc3k9ackj4jgixfk40c68cnj"; + }; + meta = with lib; { + downloadPage = "https://marketplace.visualstudio.com/items?itemName=foxundermoon.shell-format"; + homepage = "https://github.com/foxundermoon/vs-shell-format"; + license = licenses.mit; + maintainers = with maintainers; [ dbirks ]; + }; + }; + freebroccolo.reasonml = buildVscodeMarketplaceExtension { meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/freebroccolo.reasonml/changelog"; diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/terraform/default.nix b/third_party/nixpkgs/pkgs/misc/vscode-extensions/terraform/default.nix index fbfb7c06dc..592994c331 100644 --- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/terraform/default.nix +++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/terraform/default.nix @@ -3,13 +3,13 @@ vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { name = "terraform"; publisher = "hashicorp"; - version = "2.9.1"; + version = "2.10.0"; }; vsix = fetchurl { name = "${mktplcRef.publisher}-${mktplcRef.name}.zip"; - url = "https://github.com/hashicorp/vscode-terraform/releases/download/v${mktplcRef.version}/terraform-${mktplcRef.version}.vsix"; - sha256 = "1i4pzxw57hf2g7x62hfsb588b1lz3zjjh8ny96qqrif2bj2h887z"; + url = "https://github.com/hashicorp/vscode-terraform/releases/download/v${mktplcRef.version}/${mktplcRef.name}-${mktplcRef.version}.vsix"; + sha256 = "1xhypy4vvrzxj3qwkzpfx8b48hddf72mxmh0hgz7iry6bch6sh5f"; }; patches = [ ./fix-terraform-ls.patch ]; diff --git a/third_party/nixpkgs/pkgs/servers/http/nginx/generic.nix b/third_party/nixpkgs/pkgs/servers/http/nginx/generic.nix index d249d47a21..663193789a 100644 --- a/third_party/nixpkgs/pkgs/servers/http/nginx/generic.nix +++ b/third_party/nixpkgs/pkgs/servers/http/nginx/generic.nix @@ -142,7 +142,10 @@ stdenv.mkDerivation { passthru = { modules = modules; - tests.nginx = nixosTests.nginx; + tests = { + inherit (nixosTests) nginx nginx-auth nginx-etag nginx-pubhtml nginx-sandbox nginx-sso; + variants = lib.recurseIntoAttrs nixosTests.nginx-variants; + }; }; meta = if meta != null then meta else { diff --git a/third_party/nixpkgs/pkgs/servers/http/tengine/default.nix b/third_party/nixpkgs/pkgs/servers/http/tengine/default.nix index 01e5c0950d..d7c8ea226f 100644 --- a/third_party/nixpkgs/pkgs/servers/http/tengine/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/tengine/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, openssl, zlib, pcre, libxml2, libxslt -, substituteAll, gd, geoip, gperftools, jemalloc +, substituteAll, gd, geoip, gperftools, jemalloc, nixosTests , withDebug ? false , withMail ? false , withStream ? false @@ -111,6 +111,11 @@ stdenv.mkDerivation rec { mv $out/sbin $out/bin ''; + passthru = { + inherit modules; + tests = nixosTests.nginx-variants.tengine; + }; + meta = { description = "A web server based on Nginx and has many advanced features, originated by Taobao"; homepage = "https://tengine.taobao.org"; diff --git a/third_party/nixpkgs/pkgs/servers/ma1sd/default.nix b/third_party/nixpkgs/pkgs/servers/ma1sd/default.nix index 5947d18eb9..4657801919 100644 --- a/third_party/nixpkgs/pkgs/servers/ma1sd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/ma1sd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, jre, git, gradle, perl, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, jre, git, gradle_6, perl, makeWrapper }: let name = "ma1sd-${version}"; @@ -16,7 +16,7 @@ let deps = stdenv.mkDerivation { name = "${name}-deps"; inherit src; - nativeBuildInputs = [ gradle perl git ]; + nativeBuildInputs = [ gradle_6 perl git ]; buildPhase = '' export MA1SD_BUILD_VERSION=${rev} @@ -41,7 +41,7 @@ let in stdenv.mkDerivation { inherit name src version; - nativeBuildInputs = [ gradle perl makeWrapper ]; + nativeBuildInputs = [ gradle_6 perl makeWrapper ]; buildInputs = [ jre ]; buildPhase = '' diff --git a/third_party/nixpkgs/pkgs/servers/mail/mailman/web.nix b/third_party/nixpkgs/pkgs/servers/mail/mailman/web.nix index 2f1e9cd251..434f5b3191 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/mailman/web.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/mailman/web.nix @@ -14,18 +14,25 @@ buildPythonPackage rec { leaveDotGit = true; }; - # This is just so people installing from pip also get uwsgi - # installed, AFAICT. - - # Django is depended on transitively by hyperkitty and postorius, - # and mailman_web has overly restrictive version bounds on it, so - # let's remove it. postPatch = '' + # This is just so people installing from pip also get uwsgi + # installed, AFAICT. sed -i '/^ uwsgi$/d' setup.cfg + + # Django is depended on transitively by hyperkitty and postorius, + # and mailman_web has overly restrictive version bounds on it, so + # let's remove it. sed -i '/^ Django/d' setup.cfg + + # Upstream seems to mostly target installing on top of existing + # distributions, and uses a path appropriate for that, but we are + # a distribution, so use a state directory appropriate for a + # distro package. + substituteInPlace mailman_web/settings/base.py \ + --replace /opt/mailman/web /var/lib/mailman-web ''; - nativeBuildInputs = [ git setuptools-scm makeWrapper ]; + nativeBuildInputs = [ git makeWrapper setuptools-scm ]; propagatedBuildInputs = [ hyperkitty postorius whoosh ]; # Tries to check runtime configuration. diff --git a/third_party/nixpkgs/pkgs/servers/mail/postfix/default.nix b/third_party/nixpkgs/pkgs/servers/mail/postfix/default.nix index 6862507c62..579ce38331 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/postfix/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/postfix/default.nix @@ -26,11 +26,11 @@ in stdenv.mkDerivation rec { pname = "postfix"; - version = "3.5.9"; + version = "3.5.10"; src = fetchurl { url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${pname}-${version}.tar.gz"; - sha256 = "0avn00drmk9c9mjynfvcmir72ss9s3mckdhjm3mmnhas2sixbkji"; + sha256 = "sha256-W7TX1y11ErWPOjFCbcvTlP01TgpD3iHaiUZrBXoCKPg="; }; nativeBuildInputs = [ makeWrapper m4 ]; @@ -103,7 +103,6 @@ in stdenv.mkDerivation rec { description = "A fast, easy to administer, and secure mail server"; license = with licenses; [ ipl10 epl20 ]; platforms = platforms.linux; - maintainers = with maintainers; [ globin ]; + maintainers = with maintainers; [ globin dotlambda ]; }; - } diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/alertmanager-irc-relay/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/alertmanager-irc-relay/default.nix index 07e58e471d..c3c60e1d4a 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/alertmanager-irc-relay/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/alertmanager-irc-relay/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "alertmanager-irc-relay"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "google"; repo = "alertmanager-irc-relay"; rev = "v${version}"; - sha256 = "sha256-SmyKk0vSXfHzRxOdbULD2Emju/VjDcXZZ7cgVbZxGIA="; + sha256 = "sha256-IlWXsQZtDXG8sJBV+82BzEFj+JtUbfTOZyqYOrZFTXA="; }; - vendorSha256 = "sha256-aJVA9MJ9DK/dCo7aSB9OLfgKGN5L6Sw2k2aOR4J2LE4="; + vendorSha256 = "sha256-VLG15IXS/fXFMTCJKEqGW6qZ9aOLPhazidVsOywG+w4="; buildFlagsArray = [ "-ldflags=-s -w" ]; diff --git a/third_party/nixpkgs/pkgs/servers/mxisd/default.nix b/third_party/nixpkgs/pkgs/servers/mxisd/default.nix index b2ea542080..48f49b57fc 100644 --- a/third_party/nixpkgs/pkgs/servers/mxisd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mxisd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, jre, git, gradle, perl, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, jre, git, gradle_6, perl, makeWrapper }: let name = "mxisd-${version}"; @@ -16,7 +16,7 @@ let deps = stdenv.mkDerivation { name = "${name}-deps"; inherit src; - nativeBuildInputs = [ gradle perl git ]; + nativeBuildInputs = [ gradle_6 perl git ]; buildPhase = '' export MXISD_BUILD_VERSION=${rev} @@ -41,7 +41,7 @@ let in stdenv.mkDerivation { inherit name src version; - nativeBuildInputs = [ gradle perl makeWrapper ]; + nativeBuildInputs = [ gradle_6 perl makeWrapper ]; buildInputs = [ jre ]; patches = [ ./0001-gradle.patch ]; diff --git a/third_party/nixpkgs/pkgs/servers/sql/materialize/default.nix b/third_party/nixpkgs/pkgs/servers/sql/materialize/default.nix new file mode 100644 index 0000000000..e89cd9804a --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/sql/materialize/default.nix @@ -0,0 +1,91 @@ +{ stdenv +, lib +, fetchFromGitHub +, fetchzip +, rustPlatform +, bootstrap_cmds +, DiskArbitration +, Foundation +, cmake +, libiconv +, openssl +, perl +, pkg-config}: + +let + fetchNpmPackage = {name, version, hash, js_prod_file, js_dev_file, ...} @ args: + let + package = fetchzip { + url = "https://registry.npmjs.org/${name}/-/${baseNameOf name}-${version}.tgz"; + inherit hash; + }; + + static = "./src/materialized/src/http/static"; + cssVendor = "./src/materialized/src/http/static/css/vendor"; + jsProdVendor = "./src/materialized/src/http/static/js/vendor"; + jsDevVendor = "./src/materialized/src/http/static-dev/js/vendor"; + + files = with args; [ + { src = js_prod_file; dst = "${jsProdVendor}/${name}.js"; } + { src = js_dev_file; dst = "${jsDevVendor}/${name}.js"; } + ] ++ lib.optional (args ? css_file) { src = css_file; dst = "${cssVendor}/${name}.css"; } + ++ lib.optional (args ? extra_file) { src = extra_file.src; dst = "${static}/${extra_file.dst}"; }; + in + lib.concatStringsSep "\n" (lib.forEach files ({src, dst}: '' + mkdir -p "${dirOf dst}" + cp "${package}/${src}" "${dst}" + '')); + + npmPackages = import ./npm_deps.nix; +in +rustPlatform.buildRustPackage rec { + pname = "materialize"; + version = "0.7.1"; + rev = "f4bd159fa73d37d44f8ed3f1db13c0c2ff85566f"; + + src = fetchFromGitHub { + owner = "MaterializeInc"; + repo = pname; + inherit rev; + hash = "sha256-8nonB/KRv4qOGvJhh0v3UwlBzAXfzb3afeCm/7/E0AU="; + }; + + cargoSha256 = "sha256-5slgICqLZFqxPymgHvq98BtcD70hfJMr36pvAoQKEJ4="; + + nativeBuildInputs = [ cmake perl pkg-config ] + # Provides the mig command used by the krb5-src build script + ++ lib.optional stdenv.isDarwin bootstrap_cmds; + + buildInputs = [ openssl ] + ++ lib.optionals stdenv.isDarwin [ libiconv DiskArbitration Foundation ]; + + # Skip tests that use the network + checkFlags = [ + "--exact" + "--skip test_client" + "--skip test_client_errors" + "--skip test_no_block" + ]; + + postPatch = '' + ${lib.concatStringsSep "\n" (map fetchNpmPackage npmPackages)} + substituteInPlace ./misc/dist/materialized.service \ + --replace /usr/bin $out/bin \ + --replace _Materialize root + ''; + + MZ_DEV_BUILD_SHA = rev; + cargoBuildFlags = [ "--package materialized" ]; + + postInstall = '' + install --mode=444 -D ./misc/dist/materialized.service $out/etc/systemd/system/materialized.service + ''; + + meta = with lib; { + homepage = "https://materialize.com"; + description = "A streaming SQL materialized view engine for real-time applications"; + license = licenses.bsl11; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; + maintainers = [ maintainers.petrosagg ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/sql/materialize/npm_deps.nix b/third_party/nixpkgs/pkgs/servers/sql/materialize/npm_deps.nix new file mode 100644 index 0000000000..a0fccb971c --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/sql/materialize/npm_deps.nix @@ -0,0 +1,62 @@ +# materialized doesn't use npm to pull in its few node dependencies but instead +# manually pulls the tar archives for each package and pulls out a couple of +# files. +# +# The list of modules can be found in this file +# https://github.com/MaterializeInc/materialize/blob/master/src/materialized/build/npm.rs +[ + { + name = "@hpcc-js/wasm"; + version = "0.3.14"; + hash = "sha256-EsbuFk9qtlm9yWpG29RnqVAHrP0rk3xyibQLy8qgRT4="; + js_prod_file = "dist/index.min.js"; + js_dev_file = "dist/index.js"; + extra_file = { + src = "dist/graphvizlib.wasm"; + dst = "js/vendor/@hpcc-js/graphvizlib.wasm"; + }; + } + { + name = "babel-standalone"; + version = "6.26.0"; + hash = "sha256-zdeTj4aOEzWvrnh90T80jL+RD8qg8PaeG0Ceua82Dz4="; + js_prod_file = "babel.min.js"; + js_dev_file = "babel.js"; + } + { + name = "d3"; + version = "5.16.0"; + hash = "sha256-aQQRhnJxV5/9C+cQslctP3v/AePGfbSw8L3chObJzK4="; + js_prod_file = "dist/d3.min.js"; + js_dev_file = "dist/d3.js"; + } + { + name = "d3-flame-graph"; + version = "3.1.1"; + hash = "sha256-Ls3MqALr6+/A+n8jqFw7frIB++6d1W3lAXKU0qFZ2ok="; + css_file = "dist/d3-flamegraph.css"; + js_prod_file = "dist/d3-flamegraph.min.js"; + js_dev_file = "dist/d3-flamegraph.js"; + } + { + name = "pako"; + version = "1.0.11"; + hash = "sha256-St7nKpcYlJQl8qMmPkEHwmTufOHAeZK4lBZHo8VRXLA="; + js_prod_file = "dist/pako.min.js"; + js_dev_file = "dist/pako.js"; + } + { + name = "react"; + version = "16.14.0"; + hash = "sha256-X/8Bc4XvC8IqQWbW/PCRJQpmOBI/0AZT/hSFBf/uJU8="; + js_prod_file = "umd/react.production.min.js"; + js_dev_file = "umd/react.development.js"; + } + { + name = "react-dom"; + version = "16.14.0"; + hash = "sha256-2mYm9dwBFrWws6CB5bL6ghROTzX84RLM31hdnEbhG10="; + js_prod_file = "umd/react-dom.production.min.js"; + js_dev_file = "umd/react-dom.development.js"; + } +] diff --git a/third_party/nixpkgs/pkgs/servers/x11/xorg/default.nix b/third_party/nixpkgs/pkgs/servers/x11/xorg/default.nix index 1173fc2237..36fe0fcb94 100644 --- a/third_party/nixpkgs/pkgs/servers/x11/xorg/default.nix +++ b/third_party/nixpkgs/pkgs/servers/x11/xorg/default.nix @@ -2692,11 +2692,11 @@ lib.makeScope newScope (self: with self; { }) {}; xorgserver = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, openssl, libX11, libXau, libXaw, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, libXmu, libXpm, libXrender, libXres, libXt }: stdenv.mkDerivation { - name = "xorg-server-1.20.10"; + name = "xorg-server-1.20.11"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/xserver/xorg-server-1.20.10.tar.bz2"; - sha256 = "16bwrf0ag41l7jbrllbix8z6avc5yimga7ihvq4ch3a5hb020x4p"; + url = "mirror://xorg/individual/xserver/xorg-server-1.20.11.tar.bz2"; + sha256 = "0jacqgin8kcyy8fyv0lhgb4if8g9hp60rm3ih3s1mgps7xp7jk4i"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/servers/x11/xorg/tarballs.list b/third_party/nixpkgs/pkgs/servers/x11/xorg/tarballs.list index 61cfd4df18..355619d73a 100644 --- a/third_party/nixpkgs/pkgs/servers/x11/xorg/tarballs.list +++ b/third_party/nixpkgs/pkgs/servers/x11/xorg/tarballs.list @@ -218,4 +218,4 @@ mirror://xorg/individual/util/lndir-1.0.3.tar.bz2 mirror://xorg/individual/util/makedepend-1.0.6.tar.bz2 mirror://xorg/individual/util/util-macros-1.19.3.tar.bz2 mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2 -mirror://xorg/individual/xserver/xorg-server-1.20.10.tar.bz2 +mirror://xorg/individual/xserver/xorg-server-1.20.11.tar.bz2 diff --git a/third_party/nixpkgs/pkgs/tools/admin/oci-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/oci-cli/default.nix new file mode 100644 index 0000000000..16ecff07b7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/admin/oci-cli/default.nix @@ -0,0 +1,58 @@ +{ lib, fetchFromGitHub, python3Packages, locale }: + +let + # https://github.com/oracle/oci-cli/issues/189 + pinned_click = python3Packages.click.overridePythonAttrs (old: rec { + pname = "click"; + version = "6.7"; + src = python3Packages.fetchPypi { + inherit pname version; + hash = "sha256-8VUW30eNWlYYD7+A5o8gYBDm0WD8OfpQi2XgNf11Ews="; + }; + + postPatch = '' + substituteInPlace click/_unicodefun.py \ + --replace "'locale'" "'${locale}/bin/locale'" + ''; + + # Issue that wasn't resolved when this version was released: + # https://github.com/pallets/click/issues/823 + doCheck = false; + }); +in + +python3Packages.buildPythonApplication rec { + pname = "oci-cli"; + version = "2.23.0"; + + src = fetchFromGitHub { + owner = "oracle"; + repo = "oci-cli"; + rev = "v${version}"; + hash = "sha256-XRkycJrUSOZQAGiSyQZGA/SnlxnFumYL82kOkYd7s2o="; + }; + + propagatedBuildInputs = with python3Packages; [ + oci arrow certifi pinned_click configparser cryptography jmespath dateutil + pytz retrying six terminaltables pyopenssl pyyaml + ]; + + # https://github.com/oracle/oci-cli/issues/187 + doCheck = false; + + postPatch = '' + substituteInPlace setup.py \ + --replace "configparser==4.0.2" "configparser" \ + --replace "cryptography==3.2.1" "cryptography" \ + --replace "pyOpenSSL==19.1.0" "pyOpenSSL" \ + --replace "PyYAML==5.3.1" "PyYAML" \ + --replace "six==1.14.0" "six" + ''; + + meta = with lib; { + description = "Command Line Interface for Oracle Cloud Infrastructure"; + homepage = "https://docs.cloud.oracle.com/iaas/Content/API/Concepts/cliconcepts.htm"; + maintainers = with maintainers; [ ilian ]; + license = with licenses; [ asl20 upl ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/tmux/default.nix b/third_party/nixpkgs/pkgs/tools/misc/tmux/default.nix index 534fe54bc1..7fcd5322c2 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/tmux/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/tmux/default.nix @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { pname = "tmux"; - version = "3.1c"; + version = "3.2"; outputs = [ "out" "man" ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { owner = "tmux"; repo = "tmux"; rev = version; - sha256 = "1fqgpzfas85dn0sxlvvg6rj488jwgnxs8d3gqcm8lgs211m9qhcf"; + sha256 = "0alq81h1rz1f0zsy8qb2dvsl47axpa86j4bplngwkph0ksqqgr3p"; }; nativeBuildInputs = [ @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { * Terminal locking, manually or after a timeout. * A clean, easily extended, BSD-licensed codebase, under active development. ''; - + changelog = "https://github.com/tmux/tmux/raw/${version}/CHANGES"; license = lib.licenses.bsd3; platforms = lib.platforms.unix; diff --git a/third_party/nixpkgs/pkgs/tools/misc/ytfzf/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ytfzf/default.nix index 6129fd4b9d..ca211cff13 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ytfzf/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ytfzf/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "ytfzf"; - version = "1.1.2"; + version = "1.1.3"; src = fetchFromGitHub { owner = "pystardust"; repo = "ytfzf"; rev = "v${version}"; - sha256 = "09az557479d3s1my46d2w86ndkvs2xi127kaw0csag0wlq2qq10p"; + sha256 = "sha256-ST6ZSNJW4Pe8fdwRsQ0BLdCd3AE9OTG6is3J+HMdIzs="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/tools/text/mdbook-mermaid/default.nix b/third_party/nixpkgs/pkgs/tools/text/mdbook-mermaid/default.nix new file mode 100644 index 0000000000..b29fbbd6e0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/text/mdbook-mermaid/default.nix @@ -0,0 +1,24 @@ +{ lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices }: + +rustPlatform.buildRustPackage rec { + pname = "mdbook-mermaid"; + version = "0.8.1"; + + src = fetchFromGitHub { + owner = "badboy"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-UMYWRQeSQwWVJla/+RPlAXPMuFVnxqDtYDxLKmbMw4g="; + }; + + cargoSha256 = "sha256-nhJS2QZUyGeNRMS9D+P+QPMDHK2PqVK/H2AKaP7EECw="; + + buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; + + meta = with lib; { + description = "A preprocessor for mdbook to add mermaid.js support"; + homepage = "https://github.com/badboy/mdbook-mermaid"; + license = [ licenses.mpl20 ]; + maintainers = with maintainers; [ xrelkd ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/text/ocrmypdf/default.nix b/third_party/nixpkgs/pkgs/tools/text/ocrmypdf/default.nix index 6843e945fd..99e2bf0650 100644 --- a/third_party/nixpkgs/pkgs/tools/text/ocrmypdf/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/ocrmypdf/default.nix @@ -30,14 +30,14 @@ let in buildPythonApplication rec { pname = "ocrmypdf"; - version = "11.6.0"; + version = "11.7.3"; disabled = ! python3Packages.isPy3k; src = fetchFromGitHub { owner = "jbarlow83"; repo = "OCRmyPDF"; rev = "v${version}"; - sha256 = "0inmmpam0vcm5n4sm6lh9p5swk44clknvm1cdwk9cax01mdqljza"; + sha256 = "0gs2w9kl5wwrs0hx2sivq3pdvpf3lkaifblwfbz5g31yl770blji"; }; nativeBuildInputs = with python3Packages; [ @@ -85,5 +85,6 @@ buildPythonApplication rec { license = with licenses; [ mpl20 mit ]; platforms = platforms.linux; maintainers = [ maintainers.kiwi ]; + changelog = "https://github.com/jbarlow83/OCRmyPDF/blob/v${version}/docs/release_notes.rst"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/htmldoc/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/htmldoc/default.nix index 124839ca45..740d16c73d 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/htmldoc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/htmldoc/default.nix @@ -1,29 +1,23 @@ -{ lib, stdenv, fetchurl - -, SystemConfiguration ? null, Foundation ? null -}: - -assert stdenv.isDarwin -> SystemConfiguration != null - && Foundation != null; +{ lib, stdenv, fetchFromGitHub, zlib, libpng, SystemConfiguration, Foundation }: stdenv.mkDerivation rec { - version = "1.8.29"; pname = "htmldoc"; - src = fetchurl { - url = "https://github.com/michaelrsweet/htmldoc/releases/download" - + "/release-${version}/htmldoc-${version}-source.tar.gz"; - sha256 = "15x0xdf487j4i4gfap5yr83airxnbp2v4lxaz79a4s3iirrq39p0"; + version = "1.9.11"; + src = fetchFromGitHub { + owner = "michaelrsweet"; + repo = "htmldoc"; + rev = "v${version}"; + sha256 = "0660829zjfdm6vzx14z7gvsfipsb7h0z74gbkyp2ncg3g2432s4n"; }; - buildInputs = with stdenv; - lib.optional isDarwin SystemConfiguration - ++ lib.optional isDarwin Foundation; + buildInputs = [ zlib libpng ] + ++ lib.optionals stdenv.isDarwin [ Foundation SystemConfiguration ]; meta = with lib; { description = "Converts HTML files to PostScript and PDF"; homepage = "https://michaelrsweet.github.io/htmldoc"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ shanemikel ]; - platforms = with platforms; linux ++ darwin; + platforms = platforms.unix; longDescription = '' HTMLDOC is a program that reads HTML source files or web pages and diff --git a/third_party/nixpkgs/pkgs/top-level/aliases.nix b/third_party/nixpkgs/pkgs/top-level/aliases.nix index d05c81dcaa..557c083c5f 100644 --- a/third_party/nixpkgs/pkgs/top-level/aliases.nix +++ b/third_party/nixpkgs/pkgs/top-level/aliases.nix @@ -185,6 +185,7 @@ mapAliases ({ exfat-utils = exfat; # 2015-09-11 facette = throw "facette has been removed."; # added 2020-01-06 fast-neural-doodle = throw "fast-neural-doodle has been removed, as the upstream project has been abandoned"; # added 2020-03-28 + fedora-coreos-config-transpiler = throw "fedora-coreos-config-transpiler has been renamed to 'butane'."; # added 2021-04-13 fetchFromGithub = throw "You meant fetchFromGitHub, with a capital H."; ffadoFull = ffado; # added 2018-05-01 firefox-esr-68 = throw "Firefox 68 ESR reached end of life with its final release 68.12esr on 2020-08-25 and was therefore removed from nixpkgs"; diff --git a/third_party/nixpkgs/pkgs/top-level/all-packages.nix b/third_party/nixpkgs/pkgs/top-level/all-packages.nix index 6dd393492c..2b0c876113 100644 --- a/third_party/nixpkgs/pkgs/top-level/all-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/all-packages.nix @@ -375,7 +375,10 @@ in fetchbzr = callPackage ../build-support/fetchbzr { }; - fetchcvs = callPackage ../build-support/fetchcvs { }; + fetchcvs = if stdenv.buildPlatform != stdenv.hostPlatform + # hack around splicing being crummy with things that (correctly) don't eval. + then buildPackages.fetchcvs + else callPackage ../build-support/fetchcvs { }; fetchdarcs = callPackage ../build-support/fetchdarcs { }; @@ -427,7 +430,10 @@ in fetchs3 = callPackage ../build-support/fetchs3 { }; - fetchsvn = callPackage ../build-support/fetchsvn { }; + fetchsvn = if stdenv.buildPlatform != stdenv.hostPlatform + # hack around splicing being crummy with things that (correctly) don't eval. + then buildPackages.fetchsvn + else callPackage ../build-support/fetchsvn { }; fetchsvnrevision = import ../build-support/fetchsvnrevision runCommand subversion; @@ -1240,8 +1246,6 @@ in fedora-backgrounds = callPackage ../data/misc/fedora-backgrounds { }; - fedora-coreos-config-transpiler = callPackage ../development/tools/fedora-coreos-config-transpiler { }; - ccextractor = callPackage ../applications/video/ccextractor { }; cconv = callPackage ../tools/text/cconv { }; @@ -1748,6 +1752,8 @@ in blur-effect = callPackage ../tools/graphics/blur-effect { }; + butane = callPackage ../development/tools/butane { }; + charles = charles4; inherit (callPackage ../applications/networking/charles {}) charles3 @@ -2649,6 +2655,10 @@ in jellyfin_10_5 = callPackage ../servers/jellyfin/10.5.x.nix { }; + jellyfin-media-player = libsForQt5.callPackage ../applications/video/jellyfin-media-player { + inherit (darwin.apple_sdk.frameworks) CoreFoundation Cocoa CoreAudio MediaPlayer; + }; + jellyfin-mpv-shim = python3Packages.callPackage ../applications/video/jellyfin-mpv-shim { }; jotta-cli = callPackage ../applications/misc/jotta-cli { }; @@ -2837,6 +2847,8 @@ in nyx = callPackage ../tools/networking/nyx { }; + oci-cli = callPackage ../tools/admin/oci-cli { }; + ocrmypdf = callPackage ../tools/text/ocrmypdf { }; ocrfeeder = callPackage ../applications/graphics/ocrfeeder { }; @@ -2914,6 +2926,8 @@ in psrecord = python3Packages.callPackage ../tools/misc/psrecord {}; + river = callPackage ../applications/window-managers/river { }; + rmapi = callPackage ../applications/misc/remarkable/rmapi { }; rmview = libsForQt5.callPackage ../applications/misc/remarkable/rmview { }; @@ -6034,6 +6048,10 @@ in inherit (darwin.apple_sdk.frameworks) CoreServices; }; + mdbook-mermaid = callPackage ../tools/text/mdbook-mermaid { + inherit (darwin.apple_sdk.frameworks) CoreServices; + }; + mdcat = callPackage ../tools/text/mdcat { inherit (darwin.apple_sdk.frameworks) Security; inherit (python3Packages) ansi2html; @@ -18319,6 +18337,8 @@ in inherit (llvmPackages_10) clang-unwrapped lld lldClang llvm; }; + clickhouse-cli = with python3Packages; toPythonApplication clickhouse-cli; + couchdb = callPackage ../servers/http/couchdb { sphinx = python27Packages.sphinx; erlang = erlangR19; @@ -18549,6 +18569,11 @@ in nodejs-slim = nodejs-slim-12_x; }; + materialize = callPackage ../servers/sql/materialize { + inherit (buildPackages.darwin) bootstrap_cmds; + inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation; + }; + mattermost = callPackage ../servers/mattermost { }; matterircd = callPackage ../servers/mattermost/matterircd.nix { }; matterbridge = callPackage ../servers/matterbridge { }; @@ -23327,6 +23352,8 @@ in googleearth = callPackage ../applications/misc/googleearth { }; + googleearth-pro = callPackage ../applications/misc/googleearth-pro { }; + google-chrome = callPackage ../applications/networking/browsers/google-chrome { gconf = gnome2.GConf; }; google-chrome-beta = google-chrome.override { chromium = chromiumBeta; channel = "beta"; }; @@ -23551,7 +23578,7 @@ in withPortAudio = stdenv.isDarwin; }; - super-productivity = callPackage ../applications/networking/super-productivity { }; + super-productivity = callPackage ../applications/office/super-productivity { }; wlroots = callPackage ../development/libraries/wlroots { inherit (xorg) xcbutilrenderutil; @@ -24054,6 +24081,8 @@ in lbdb = callPackage ../tools/misc/lbdb { abook = null; gnupg = null; goobook = null; khard = null; mu = null; }; + lbry = callPackage ../applications/video/lbry { }; + lbzip2 = callPackage ../tools/compression/lbzip2 { }; lci = callPackage ../applications/science/logic/lci {}; @@ -26119,6 +26148,8 @@ in todo-txt-cli = callPackage ../applications/office/todo.txt-cli { }; + todofi-sh = callPackage ../applications/office/todofi.sh { }; + todoman = callPackage ../applications/office/todoman { }; toggldesktop = libsForQt514.callPackage ../applications/misc/toggldesktop { }; @@ -26273,6 +26304,8 @@ in vimiv = callPackage ../applications/graphics/vimiv { }; + vimiv-qt = callPackage ../applications/graphics/vimiv-qt { }; + macvim = callPackage ../applications/editors/vim/macvim-configurable.nix { stdenv = clangStdenv; }; vimHugeX = vim_configurable; @@ -27936,7 +27969,10 @@ in tk = tk-8_6; }; - scummvm = callPackage ../games/scummvm { }; + scummvm = callPackage ../games/scummvm { + inherit (darwin) cctools; + inherit (darwin.apple_sdk.frameworks) Cocoa AudioToolbox Carbon CoreMIDI AudioUnit; + }; inherit (callPackage ../games/scummvm/games.nix { }) beneath-a-steel-sky @@ -28540,6 +28576,8 @@ in macse = callPackage ../applications/science/biology/macse { }; + MACS2 = callPackage ../applications/science/biology/MACS2 { }; + migrate = callPackage ../applications/science/biology/migrate { }; minia = callPackage ../applications/science/biology/minia { diff --git a/third_party/nixpkgs/pkgs/top-level/coq-packages.nix b/third_party/nixpkgs/pkgs/top-level/coq-packages.nix index 44d7301c7b..e533d5aace 100644 --- a/third_party/nixpkgs/pkgs/top-level/coq-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/coq-packages.nix @@ -42,6 +42,7 @@ let interval = callPackage ../development/coq-modules/interval {}; InfSeqExt = callPackage ../development/coq-modules/InfSeqExt {}; iris = callPackage ../development/coq-modules/iris {}; + ITree = callPackage ../development/coq-modules/ITree { }; ltac2 = callPackage ../development/coq-modules/ltac2 {}; math-classes = callPackage ../development/coq-modules/math-classes { }; mathcomp = callPackage ../development/coq-modules/mathcomp {}; diff --git a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix index 00d5342d62..a312354660 100644 --- a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix @@ -10884,10 +10884,10 @@ let JSONValidator = buildPerlPackage { pname = "JSON-Validator"; - version = "4.14"; + version = "4.16"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/JSON-Validator-4.14.tar.gz"; - sha256 = "16zaaw7p94nz7yclz30b9xph0riy5ailqg5rjkvi1yps2hr9ba7z"; + url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/JSON-Validator-4.16.tar.gz"; + sha256 = "0mhdczx2pxzi4lrrzkxl2a3r0s2b79ffsrar6g2l01idfpri6gi2"; }; buildInputs = [ TestDeep ]; propagatedBuildInputs = [ DataValidateDomain DataValidateIP Mojolicious NetIDNEncode YAMLLibYAML ]; @@ -11259,10 +11259,10 @@ let LinkEmbedder = buildPerlPackage { pname = "LinkEmbedder"; - version = "1.17"; + version = "1.18"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/LinkEmbedder-1.17.tar.gz"; - sha256 = "10r1q2xfba59w818li5xaj6jlph9qla7vb99ir1ampq5n8g0s5i6"; + url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/LinkEmbedder-1.18.tar.gz"; + sha256 = "17gnixbawzr0r1k37dry7axb7ry6sj2xiahki28m8qbk1l69dfjz"; }; buildInputs = [ TestDeep ]; propagatedBuildInputs = [ Mojolicious ]; @@ -13524,10 +13524,10 @@ let Mojolicious = buildPerlPackage { pname = "Mojolicious"; - version = "9.10"; + version = "9.17"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-9.10.tar.gz"; - sha256 = "0y4ccy85vh7nily2y1c457f687qc8rwi4mnx13619hslkagw4rqw"; + url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-9.17.tar.gz"; + sha256 = "13dxjhr03dhh1f5bbxbb3jiwdv7jby96qqb97l3arf5x043yd9hd"; }; meta = { homepage = "https://mojolicious.org"; @@ -13586,10 +13586,10 @@ let MojoliciousPluginOpenAPI = buildPerlPackage { pname = "Mojolicious-Plugin-OpenAPI"; - version = "4.00"; + version = "4.02"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojolicious-Plugin-OpenAPI-4.00.tar.gz"; - sha256 = "1npnbygs12d683m5i6cgvdmw6glvppnv75f4qpp908fdz8lwcb2z"; + url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojolicious-Plugin-OpenAPI-4.02.tar.gz"; + sha256 = "0rkkkcd3y3gjj0kis0hrab6mz8rk1qd57nz4npy39bag6h1kpyfv"; }; propagatedBuildInputs = [ JSONValidator ]; meta = { @@ -13602,12 +13602,12 @@ let MojoliciousPluginStatus = buildPerlPackage { pname = "Mojolicious-Plugin-Status"; - version = "1.12"; + version = "1.17"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-Plugin-Status-1.12.tar.gz"; - sha256 = "1hn333220ba3hxl9aks0ywx933zv6klyi3a0iw571q76z5a8r2jn"; + url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-Plugin-Status-1.17.tar.gz"; + sha256 = "1d475ch43vbfn3h4lsmr3n6rhgxgz670xqj4rcdjd4g1wfpiyasc"; }; - propagatedBuildInputs = [ BSDResource CpanelJSONXS FileMap Mojolicious ]; + propagatedBuildInputs = [ BSDResource CpanelJSONXS FileMap Mojolicious Sereal ]; meta = { homepage = "https://github.com/mojolicious/mojo-status"; description = "Mojolicious server status plugin"; @@ -13618,10 +13618,10 @@ let MojoliciousPluginTextExceptions = buildPerlPackage { pname = "Mojolicious-Plugin-TextExceptions"; - version = "0.01"; + version = "0.02"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MR/MRAMBERG/Mojolicious-Plugin-TextExceptions-0.01.tar.gz"; - sha256 = "070daf284c5d3832b7fde42120eaf747aea4cc75de8ff807f77accc84fe4f22e"; + url = "mirror://cpan/authors/id/M/MR/MRAMBERG/Mojolicious-Plugin-TextExceptions-0.02.tar.gz"; + sha256 = "0x7qkd9nmarzb7kvk4dvhka4s44mfcd026zz3ikfwk3qql2p86rs"; }; propagatedBuildInputs = [ Mojolicious ]; meta = { diff --git a/third_party/nixpkgs/pkgs/top-level/python-packages.nix b/third_party/nixpkgs/pkgs/top-level/python-packages.nix index 70e06433e9..b032c553a5 100644 --- a/third_party/nixpkgs/pkgs/top-level/python-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/python-packages.nix @@ -1413,6 +1413,8 @@ in { clickhouse-cityhash = callPackage ../development/python-modules/clickhouse-cityhash {}; + clickhouse-cli = callPackage ../development/python-modules/clickhouse-cli { }; + clickhouse-driver = callPackage ../development/python-modules/clickhouse-driver {}; cliff = callPackage ../development/python-modules/cliff { }; @@ -3397,7 +3399,7 @@ in { ipdbplugin = callPackage ../development/python-modules/ipdbplugin { }; - ipfsapi = callPackage ../development/python-modules/ipfsapi { }; + ipfshttpclient = callPackage ../development/python-modules/ipfshttpclient { }; iptools = callPackage ../development/python-modules/iptools { }; @@ -3685,6 +3687,8 @@ in { karton-core = callPackage ../development/python-modules/karton-core { }; + karton-yaramatcher = callPackage ../development/python-modules/karton-yaramatcher { }; + kazoo = callPackage ../development/python-modules/kazoo { }; kconfiglib = callPackage ../development/python-modules/kconfiglib { }; @@ -4811,6 +4815,8 @@ in { graphvizPkgs = pkgs.graphviz; }; + oci = callPackage ../development/python-modules/oci { }; + od = callPackage ../development/python-modules/od { }; odfpy = callPackage ../development/python-modules/odfpy { }; @@ -8225,6 +8231,8 @@ in { else callPackage ../development/python-modules/sympy/1_5.nix { }; + systembridge = callPackage ../development/python-modules/systembridge { }; + systemd = callPackage ../development/python-modules/systemd { inherit (pkgs) systemd; }; @@ -8987,6 +8995,8 @@ in { wled = callPackage ../development/python-modules/wled { }; + woob = callPackage ../development/python-modules/woob { }; + word2vec = callPackage ../development/python-modules/word2vec { }; wordcloud = callPackage ../development/python-modules/wordcloud { };