diff options
184 files changed, 7629 insertions, 3619 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3b5ad02719e6b..41018c41728ba 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1564,6 +1564,16 @@ githubId = 87764; name = "Ben Ford"; }; + boppyt = { + email = "boppy@nwcpz.com"; + github = "boppyt"; + githubId = 71049646; + name = "Zack A"; + keys = [{ + longkeyid = "rsa4096/0x6310C97DE31D1545"; + fingerprint = "E8D7 5C19 9F65 269B 439D F77B 6310 C97D E31D 1545"; + }]; + }; borisbabic = { email = "boris.ivan.babic@gmail.com"; github = "borisbabic"; @@ -4717,6 +4727,12 @@ githubId = 896431; name = "Chris Hodapp"; }; + hollowman6 = { + email = "hollowman@hollowman.ml"; + github = "HollowMan6"; + githubId = 43995067; + name = "Songlin Jiang"; + }; holymonson = { email = "holymonson@gmail.com"; github = "holymonson"; @@ -7839,6 +7855,12 @@ githubId = 99988; name = "Maarten Hoogendoorn"; }; + MoritzBoehme = { + email = "mail@moritzboeh.me"; + github = "MoritzBoehme"; + githubId = 42215704; + name = "Moritz Böhme"; + }; MostAwesomeDude = { email = "cds@corbinsimpson.com"; github = "MostAwesomeDude"; @@ -8680,6 +8702,12 @@ githubId = 101514; name = "Orivej Desh"; }; + ornxka = { + email = "ornxka@littledevil.sh"; + github = "ornxka"; + githubId = 52086525; + name = "ornxka"; + }; oro = { email = "marco@orovecchia.at"; github = "oro"; @@ -9760,6 +9788,12 @@ githubId = 37246692; name = "Riley Inman"; }; + riotbib = { + email = "github-nix@lnrt.de"; + github = "riotbib"; + githubId = 43172581; + name = "Lennart Mühlenmeier"; + }; ris = { email = "code@humanleg.org.uk"; github = "risicle"; @@ -9973,6 +10007,12 @@ githubId = 592876; name = "Robert W. Pearce"; }; + rprecenth = { + email = "rasmus@precenth.eu"; + github = "Prillan"; + githubId = 1675190; + name = "Rasmus Précenth"; + }; rprospero = { email = "rprospero+nix@gmail.com"; github = "rprospero"; diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix index 2f2986c2fec5a..3638bebed931b 100644 --- a/nixos/modules/misc/locate.nix +++ b/nixos/modules/misc/locate.nix @@ -149,7 +149,7 @@ in { prunePaths = mkOption { type = listOf path; - default = ["/tmp" "/var/tmp" "/var/cache" "/var/lock" "/var/run" "/var/spool" "/nix/store"]; + default = [ "/tmp" "/var/tmp" "/var/cache" "/var/lock" "/var/run" "/var/spool" "/nix/store" "/nix/var/log/nix" ]; description = '' Which paths to exclude from indexing ''; @@ -157,7 +157,7 @@ in { pruneNames = mkOption { type = listOf str; - default = []; + default = [ ".bzr" ".cache" ".git" ".hg" ".svn" ]; description = '' Directory components which should exclude paths containing them from indexing ''; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 4ee79b4396026..5d075d1aa299f 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -611,6 +611,7 @@ ./services/misc/uhub.nix ./services/misc/weechat.nix ./services/misc/xmr-stak.nix + ./services/misc/xmrig.nix ./services/misc/zigbee2mqtt.nix ./services/misc/zoneminder.nix ./services/misc/zookeeper.nix diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix index 3b67d628f9fd7..33dd80d7c5abd 100644 --- a/nixos/modules/profiles/base.nix +++ b/nixos/modules/profiles/base.nix @@ -40,6 +40,7 @@ # Tools to create / manipulate filesystems. pkgs.ntfsprogs # for resizing NTFS partitions pkgs.dosfstools + pkgs.mtools pkgs.xfsprogs.bin pkgs.jfsutils pkgs.f2fs-tools diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 40df6c67ef842..70bce783a90b6 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -410,46 +410,64 @@ let # Samba stuff to the Samba module. This requires that the PAM # module provides the right hooks. text = mkDefault - ('' - # Account management. - account required pam_unix.so - ${optionalString use_ldap - "account sufficient ${pam_ldap}/lib/security/pam_ldap.so"} - ${optionalString (config.services.sssd.enable && cfg.sssdStrictAccess==false) - "account sufficient ${pkgs.sssd}/lib/security/pam_sss.so"} - ${optionalString (config.services.sssd.enable && cfg.sssdStrictAccess) - "account [default=bad success=ok user_unknown=ignore] ${pkgs.sssd}/lib/security/pam_sss.so"} - ${optionalString config.krb5.enable - "account sufficient ${pam_krb5}/lib/security/pam_krb5.so"} - ${optionalString cfg.googleOsLoginAccountVerification '' + ( + '' + # Account management. + account required pam_unix.so + '' + + optionalString use_ldap '' + account sufficient ${pam_ldap}/lib/security/pam_ldap.so + '' + + optionalString (config.services.sssd.enable && cfg.sssdStrictAccess==false) '' + account sufficient ${pkgs.sssd}/lib/security/pam_sss.so + '' + + optionalString (config.services.sssd.enable && cfg.sssdStrictAccess) '' + account [default=bad success=ok user_unknown=ignore] ${pkgs.sssd}/lib/security/pam_sss.so + '' + + optionalString config.krb5.enable '' + account sufficient ${pam_krb5}/lib/security/pam_krb5.so + '' + + optionalString cfg.googleOsLoginAccountVerification '' account [success=ok ignore=ignore default=die] ${pkgs.google-compute-engine-oslogin}/lib/pam_oslogin_login.so account [success=ok default=ignore] ${pkgs.google-compute-engine-oslogin}/lib/pam_oslogin_admin.so - ''} - - # Authentication management. - ${optionalString cfg.googleOsLoginAuthentication - "auth [success=done perm_denied=bad default=ignore] ${pkgs.google-compute-engine-oslogin}/lib/pam_oslogin_login.so"} - ${optionalString cfg.rootOK - "auth sufficient pam_rootok.so"} - ${optionalString cfg.requireWheel - "auth required pam_wheel.so use_uid"} - ${optionalString cfg.logFailures - "auth required pam_faillock.so"} - ${optionalString (config.security.pam.enableSSHAgentAuth && cfg.sshAgentAuth) - "auth sufficient ${pkgs.pam_ssh_agent_auth}/libexec/pam_ssh_agent_auth.so file=${lib.concatStringsSep ":" config.services.openssh.authorizedKeysFiles}"} - ${let p11 = config.security.pam.p11; in optionalString cfg.p11Auth - "auth ${p11.control} ${pkgs.pam_p11}/lib/security/pam_p11.so ${pkgs.opensc}/lib/opensc-pkcs11.so"} - ${let u2f = config.security.pam.u2f; in optionalString cfg.u2fAuth - "auth ${u2f.control} ${pkgs.pam_u2f}/lib/security/pam_u2f.so ${optionalString u2f.debug "debug"} ${optionalString (u2f.authFile != null) "authfile=${u2f.authFile}"} ${optionalString u2f.interactive "interactive"} ${optionalString u2f.cue "cue"} ${optionalString (u2f.appId != null) "appid=${u2f.appId}"}"} - ${optionalString cfg.usbAuth - "auth sufficient ${pkgs.pam_usb}/lib/security/pam_usb.so"} - ${let oath = config.security.pam.oath; in optionalString cfg.oathAuth - "auth requisite ${pkgs.oathToolkit}/lib/security/pam_oath.so window=${toString oath.window} usersfile=${toString oath.usersFile} digits=${toString oath.digits}"} - ${let yubi = config.security.pam.yubico; in optionalString cfg.yubicoAuth - "auth ${yubi.control} ${pkgs.yubico-pam}/lib/security/pam_yubico.so mode=${toString yubi.mode} ${optionalString (yubi.challengeResponsePath != null) "chalresp_path=${yubi.challengeResponsePath}"} ${optionalString (yubi.mode == "client") "id=${toString yubi.id}"} ${optionalString yubi.debug "debug"}"} - ${optionalString cfg.fprintAuth - "auth sufficient ${pkgs.fprintd}/lib/security/pam_fprintd.so"} - '' + + '' + + '' + + # Authentication management. + '' + + optionalString cfg.googleOsLoginAuthentication '' + auth [success=done perm_denied=bad default=ignore] ${pkgs.google-compute-engine-oslogin}/lib/pam_oslogin_login.so + '' + + optionalString cfg.rootOK '' + auth sufficient pam_rootok.so + '' + + optionalString cfg.requireWheel '' + auth required pam_wheel.so use_uid + '' + + optionalString cfg.logFailures '' + auth required pam_faillock.so + '' + + optionalString (config.security.pam.enableSSHAgentAuth && cfg.sshAgentAuth) '' + auth sufficient ${pkgs.pam_ssh_agent_auth}/libexec/pam_ssh_agent_auth.so file=${lib.concatStringsSep ":" config.services.openssh.authorizedKeysFiles} + '' + + (let p11 = config.security.pam.p11; in optionalString cfg.p11Auth '' + auth ${p11.control} ${pkgs.pam_p11}/lib/security/pam_p11.so ${pkgs.opensc}/lib/opensc-pkcs11.so + '') + + (let u2f = config.security.pam.u2f; in optionalString cfg.u2fAuth '' + auth ${u2f.control} ${pkgs.pam_u2f}/lib/security/pam_u2f.so ${optionalString u2f.debug "debug"} ${optionalString (u2f.authFile != null) "authfile=${u2f.authFile}"} ${optionalString u2f.interactive "interactive"} ${optionalString u2f.cue "cue"} ${optionalString (u2f.appId != null) "appid=${u2f.appId}"} + '') + + optionalString cfg.usbAuth '' + auth sufficient ${pkgs.pam_usb}/lib/security/pam_usb.so + '' + + (let oath = config.security.pam.oath; in optionalString cfg.oathAuth '' + auth requisite ${pkgs.oathToolkit}/lib/security/pam_oath.so window=${toString oath.window} usersfile=${toString oath.usersFile} digits=${toString oath.digits} + '') + + (let yubi = config.security.pam.yubico; in optionalString cfg.yubicoAuth '' + auth ${yubi.control} ${pkgs.yubico-pam}/lib/security/pam_yubico.so mode=${toString yubi.mode} ${optionalString (yubi.challengeResponsePath != null) "chalresp_path=${yubi.challengeResponsePath}"} ${optionalString (yubi.mode == "client") "id=${toString yubi.id}"} ${optionalString yubi.debug "debug"} + '') + + optionalString cfg.fprintAuth '' + auth sufficient ${pkgs.fprintd}/lib/security/pam_fprintd.so + '' + # Modules in this block require having the password set in PAM_AUTHTOK. # pam_unix is marked as 'sufficient' on NixOS which means nothing will run # after it succeeds. Certain modules need to run after pam_unix @@ -457,115 +475,151 @@ let # earlier point and it will run again with 'sufficient' further down. # We use try_first_pass the second time to avoid prompting password twice (optionalString (cfg.unixAuth && - (config.security.pam.enableEcryptfs - || cfg.pamMount - || cfg.enableKwallet - || cfg.enableGnomeKeyring - || cfg.googleAuthenticator.enable - || cfg.gnupg.enable - || cfg.duoSecurity.enable)) '' - auth required pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} ${optionalString cfg.nodelay "nodelay"} likeauth - ${optionalString config.security.pam.enableEcryptfs - "auth optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so unwrap"} - ${optionalString cfg.pamMount - "auth optional ${pkgs.pam_mount}/lib/security/pam_mount.so disable_interactive"} - ${optionalString cfg.enableKwallet - ("auth optional ${pkgs.plasma5Packages.kwallet-pam}/lib/security/pam_kwallet5.so" + - " kwalletd=${pkgs.plasma5Packages.kwallet.bin}/bin/kwalletd5")} - ${optionalString cfg.enableGnomeKeyring - "auth optional ${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so"} - ${optionalString cfg.gnupg.enable - "auth optional ${pkgs.pam_gnupg}/lib/security/pam_gnupg.so" - + optionalString cfg.gnupg.storeOnly " store-only" - } - ${optionalString cfg.googleAuthenticator.enable - "auth required ${pkgs.googleAuthenticator}/lib/security/pam_google_authenticator.so no_increment_hotp"} - ${optionalString cfg.duoSecurity.enable - "auth required ${pkgs.duo-unix}/lib/security/pam_duo.so"} - '') + '' - ${optionalString cfg.unixAuth - "auth sufficient pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} ${optionalString cfg.nodelay "nodelay"} likeauth try_first_pass"} - ${optionalString cfg.otpwAuth - "auth sufficient ${pkgs.otpw}/lib/security/pam_otpw.so"} - ${optionalString use_ldap - "auth sufficient ${pam_ldap}/lib/security/pam_ldap.so use_first_pass"} - ${optionalString config.services.sssd.enable - "auth sufficient ${pkgs.sssd}/lib/security/pam_sss.so use_first_pass"} - ${optionalString config.krb5.enable '' + (config.security.pam.enableEcryptfs + || cfg.pamMount + || cfg.enableKwallet + || cfg.enableGnomeKeyring + || cfg.googleAuthenticator.enable + || cfg.gnupg.enable + || cfg.duoSecurity.enable)) + ( + '' + auth required pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} ${optionalString cfg.nodelay "nodelay"} likeauth + '' + + optionalString config.security.pam.enableEcryptfs '' + auth optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so unwrap + '' + + optionalString cfg.pamMount '' + auth optional ${pkgs.pam_mount}/lib/security/pam_mount.so disable_interactive + '' + + optionalString cfg.enableKwallet '' + auth optional ${pkgs.plasma5Packages.kwallet-pam}/lib/security/pam_kwallet5.so kwalletd=${pkgs.plasma5Packages.kwallet.bin}/bin/kwalletd5 + '' + + optionalString cfg.enableGnomeKeyring '' + auth optional ${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so + '' + + optionalString cfg.gnupg.enable '' + auth optional ${pkgs.pam_gnupg}/lib/security/pam_gnupg.so ${optionalString cfg.gnupg.storeOnly " store-only"} + '' + + optionalString cfg.googleAuthenticator.enable '' + auth required ${pkgs.googleAuthenticator}/lib/security/pam_google_authenticator.so no_increment_hotp + '' + + optionalString cfg.duoSecurity.enable '' + auth required ${pkgs.duo-unix}/lib/security/pam_duo.so + '' + )) + + optionalString cfg.unixAuth '' + auth sufficient pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} ${optionalString cfg.nodelay "nodelay"} likeauth try_first_pass + '' + + optionalString cfg.otpwAuth '' + auth sufficient ${pkgs.otpw}/lib/security/pam_otpw.so + '' + + optionalString use_ldap '' + auth sufficient ${pam_ldap}/lib/security/pam_ldap.so use_first_pass + '' + + optionalString config.services.sssd.enable '' + auth sufficient ${pkgs.sssd}/lib/security/pam_sss.so use_first_pass + '' + + optionalString config.krb5.enable '' auth [default=ignore success=1 service_err=reset] ${pam_krb5}/lib/security/pam_krb5.so use_first_pass auth [default=die success=done] ${pam_ccreds}/lib/security/pam_ccreds.so action=validate use_first_pass auth sufficient ${pam_ccreds}/lib/security/pam_ccreds.so action=store use_first_pass - ''} - auth required pam_deny.so - - # Password management. - password sufficient pam_unix.so nullok sha512 - ${optionalString config.security.pam.enableEcryptfs - "password optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"} - ${optionalString cfg.pamMount - "password optional ${pkgs.pam_mount}/lib/security/pam_mount.so"} - ${optionalString use_ldap - "password sufficient ${pam_ldap}/lib/security/pam_ldap.so"} - ${optionalString config.services.sssd.enable - "password sufficient ${pkgs.sssd}/lib/security/pam_sss.so use_authtok"} - ${optionalString config.krb5.enable - "password sufficient ${pam_krb5}/lib/security/pam_krb5.so use_first_pass"} - ${optionalString cfg.enableGnomeKeyring - "password optional ${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so use_authtok"} - - # Session management. - ${optionalString cfg.setEnvironment '' + '' + + '' + auth required pam_deny.so + + # Password management. + password sufficient pam_unix.so nullok sha512 + '' + + optionalString config.security.pam.enableEcryptfs '' + password optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so + '' + + optionalString cfg.pamMount '' + password optional ${pkgs.pam_mount}/lib/security/pam_mount.so + '' + + optionalString use_ldap '' + password sufficient ${pam_ldap}/lib/security/pam_ldap.so + '' + + optionalString config.services.sssd.enable '' + password sufficient ${pkgs.sssd}/lib/security/pam_sss.so use_authtok + '' + + optionalString config.krb5.enable '' + password sufficient ${pam_krb5}/lib/security/pam_krb5.so use_first_pass + '' + + optionalString cfg.enableGnomeKeyring '' + password optional ${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so use_authtok + '' + + '' + + # Session management. + '' + + optionalString cfg.setEnvironment '' session required pam_env.so conffile=/etc/pam/environment readenv=0 - ''} - session required pam_unix.so - ${optionalString cfg.setLoginUid - "session ${ - if config.boot.isContainer then "optional" else "required" - } pam_loginuid.so"} - ${optionalString cfg.ttyAudit.enable - "session required ${pkgs.pam}/lib/security/pam_tty_audit.so + '' + + '' + session required pam_unix.so + '' + + optionalString cfg.setLoginUid '' + session ${if config.boot.isContainer then "optional" else "required"} pam_loginuid.so + '' + + optionalString cfg.ttyAudit.enable '' + session required ${pkgs.pam}/lib/security/pam_tty_audit.so open_only=${toString cfg.ttyAudit.openOnly} ${optionalString (cfg.ttyAudit.enablePattern != null) "enable=${cfg.ttyAudit.enablePattern}"} ${optionalString (cfg.ttyAudit.disablePattern != null) "disable=${cfg.ttyAudit.disablePattern}"} - "} - ${optionalString cfg.makeHomeDir - "session required ${pkgs.pam}/lib/security/pam_mkhomedir.so silent skel=${config.security.pam.makeHomeDir.skelDirectory} umask=0077"} - ${optionalString cfg.updateWtmp - "session required ${pkgs.pam}/lib/security/pam_lastlog.so silent"} - ${optionalString config.security.pam.enableEcryptfs - "session optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"} - ${optionalString cfg.pamMount - "session optional ${pkgs.pam_mount}/lib/security/pam_mount.so disable_interactive"} - ${optionalString use_ldap - "session optional ${pam_ldap}/lib/security/pam_ldap.so"} - ${optionalString config.services.sssd.enable - "session optional ${pkgs.sssd}/lib/security/pam_sss.so"} - ${optionalString config.krb5.enable - "session optional ${pam_krb5}/lib/security/pam_krb5.so"} - ${optionalString cfg.otpwAuth - "session optional ${pkgs.otpw}/lib/security/pam_otpw.so"} - ${optionalString cfg.startSession - "session optional ${pkgs.systemd}/lib/security/pam_systemd.so"} - ${optionalString cfg.forwardXAuth - "session optional pam_xauth.so xauthpath=${pkgs.xorg.xauth}/bin/xauth systemuser=99"} - ${optionalString (cfg.limits != []) - "session required ${pkgs.pam}/lib/security/pam_limits.so conf=${makeLimitsConf cfg.limits}"} - ${optionalString (cfg.showMotd && config.users.motd != null) - "session optional ${pkgs.pam}/lib/security/pam_motd.so motd=${motd}"} - ${optionalString (cfg.enableAppArmor && config.security.apparmor.enable) - "session optional ${pkgs.apparmor-pam}/lib/security/pam_apparmor.so order=user,group,default debug"} - ${optionalString (cfg.enableKwallet) - ("session optional ${pkgs.plasma5Packages.kwallet-pam}/lib/security/pam_kwallet5.so" + - " kwalletd=${pkgs.plasma5Packages.kwallet.bin}/bin/kwalletd5")} - ${optionalString (cfg.enableGnomeKeyring) - "session optional ${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start"} - ${optionalString cfg.gnupg.enable - "session optional ${pkgs.pam_gnupg}/lib/security/pam_gnupg.so" - + optionalString cfg.gnupg.noAutostart " no-autostart" - } - ${optionalString (config.virtualisation.lxc.lxcfs.enable) - "session optional ${pkgs.lxc}/lib/security/pam_cgfs.so -c all"} - ''); + '' + + optionalString cfg.makeHomeDir '' + session required ${pkgs.pam}/lib/security/pam_mkhomedir.so silent skel=${config.security.pam.makeHomeDir.skelDirectory} umask=0077 + '' + + optionalString cfg.updateWtmp '' + session required ${pkgs.pam}/lib/security/pam_lastlog.so silent + '' + + optionalString config.security.pam.enableEcryptfs '' + session optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so + '' + + optionalString cfg.pamMount '' + session optional ${pkgs.pam_mount}/lib/security/pam_mount.so disable_interactive + '' + + optionalString use_ldap '' + session optional ${pam_ldap}/lib/security/pam_ldap.so + '' + + optionalString config.services.sssd.enable '' + session optional ${pkgs.sssd}/lib/security/pam_sss.so + '' + + optionalString config.krb5.enable '' + session optional ${pam_krb5}/lib/security/pam_krb5.so + '' + + optionalString cfg.otpwAuth '' + session optional ${pkgs.otpw}/lib/security/pam_otpw.so + '' + + optionalString cfg.startSession '' + session optional ${pkgs.systemd}/lib/security/pam_systemd.so + '' + + optionalString cfg.forwardXAuth '' + session optional pam_xauth.so xauthpath=${pkgs.xorg.xauth}/bin/xauth systemuser=99 + '' + + optionalString (cfg.limits != []) '' + session required ${pkgs.pam}/lib/security/pam_limits.so conf=${makeLimitsConf cfg.limits} + '' + + optionalString (cfg.showMotd && config.users.motd != null) '' + session optional ${pkgs.pam}/lib/security/pam_motd.so motd=${motd} + '' + + optionalString (cfg.enableAppArmor && config.security.apparmor.enable) '' + session optional ${pkgs.apparmor-pam}/lib/security/pam_apparmor.so order=user,group,default debug + '' + + optionalString (cfg.enableKwallet) '' + session optional ${pkgs.plasma5Packages.kwallet-pam}/lib/security/pam_kwallet5.so kwalletd=${pkgs.plasma5Packages.kwallet.bin}/bin/kwalletd5 + '' + + optionalString (cfg.enableGnomeKeyring) '' + session optional ${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start + '' + + optionalString cfg.gnupg.enable '' + session optional ${pkgs.pam_gnupg}/lib/security/pam_gnupg.so ${optionalString cfg.gnupg.noAutostart " no-autostart"} + '' + + optionalString (config.virtualisation.lxc.lxcfs.enable) '' + session optional ${pkgs.lxc}/lib/security/pam_cgfs.so -c all + '' + ); }; }; diff --git a/nixos/modules/services/databases/hbase.nix b/nixos/modules/services/databases/hbase.nix index ff01a1bcd98b9..183c8a2f46d53 100644 --- a/nixos/modules/services/databases/hbase.nix +++ b/nixos/modules/services/databases/hbase.nix @@ -5,18 +5,24 @@ with lib; let cfg = config.services.hbase; - configFile = pkgs.writeText "hbase-site.xml" '' - <configuration> - <property> - <name>hbase.rootdir</name> - <value>file://${cfg.dataDir}/hbase</value> - </property> - <property> - <name>hbase.zookeeper.property.dataDir</name> - <value>${cfg.dataDir}/zookeeper</value> - </property> - </configuration> - ''; + defaultConfig = { + "hbase.rootdir" = "file://${cfg.dataDir}/hbase"; + "hbase.zookeeper.property.dataDir" = "${cfg.dataDir}/zookeeper"; + }; + + buildProperty = configAttr: + (builtins.concatStringsSep "\n" + (lib.mapAttrsToList + (name: value: '' + <property> + <name>${name}</name> + <value>${builtins.toString value}</value> + </property> + '') + configAttr)); + + configFile = pkgs.writeText "hbase-site.xml" + (buildProperty (defaultConfig // cfg.settings)); configDir = pkgs.runCommand "hbase-config-dir" { preferLocalBuild = true; } '' mkdir -p $out @@ -85,6 +91,14 @@ in { ''; }; + settings = mkOption { + type = with lib.types; attrsOf (oneOf [ str int bool ]); + default = defaultConfig; + description = '' + configurations in hbase-site.xml, see <link xlink:href="https://github.com/apache/hbase/blob/master/hbase-server/src/test/resources/hbase-site.xml"/> for details. + ''; + }; + }; }; diff --git a/nixos/modules/services/logging/logstash.nix b/nixos/modules/services/logging/logstash.nix index 044d5330231ec..a08203dffe789 100644 --- a/nixos/modules/services/logging/logstash.nix +++ b/nixos/modules/services/logging/logstash.nix @@ -23,12 +23,16 @@ let logstashSettingsYml = pkgs.writeText "logstash.yml" cfg.extraSettings; + logstashJvmOptionsFile = pkgs.writeText "jvm.options" cfg.extraJvmOptions; + logstashSettingsDir = pkgs.runCommand "logstash-settings" { + inherit logstashJvmOptionsFile; inherit logstashSettingsYml; preferLocalBuild = true; } '' mkdir -p $out ln -s $logstashSettingsYml $out/logstash.yml + ln -s $logstashJvmOptionsFile $out/jvm.options ''; in @@ -152,6 +156,15 @@ in ''; }; + extraJvmOptions = mkOption { + type = types.lines; + default = ""; + description = "Extra JVM options, one per line (jvm.options format)."; + example = '' + -Xms2g + -Xmx2g + ''; + }; }; }; diff --git a/nixos/modules/services/matrix/mjolnir.nix b/nixos/modules/services/matrix/mjolnir.nix index 8a54f93d98d8f..278924b05cf28 100644 --- a/nixos/modules/services/matrix/mjolnir.nix +++ b/nixos/modules/services/matrix/mjolnir.nix @@ -14,6 +14,8 @@ let else cfg.homeserverUrl; + rawHomeserverUrl = cfg.homeserverUrl; + pantalaimon = { inherit (cfg.pantalaimon) username; diff --git a/nixos/modules/services/misc/xmrig.nix b/nixos/modules/services/misc/xmrig.nix index 15c7d2a7b14ca..cf01bb119e894 100644 --- a/nixos/modules/services/misc/xmrig.nix +++ b/nixos/modules/services/misc/xmrig.nix @@ -51,6 +51,8 @@ with lib; }; config = mkIf cfg.enable { + boot.kernelModules = [ "msr" ]; + systemd.services.xmrig = { wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; @@ -58,14 +60,16 @@ with lib; serviceConfig = { ExecStartPre = "${cfg.package}/bin/xmrig --config=${configFile} --dry-run"; ExecStart = "${cfg.package}/bin/xmrig --config=${configFile}"; - DynamicUser = true; + # https://xmrig.com/docs/miner/randomx-optimization-guide/msr + # If you use recent XMRig with root privileges (Linux) or admin + # privileges (Windows) the miner configure all MSR registers + # automatically. + DynamicUser = lib.mkDefault false; }; }; }; meta = with lib; { - description = "XMRig Mining Software Service"; - license = licenses.gpl3Only; maintainers = with maintainers; [ ratsclub ]; }; } diff --git a/nixos/modules/services/monitoring/cadvisor.nix b/nixos/modules/services/monitoring/cadvisor.nix index da051dbe4655b..dfbf07efcaea9 100644 --- a/nixos/modules/services/monitoring/cadvisor.nix +++ b/nixos/modules/services/monitoring/cadvisor.nix @@ -111,6 +111,8 @@ in { wantedBy = [ "multi-user.target" ]; after = [ "network.target" "docker.service" "influxdb.service" ]; + path = optionals config.boot.zfs.enabled [ pkgs.zfs ]; + postStart = mkBefore '' until ${pkgs.curl.bin}/bin/curl -s -o /dev/null 'http://${cfg.listenAddress}:${toString cfg.port}/containers/'; do sleep 1; diff --git a/nixos/modules/services/monitoring/zabbix-server.nix b/nixos/modules/services/monitoring/zabbix-server.nix index 9b0fd9dbff13e..0141c073da25d 100644 --- a/nixos/modules/services/monitoring/zabbix-server.nix +++ b/nixos/modules/services/monitoring/zabbix-server.nix @@ -250,7 +250,12 @@ in }; security.wrappers = { - fping.source = "${pkgs.fping}/bin/fping"; + fping = + { setuid = true; + owner = "root"; + group = "root"; + source = "${pkgs.fping}/bin/fping"; + }; }; systemd.services.zabbix-server = { diff --git a/nixos/modules/services/x11/hardware/libinput.nix b/nixos/modules/services/x11/hardware/libinput.nix index e2fb7d0918e36..efdb7c61dfaeb 100644 --- a/nixos/modules/services/x11/hardware/libinput.nix +++ b/nixos/modules/services/x11/hardware/libinput.nix @@ -13,7 +13,7 @@ let cfg = config.services.xserver.libinput; example = "/dev/input/event0"; description = '' - Path for ${deviceType} device. Set to null to apply to any + Path for ${deviceType} device. Set to <literal>null</literal> to apply to any auto-detected ${deviceType}. ''; }; @@ -24,8 +24,8 @@ let cfg = config.services.xserver.libinput; example = "flat"; description = '' - Sets the pointer acceleration profile to the given profile. - Permitted values are adaptive, flat. + Sets the pointer acceleration profile to the given profile. + Permitted values are <literal>adaptive</literal>, <literal>flat</literal>. Not all devices support this option or all profiles. If a profile is unsupported, the default profile for this is used. <literal>flat</literal>: Pointer motion is accelerated by a constant @@ -38,12 +38,14 @@ let cfg = config.services.xserver.libinput; accelSpeed = mkOption { type = types.nullOr types.str; default = null; + example = "-0.5"; description = "Cursor acceleration (how fast speed increases from minSpeed to maxSpeed)."; }; buttonMapping = mkOption { type = types.nullOr types.str; default = null; + example = "1 6 3 4 5 0 7"; description = '' Sets the logical button mapping for this device, see XSetPointerMapping(3). The string must @@ -58,9 +60,10 @@ let cfg = config.services.xserver.libinput; calibrationMatrix = mkOption { type = types.nullOr types.str; default = null; + example = "0.5 0 0 0 0.8 0.1 0 0 1"; description = '' - A string of 9 space-separated floating point numbers. Sets the calibration matrix to the + A string of 9 space-separated floating point numbers. Sets the calibration matrix to the 3x3 matrix where the first row is (abc), the second row is (def) and the third row is (ghi). ''; }; @@ -68,6 +71,7 @@ let cfg = config.services.xserver.libinput; clickMethod = mkOption { type = types.nullOr (types.enum [ "none" "buttonareas" "clickfinger" ]); default = null; + example = "buttonareas"; description = '' Enables a click method. Permitted values are <literal>none</literal>, @@ -166,8 +170,9 @@ let cfg = config.services.xserver.libinput; transformationMatrix = mkOption { type = types.nullOr types.str; default = null; + example = "0.5 0 0 0 0.8 0.1 0 0 1"; description = '' - A string of 9 space-separated floating point numbers. Sets the transformation matrix to + A string of 9 space-separated floating point numbers. Sets the transformation matrix to the 3x3 matrix where the first row is (abc), the second row is (def) and the third row is (ghi). ''; }; diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 6ce4461babc7e..67fde55faabe7 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -306,7 +306,7 @@ in virtualisation.msize = mkOption { type = types.ints.positive; - default = 16384; + default = pkgs.vmTools.default9PMsizeBytes; description = '' The msize (maximum packet size) option passed to 9p file systems, in diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 985dbd3b6767b..a74792d3d2eb0 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -228,9 +228,10 @@ in kubernetes = handleTestOn ["x86_64-linux"] ./kubernetes {}; latestKernel.login = handleTest ./login.nix { latestKernel = true; }; leaps = handleTest ./leaps.nix {}; + libinput = handleTest ./libinput.nix {}; libreddit = handleTest ./libreddit.nix {}; - lidarr = handleTest ./lidarr.nix {}; libreswan = handleTest ./libreswan.nix {}; + lidarr = handleTest ./lidarr.nix {}; lightdm = handleTest ./lightdm.nix {}; limesurvey = handleTest ./limesurvey.nix {}; litestream = handleTest ./litestream.nix {}; diff --git a/nixos/tests/libinput.nix b/nixos/tests/libinput.nix new file mode 100644 index 0000000000000..2f84aaadcd0be --- /dev/null +++ b/nixos/tests/libinput.nix @@ -0,0 +1,38 @@ +import ./make-test-python.nix ({ ... }: + +{ + name = "libinput"; + + machine = { ... }: + { + imports = [ + ./common/x11.nix + ./common/user-account.nix + ]; + + test-support.displayManager.auto.user = "alice"; + + services.xserver.libinput = { + enable = true; + mouse = { + naturalScrolling = true; + leftHanded = true; + middleEmulation = false; + horizontalScrolling = false; + }; + }; + }; + + testScript = '' + def expect_xserver_option(option, value): + machine.succeed(f"""cat /var/log/X.0.log | grep -F 'Option "{option}" "{value}"'""") + + machine.start() + machine.wait_for_x() + machine.succeed("""cat /var/log/X.0.log | grep -F "Using input driver 'libinput'" """) + expect_xserver_option("NaturalScrolling", "on") + expect_xserver_option("LeftHanded", "on") + expect_xserver_option("MiddleEmulation", "off") + expect_xserver_option("HorizontalScrolling", "off") + ''; +}) diff --git a/pkgs/applications/blockchains/chia/default.nix b/pkgs/applications/blockchains/chia/default.nix index a62d7f95d6067..207b42e5584ee 100644 --- a/pkgs/applications/blockchains/chia/default.nix +++ b/pkgs/applications/blockchains/chia/default.nix @@ -6,14 +6,14 @@ let chia = python3Packages.buildPythonApplication rec { pname = "chia"; - version = "1.2.10"; + version = "1.2.11"; src = fetchFromGitHub { owner = "Chia-Network"; repo = "chia-blockchain"; rev = version; fetchSubmodules = true; - sha256 = "sha256-TzSBGjgaE0IWaqJcCIoO/u+gDh17NtAqhE8ldbbjNIE="; + sha256 = "sha256-hRpZce8ydEsyq7htNfzlRSKPwMAOUurC3uiQpX6WiB8="; }; postPatch = '' @@ -46,7 +46,7 @@ let chia = python3Packages.buildPythonApplication rec { colorlog concurrent-log-handler cryptography - dnspython + dnspythonchia fasteners keyrings-cryptfile pyyaml diff --git a/pkgs/applications/blockchains/clightning/default.nix b/pkgs/applications/blockchains/clightning/default.nix index 04f3c1fcbc841..df7eace3284d8 100644 --- a/pkgs/applications/blockchains/clightning/default.nix +++ b/pkgs/applications/blockchains/clightning/default.nix @@ -39,11 +39,9 @@ stdenv.mkDerivation rec { devtools/sql-rewrite.py ''; - configurePhase = '' - ./configure --prefix=$out --disable-developer --disable-valgrind - ''; + configureFlags = [ "--disable-developer" "--disable-valgrind" ]; - makeFlags = [ "prefix=$(out) VERSION=v${version}" ]; + makeFlags = [ "VERSION=v${version}" ]; enableParallelBuilding = true; diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index ac24baa934a4b..eb44dc219b667 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,12 +2,12 @@ let pname = "ledger-live-desktop"; - version = "2.35.0"; + version = "2.35.1"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256-o2XGBTqyHqQ/yq54B0GBFEk35Zxt2ZWGZCTjbEbKqiw="; + hash = "sha256:0z60c4sjq63r5rs95rbv7afliia05l1p9bgfd5zv7i51qxgzfs4a"; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json index 118065eb31ca2..9467f6c7aba78 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json @@ -1968,38 +1968,6 @@ } }, { - "ename": "agda2-mode", - "commit": "714e0fe062981d27e3f1d48b2fd759d60bbb4d8c", - "sha256": "0vbi64fri02ziy68dvpq1y946w4n4mla8gh1cmldqq8x24l8ssdg", - "fetcher": "github", - "repo": "agda/agda", - "unstable": { - "version": [ - 20210903, - 1114 - ], - "deps": [ - "annotation", - "eri" - ], - "commit": "475d9add939bf86936a1d5b41c3260f0000bd3c8", - "sha256": "0f7849s67gzzrnkb57hm2p6hbkrd50s02m9l5xfqg286dinhqp0v" - }, - "stable": { - "version": [ - 2, - 6, - 2 - ], - "deps": [ - "annotation", - "eri" - ], - "commit": "246a229faea2ef2fa53caf491ff8a2d72dd7510c", - "sha256": "1ccmryw6vs8d87d5zmjl0kr2kvyd1zxl73344fa7yzqgg2kw1da6" - } - }, - { "ename": "aggressive-fill-paragraph", "commit": "982f5936f2d83222263df2886ca0b629076366bb", "sha256": "1df4bk3ks09805y67af6z1gpfln0lz773jzbbckfl0fy3yli0dja", @@ -2472,11 +2440,11 @@ "repo": "domtronn/all-the-icons.el", "unstable": { "version": [ - 20211021, - 1244 + 20211108, + 7 ], - "commit": "b7002b5aa152b56a2a852c3aae2f2e1a0e963277", - "sha256": "0srh30xciwb6dsw5rixz5ikc1z7jx3987zd4gnc1b7aj01826n8k" + "commit": "483dba65e897071c156cefec937edcf51aa333db", + "sha256": "01v0pyfz49a74d7vqg8nhq9jpbyqbywcpk3ajc59d9fwg7wmzjvq" }, "stable": { "version": [ @@ -2999,8 +2967,8 @@ 20211030, 1358 ], - "commit": "2a4319971f42c754dd43806b66c13317741d6939", - "sha256": "1965wfdaqr7p3b0yc287xdb367xib491ljp7yazn3dxxy7ayd25h" + "commit": "9f814c5e8bcabb5f65563b057ae9ad8458b90408", + "sha256": "0jy2pxcsj06klrc02q9nsm626nj229zg5y9gn7xyixszjjbvmlyj" } }, { @@ -3281,8 +3249,8 @@ 20200914, 644 ], - "commit": "475d9add939bf86936a1d5b41c3260f0000bd3c8", - "sha256": "0f7849s67gzzrnkb57hm2p6hbkrd50s02m9l5xfqg286dinhqp0v" + "commit": "6cb77e1a216098d6a4e273f6750dbf4445953272", + "sha256": "1rj04f9q7fn88ifznqqi3p7anv0m827mz2w2bwb4s09kdn03nf6p" }, "stable": { "version": [ @@ -3329,14 +3297,14 @@ "repo": "rejeep/ansi.el", "unstable": { "version": [ - 20211023, - 529 + 20211104, + 1420 ], "deps": [ "cl-lib" ], - "commit": "6e5455af7fa5d7b21bdb383e36190cb9d996ec35", - "sha256": "026bbdqnwcivgkhff6wp71vwi0wk2kn85idad7jmdsabdgzl9hmr" + "commit": "2367fba7b3b2340364a30cd6de7f3eb6bb9898a3", + "sha256": "1n7h6l4icm6lks3zpvd83j1fzrnspw19rmz7c96vy7pdh1y4v3p3" }, "stable": { "version": [ @@ -3597,8 +3565,8 @@ 20211023, 1831 ], - "commit": "8b326a38fa1bf3b9675b251c78eb9456245aeef9", - "sha256": "07qcvn607x3mmrp8mc3wkxczj1mkhd0lb8674qx84j0yl7idv1dm" + "commit": "c55c6468526100ba0da00bff05cfb17cdf8839cf", + "sha256": "1wmq1fwzfj10c445gyh7silrzi3d911fc8knc967g7hspw4kna3w" }, "stable": { "version": [ @@ -3633,11 +3601,11 @@ "repo": "raxod502/apheleia", "unstable": { "version": [ - 20211031, - 1757 + 20211116, + 132 ], - "commit": "1b7f2cf9969e7dfe610780b38b6f3dd834d1c01d", - "sha256": "1gy4pczi6lwvcjfxng8kf6nd4czpi261k4p46dgny686hr70mzc9" + "commit": "8e0605cc29732ec889b7318dd57921bf3f5ba06c", + "sha256": "1ffhnpz2zv4s4wl4a31c9xz9srx6h50q0ya7lacmj15vw9ffwd4z" }, "stable": { "version": [ @@ -3794,11 +3762,11 @@ "repo": "waymondo/apropospriate-theme", "unstable": { "version": [ - 20211103, - 1600 + 20211113, + 1913 ], - "commit": "008cd61d8b42367316b147eef2a81636f01faeee", - "sha256": "04k12kb19xzw3dm4ydiy1m3qfpv0smvr33847lh4bhkiv1wyilp8" + "commit": "b934a5a17cac02137c1bfe81935638ab85dbaec9", + "sha256": "1wbvxvv7fydv9p148xxyivsvjh000z4ndfwfpbir4hv0l83xghrw" }, "stable": { "version": [ @@ -3940,14 +3908,14 @@ "repo": "stardiviner/arduino-mode", "unstable": { "version": [ - 20210907, - 1455 + 20211112, + 1223 ], "deps": [ "spinner" ], - "commit": "6d2d1122924370ffa17ce337e3b02ecab79d861b", - "sha256": "039h4hkl7n9ypdwi8zqs10fcbvwh5c2qmlz86x66xlp0wamg827r" + "commit": "3bc47bd7f75a7ccae409236dab43208ce8d41d51", + "sha256": "1jsifn9gfpb2rwhz9fr6r4qsmyydfd6rmz87iy7884nrnxkmdsci" } }, { @@ -5055,20 +5023,20 @@ }, { "ename": "auto-highlight-symbol", - "commit": "96293eb591e5f436efe8e9dc131d29ede292d2c3", - "sha256": "0n8acv58jkbqj00pi7d4g3nryvgvy52z0xg874jfh73d2f17dcdl", + "commit": "be4b46eddfa1dd39381913d1d56e9ba1d1a1f9ad", + "sha256": "1bkf4n0vg2ramz8n6qr44swdyp93d14qvm1gidpmgpaffdxsf8rl", "fetcher": "github", - "repo": "jcs-elpa/auto-highlight-symbol", + "repo": "elp-revive/auto-highlight-symbol", "unstable": { "version": [ - 20211006, - 603 + 20211116, + 1242 ], "deps": [ "ht" ], - "commit": "1a54a61fda6206c5e0fa843d16635133241292ba", - "sha256": "0b90i17rvdszdbmm4snzx6z5xgj705ahy0b0brfqs0b9m9s1iy13" + "commit": "0a16afcb10d8b3cf0e21002a6dff74f3b417c7c5", + "sha256": "13z0p702qxnz2xfrdw3himzgkwl3sqhcskqw8awmz67fqglw71zf" }, "stable": { "version": [ @@ -5151,14 +5119,14 @@ "repo": "rranelli/auto-package-update.el", "unstable": { "version": [ - 20211025, - 1352 + 20211108, + 2025 ], "deps": [ "dash" ], - "commit": "610576ed3adb6e732bc9288d1f9ec18e2ddef345", - "sha256": "0rgdrdsffr4d6lqpxfq8j8r35q1z38ba1985nnnci13lf53ibnvj" + "commit": "ad95435fefe2bb501d1d787b08272f9c1b7df488", + "sha256": "00456kxd1zb5lcwkm211mhdgkl0b01pp4fbkl1ryvdnhddn83ipv" }, "stable": { "version": [ @@ -5630,8 +5598,8 @@ "avy", "embark" ], - "commit": "0b524bda8d9c5f9e26898e383e98a4ec689fa144", - "sha256": "1jgl9n6js71sx4j1wg2nl5aaqmsq2hzna0qawz813637kaylrdxn" + "commit": "edfd0a842a75ad25115f95f56b0c8a9351d3e248", + "sha256": "1mq84aiak2fwxbxacf9wzk223dri6z918vqdgs3vy0amvn1ys2ji" }, "stable": { "version": [ @@ -5841,11 +5809,11 @@ "url": "https://bitbucket.org/pdo/axiom-environment", "unstable": { "version": [ - 20210714, - 1912 + 20211116, + 2200 ], - "commit": "7d72e6319b98b334f74b78f3d4151e92fb7dcbad", - "sha256": "1hwcndb1x3i51l0kvzk4mj6sil8h10mxmazic9zvwjhia9qz9hz3" + "commit": "3266c5b2e4865337da86043b53a4e6609dbc8308", + "sha256": "11k53vvw5df66f54mh3zkghspmi7zsgls3mlkfvl19hz2z1pyhwq" } }, { @@ -6842,11 +6810,11 @@ "repo": "gilbertw1/better-jumper", "unstable": { "version": [ - 20210713, - 1426 + 20211108, + 2015 ], - "commit": "7f328a886ba4dd01993d269eee01c8ee3d0ddf52", - "sha256": "1xfap2db1ncfdnv8d3vdn8gxgkzamz8vz9jsyn0jiminhy0hb2na" + "commit": "3148a17b5920bba8ec4f81b717b99acde5fd5b74", + "sha256": "097xgcmp6a22hqyyfxqyxiq8p4kwq0gql4gcbmjhm9dd8qpf3s8b" } }, { @@ -7543,26 +7511,32 @@ }, { "ename": "blamer", - "commit": "4424e068324a241450fb4e8b6cccb697fdb2f187", - "sha256": "0fis6f2gpzj88mdf24fbply6a63i753bmlxfwlglbxx5k457wkkj", + "commit": "412fea9e0564929310918096bae95636ba885a7c", + "sha256": "1p7g9c0621nsj2vn6janywghhllv5j8i4lpqv06vxmqy6pydl0xw", "fetcher": "github", - "repo": "artawower/blamer.el", + "repo": "Artawower/blamer.el", "unstable": { "version": [ - 20211102, - 2116 + 20211114, + 2013 + ], + "deps": [ + "a" ], - "commit": "9979fbe64cdb7aaa8548a3ab430afbe27d00323f", - "sha256": "02anikbwihgficgnvrdhmizf1l5syf4bvzhwfq5ips6b6ldsfxis" + "commit": "8855eeb6ef6aa323361498714d06365e0db83488", + "sha256": "04wy05pa9xzvrk33xnfvfk8hy127q7nlgn9kbcd4mm7ql4ywf8gp" }, "stable": { "version": [ 0, - 2, - 1 + 3, + 2 + ], + "deps": [ + "a" ], - "commit": "1117a34dc09ae6b65eca88e2b6199d4b90e52af7", - "sha256": "114cbb32y0bd39yajs2m0pbm8fwdx3cfnf0qs1sf343qyzzkb319" + "commit": "8855eeb6ef6aa323361498714d06365e0db83488", + "sha256": "04wy05pa9xzvrk33xnfvfk8hy127q7nlgn9kbcd4mm7ql4ywf8gp" } }, { @@ -8048,15 +8022,15 @@ "repo": "emacscollective/borg", "unstable": { "version": [ - 20211001, - 2148 + 20211111, + 2352 ], "deps": [ "epkg", "magit" ], - "commit": "069859e8857d70ca0cc755466ffdd35c18780607", - "sha256": "0ca5gmj437zxmzcvxfnbwpsdxblss9fv3689v9q6dqpy0p9vz0wq" + "commit": "2ffcfd4481710e5b6d45a07a99da2561fe1c9d3e", + "sha256": "1nfrvln6s09krabzgsw1hqxs5rp95137dcaqk0pfj9y320awa1gb" }, "stable": { "version": [ @@ -8273,8 +8247,8 @@ 20200321, 2126 ], - "commit": "3b34032bdde6a37b4566c45ce93cb38da21d4965", - "sha256": "16p4404mxqgl1zqdalnq3bvbhwv11wgfl42871lxv3nndcsd30gr" + "commit": "71c555c2e254629c365e6fc44c2fc4d5b6d0ae8b", + "sha256": "03f0ipzmmpv64kk9dim8nihai3mz2ys7v2qvhywpd3a52nnmlqv4" }, "stable": { "version": [ @@ -8397,11 +8371,11 @@ "repo": "topikettunen/brutal-emacs", "unstable": { "version": [ - 20211018, - 2212 + 20211112, + 1713 ], - "commit": "5ec10f0614978c376df95ed9da05f2227cd7cd62", - "sha256": "1gz69g9kz90yriwlyarfd632k19q65sb0r4as25ykq8m67cr5cm9" + "commit": "f9bba56199e861bc405703286ac3378bda496898", + "sha256": "12j7ad1fs93a9d5s9ki99321lbky1kpsz0b84xj0yld08zvhwixb" } }, { @@ -8663,8 +8637,8 @@ "ht", "s" ], - "commit": "7336ae668c0b26e3a53bcd36577ea84a8090ec21", - "sha256": "1gzgp7w4j8dlig4psqc9g4ns69dd70hj83347al0jqcnrhw0ysy3" + "commit": "a2bc0252eae7a787219627512d5d54984b97e1a2", + "sha256": "0scqddzijg02dggyj7v59f30irp9hw68sc075wa0i039f4ab8kh4" }, "stable": { "version": [ @@ -9843,8 +9817,8 @@ 20210707, 2310 ], - "commit": "a3bb240667686a007f3dd0649a093b7326e130cf", - "sha256": "03svmpz905nhpcgriq66sw4la2v58l2490h663yggf313zlplych" + "commit": "5ecc98425417732e7124460c7d938c0994958c1f", + "sha256": "10g0jap8rq0bbxqq61vvn2zklmhz94d883mr18gq1f926l3ni9z2" }, "stable": { "version": [ @@ -10219,10 +10193,10 @@ }, { "ename": "ccls", - "commit": "be27a4022d58860917a659fce2b7d7791fbea4e2", - "sha256": "0kiv0n6pdpa75wjcimpwccwbjbhga4gjnphjrkpj4qz5qv42rbnm", + "commit": "5bd4c12f9c8ea96e29d684c4121ea4e10ba5e775", + "sha256": "1h0l6y4iky4ry36mfw6k8fddn0nyibcnhh6hhprjn7zmhyd32f5l", "fetcher": "github", - "repo": "MaskRay/emacs-ccls", + "repo": "emacs-lsp/emacs-ccls", "unstable": { "version": [ 20200820, @@ -10532,8 +10506,8 @@ 20171115, 2108 ], - "commit": "1a3b84397c11d99cbeaadfccd7472ac914f715b2", - "sha256": "05xk1zmngk90vdskmj2ldlc14sk13g6adckch7g83nhdhw936x9h" + "commit": "be17316bf94dcfd0e725383041f5f059d85d8846", + "sha256": "0jf9ss3nj1v5qn02g9vhcsxp4rdrhx9s5ajd9md641av9p8c6rkm" }, "stable": { "version": [ @@ -11323,8 +11297,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20211103, - 2049 + 20211108, + 621 ], "deps": [ "clojure-mode", @@ -11335,8 +11309,8 @@ "sesman", "spinner" ], - "commit": "7228402c093a7660a6bee6e4c1c69cce81703013", - "sha256": "174az297qq5x5x13ga99zvw7pn4n7aazplby348w79sih5flkl1z" + "commit": "a30d2e5ee2052dbc06e24c2494747ebd60f0cd03", + "sha256": "1dsx3f752hkj18b2bwyjnl37xfb4cqhh8mxl5gjp5dc9nk6i2ccv" }, "stable": { "version": [ @@ -11605,15 +11579,28 @@ "repo": "bdarcus/citar", "unstable": { "version": [ - 20211101, - 1853 + 20211117, + 312 + ], + "deps": [ + "org", + "parsebib", + "s" + ], + "commit": "26c83fb42e0daece49cc98bebca0e81ea7c0232b", + "sha256": "0ch6wja4s6mdcfhxkdjfx82k519wq41v4rirsggczpkrzx7j5ql3" + }, + "stable": { + "version": [ + 0, + 8 ], "deps": [ "bibtex-completion", "parsebib" ], - "commit": "e2e86bb9ad854548253322751f433b0b940fca1a", - "sha256": "1yfmk1calvzh44pzh3041lj5vrrgs67m6iq93v7knl59ghy2japw" + "commit": "2dcf0c450a80609294edcb89d55f352e763d0570", + "sha256": "1jrfcfr976c9nb2vpfrh6yhck5gm34wcjzbk0m6gq2xg3qfv2g6p" } }, { @@ -11624,8 +11611,8 @@ "repo": "andras-simonyi/citeproc-el", "unstable": { "version": [ - 20211104, - 751 + 20211111, + 1008 ], "deps": [ "dash", @@ -11636,8 +11623,8 @@ "s", "string-inflection" ], - "commit": "e93b45fe125d2ed61c60136638b3836ec770f879", - "sha256": "176h3xs9jgxcgslp9vklzzsk5s02nf8zdljcjgnjkfxrjng26s8b" + "commit": "2857f9bb819d0d0a6e6ed91cc38b165e506bfc2e", + "sha256": "11qm0mg0spwmqrl8d4pwjp0byn5b2askjcbs1yl1rpmlki97hb6m" }, "stable": { "version": [ @@ -12056,8 +12043,8 @@ "repo": "clojure-emacs/clj-refactor.el", "unstable": { "version": [ - 20211031, - 723 + 20211117, + 1008 ], "deps": [ "cider", @@ -12070,14 +12057,14 @@ "seq", "yasnippet" ], - "commit": "9eab9469fe2a06275b7cac7e53eb48ceb5724f81", - "sha256": "0gg6pavih3nifcgdpafsl463f50klaf7mhmh9iz9sz45iyfz2q1i" + "commit": "af1bde5cb0ca5679927f70eb21e7a95a33791e51", + "sha256": "1a962xav2pzbdx2zfaf53hqj8a5nz1im1773b7b1d9s7vp4lc991" }, "stable": { "version": [ 3, - 0, - 0 + 2, + 2 ], "deps": [ "cider", @@ -12090,8 +12077,8 @@ "seq", "yasnippet" ], - "commit": "b1503962c90f1c88a4f32b8d32cf87c48437c158", - "sha256": "0i759k6qm752lmdsxrgp0bh3akl01as8k8q6x1a7cpdh6yddwajs" + "commit": "e0d83c845014a24c2604a08f9c9931c63ea809c4", + "sha256": "1iyivn7x5bcnp4g7k0k2b0jdcph84pbldlk83qqfzix6h4sp1k1f" } }, { @@ -12318,11 +12305,11 @@ "repo": "clojure-emacs/clojure-mode", "unstable": { "version": [ - 20211028, - 1217 + 20211114, + 757 ], - "commit": "feb03a603b2080b36492b538aeb2041bac4d129c", - "sha256": "1x2fqc003hkvk0gqqgzy0xnya1mx6mi864gicvf2fxbvvwl28vvh" + "commit": "08986ac32972830bb191496ea680fba1d6cd5fe2", + "sha256": "1y6zr7ijpyl1kf15108b5mkicf76ha2v8wq8lsk02xglgmjb7f5l" }, "stable": { "version": [ @@ -12342,14 +12329,14 @@ "repo": "clojure-emacs/clojure-mode", "unstable": { "version": [ - 20210322, - 704 + 20211110, + 1015 ], "deps": [ "clojure-mode" ], - "commit": "feb03a603b2080b36492b538aeb2041bac4d129c", - "sha256": "1x2fqc003hkvk0gqqgzy0xnya1mx6mi864gicvf2fxbvvwl28vvh" + "commit": "08986ac32972830bb191496ea680fba1d6cd5fe2", + "sha256": "1y6zr7ijpyl1kf15108b5mkicf76ha2v8wq8lsk02xglgmjb7f5l" }, "stable": { "version": [ @@ -12651,8 +12638,8 @@ 20210104, 1831 ], - "commit": "909f435b9302f0cd02a73f34bc3316a8e1620bae", - "sha256": "16435f7clz33gl9j1l86ng5i4cgj7qgcv49335k39wjjzqdhqqa2" + "commit": "d2e10c4d8dd7dc32ae775a6382c5277308639271", + "sha256": "1jcw34vbfhs6mv4a9sl9gnqyf3g4fsnrcpdzkyx872c6awdg36dl" }, "stable": { "version": [ @@ -12660,10 +12647,10 @@ 22, 0, -1, - 2 + 3 ], - "commit": "28a033cc7de056d1a74857606397bb294ebe27ac", - "sha256": "18ir7q31l9jqshx3hixiaq9nvlfasxqrmr0a57q852xb0ad31gcj" + "commit": "fed67fa40d7b6e34ee7c8565694bd54af61aed73", + "sha256": "0ddnqjbkmj40119w071vhchprcljdm1k9n3aps5vsa6srdpxa0dh" } }, { @@ -12731,11 +12718,11 @@ "repo": "tumashu/cnfonts", "unstable": { "version": [ - 20211102, - 2232 + 20211112, + 808 ], - "commit": "46c9034f28cc559f8c93650baa1a64a42b06c535", - "sha256": "1dy6n1cdn05bdr4f1wk72gav5mnfbm23i6cp2vh6nd1nq5kkkchp" + "commit": "4dad44ed3619c40ba406bcf45d37fdec3ce0db8e", + "sha256": "037k5d4ikb3bqa1gqipzkx92ml8fajgalz0r375y7hlvasr2zvzx" }, "stable": { "version": [ @@ -13604,11 +13591,11 @@ "repo": "company-mode/company-mode", "unstable": { "version": [ - 20211024, - 2305 + 20211112, + 2354 ], - "commit": "811beeade86669e20da35efed5b00de6a5e305ab", - "sha256": "0v5y92c328x3fn2z4hxiwv0qgjp85r4g28wp6b5cph8azfvzgnk9" + "commit": "eb9be0bff7c323c720198dcd539ee05fa2485cd3", + "sha256": "09xzxyk81rwpgc05g8w0nl36lax6x6z94hrnjivn72c7zdwq58i2" }, "stable": { "version": [ @@ -13746,8 +13733,8 @@ "axiom-environment", "company" ], - "commit": "7d72e6319b98b334f74b78f3d4151e92fb7dcbad", - "sha256": "1hwcndb1x3i51l0kvzk4mj6sil8h10mxmazic9zvwjhia9qz9hz3" + "commit": "3266c5b2e4865337da86043b53a4e6609dbc8308", + "sha256": "11k53vvw5df66f54mh3zkghspmi7zsgls3mlkfvl19hz2z1pyhwq" } }, { @@ -14172,16 +14159,16 @@ "stable": { "version": [ 1, - 2, - 2 + 3, + 0 ], "deps": [ "company", "ht", "s" ], - "commit": "ea577f13d0a47b6efbe2974a5a347a87d27c0c42", - "sha256": "1g6p5868qb2001ippdcnsscsm15d1fwl0iyilq7jk3ys68j30pr3" + "commit": "7067175ebf56c5110edf1475b03e2e242a00e66b", + "sha256": "1sfzj5qbpc1j1blg6rq5lmimgy1yfwyg7ixgp7psf53nq0cbq9jd" } }, { @@ -14922,15 +14909,15 @@ "repo": "company-mode/company-quickhelp", "unstable": { "version": [ - 20210515, - 2212 + 20211115, + 1335 ], "deps": [ "company", "pos-tip" ], - "commit": "530b29380f0f95ae338cbe089693d786e6f53d86", - "sha256": "0w2xj9k50j96x81l767ah1m17pcjsbfk91mndm4w25p30kd1g8j4" + "commit": "3ca2708b4e5190205aca01d65fe1b391963a53f9", + "sha256": "120kvdrzbxs7idrqwz8rz59ic3ymq1b586l0qi27y7bdy2pg6njw" }, "stable": { "version": [ @@ -15134,8 +15121,8 @@ "company", "solidity-mode" ], - "commit": "9c77b390eab999e5e54dc5c1068f57201e6628bf", - "sha256": "0i6kjvd82bq3djh4makf4czdbmg3sb5q74wbdfhdyikx6kkzfj0m" + "commit": "bac439dbd2097664df45e9fac0ce57e23462c14c", + "sha256": "1vs64gwm6zn47fl4nvaizkwh8zwnqh764yqcmggyz4awsxsxg6ym" }, "stable": { "version": [ @@ -15833,19 +15820,19 @@ "repo": "minad/consult", "unstable": { "version": [ - 20211103, - 1226 + 20211117, + 855 ], - "commit": "3b18b04524f0e963070ab6c61d4d3a3f10507d12", - "sha256": "07m3v8lg91ql0j0vicf59cavhyn0xva8qd83xxlngnsivqsa0h63" + "commit": "69bc425c59414ece0a49dfa8e3f2d9759a13748c", + "sha256": "066a3gf1hgzc4n7r06m1x3kyp98sabs8kf25dhlg9wgl2l6gccf0" }, "stable": { "version": [ 0, - 12 + 13 ], - "commit": "ebb62563127a4b9442148372f897efb7baef61d2", - "sha256": "1bzlqn7k5akhyl763q29853yh5s8rmk6y1ncmy3am940wfypxjic" + "commit": "c2fed383c9c555ed017200a22efad0a9734725b0", + "sha256": "0ik5j4i4vb9hz629cjwnzhimskpv0fc8wca37z4ak0q1d898ayph" } }, { @@ -15989,16 +15976,16 @@ "repo": "gagbo/consult-lsp", "unstable": { "version": [ - 20211103, - 1200 + 20211104, + 1506 ], "deps": [ "consult", "f", "lsp-mode" ], - "commit": "91deff6bcaee55ee4e33a4a9fe943d8de305e26c", - "sha256": "10nwwkdx537xr9d5zi5drbw4whrfha27kq0xd1jkvvdsqiaydxrl" + "commit": "aaa9a31bc82259d743186c53d8b01f043c6fec13", + "sha256": "1d4l930gwfp2syxkm129lxbvrwcqv3rz2qzb3m18v6aklk0si2db" }, "stable": { "version": [ @@ -16022,15 +16009,15 @@ "url": "https://codeberg.org/jao/consult-notmuch.git", "unstable": { "version": [ - 20210909, - 101 + 20211114, + 557 ], "deps": [ "consult", "notmuch" ], - "commit": "015642e88a48b1e3b4791a5badd8dbdfe6a6037e", - "sha256": "1nbyd21n3dfdikr2dv7bcb2rg2sar22dmirrlkd5bz0qniaqim4n" + "commit": "5e62b4da80c5361a656f459fc2fd3ec65d5d9bf1", + "sha256": "1krap35x6r3gfh0hk9vq7z471m21j2dyljaf5ppx85yhfanhpxp2" }, "stable": { "version": [ @@ -16072,14 +16059,25 @@ "url": "https://codeberg.org/jao/consult-recoll.git", "unstable": { "version": [ - 20210807, - 1613 + 20211113, + 1958 + ], + "deps": [ + "consult" + ], + "commit": "42dea1d40fedf7894e2515b4566a783b7b85486a", + "sha256": "0nzch4x58vgvmcjr6p622lkzms2gvjfdgpvi6bbj5qdzkln5q23a" + }, + "stable": { + "version": [ + 0, + 3 ], "deps": [ "consult" ], - "commit": "fe7a09b99d1497a30e11a2f86b6415adde00788a", - "sha256": "1bqmr686ncn46fbbq000mpbqrhf76sc9npbyg85053rhnwjdkk84" + "commit": "1b21fa157ba40fcfeecd0a10c5c82ecfb87aee53", + "sha256": "0bfvxzvyppkqfdj4cm5haqgkd72wrh5l7x8ldnpycapqyjpv9pip" } }, { @@ -16090,15 +16088,15 @@ "url": "https://codeberg.org/jao/espotify", "unstable": { "version": [ - 20210620, - 1953 + 20211114, + 2258 ], "deps": [ "consult", "espotify" ], - "commit": "5bf63dacc5df8a74860e80dabd16afce68a24a36", - "sha256": "1vxg86wv6f96bva0d1xxhisk525chwhdl4nq77xhriflq65mcmi3" + "commit": "5c1dcf0182135cda4191d4ba206fe2f265100293", + "sha256": "06wj2pixhjgqddl9g2wkv7cq9gz9yjb46cb1jrlbya3rdjyfb6h5" } }, { @@ -16582,15 +16580,15 @@ "repo": "hlissner/emacs-counsel-css", "unstable": { "version": [ - 20210310, - 452 + 20211115, + 1755 ], "deps": [ "cl-lib", "counsel" ], - "commit": "f7647b4195b9b4e97f1ee1acede6054ae38df630", - "sha256": "06xvyf9cnyq9zlp7rkq0a0h85yk967icifhg1pfhsz17za97yg94" + "commit": "8e9c0515fc952452eee786d8ebb43d48ea86c9f8", + "sha256": "18wncb713slsynm3amqs8ibpzfab819nn6r6yzl6yxsliahi2xil" }, "stable": { "version": [ @@ -17658,20 +17656,20 @@ "repo": "emacs-csharp/csharp-mode", "unstable": { "version": [ - 20210826, - 421 + 20211115, + 2134 ], - "commit": "c0c7602368f7b3933584e7790394a4d509bd1c50", - "sha256": "1nkaaggdh9bzisq4dx6mi2lbajymq9l6dp83gsphf94xcn3q5g2s" + "commit": "515b866704252fc862144d9ff677fba75488e445", + "sha256": "0xadchhbfikw2vac6kqkmdjjixhybxqqf99cpl089cga9sjc7i5p" }, "stable": { "version": [ 1, - 0, - 2 + 1, + 0 ], - "commit": "723a4ab2581b11f84d23f421faa06103864d2bc8", - "sha256": "1gdr1y8q93xr5vlx6jj95js6rmmsspq2bn870igbaijwwsn0sf7g" + "commit": "515b866704252fc862144d9ff677fba75488e445", + "sha256": "0xadchhbfikw2vac6kqkmdjjixhybxqqf99cpl089cga9sjc7i5p" } }, { @@ -18351,11 +18349,11 @@ "repo": "cython/cython", "unstable": { "version": [ - 20190111, - 2150 + 20211111, + 1407 ], - "commit": "b5f81f5e900922356ee7aeedf78a54fa96f85c71", - "sha256": "0rb5sngg8l1l4wdixhq4jzf2a55x60c0xzyzrqvpb596pacadbg9" + "commit": "2b1e743b9c736ec41e92b197eb709db0427558b4", + "sha256": "0x6nbir7pk8w4265qywqxjdvrrkyvkp8z066z29zljwcry1wk1ml" }, "stable": { "version": [ @@ -18562,8 +18560,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20211020, - 1757 + 20211110, + 1129 ], "deps": [ "bui", @@ -18575,8 +18573,8 @@ "posframe", "s" ], - "commit": "a18f29e3d1a3a945ec5dfc7dea98927ecb022c34", - "sha256": "037xly2c3jd33a3gnkrfp7lammrgarl5kknp5zvqs35278xpsdng" + "commit": "c19da4d347114d19fd9cd77af3650bcec7d81b15", + "sha256": "1pmzrb9c8z3jhwfjygdlkarc9ssaldvqx4vi48j6yg8av99p5z03" }, "stable": { "version": [ @@ -19313,16 +19311,16 @@ "repo": "Wilfred/deadgrep", "unstable": { "version": [ - 20210830, - 656 + 20211107, + 445 ], "deps": [ "dash", "s", "spinner" ], - "commit": "4ec21e644ef482a913c64f068ec8d602eedac1c6", - "sha256": "1ipjdwnf6c9qdwg4klkf6g06jj4lgap75ms5yq6a0gg2075d84jk" + "commit": "97663c41624526c4ceaf82fb6a0137ab2081affe", + "sha256": "1rkskf8byl5fnnlahvppawfjj7zc41sag4gwxdb2r3j77g5d5ahq" }, "stable": { "version": [ @@ -20187,14 +20185,14 @@ "repo": "dgutov/diff-hl", "unstable": { "version": [ - 20211102, - 242 + 20211106, + 2353 ], "deps": [ "cl-lib" ], - "commit": "47f8724ced083c4f5aca9e0751bfd2489198d1be", - "sha256": "186b66fr2hj75si88431dx8jcp2icvk6qb2xi0z24ll7rxwccskg" + "commit": "6fa3af0843093f44e028584a93eef091ec7e79d2", + "sha256": "0fg7mdcjjnibqi8f7zj2pig35kcq4gqfi4jvg4hvw9fcncdv0yln" }, "stable": { "version": [ @@ -20390,6 +20388,37 @@ } }, { + "ename": "dilbert", + "commit": "7fb785715c05adaa7551b27f4eaca2b704bf1a86", + "sha256": "1bsz4qmjy9hvpgrxpbz94v2yv0xvh1v8fik1pldv72bl4jkvifvl", + "fetcher": "github", + "repo": "DaniruKun/dilbert-el", + "unstable": { + "version": [ + 20211114, + 1009 + ], + "deps": [ + "dash", + "enlive" + ], + "commit": "bd8c11ccc512ca60906a8b0e4bca2081ba4aab7b", + "sha256": "110ynzqsnkv6sdnbk475h6qyrvj4w1dk577hpr1p7pk7bif4waxd" + }, + "stable": { + "version": [ + 0, + 1 + ], + "deps": [ + "dash", + "enlive" + ], + "commit": "e660def51721f80b7d21eeab60e9a719be5106f7", + "sha256": "0gim8imb9cw16sr76hydjp1rjw2cczslnh4h2gvq3jsmpk2hdvma" + } + }, + { "ename": "dim", "commit": "3a740ab40cab3a1890f56df808f41a2d541aa77c", "sha256": "0gsyily47g3g55qmhp1wzfz319l1pkgjz4lbigafjzlzqxyclz52", @@ -21833,14 +21862,14 @@ "repo": "unhammer/dix", "unstable": { "version": [ - 20210312, - 1850 + 20211117, + 954 ], "deps": [ "cl-lib" ], - "commit": "17f33f9a8bb50156261e10c045d54eb866ea84fa", - "sha256": "1aajxj4xvi8jpskfhh52n6388w1skj1y9aq2xdvwj7cizy57lqn2" + "commit": "9ad8b231812af17c2f7655057a8e0dece96a7d7f", + "sha256": "1l3js4rqwqjlk5b13fsr3nk6n3yzlnscya4jsc1j8dr19i5nbxcf" }, "stable": { "version": [ @@ -21870,8 +21899,8 @@ "dix", "evil" ], - "commit": "17f33f9a8bb50156261e10c045d54eb866ea84fa", - "sha256": "1aajxj4xvi8jpskfhh52n6388w1skj1y9aq2xdvwj7cizy57lqn2" + "commit": "9ad8b231812af17c2f7655057a8e0dece96a7d7f", + "sha256": "1l3js4rqwqjlk5b13fsr3nk6n3yzlnscya4jsc1j8dr19i5nbxcf" }, "stable": { "version": [ @@ -22196,8 +22225,8 @@ "repo": "Silex/docker.el", "unstable": { "version": [ - 20211101, - 717 + 20211105, + 138 ], "deps": [ "dash", @@ -22207,8 +22236,8 @@ "tablist", "transient" ], - "commit": "a7097f68a96470ae7d77b86c7bdee9acb095f06e", - "sha256": "1dnrk8fc725l3nk0rr0xxzz8zizs3558spprjbg8ry1l5fahjm9a" + "commit": "8d64cf4f84d7da5f839a8248fdddfb635a63f803", + "sha256": "1ivyvgh24nadhiv9ffqxckwln8vc9c2l0bvrvrd53yf0w8i345yz" }, "stable": { "version": [ @@ -22569,30 +22598,30 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20211024, - 1720 + 20211111, + 834 ], "deps": [ "all-the-icons", "dash", "shrink-path" ], - "commit": "25e81e77cd7481de4c666d4070ae038e4970c767", - "sha256": "1xrhfrnpzj3c3vrqzw8wsrbpgnvl849ad4fzpqid1vvzl6xzq2ww" + "commit": "36fed6d1a1614f72d425073d7c9e1529f622fe7a", + "sha256": "0g56jvpsz8mdjpg7rifn89p7k2iw4rl1rvj8xv5323x9hl6772dx" }, "stable": { "version": [ 3, 2, - 0 + 1 ], "deps": [ "all-the-icons", "dash", "shrink-path" ], - "commit": "d514f43679513819b37333a64a44523f239150b6", - "sha256": "1gfkaxga919a1a19dhpbby95l8dixb1278g5d7iadjf2i3j0p3l0" + "commit": "b59802efba1215bb861621deba0030cfda2796ed", + "sha256": "1ji15n2rdp7bjg5iq9im6c4m12k24kqp85i3n1m9npihrb4arh54" } }, { @@ -22622,14 +22651,14 @@ "repo": "hlissner/emacs-doom-themes", "unstable": { "version": [ - 20211011, - 1314 + 20211114, + 1641 ], "deps": [ "cl-lib" ], - "commit": "3e6f5d9ce129ac6fc0f466eb6f5518593625578f", - "sha256": "1ar9nb67hppqhbdl6l6mv1y6zl48mcdl91bmsc49bjpzp9a38y5b" + "commit": "96edc0ceb864b7d72218e58c8e9272cd96e5712c", + "sha256": "0qkpwlg5h3ysmf6aywz49a9gkl4xszxzdkcfpqc3n0i2bvcmf6vk" }, "stable": { "version": [ @@ -22873,11 +22902,11 @@ "repo": "dracula/emacs", "unstable": { "version": [ - 20210922, - 1038 + 20211108, + 749 ], - "commit": "943faeda66931dd275fe83d858945bd07abacc5a", - "sha256": "01k8i4g0vv7m2jgjmj3y2n1821965r4m1j3fra5v30pnljjl7zjb" + "commit": "8c38b293af039041e8914894d86122403eec5bcf", + "sha256": "15h2zkrhlhhc7qkyydpbm2xdgbx3vwy1jj78rq3vycwb37v52kci" }, "stable": { "version": [ @@ -23285,8 +23314,8 @@ 20210909, 1010 ], - "commit": "4060ee0f13866916336f4ba2c14fa836c9ad04da", - "sha256": "0ffxaj9l186ln642j86m9j79hkn71wqqx8xyzcwg2cc3avqnm3sx" + "commit": "05653b996b18032a4e80ab71827e7a15601a69d6", + "sha256": "1l2803hd9gr5mjzpfz21fgwcyy55zj0rdafwdmy1hcdy9g1d3cg8" }, "stable": { "version": [ @@ -23522,8 +23551,8 @@ 20210924, 2026 ], - "commit": "76142cf100d9e611024638a761e62bd82af156cd", - "sha256": "1fsydk7pld2xpmmp1jnm8b3y7zdynibwicgmsfxpk11915y4fh6r" + "commit": "dc9013117bdcdc1b12feebcc58eaf129a6ad3a73", + "sha256": "0z5r0wybpm74hlcbisavn90i31vh3jsalhk0frihfclfgbqd24d9" }, "stable": { "version": [ @@ -24051,14 +24080,14 @@ "repo": "joostkremers/ebib", "unstable": { "version": [ - 20211102, - 2220 + 20211112, + 2206 ], "deps": [ "parsebib" ], - "commit": "84c7234c4901207fa0520af96922c2b8e407ff4c", - "sha256": "18gvmymkpzws8s4zjcm1kijyr55dgfcq201z3w1jzhkhcs01bfsc" + "commit": "b2f9c0a354044449a49501cc405cdb090e19dda0", + "sha256": "0f56rmpwj71lgqyb5gx9mnb2gz9s7bnmf7fyiwc0f541jrrgcfcl" }, "stable": { "version": [ @@ -24829,14 +24858,11 @@ "repo": "ROCKTAKEY/egalgo", "unstable": { "version": [ - 20190706, - 1611 - ], - "deps": [ - "dash" + 20211105, + 1657 ], - "commit": "e683b16ed4265ddb46efcc8cbf9503301cc39e22", - "sha256": "12nsbqrk7clr642kmbaa9xqgx7j2r6as6grx5qmghnp7kjfy1d7l" + "commit": "a56a86591351d53ca2add7c651757bfb0064fb22", + "sha256": "1xcd1kwrdclncln1fgg3ikdja8j96jfp0a9r9r7x2h05npb3881q" }, "stable": { "version": [ @@ -24922,8 +24948,8 @@ "repo": "joaotavora/eglot", "unstable": { "version": [ - 20211009, - 1931 + 20211116, + 823 ], "deps": [ "eldoc", @@ -24932,8 +24958,8 @@ "project", "xref" ], - "commit": "9665359bb6bfb6a96b0c3b307d4abea9fcbff7a5", - "sha256": "154wf1ps7s00vpmdxgj2pw36gcda1w82f5yw0zhl9c7gi05g3xn3" + "commit": "55c13a91378cdd7822c99bbbf340ea76b1f0bf38", + "sha256": "01861nbwkgx88ndhqcb2dcy9mzsk7za61ngbw02mxlg3ninl15ic" }, "stable": { "version": [ @@ -24967,8 +24993,8 @@ "fsharp-mode", "jsonrpc" ], - "commit": "e92e270c6c987497041fac65cded82146cd41dde", - "sha256": "0jzxdim6mpj984cmhxzpafig6dcaav5x98y59f4ji3dxc95qs6r7" + "commit": "0ba09a8124cee35cf81f55b4db9144efeb00a92f", + "sha256": "1y11q6zbmdfwswgy205f0iqsd5c4075zsf135vsnc7bpmmkpgcvw" }, "stable": { "version": [ @@ -25083,8 +25109,8 @@ "repo": "millejoh/emacs-ipython-notebook", "unstable": { "version": [ - 20211012, - 347 + 20211107, + 1724 ], "deps": [ "anaphora", @@ -25095,8 +25121,8 @@ "websocket", "with-editor" ], - "commit": "e354ea77c29e8c20b6b1a9ee00d86e6a9512bc0d", - "sha256": "1ny4gjawwsq7gx1ih7f37p24pyyjv9jbp702v1sl6wfnk6r7ll9c" + "commit": "1e42a2b26c2b113884170a94229c2743978e2dec", + "sha256": "0fvsbhv65z6vjw41s4yrk2j71cm7rw9yljlizrv55gazrpd5g6i8" }, "stable": { "version": [ @@ -25594,24 +25620,19 @@ "repo": "doublep/eldev", "unstable": { "version": [ - 20211102, - 1943 + 20211113, + 1804 ], - "commit": "4a44c72a8cca50677315b1af7dbcae471421ef3f", - "error": [ - "exited abnormally with code 1\n", - "", - "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://github.com/doublep/eldev/archive/4a44c72a8cca50677315b1af7dbcae471421ef3f.tar.gz': Couldn't resolve host name (6); retrying in 330 ms\nwarning: unable to download 'https://github.com/doublep/eldev/archive/4a44c72a8cca50677315b1af7dbcae471421ef3f.tar.gz': Couldn't resolve host name (6); retrying in 517 ms\nwarning: unable to download 'https://github.com/doublep/eldev/archive/4a44c72a8cca50677315b1af7dbcae471421ef3f.tar.gz': Couldn't resolve host name (6); retrying in 1178 ms\nwarning: unable to download 'https://github.com/doublep/eldev/archive/4a44c72a8cca50677315b1af7dbcae471421ef3f.tar.gz': HTTP error 302 (curl error: Couldn't resolve host name); retrying in 2285 ms\nerror: unable to download 'https://github.com/doublep/eldev/archive/4a44c72a8cca50677315b1af7dbcae471421ef3f.tar.gz': HTTP error 302 (curl error: Couldn't resolve host name)\n" - ] + "commit": "70aa39c6c6ed696b7f1505c1c9bf4b2556179a27", + "sha256": "01y3jyjisxngaj0wyib5s37839m7q4azkchaa381mwx0l5nv5k5d" }, "stable": { "version": [ 0, - 9, - 3 + 10 ], - "commit": "95fedcc075afba7306341e55122b8aa6108d412e", - "sha256": "0qmyx74hikkirv31x65gybr9n7ignxlyx61xkz5qmjk8pgdmkn3r" + "commit": "012f5ae33166987b4a541b0df2d39e3770ade228", + "sha256": "1y1gc37vn8k1yhp6b069sg8hdh1bn22icdqn4b28c2k5iiw9g7gi" } }, { @@ -25778,14 +25799,14 @@ "repo": "davidshepherd7/electric-operator", "unstable": { "version": [ - 20210906, - 1235 + 20211114, + 1153 ], "deps": [ "dash" ], - "commit": "14def81d88bf4344a335e68007324e3f3ef5c435", - "sha256": "1p4kpxq8fvdcs5za79c4pzw1g8108kyfl9rcybs0g75fjxk1f2jb" + "commit": "1c51e88d5719e7b0dd022a4704c46b24e0c91348", + "sha256": "1zzy3y5vkdlb7wb3b4fgvm61zn3dj9n0ldi3153qvrgwn6w8m648" }, "stable": { "version": [ @@ -26043,8 +26064,8 @@ "cl-lib", "elfeed" ], - "commit": "5e17d4280f5f8019c3f8962a710c9b3e633f41ff", - "sha256": "0kv6svwg1h0wcj7z89xs20a9wns7v67af9m9rir3m8f47iyy70gr" + "commit": "c88bb246a40c2f8ec2cb36bc16690d1ed43f8b14", + "sha256": "0aq1rp46dr2hdkzm8aapb1xlcbdpa0nbrgb8b5avkihmyx7nkwkb" }, "stable": { "version": [ @@ -26421,8 +26442,8 @@ 20211013, 1408 ], - "commit": "907ef434a0ce0f94dbd0c77f09bdfcdc779bca73", - "sha256": "0sri7m0n0wafc9dyffi5myvv2vawkfwx6lgmfrj7kikbds0l5s4c" + "commit": "7373e91e859c3ddc66457723d531cfab821160a3", + "sha256": "0g1krxgm3x8mj959yin1k8khqhgdr70cymvn78kb0w286079xkmn" }, "stable": { "version": [ @@ -27193,8 +27214,8 @@ "deps": [ "cl-lib" ], - "commit": "da88fa2d04e37397c519e8b1181163f06a350e2f", - "sha256": "02g42xccwbhgq0wf4v2sd3khyvvsvigixxjb2rdqw70h4j1k8mya" + "commit": "ed03b9396da9ef16e498a2d33a51ec5596021b0e", + "sha256": "003pfp9mksl6w446c5njwi6kmlvm2m7pncilj075r9zdpra4a30z" } }, { @@ -27518,11 +27539,11 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20211103, - 1737 + 20211116, + 2111 ], - "commit": "0b524bda8d9c5f9e26898e383e98a4ec689fa144", - "sha256": "1jgl9n6js71sx4j1wg2nl5aaqmsq2hzna0qawz813637kaylrdxn" + "commit": "edfd0a842a75ad25115f95f56b0c8a9351d3e248", + "sha256": "1mq84aiak2fwxbxacf9wzk223dri6z918vqdgs3vy0amvn1ys2ji" }, "stable": { "version": [ @@ -27541,15 +27562,15 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20211031, - 1522 + 20211116, + 2111 ], "deps": [ "consult", "embark" ], - "commit": "0b524bda8d9c5f9e26898e383e98a4ec689fa144", - "sha256": "1jgl9n6js71sx4j1wg2nl5aaqmsq2hzna0qawz813637kaylrdxn" + "commit": "edfd0a842a75ad25115f95f56b0c8a9351d3e248", + "sha256": "1mq84aiak2fwxbxacf9wzk223dri6z918vqdgs3vy0amvn1ys2ji" }, "stable": { "version": [ @@ -28473,8 +28494,8 @@ "deps": [ "closql" ], - "commit": "9be7c61fe119d9d984d8f3a91139c794300a77f2", - "sha256": "03qymnnsw5fb2xv1bm4z8arz8mnzqhg988baj15r13j1fcakl55r" + "commit": "8fa633c278241df577200c6c94102a0fa07bf8a5", + "sha256": "0h3f3xa5chm3vcahk97fx87l468d33myvpyd9blq26a7js568y7q" }, "stable": { "version": [ @@ -29067,14 +29088,14 @@ "repo": "ergoemacs/ergoemacs-mode", "unstable": { "version": [ - 20211103, - 2356 + 20211105, + 1531 ], "deps": [ "cl-lib" ], - "commit": "63fe57790e212a3375fd9af2ccb3184f3e1d821b", - "sha256": "1hac7p9v510iw15livf3mx8f5f522n6s3w4mbhflilymb3bxclgh" + "commit": "df8d4253c44aee607308826093222188c4732099", + "sha256": "1rss0k7yvgbi326x2zjhbx9a5m80a58w1vj86c9ykrd0n4wj2nk0" }, "stable": { "version": [ @@ -29121,8 +29142,8 @@ 20200914, 644 ], - "commit": "475d9add939bf86936a1d5b41c3260f0000bd3c8", - "sha256": "0f7849s67gzzrnkb57hm2p6hbkrd50s02m9l5xfqg286dinhqp0v" + "commit": "6cb77e1a216098d6a4e273f6750dbf4445953272", + "sha256": "1rj04f9q7fn88ifznqqi3p7anv0m827mz2w2bwb4s09kdn03nf6p" }, "stable": { "version": [ @@ -29142,20 +29163,20 @@ "repo": "erlang/otp", "unstable": { "version": [ - 20210315, - 1640 + 20211112, + 1232 ], - "commit": "b3d4affcf9880255f6edc2e67095015e6ed2aca2", - "sha256": "1rz9akamp7qc8m417xgbjbm0785bj1jsjpaabzmq3pjxcqzykna0" + "commit": "abe8285f0b4c594d610f72df6890f6851b89f248", + "sha256": "1fw0chd6qmv1m06762l3lhbmd23l34g0dyvri7ql3bam0z9jjakq" }, "stable": { "version": [ 24, 1, - 4 + 5 ], - "commit": "eef2e7066ecdf9de5dc7fd81dc5043d9a9757efa", - "sha256": "0gpjl5avpfgrkm6g3p8b2b3zgfvrpsxgvzgb01mhbcw8mi2raka0" + "commit": "9e23eca89170fcdf22441ed65f05ef891096f318", + "sha256": "1gd5nac4d56wp5qqkaicdcjf3n63wbbqg4m08s26gxfbjqkfh8ri" } }, { @@ -29670,6 +29691,25 @@ } }, { + "ename": "eshell-info-banner", + "commit": "d602d153819e37a155ca9c4edf0271f478bd4200", + "sha256": "11xvlqxnxc0z5968mnmgqmpg3jn9l7x24w1qmwg9pkvr72ynh7vd", + "fetcher": "github", + "repo": "Phundrak/eshell-info-banner.el", + "unstable": { + "version": [ + 20211115, + 914 + ], + "deps": [ + "f", + "s" + ], + "commit": "312f1e3da3f42a82b99228491427a429ee379648", + "sha256": "07xwph4mnmyd80apn6r1m8alxh2vy1d0y1jacb0ghqjbs01qg47q" + } + }, + { "ename": "eshell-outline", "commit": "950b9323c19b145bbf07a9a8f780880a2593831c", "sha256": "1k510vsfsnhp86y2587zbc0cmaf735sp802d6qk7bgdllljl18hd", @@ -29909,11 +29949,11 @@ "url": "https://codeberg.org/jao/espotify", "unstable": { "version": [ - 20210405, - 1808 + 20211114, + 2251 ], - "commit": "5bf63dacc5df8a74860e80dabd16afce68a24a36", - "sha256": "1vxg86wv6f96bva0d1xxhisk525chwhdl4nq77xhriflq65mcmi3" + "commit": "5c1dcf0182135cda4191d4ba206fe2f265100293", + "sha256": "06wj2pixhjgqddl9g2wkv7cq9gz9yjb46cb1jrlbya3rdjyfb6h5" } }, { @@ -30025,11 +30065,11 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20211011, - 2049 + 20211113, + 1429 ], - "commit": "569dca1f4ff939a93c7be97c34577666d9af8b3a", - "sha256": "086nl0486l28n1zmw9jxqh63d7bqanzlqwh9nm4a4aw1fyjy7pda" + "commit": "aaa82f24c9f44fd7e39b7d918a7819eefbbb40a7", + "sha256": "0hxa8mm2i8xr98yw9b93m8fv3xmfb3kmydgkzai0svpi6wwn9kw2" }, "stable": { "version": [ @@ -30620,15 +30660,15 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20211021, - 2104 + 20211116, + 2102 ], "deps": [ "cl-lib", "goto-chg" ], - "commit": "17c635f6e1f538bf4b2c3c276ddd9d4d165a52fb", - "sha256": "1yd7kmhk0v235h4nlynfs29ljx7ca6i7s7h8wj5krk5b8sv51x27" + "commit": "c28e42126c4ae349e2d77c80b38feb68bc1b5b78", + "sha256": "00z3gmcn12nb32nczplxb68kfmmdrv0fg6f376ip6iwygjgn4cqc" }, "stable": { "version": [ @@ -30822,15 +30862,15 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20211028, - 1851 + 20211114, + 702 ], "deps": [ "annalist", "evil" ], - "commit": "9e47d61bdfb63495503e62955ac5509b34c51de0", - "sha256": "06lwla41sr7m4bzlixbivn46c0ydc2hx0jfcqgi9lxk447v8ixcs" + "commit": "652d74acfb5789eacef36660c4ffc68905c8d741", + "sha256": "0pqm6pp6h8v5jy36cgm70kkjjgj38xdyq0irhnyqmaf5hdvrbvkh" }, "stable": { "version": [ @@ -31489,16 +31529,16 @@ "repo": "hlissner/evil-multiedit", "unstable": { "version": [ - 20211030, - 2202 + 20211114, + 1644 ], "deps": [ "cl-lib", "evil", "iedit" ], - "commit": "dd88d83a6c4d8501b809aa58d18ac2d51ad5fddb", - "sha256": "028qnaiwnx78c412iywsr4wqsh6fw6mjk5aqpkf5xrk7gvka27h0" + "commit": "e17078ff801c3cfc125bbe432a5fa24bd2958b67", + "sha256": "0x4fdjfvpx2nbca7jr1y0gjipg4rwf6cjmzf91j46vzslcvhqv4n" }, "stable": { "version": [ @@ -31620,14 +31660,14 @@ "repo": "Somelauw/evil-org-mode", "unstable": { "version": [ - 20201222, - 2023 + 20211112, + 108 ], "deps": [ "evil" ], - "commit": "80ef38fb378541937f6ddfe836809e76eda1e355", - "sha256": "19028laqnsl0h5nii7ykfh39srg94zhydhj1rcv52fs9nlg6c6dq" + "commit": "c3ec94bc2fb79127826ea85509247f082bc394aa", + "sha256": "15fvw5zq97q18nr5vshkf4qp9di0sb8fklyhgwmhyh254zfdlghf" }, "stable": { "version": [ @@ -31957,15 +31997,15 @@ "repo": "hlissner/evil-snipe", "unstable": { "version": [ - 20210713, - 1456 + 20211114, + 1647 ], "deps": [ "cl-lib", "evil" ], - "commit": "1a28d718c835a21591a170af78a03a366cd60c0d", - "sha256": "1dm73xmlhznh9yc22ifb238yyad09011nryc91n6glla347896p0" + "commit": "a79177df406a79b4ffa25743c752f21363bba1cc", + "sha256": "0pz2s0g0859zhyryvn1glngw1aq7a04x9rydl1l89h50hf5avmvj" }, "stable": { "version": [ @@ -32057,8 +32097,8 @@ "deps": [ "evil" ], - "commit": "3bd73794ee5a760118042584ef74e2b6fb2a1e06", - "sha256": "125yxpd2cmhwvcb0p9z5dc6ydk4w2a9vblkn9hayh6myj9jwjy9f" + "commit": "282a975bda83310d20a2c536ac3cf95d2bf188a5", + "sha256": "0f9y5dwjkjv768s63bypp6nb51kklhkq58ixgzfs59r423y8l1nl" }, "stable": { "version": [ @@ -32148,8 +32188,8 @@ "deps": [ "evil" ], - "commit": "17c635f6e1f538bf4b2c3c276ddd9d4d165a52fb", - "sha256": "1yd7kmhk0v235h4nlynfs29ljx7ca6i7s7h8wj5krk5b8sv51x27" + "commit": "c28e42126c4ae349e2d77c80b38feb68bc1b5b78", + "sha256": "00z3gmcn12nb32nczplxb68kfmmdrv0fg6f376ip6iwygjgn4cqc" }, "stable": { "version": [ @@ -32351,15 +32391,15 @@ "repo": "meain/evil-textobj-tree-sitter", "unstable": { "version": [ - 20211029, - 514 + 20211105, + 1632 ], "deps": [ "evil", "tree-sitter" ], - "commit": "08823ff97277fe50540d8226c7d298e06fb14932", - "sha256": "0w0kj6nd2achp7s6h56vzjjb28c8m5i45laa11iph3g8avvyhf2c" + "commit": "b35565ab6c8e380227048256885bb7aa7e7fd72c", + "sha256": "17rbxqvrq9c8j34mycbjkzrd6cjpamldj6h8k1hyzm2ld97w6gqm" } }, { @@ -32381,6 +32421,28 @@ } }, { + "ename": "evil-tree-edit", + "commit": "43726f8e4c4f7f673ca892ec17329471dba77b3e", + "sha256": "126jkiy9jganamn9xv2d357mxipgbz9skpvygwb7lkhnvkz263dg", + "fetcher": "github", + "repo": "ethan-leba/tree-edit", + "unstable": { + "version": [ + 20211114, + 2308 + ], + "deps": [ + "avy", + "evil", + "s", + "tree-edit", + "tree-sitter" + ], + "commit": "6fd445dbeb158d05d785965077cc594aeeb73a61", + "sha256": "0h1zjdqxynxxlqdc9yxhmkjwarx4vn9anasv9i68fcmmnq7c0aw9" + } + }, + { "ename": "evil-tutor", "commit": "4b7bfffdc34e181893b8cf4d1cc091f6c3f91126", "sha256": "1hvc2w5ykrgh62n4sxqqqcdk5sd7nmh6xzv4mir5vf9y2dgqcvsn", @@ -32780,8 +32842,8 @@ "deps": [ "cl-lib" ], - "commit": "0a07f5489c66f76249e6207362614b595b80c230", - "sha256": "081p104ma9b7nzhs42y6zn8r8vz5dp7kz6vp79xdyl42w9dqinww" + "commit": "3a8d97c096c2c5714b667130fd8a80d5622ee067", + "sha256": "1fdfg9zblk82546fhmha84lz45g4nrgmqqq39jsr601axalfkl7q" }, "stable": { "version": [ @@ -32847,10 +32909,10 @@ }, { "ename": "exotica-theme", - "commit": "744e4cf9105c9eaafe2b49ca1f8d7d6b9c5be4a6", - "sha256": "0gkidf8jcv3j3cqhjkjcxg6hv0m8kspycffn9dvjxqn912n6ljks", + "commit": "c3543d83fa2e0ed2b8b313f3c9e7a2c6f42b5085", + "sha256": "0jf18siqbwilx9v0mlm6v5k03c1v9jm4xdlk183bnrad09rdw6qh", "fetcher": "github", - "repo": "zenobharat/exotica-theme", + "repo": "zenobht/exotica-theme", "unstable": { "version": [ 20180212, @@ -33787,8 +33849,8 @@ "repo": "jumper047/fb2-reader", "unstable": { "version": [ - 20211104, - 24 + 20211116, + 2053 ], "deps": [ "async", @@ -33797,8 +33859,8 @@ "s", "visual-fill-column" ], - "commit": "3d4f2aef7051ab35f63ed94fda19ab25d1182883", - "sha256": "01vjz1bq7lrf8ynrfyr8lvkll0z228p9qdwj933c3812wjwgk6ml" + "commit": "b93dfcacbe3ea1147642ee4e1dab2e2c36c4f6a3", + "sha256": "1c5i2w59kgs1pbhyxa0m0bny50kra2xlziydzpvryyddix94k4ld" } }, { @@ -33970,11 +34032,11 @@ "repo": "technomancy/fennel-mode", "unstable": { "version": [ - 20211101, - 1749 + 20211110, + 1728 ], - "commit": "777c19b8cbf48f3247f8bd47f61858581ad02b50", - "sha256": "0v9a6psnlbh9cyibp95k2frix29ma6b69cgivmh8z4nrp0ycywc7" + "commit": "2900e3c2d5554b115a0a3b181e74a27c76489f4d", + "sha256": "14in4r89aqx6gq8qlia2bgprr73ldj7nlyvz61np2zqn7kfw1nfq" }, "stable": { "version": [ @@ -34120,15 +34182,15 @@ "repo": "knpatel401/filetree", "unstable": { "version": [ - 20211025, - 2000 + 20211115, + 506 ], "deps": [ "dash", "helm" ], - "commit": "a7a71d875cb666bed34e2ec86ae7921d8af5c28a", - "sha256": "08lz5zksnc8728v8gxpmc587pi7i85iv7f35d46appffwc42hfra" + "commit": "4f97329cdc628d2b9424114a981d046daab50d61", + "sha256": "06hdllrg2xca7qq6m6f4xnjlb06ljn6lk7zypviy20qv7vmxa87s" } }, { @@ -34433,8 +34495,8 @@ "repo": "LaurenceWarne/finito.el", "unstable": { "version": [ - 20211015, - 937 + 20211107, + 1925 ], "deps": [ "async", @@ -34445,8 +34507,8 @@ "s", "transient" ], - "commit": "21a492d3e67e5e3ab59b75107d345142a4c3ac02", - "sha256": "02n3h2zvdf24jxmcpp0cjcfba54cs0isymcd4k4j68zywszwzp36" + "commit": "f1b280cfbcbbb0729a83d763f08e25ccdb4c399d", + "sha256": "0x8aysl2s0ixl72qbz924b59advxp3f6ifmwf41rn11rnqjdmlr0" }, "stable": { "version": [ @@ -36700,8 +36762,8 @@ "flycheck", "keg" ], - "commit": "bf2457d128dca207b3fb00a2660eb662327f877b", - "sha256": "0yc24n8mvppxni3hbfwk1p5spxqswax90l2v0gwc9wf20djmkdfq" + "commit": "f0a719892aed5b1b4b644f1339d1ace99c656100", + "sha256": "0vk4fdkai0ssq31ycckkz4iwp35ip5d8lnyisv4m3b98jv3pb6k0" } }, { @@ -36741,14 +36803,14 @@ "repo": "emacs-languagetool/flycheck-languagetool", "unstable": { "version": [ - 20210715, - 946 + 20211107, + 1001 ], "deps": [ "flycheck" ], - "commit": "4fcf88d131fd0e149a7f1c787c07f4e03ea24fe8", - "sha256": "0p1fmxgbpfh3bihpdaqd2dfsgi3s9x17nhb8439livfrjhqdhfhd" + "commit": "b6d0b1515418e5821241ac04143a12997c3bb240", + "sha256": "1klwi2ssjnjc5cirq201wl643w8cb32r42nmjhvxv4dgad14i659" }, "stable": { "version": [ @@ -39551,6 +39613,40 @@ } }, { + "ename": "fontsloth", + "commit": "f9c704d7509531a89ace039565152b5336a3f25a", + "sha256": "1kkcx9rycpcknyw1423d6k4dnbcpvkj3adzvgxl6a8h60q3i17v6", + "fetcher": "github", + "repo": "jollm/fontsloth", + "unstable": { + "version": [ + 20211102, + 511 + ], + "deps": [ + "f", + "logito", + "pcache" + ], + "commit": "e43c7ed8302841aefe45f2e6bf35f84d854868f5", + "sha256": "1r3rn65gmnj964wisjagknz46kqhnpma5byw7gyzl69s8gfaifg0" + }, + "stable": { + "version": [ + 0, + 15, + 3 + ], + "deps": [ + "f", + "logito", + "pcache" + ], + "commit": "8ce1802b356962296a492d90cc9ae62e06c7ae43", + "sha256": "106ry9gqp10fpf24zsh9aar3qr3q6lg1l7wj38sfc73saq71mi17" + } + }, + { "ename": "forecast", "commit": "a7ea18a56370348715dec91f75adc162c800dd10", "sha256": "0zng8xdficpfccq484pghzg8yylihcy8aq0vpxd1w6l40m2qf6zn", @@ -39639,8 +39735,8 @@ "repo": "magit/forge", "unstable": { "version": [ - 20211103, - 2319 + 20211111, + 2038 ], "deps": [ "closql", @@ -39653,8 +39749,8 @@ "transient", "yaml" ], - "commit": "760affa8de6dd4ccb1607d343e36b54296473074", - "sha256": "0139z7h835669f6msflnp940106s3x29k7kagiga413ijjiv140h" + "commit": "41efa674cff0b447efbc103494fd61ec9b9156ae", + "sha256": "0baaq8bf07aq80ll1q86q9dzzgkpn6j5jl1c1dssc04awg69kjsb" }, "stable": { "version": [ @@ -39854,14 +39950,14 @@ "repo": "rnkn/fountain-mode", "unstable": { "version": [ - 20211104, - 1141 + 20211105, + 1510 ], "deps": [ "seq" ], - "commit": "bf1849456f6c7587e15a44a0e5c7e1f93810a6e2", - "sha256": "1hm2qw11kka2sfafqqhxvbc7ksrgsz5x7difmrbx03ljnib6fvcg" + "commit": "e3e4509e95019b5a56fb6596cafad0a78ebf2c79", + "sha256": "199carn2y5kxqsmxwrjcgvq4ih5xk74k09akb7milnxhys0zhnlk" }, "stable": { "version": [ @@ -40095,14 +40191,14 @@ "repo": "Fuco1/free-keys", "unstable": { "version": [ - 20160726, - 2050 + 20211116, + 1501 ], "deps": [ "cl-lib" ], - "commit": "edfd69dc369b2647447b7c28c7c1163b1ddf45b4", - "sha256": "0xgifa7s9n882f9ymyyz9gc11xfbj3vfpnxiq1fqfm5hmwx9pwbc" + "commit": "7348ce68192871b8a69b687ec124d9f816d493ca", + "sha256": "0f99vykxvvcsdqs03ig5kyd3vdrclk8mcryn7b310ysg840ksrw8" }, "stable": { "version": [ @@ -40404,14 +40500,14 @@ "repo": "fsharp/emacs-fsharp-mode", "unstable": { "version": [ - 20211031, - 1617 + 20211115, + 1418 ], "deps": [ "s" ], - "commit": "e92e270c6c987497041fac65cded82146cd41dde", - "sha256": "0jzxdim6mpj984cmhxzpafig6dcaav5x98y59f4ji3dxc95qs6r7" + "commit": "0ba09a8124cee35cf81f55b4db9144efeb00a92f", + "sha256": "1y11q6zbmdfwswgy205f0iqsd5c4075zsf135vsnc7bpmmkpgcvw" }, "stable": { "version": [ @@ -41411,15 +41507,15 @@ "url": "https://alexschroeder.ch/cgit/gemini-write", "unstable": { "version": [ - 20211026, - 1639 + 20211114, + 1032 ], "deps": [ "elpher", "gemini-mode" ], - "commit": "169333a5c251c14a84286dea02a63d1a5e93cf54", - "sha256": "1mfg8yb03wr278x6whzqz0y68xsl2g5zdwak08j9a6yigib8pmcf" + "commit": "2a7d07d0ce4c5b8750f3ff1182ad94ee616734c8", + "sha256": "0jp16la1v4l8mdnxsia9w11a33s5jxs9rdgwp2snxq3h40wyv0is" } }, { @@ -41838,15 +41934,15 @@ "repo": "magit/ghub", "unstable": { "version": [ - 20211001, - 2224 + 20211106, + 2042 ], "deps": [ "let-alist", "treepy" ], - "commit": "192eff9da2c0f61813f3bc9c00913985c1804180", - "sha256": "1bc5z63ylb0ir5v9qngyl50svmlfd6hx9lv1ladwywncdpsslls8" + "commit": "4d6a4b2bc1d88b993c09c1cb47b575a08eb264ea", + "sha256": "1sdwpn917p92bh8cljl70zzxrwdy368p0w1ynsfp4x9xdkgc068f" }, "stable": { "version": [ @@ -42212,8 +42308,8 @@ "transient", "with-editor" ], - "commit": "2bd1d823ddebb0cfef31a3338916aaef9ae01660", - "sha256": "1d3hhsb7r7ch3q6azchvpjf885mfnqx6xg5wl3iqbyhhr0i8q7vj" + "commit": "9413847c1a085899d8de6f8d978bd7265f65e5d8", + "sha256": "0b39813iyxgq0ai6hz4hpf9f4wix1lhcp6z5p1cm6y6hd8dyg486" }, "stable": { "version": [ @@ -44112,8 +44208,8 @@ "cl-lib", "go-mode" ], - "commit": "34974346d1f74fa835d745514c9fe9afccce8dae", - "sha256": "1h0vyp3xbz6xx6warxi23w8kjjgkr0x1lr6r9a2qiz2rywn8jlxf" + "commit": "5bd8efab64352dccf31dbc99c4fc96d3b985ef27", + "sha256": "0j430sd72pkh00773yqrg1jllli9yccdf645yxrxsf3n3k95s603" }, "stable": { "version": [ @@ -44205,11 +44301,11 @@ "repo": "dominikh/go-mode.el", "unstable": { "version": [ - 20210509, - 2353 + 20211113, + 705 ], - "commit": "34974346d1f74fa835d745514c9fe9afccce8dae", - "sha256": "1h0vyp3xbz6xx6warxi23w8kjjgkr0x1lr6r9a2qiz2rywn8jlxf" + "commit": "5bd8efab64352dccf31dbc99c4fc96d3b985ef27", + "sha256": "0j430sd72pkh00773yqrg1jllli9yccdf645yxrxsf3n3k95s603" }, "stable": { "version": [ @@ -44328,8 +44424,8 @@ "deps": [ "go-mode" ], - "commit": "34974346d1f74fa835d745514c9fe9afccce8dae", - "sha256": "1h0vyp3xbz6xx6warxi23w8kjjgkr0x1lr6r9a2qiz2rywn8jlxf" + "commit": "5bd8efab64352dccf31dbc99c4fc96d3b985ef27", + "sha256": "0j430sd72pkh00773yqrg1jllli9yccdf645yxrxsf3n3k95s603" }, "stable": { "version": [ @@ -44454,10 +44550,10 @@ "stable": { "version": [ 0, - 2 + 3 ], - "commit": "b3174e09a03954b1423c4ea2f2936f9fcd94f381", - "sha256": "054l7m9slhznpfkixrnk6n5h8rc9x7gjsahizxvkd73q0jvgqxgn" + "commit": "8de1c3b660602b6739444ceed3e48214c417fe38", + "sha256": "0b8jbcs848ck0zbl6rmyyac3mbhx58zq04l7wvi7paficg9lphj9" } }, { @@ -44828,24 +44924,6 @@ } }, { - "ename": "gopher", - "commit": "8c01e1c5009e8a4fefe5169c8e97ead53f8f6621", - "sha256": "01b1mr8nn5yrq65y067slc7mvxigansbim0nha41ckyrkh8mw4fs", - "fetcher": "github", - "repo": "msnyder-info/gopher.el", - "unstable": { - "version": [ - 20190512, - 1351 - ], - "deps": [ - "w3m" - ], - "commit": "6f4accac226698b22e8388e41ad5723b12553dde", - "sha256": "02093q9dwbqjyq47j05cmxmw12690f4qqpwsj7qnqz15m9n4b6xc" - } - }, - { "ename": "gore-mode", "commit": "de09fcf14f778efe4247a93fb887b77050258f39", "sha256": "0nljybh2pw8pbbajfsz57r11rs4bvzfxmwpbm5qrdn6dzzv65nq3", @@ -45078,8 +45156,8 @@ "magit-popup", "s" ], - "commit": "14d8083c9ca296ce3c3e6d4fe21e455119f56db5", - "sha256": "0k8k22vwd0148sr8lnxjsvrhsp4byfb8icaqhk9cshws3g5hpb7w" + "commit": "7f4153164fcd6588e2245ca3f5b4aee7737f4367", + "sha256": "1wrmw1y6qp3s36s30v4dncn68mf5biykpwpf5sk3h7sh0ifgk8yv" }, "stable": { "version": [ @@ -45860,20 +45938,20 @@ "repo": "ROCKTAKEY/grugru", "unstable": { "version": [ - 20210617, - 1028 + 20211116, + 850 ], - "commit": "7efb041b826f15b10aa9cfb67b971fdc41064980", - "sha256": "175gfhi1621pclwvhbz2a8rramfb47v353x5hxjys1b0p848yk1l" + "commit": "7b63aa731bf7df528bb7d680ca3efe42ab4ead38", + "sha256": "0l60w8r5586af740vkcr11xj8ganws0hgbv4n7rn11mksr5idzwz" }, "stable": { "version": [ 1, - 20, + 21, 0 ], - "commit": "e7f0fca4bfd4815e5ed794f13f89b1e28ce57d26", - "sha256": "15h1h5gg369h2dm9yp97ac6l5qajm7f9c0s2cgpymv21gyx2ikr5" + "commit": "1225a06dcb10c600ab9c44fd3d7df25bcd74d704", + "sha256": "0b5dgy3la3jzfxvj4fsdjphqvymvs6zx8dsibvld5ydkj3cx4pfw" } }, { @@ -46905,68 +46983,6 @@ } }, { - "ename": "hasky-extensions", - "commit": "e3f73e3df8476fa231d04211866671dd74911603", - "sha256": "0ymigba1d0qkrk3ccd3cx754safzmx1v5d13976571rszgmkvr15", - "fetcher": "github", - "repo": "hasky-mode/hasky-extensions", - "unstable": { - "version": [ - 20190204, - 2016 - ], - "deps": [ - "avy-menu" - ], - "commit": "4a0d1d9beb3be8ff4a1857eb920c916734dcc8e1", - "sha256": "1sp07lqvxxcl625qr9ka7idvci3j0p77ll90pwzykr5cs7r3lzl2" - }, - "stable": { - "version": [ - 0, - 2, - 0 - ], - "deps": [ - "avy-menu" - ], - "commit": "65bf7bc3967cbda23789d6c505daf73eed9a43aa", - "sha256": "0r91hcm265xa8amdfi44pn0cqf4m9zigzqx1ldgg8qd6l9r2hbh7" - } - }, - { - "ename": "hasky-stack", - "commit": "c3faf544872478c3bccf2fe7dc51d406031e4d80", - "sha256": "08ds0v5p829s47lbhibswnbn1aqfnwf6xx7p5bc5062wxdvqahw8", - "fetcher": "github", - "repo": "hasky-mode/hasky-stack", - "unstable": { - "version": [ - 20190304, - 2248 - ], - "deps": [ - "f", - "magit-popup" - ], - "commit": "9ef133ed831a95a2b9990a46a3c57f1918d0274f", - "sha256": "08h795hplyy7d0yqxvdfx3ylb7gkjplyriyq0w9dsv6ggvmc5hhl" - }, - "stable": { - "version": [ - 0, - 9, - 0 - ], - "deps": [ - "f", - "magit-popup" - ], - "commit": "a3176aece9a9ab0a36ae795965f83f4c1fa243bf", - "sha256": "1j9cvy95wnmssg68y7hcjr0fh117ix1ypa0k7rxqn84na7hyhdpl" - } - }, - { "ename": "hass", "commit": "d9f55bfa87d6fbaeafe713f8862369ea013a0c67", "sha256": "1jmxngfjad8vqd6abgqhf2a8x3vysxfhwk4qs0c327qfazmd7vq3", @@ -47184,30 +47200,30 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20211031, - 1714 + 20211116, + 1616 ], "deps": [ "async", "helm-core", "popup" ], - "commit": "349663e85eddb40ed6ae78329e6abc47513b17f1", - "sha256": "0as1wk8crs9yizn1h6pqj60z4df59f6m632kfcnwl08yvzhiva3n" + "commit": "ab2592262f4f62498f3261993eb249bb4c60c8ba", + "sha256": "0d5accmbidapgxj9fbrn5cdcfy3i0993sxrafnj2x8cb8px1lrg4" }, "stable": { "version": [ 3, 8, - 0 + 1 ], "deps": [ "async", "helm-core", "popup" ], - "commit": "0714e27fe703a42fa52caf6daa0921d544a55402", - "sha256": "1xrpv0sqmlwn94bc31k2iav284i1hl95937541ihlkhqg6v2vwrv" + "commit": "52dcf9e27c1a10be058efa0cf790510bbfeb89e7", + "sha256": "1yfr2vz1kd21rvnxi8xzv67gs5r599fhjmw8qphsmpv5afscfl7k" } }, { @@ -48092,26 +48108,26 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20211017, - 530 + 20211114, + 1507 ], "deps": [ "async" ], - "commit": "349663e85eddb40ed6ae78329e6abc47513b17f1", - "sha256": "0as1wk8crs9yizn1h6pqj60z4df59f6m632kfcnwl08yvzhiva3n" + "commit": "ab2592262f4f62498f3261993eb249bb4c60c8ba", + "sha256": "0d5accmbidapgxj9fbrn5cdcfy3i0993sxrafnj2x8cb8px1lrg4" }, "stable": { "version": [ 3, 8, - 0 + 1 ], "deps": [ "async" ], - "commit": "0714e27fe703a42fa52caf6daa0921d544a55402", - "sha256": "1xrpv0sqmlwn94bc31k2iav284i1hl95937541ihlkhqg6v2vwrv" + "commit": "52dcf9e27c1a10be058efa0cf790510bbfeb89e7", + "sha256": "1yfr2vz1kd21rvnxi8xzv67gs5r599fhjmw8qphsmpv5afscfl7k" } }, { @@ -52185,11 +52201,11 @@ "repo": "hlissner/emacs-hide-mode-line", "unstable": { "version": [ - 20190922, - 115 + 20211112, + 1400 ], - "commit": "88888825b5b27b300683e662fa3be88d954b1cea", - "sha256": "0dfzjgxfkcw4wisbyldsm1km18pfp9j8xgadn6qnsz11l55bpgyp" + "commit": "bc5d293576c5e08c29e694078b96a5ed85631942", + "sha256": "12mfhg0r3gvy59ijy44vsircn251nmisp04k9vvgd2yhykpsr1j6" }, "stable": { "version": [ @@ -54025,14 +54041,14 @@ "repo": "zzkt/i-ching", "unstable": { "version": [ - 20210222, - 1519 + 20211112, + 1528 ], "deps": [ "request" ], - "commit": "51a3180ed07ae9f8b7ff3f2b822d998495864a07", - "sha256": "1rrykszzcyvrmks2clrpdq5kdldcqp38wc908bhq2b4qw7w3d7sw" + "commit": "39fd7daf1efd761336616c870cc5b8871422d95e", + "sha256": "18b9n5w36zdsaxc63nhsry2i1s28a4y21sc6cj7rawvd8zyxargv" } }, { @@ -54876,8 +54892,8 @@ "cl-lib", "prop-menu" ], - "commit": "8553aef4e4bd22e35a236413b09980c6f93a9041", - "sha256": "15r63yqaslsdg760xiwrg2d7cxiiyvzrjzfmnfx8zwg32nfpkh1b" + "commit": "2e4b5c6a979b04d9383c44423388f6cb0988f14f", + "sha256": "0bl6wz05m325h2y4in7fv280p73a2iv2k52jg7qp26aggmpfrjxa" }, "stable": { "version": [ @@ -54915,11 +54931,11 @@ "repo": "victorhge/iedit", "unstable": { "version": [ - 20210812, - 735 + 20211116, + 11 ], - "commit": "2f504c966e7f640dcd6ecbf40a6a1a05ea286de0", - "sha256": "08lgv18584ksgkz0r39vc6xfjid93v0z3wbds38iynaayimr3p68" + "commit": "012de2e8d8519e850a790f8a2c71a5b08358c29c", + "sha256": "00b1hmr8p6fwydppql75cqkcqbnc89271b7h1kydgnwm7pcg177w" }, "stable": { "version": [ @@ -57467,8 +57483,8 @@ "migemo", "nadvice" ], - "commit": "a2ce15abe6a30fae63ed457ab25a80455704f28e", - "sha256": "18j3h2ndrw92gpbd9q5ji6q8qrwqmzw2xw8yds8f0fd8aybkw8zz" + "commit": "b91f341d1b70175baf989f0c6eee6573bf781a27", + "sha256": "0svvh14zhym9ssc0dc7wyr1pw0rhiirn2s7a0xk43wl2r0c36cgj" }, "stable": { "version": [ @@ -57782,8 +57798,8 @@ "espotify", "ivy" ], - "commit": "5bf63dacc5df8a74860e80dabd16afce68a24a36", - "sha256": "1vxg86wv6f96bva0d1xxhisk525chwhdl4nq77xhriflq65mcmi3" + "commit": "5c1dcf0182135cda4191d4ba206fe2f265100293", + "sha256": "06wj2pixhjgqddl9g2wkv7cq9gz9yjb46cb1jrlbya3rdjyfb6h5" } }, { @@ -59134,14 +59150,14 @@ "repo": "mooz/js2-mode", "unstable": { "version": [ - 20210906, - 2337 + 20211105, + 1214 ], "deps": [ "cl-lib" ], - "commit": "a059c4105b374ce037b4cc0c942f9aed96508021", - "sha256": "0cghwxk43jzajb5f5l4904bl2p95bdcld2qc25r08a5d34jidvl1" + "commit": "d2636f95ebe4d423dc9b4311aff248c7688271c5", + "sha256": "1p293jhzsqzn4kljz1nl87jg1aq35jzqzs31ryfi8dn8iicwyd85" }, "stable": { "version": [ @@ -59349,6 +59365,36 @@ } }, { + "ename": "json-par", + "commit": "db033df8bb4e12f8ba39accc42f285d8037268c5", + "sha256": "1d4jl6pllvsa5b132c9ygr5x5c7n49gz15w70fgdbkzm1gh17n7r", + "fetcher": "github", + "repo": "taku0/json-par", + "unstable": { + "version": [ + 20211106, + 535 + ], + "deps": [ + "json-mode" + ], + "commit": "45902f2f36d4a90662caaaca6612b762ccb5b34e", + "sha256": "1p46pylidl035bhxv73867iw206ddriziplcv347rqj39drknlix" + }, + "stable": { + "version": [ + 2, + 0, + 1 + ], + "deps": [ + "json-mode" + ], + "commit": "85a5288bea5c579b2bfdd7be16bdfc18a58b3a26", + "sha256": "0fbrgxd2n45smq7im6qas6nnzrxv3397rxp1snx7pk58vz4v980h" + } + }, + { "ename": "json-process-client", "commit": "a681f977631344190e2a35d9ac2cbb9a42402272", "sha256": "0nf0lna15ymcn8wniz24ixxwr1qaznic9nym1q16ifwl72qryj79", @@ -59653,8 +59699,8 @@ "repo": "gcv/julia-snail", "unstable": { "version": [ - 20211103, - 449 + 20211110, + 1407 ], "deps": [ "dash", @@ -59663,8 +59709,8 @@ "spinner", "vterm" ], - "commit": "74aa827032e34f1d4202831008bcfa3c29b9f0c8", - "sha256": "03rmj7pj91bhg1kzqha9l5glnxgrjqmbsmblamrka4k22r09pcn6" + "commit": "55458e9c8fbeebb33ffeb291d40c529f2b006c8d", + "sha256": "0b9khsza4zfxdi03i5gx6s1g0f27qg71vmj4f4gcqkgdhfxxy4yb" }, "stable": { "version": [ @@ -59844,8 +59890,8 @@ "repo": "nnicandro/emacs-jupyter", "unstable": { "version": [ - 20210422, - 1451 + 20211116, + 150 ], "deps": [ "cl-lib", @@ -59853,8 +59899,8 @@ "websocket", "zmq" ], - "commit": "20e68a683632d4772780199216932223fa404aa7", - "sha256": "1ivq67cbkvb675sllrs1184a32agvh3c2i950vf017jjf1hab05k" + "commit": "f178c1c7b8d9a0c0b77e38dc03524db3d2c8288a", + "sha256": "1vmg6bq8w9aw5r9plnvslvhq1ykj5m5srz67qn9jbn54lx7qq08p" }, "stable": { "version": [ @@ -60410,11 +60456,11 @@ "repo": "conao3/keg.el", "unstable": { "version": [ - 20211104, - 617 + 20211105, + 316 ], - "commit": "bf2457d128dca207b3fb00a2660eb662327f877b", - "sha256": "0yc24n8mvppxni3hbfwk1p5spxqswax90l2v0gwc9wf20djmkdfq" + "commit": "f0a719892aed5b1b4b644f1339d1ace99c656100", + "sha256": "0vk4fdkai0ssq31ycckkz4iwp35ip5d8lnyisv4m3b98jv3pb6k0" } }, { @@ -60428,8 +60474,8 @@ 20200601, 333 ], - "commit": "bf2457d128dca207b3fb00a2660eb662327f877b", - "sha256": "0yc24n8mvppxni3hbfwk1p5spxqswax90l2v0gwc9wf20djmkdfq" + "commit": "f0a719892aed5b1b4b644f1339d1ace99c656100", + "sha256": "0vk4fdkai0ssq31ycckkz4iwp35ip5d8lnyisv4m3b98jv3pb6k0" } }, { @@ -60888,20 +60934,20 @@ "repo": "hperrey/khalel", "unstable": { "version": [ - 20211003, - 1150 + 20211114, + 1233 ], - "commit": "c6f2adfd7211c747d443bf85618833820078ca4b", - "sha256": "0f76a9zr76azhb8rkzs24afscnx0sdypmha1z03cidn4mcz00sdb" + "commit": "313f74b17580c2a55f5c068e1bda17821b50c31e", + "sha256": "0m4448qvlh06n26l8l8hax4ir08mbai17mdi6inzvch7b09p0gpl" }, "stable": { "version": [ 0, 1, - 5 + 6 ], - "commit": "c6f2adfd7211c747d443bf85618833820078ca4b", - "sha256": "0f76a9zr76azhb8rkzs24afscnx0sdypmha1z03cidn4mcz00sdb" + "commit": "313f74b17580c2a55f5c068e1bda17821b50c31e", + "sha256": "0m4448qvlh06n26l8l8hax4ir08mbai17mdi6inzvch7b09p0gpl" } }, { @@ -61090,8 +61136,8 @@ 20210318, 2106 ], - "commit": "e8725996ac8cc8d533ba91f1e8325b74928d0b7d", - "sha256": "0px17zsy1dawgkm5zjbkg8j4zbsgiswkfcwrg1dxp0bf1b3my1j6" + "commit": "74057b9fcf7cbe3ec2f17c86e7a3da93b40e372b", + "sha256": "18n1xpcs8z7pmc2k35c343qsjai0rgyc1jgsc35j9z2xqzq6mpji" }, "stable": { "version": [ @@ -61456,8 +61502,8 @@ "repo": "kubernetes-el/kubernetes-el", "unstable": { "version": [ - 20211031, - 133 + 20211114, + 420 ], "deps": [ "dash", @@ -61466,8 +61512,8 @@ "transient", "with-editor" ], - "commit": "cfe2aff207d22af0be08835302a74bc52a30f69a", - "sha256": "1jfg73vam49rg4kw88mvh4arlf02w8vsgyxnqwr4f3112x3m1r76" + "commit": "4b740d88c6dcb091d701f74ddcf53e3732999ac9", + "sha256": "1l5rbgagdi6gfp8prj01pcgh4k3k90aijrrq5b8nkqppxiq85kh7" }, "stable": { "version": [ @@ -61501,8 +61547,8 @@ "evil", "kubernetes" ], - "commit": "cfe2aff207d22af0be08835302a74bc52a30f69a", - "sha256": "1jfg73vam49rg4kw88mvh4arlf02w8vsgyxnqwr4f3112x3m1r76" + "commit": "4b740d88c6dcb091d701f74ddcf53e3732999ac9", + "sha256": "1l5rbgagdi6gfp8prj01pcgh4k3k90aijrrq5b8nkqppxiq85kh7" }, "stable": { "version": [ @@ -61777,16 +61823,16 @@ "repo": "Deducteam/lambdapi", "unstable": { "version": [ - 20211029, - 1658 + 20211116, + 1414 ], "deps": [ "eglot", "highlight", "math-symbol-lists" ], - "commit": "6b453ab1f1fd0c48bb18ce077009e038c649cf04", - "sha256": "13bprd1vg4adr61hbcbih3p2yghlx4ygw5zi0vgcfr2r4lbpnn6k" + "commit": "dcb95cd0605cad14fe491903b40a13fad61e382d", + "sha256": "0lw9rydgfr6rf5579ac1jvz0449m52swhp0ad16wlxlrfi0k4iiw" } }, { @@ -62293,11 +62339,11 @@ "repo": "conao3/leaf.el", "unstable": { "version": [ - 20211030, - 621 + 20211115, + 1551 ], - "commit": "61365188be30c34c0e8b6f2004488e60a83dfcd6", - "sha256": "1fps4pmwhciksk21b9w7y6y827panf8xr80rk14fjsf2j2bpv841" + "commit": "7d8f768db5077bdb9f595cbf841018fc600ecf77", + "sha256": "15f0q4dlybqb3k17sgaj9vp42mgvrh72mqzs5sh49lxi000bdhkh" }, "stable": { "version": [ @@ -62417,14 +62463,14 @@ "repo": "conao3/leaf-tree.el", "unstable": { "version": [ - 20210503, - 531 + 20211105, + 19 ], "deps": [ "imenu-list" ], - "commit": "8126baf45c881fd4a692c2d74f9cc2eb15170401", - "sha256": "1vb5id0y9002yabkxijfi0l8vbibbd863kq4qk3gqax9dgbld481" + "commit": "89c3b8842df067bba67663d309f43aa311acdccd", + "sha256": "0him39wsl65nmml9as8gfrix707xjxwvjkwmrgxc9qfjwcxvbvsj" }, "stable": { "version": [ @@ -62847,8 +62893,8 @@ 20210729, 1808 ], - "commit": "25c8d839cf78332c15b5762024ccb5f7c90b7a11", - "sha256": "14x4a6dw9ywzl16f4blg7bmb0rvvik5jjldilshjdxf4zpvy80fd" + "commit": "a49235c918d626f5053344604cb1c464960762af", + "sha256": "1b4k80bm2p7sqh33dx72qag7056nlxqv9s8czql2qfvi8vlnwzz0" } }, { @@ -63144,20 +63190,20 @@ "repo": "ligolang/ligo", "unstable": { "version": [ - 20211011, - 954 + 20211116, + 1344 ], - "commit": "faad1b26fd53121bd65e938ad4a4e78281712bde", - "sha256": "0bm2hxk2fhr11q2v45issa268snz0mxjhyc3ik2w8kg12faz936g" + "commit": "f5d298df9bb9acf9a1fc734c75a8f033f3eae3e5", + "sha256": "1lg6r78f7c4d4dzkpv3260p9j32f7rc51v4c5bajkblq379yn98r" }, "stable": { "version": [ 0, - 28, + 29, 0 ], - "commit": "16fee65109043bc5d899c5f34dd10354bd087615", - "sha256": "0bm2hxk2fhr11q2v45issa268snz0mxjhyc3ik2w8kg12faz936g" + "commit": "e1bcb971b9f964bc927c9d12fcf377a1878c459f", + "sha256": "1lg6r78f7c4d4dzkpv3260p9j32f7rc51v4c5bajkblq379yn98r" } }, { @@ -63168,16 +63214,16 @@ "repo": "emacs-vs/line-reminder", "unstable": { "version": [ - 20211025, - 1745 + 20211116, + 614 ], "deps": [ "fringe-helper", "ht", "indicators" ], - "commit": "593bbe1277651e1281807f84e46a4e9a75ced784", - "sha256": "1r8dkbca9abjs5g949hqkn54ggd2wmgl60h10jx8y9s6c07g14hq" + "commit": "41783a2ecd76c2d02ad87295bb8719eda1ee4ed3", + "sha256": "1v8x2kf0w5vwl4myiwraq5b1nyfx0b0fgwpzvb9bnjjdj2nsk36p" }, "stable": { "version": [ @@ -63694,20 +63740,20 @@ "repo": "publicimageltd/lister", "unstable": { "version": [ - 20211028, - 1659 + 20211106, + 2151 ], - "commit": "22df7ad4a7cccd5e5861a37127263317ef6bea2a", - "sha256": "07im7gnrn8n8hsaf7zyfj7h1r5ig0bw7p0g26sicgwgbhfnz22y9" + "commit": "5ae4f8bcfad02eee81a18c15c921637bb4269c13", + "sha256": "04lxz74v8axkn0ahgaan0bxkxyxcfp7ny2kxx9sxm0yg77c26gzl" }, "stable": { "version": [ 0, 9, - 1 + 3 ], - "commit": "4c442c18ed5e4865393e72ffff16de9919b54456", - "sha256": "07h55vsfmpf4r1dggjn4a0xxpxahbj1amyfywbf21wx59p17aja8" + "commit": "f9271f641f82cca9cdf8dd5737dc6dcf77aa5a1d", + "sha256": "1mmph8q1ff3bvsfggff74k7zadn020imyj63p1g1swp5a3bs6yyq" } }, { @@ -63982,20 +64028,20 @@ "repo": "donkirkby/live-py-plugin", "unstable": { "version": [ - 20211102, - 152 + 20211112, + 1745 ], - "commit": "bd933c7351751eecc0f988166e983a9e478531be", - "sha256": "1apdjil570i9kjl4hm952cp5rjh68vhi23a1mq1d0vna4sc6pzl1" + "commit": "61e043c705dc8804ee7c6f78ed3f374b325d5917", + "sha256": "0hj36x4aall7phvd9mi58scmzr42xc0zzs8jh16nq3i2xd8p0rqd" }, "stable": { "version": [ 4, - 4, + 5, 0 ], - "commit": "26d51013e75ddedd5eb8600a0a3dd035319f9d3f", - "sha256": "10p4ijx4l56ikb10416bmdwfxbcyqfa29kk1nf48gibxyvdlwdby" + "commit": "660dd193cdb51979145a548f495ab02917bc4613", + "sha256": "10qcggakqv4fm96mjz72x7rrvgphizdnd4n03gm3hhvc2yw3qma9" } }, { @@ -64736,8 +64782,8 @@ "repo": "emacs-lsp/lsp-dart", "unstable": { "version": [ - 20211009, - 2036 + 20211113, + 1440 ], "deps": [ "dap-mode", @@ -64747,8 +64793,8 @@ "lsp-mode", "lsp-treemacs" ], - "commit": "e2f4ee0d3a88956afdd8515a055678b06f947bf0", - "sha256": "0ma0q36q7i0bxbxx525h8s0y0p63pc1hnc5bidbdykrp3hlxw50c" + "commit": "9c3ba0a27e8ad3b7fa16c553d8a1815db82b8638", + "sha256": "13f6a9fkhasdzh4y5rix8j151csj1x6y2qlld6lvbxgpln19zwz2" }, "stable": { "version": [ @@ -64935,8 +64981,8 @@ "repo": "emacs-lsp/lsp-java", "unstable": { "version": [ - 20211017, - 1826 + 20211114, + 1305 ], "deps": [ "dap-mode", @@ -64948,8 +64994,8 @@ "request", "treemacs" ], - "commit": "2b789750b272c85e838b9fc4e3d4f1d2eff34b5b", - "sha256": "1sqv15mbv9f6pw995jrmw3wqr16pkrkm83vgabc0wi7j3dkz1cx7" + "commit": "3246272b43659ce3020e6f47cd3eea17432b389a", + "sha256": "0kz2bhnijar7dkyqydfq66xp8isf90paaqy0kwzjrb9ss0bglsba" }, "stable": { "version": [ @@ -65124,8 +65170,8 @@ "repo": "emacs-lsp/lsp-metals", "unstable": { "version": [ - 20210914, - 1821 + 20211112, + 1442 ], "deps": [ "dap-mode", @@ -65137,8 +65183,8 @@ "scala-mode", "treemacs" ], - "commit": "695291761b2a3db734c3f53bb7fc4acfe0a5eb94", - "sha256": "0kg51yjrjrmsz78aj3ahbk2knrn8ccz4ccs894p8li6vz3gxm2fh" + "commit": "38dda2c22db66547d99e3cfa6b7e76c42e7c6b5a", + "sha256": "0p2pz6272h2rbb1si9psb4rh92mahlcr58slkm2mwqjwwbi5hfjl" }, "stable": { "version": [ @@ -65168,8 +65214,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20211103, - 1331 + 20211115, + 807 ], "deps": [ "dash", @@ -65179,8 +65225,8 @@ "markdown-mode", "spinner" ], - "commit": "293a43819a96eb94b90bc14b6cb11ebfd090e8c8", - "sha256": "0rd3nh9wslp753cm5xypp9h8x2p7a5s7v6gkdqfs80fzdiy8ny3m" + "commit": "a7effcc79114e91e74f06ef3a7e078bafba05c2a", + "sha256": "09kjprvbdcv6h27fi24bfg0yl37djmfkic3a3ymfzl2r52gfkchv" }, "stable": { "version": [ @@ -65448,14 +65494,14 @@ "repo": "merrickluo/lsp-tailwindcss", "unstable": { "version": [ - 20211003, - 305 + 20211117, + 321 ], "deps": [ "lsp-mode" ], - "commit": "8b45d5ab6ad41f881ef52983d6906193736e6f41", - "sha256": "07ggss18zvmxv7r2x3m5x07c994sjwq0bfjjq50j7kfnd53bmb4h" + "commit": "bee8bf1f6707362ace02563b4dfc481e7452f936", + "sha256": "0rvwp8859p0byypy83mw42akjvv54ifx0gd3f4vb9vvp879rmsfi" }, "stable": { "version": [ @@ -66034,8 +66080,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20211101, - 1824 + 20211115, + 1701 ], "deps": [ "dash", @@ -66044,8 +66090,8 @@ "transient", "with-editor" ], - "commit": "2bd1d823ddebb0cfef31a3338916aaef9ae01660", - "sha256": "1d3hhsb7r7ch3q6azchvpjf885mfnqx6xg5wl3iqbyhhr0i8q7vj" + "commit": "9413847c1a085899d8de6f8d978bd7265f65e5d8", + "sha256": "0b39813iyxgq0ai6hz4hpf9f4wix1lhcp6z5p1cm6y6hd8dyg486" }, "stable": { "version": [ @@ -66410,8 +66456,8 @@ "libgit", "magit" ], - "commit": "2bd1d823ddebb0cfef31a3338916aaef9ae01660", - "sha256": "1d3hhsb7r7ch3q6azchvpjf885mfnqx6xg5wl3iqbyhhr0i8q7vj" + "commit": "9413847c1a085899d8de6f8d978bd7265f65e5d8", + "sha256": "0b39813iyxgq0ai6hz4hpf9f4wix1lhcp6z5p1cm6y6hd8dyg486" }, "stable": { "version": [ @@ -66578,8 +66624,8 @@ "deps": [ "dash" ], - "commit": "2bd1d823ddebb0cfef31a3338916aaef9ae01660", - "sha256": "1d3hhsb7r7ch3q6azchvpjf885mfnqx6xg5wl3iqbyhhr0i8q7vj" + "commit": "9413847c1a085899d8de6f8d978bd7265f65e5d8", + "sha256": "0b39813iyxgq0ai6hz4hpf9f4wix1lhcp6z5p1cm6y6hd8dyg486" }, "stable": { "version": [ @@ -67374,11 +67420,11 @@ "repo": "minad/marginalia", "unstable": { "version": [ - 20211028, - 1244 + 20211114, + 1401 ], - "commit": "09d8ab38a5a4aa55a83968dc3e454d11fee05255", - "sha256": "140hbxyb7z09vp0f0h5fad4jiyfz4s34nnhgrw3vpm1whspq7ng8" + "commit": "8b24ffc91222f8a61f8f2aa3c3662198c7d74de9", + "sha256": "0kpa0h53jk01x786s8lw7ibcrb78h9ndah9i7lvr6jx0r6v30vkq" }, "stable": { "version": [ @@ -68410,16 +68456,16 @@ "repo": "meow-edit/meow", "unstable": { "version": [ - 20211104, - 807 + 20211116, + 1952 ], "deps": [ "cl-lib", "dash", "s" ], - "commit": "95a9df3e469355cb867724d1dd1139ec4e21540d", - "sha256": "0s231294mgf951y5swqr3hrh1q48ip5p8w4vvj3kqjsq15n0lw3s" + "commit": "f1c81c35141e6c669a36b5ebcc04ead8cf7d7364", + "sha256": "1353qfvind0xwdl7ig2hb36236bdfv242kij5lwy7z6kqg1d6z0s" } }, { @@ -68433,8 +68479,8 @@ 20210720, 950 ], - "commit": "27600243558e2596a6bbdc52540389c298488adb", - "sha256": "0fn66n8ln0xc4l25l48yshzrmyy7sf7ik9nqpfhhpzslcf249h39" + "commit": "a5c440c12758a7dd7d698b843e05aa4eb6d4e721", + "sha256": "1czqd9g6f346a96klrsb31xscy23r2ix6xfx9ks6h0fkxyw7prqa" }, "stable": { "version": [ @@ -68463,8 +68509,8 @@ "auto-complete", "merlin" ], - "commit": "27600243558e2596a6bbdc52540389c298488adb", - "sha256": "0fn66n8ln0xc4l25l48yshzrmyy7sf7ik9nqpfhhpzslcf249h39" + "commit": "a5c440c12758a7dd7d698b843e05aa4eb6d4e721", + "sha256": "1czqd9g6f346a96klrsb31xscy23r2ix6xfx9ks6h0fkxyw7prqa" }, "stable": { "version": [ @@ -68497,8 +68543,8 @@ "company", "merlin" ], - "commit": "27600243558e2596a6bbdc52540389c298488adb", - "sha256": "0fn66n8ln0xc4l25l48yshzrmyy7sf7ik9nqpfhhpzslcf249h39" + "commit": "a5c440c12758a7dd7d698b843e05aa4eb6d4e721", + "sha256": "1czqd9g6f346a96klrsb31xscy23r2ix6xfx9ks6h0fkxyw7prqa" }, "stable": { "version": [ @@ -68560,8 +68606,8 @@ "iedit", "merlin" ], - "commit": "27600243558e2596a6bbdc52540389c298488adb", - "sha256": "0fn66n8ln0xc4l25l48yshzrmyy7sf7ik9nqpfhhpzslcf249h39" + "commit": "a5c440c12758a7dd7d698b843e05aa4eb6d4e721", + "sha256": "1czqd9g6f346a96klrsb31xscy23r2ix6xfx9ks6h0fkxyw7prqa" }, "stable": { "version": [ @@ -68918,8 +68964,8 @@ 20210131, 2152 ], - "commit": "5927a54208996cbb7b435fe89bb65ac8beb61bb6", - "sha256": "1dhz1yfy3gbmpf4nrys11166wzylv5vl1sg1sncwgq67r8zf729x" + "commit": "0652273fe1bfbeb165715613e00583b96ed07c2d", + "sha256": "1qr1zg0ppl6xlg91a21j4dlbysglwyjs8x139b2gyf95xlfkxpkw" }, "stable": { "version": [ @@ -69321,20 +69367,20 @@ "repo": "tarsius/minions", "unstable": { "version": [ - 20211022, - 2311 + 20211110, + 142 ], - "commit": "3cc45f82cb50a4c895fe5df2ed69e07481ea131b", - "sha256": "0pl0lyzwb2ngqbh6kkx4kr6im19kqmnkpybss353947vl2njlbd6" + "commit": "fca3ba548dccc6e553affca8068c9aecb6a9a789", + "sha256": "1bzxxs8mxaihpjkbxgynhsi39lbbnij28grdc3sk9sq09j9752vw" }, "stable": { "version": [ 0, 3, - 6 + 7 ], - "commit": "1be68e8571336672d6cbec86246d1bf7844976be", - "sha256": "0lg704kwc851spp69745np8hsk0h6rl2hvfpid0j412278ds1qi8" + "commit": "fca3ba548dccc6e553affca8068c9aecb6a9a789", + "sha256": "1bzxxs8mxaihpjkbxgynhsi39lbbnij28grdc3sk9sq09j9752vw" } }, { @@ -69435,11 +69481,11 @@ "repo": "hlissner/emacs-mips-mode", "unstable": { "version": [ - 20180502, - 1457 + 20211114, + 1645 ], - "commit": "75152fc78baa762af4f83602f6cb3c8b9bcebca3", - "sha256": "1bk1jfqwwrq3jr6zasyjaz16rjjqbihrn7kakgfk3szv6grvsd7p" + "commit": "5676174bea9a5780ddd33d2d8111b8678dfa4e99", + "sha256": "0nlxhchcy3swmyfzdd8qmdzq05a4lzlgs1psnsvfjbbi9w8g8w5v" }, "stable": { "version": [ @@ -69982,11 +70028,11 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20211104, - 736 + 20211114, + 1209 ], - "commit": "ef234d41fd2d45f32e7c40e6f334231916c9dad9", - "sha256": "068im2wq70rfac8l1a6542ishjay3apgx4hqga22x5bvb4kq6351" + "commit": "a70c6d0f752859c6de2c175dd9b71a66bf28ed97", + "sha256": "05l919641qn2dm6b328i6ymb2xgc42jbvpdvnwypi9brydnz7zm9" }, "stable": { "version": [ @@ -70242,11 +70288,11 @@ "repo": "caffo/monotropic-theme", "unstable": { "version": [ - 20181015, - 1230 + 20211116, + 1328 ], - "commit": "36df566aa8225e303f6c9d90c00740dd678a415e", - "sha256": "05n8s3719f6yrh4fi5xyzzlhpsgpbc60mmfmzycxlb4sinq9bfks" + "commit": "f32a04b5bfee9cbcce4b223f17228d1142a28211", + "sha256": "0kfgj6h3jvivbssh27fi4nyqfqrbj6das79i6syywwqf200h29rl" } }, { @@ -70617,8 +70663,8 @@ 20210306, 1053 ], - "commit": "5e7fdb7551b1928d09eaf2114f19601458bc6c31", - "sha256": "1jab8w5mbh4x0kc8sfidd29609d2m9m06mv03fh4q6wip4rfkl24" + "commit": "3dc692847d53e209ef9010791c3ab5ac06fd979b", + "sha256": "0pcf2vnq38jdnsg8vz92pqsx7qd0r9x8jv5kfqk9br153vsh6xgd" }, "stable": { "version": [ @@ -71298,14 +71344,14 @@ "repo": "ReanGD/emacs-multi-compile", "unstable": { "version": [ - 20211027, - 1954 + 20211113, + 2119 ], "deps": [ "dash" ], - "commit": "3f936abeb3e910cd6221f99ced30004b41bd9ffa", - "sha256": "0hk0mxwza04vqxmr4c8z5l1mbwy3kmffkn7mw75k005fl9apj56x" + "commit": "360e44b200d07da379c906856d37613d0f06a9ae", + "sha256": "0z2b26qr712j4745wlnqisc53fhh2gh088j6024b00n006fr1lzq" } }, { @@ -71491,14 +71537,14 @@ "repo": "magnars/multiple-cursors.el", "unstable": { "version": [ - 20210323, - 1128 + 20211112, + 2223 ], "deps": [ "cl-lib" ], - "commit": "588daf8c520f4545323e36b8900f02693ddcf5d3", - "sha256": "0yinp3148sa72ckmaycgfy7sw3pccz6h5bl7kiz5j54hfk66hsxk" + "commit": "8a60fc7ef0ae6e5ca089a7c95264cd0ae83e7274", + "sha256": "14yayh8hmv00f27kgz5y57z035ccv94cmsgqpyl15p1vnwiq2if3" }, "stable": { "version": [ @@ -72992,11 +73038,11 @@ "repo": "m-cat/nimbus-theme", "unstable": { "version": [ - 20211014, - 1848 + 20211115, + 430 ], - "commit": "b9e383b4fcc7a3232f9943aed29586a760602a1d", - "sha256": "1kmcpndqh4072nkkji2vxd2br0wyp4ih3b7r4rx90mrimpdvcbrm" + "commit": "fe8ebe24cecb0181f49446de0a0faf3cd7630747", + "sha256": "1c7y0b880572sxjqqsqf521yhb1jfhl4i7sm4nfysa85bnn6k5n2" } }, { @@ -73010,8 +73056,8 @@ 20181024, 1439 ], - "commit": "0cd88287a4cd77d11c92c7a9b44bb15fb787a1ee", - "sha256": "0c93b83zc1x22bq04fnka497qi0v4bs57nvsz9gbanqxng4b4gf7" + "commit": "e5935b63757f3a788bc56d2c7afd9e390daf2f07", + "sha256": "0arrxdpf4mcbr3mhl5955xiyw8772r571hvamacdln3cz044lr3p" }, "stable": { "version": [ @@ -73109,14 +73155,14 @@ "repo": "NixOS/nix-mode", "unstable": { "version": [ - 20211019, - 1523 + 20211109, + 1805 ], "deps": [ "magit-section" ], - "commit": "1ac42cd103ba11c37e8566e240a2272966e6f813", - "sha256": "11s98jjqkk7pfmqb4a99ilvp6w3m8vqr1df65lpwjirlyf2lvw2y" + "commit": "e7bf2e4cc49e7a12265714dfaf5e286bfbc1e87f", + "sha256": "0ym70i1jndm12av9jzq5qq3vr2d5cjh5q95vq22whiah0svbbpxy" }, "stable": { "version": [ @@ -73241,15 +73287,15 @@ "repo": "hlissner/emacs-nlinum-hl", "unstable": { "version": [ - 20190301, - 2117 + 20211112, + 1241 ], "deps": [ "cl-lib", "nlinum" ], - "commit": "dc6b365a58e06c7d637a76a31c71a40b20da8b56", - "sha256": "1fvvyc77iggil9mzy8hd4vx8xw96bkfx6pmlb9ami428qp8r45g7" + "commit": "22f8d75ecdaab67e0d6d0d2da4766358456ca4f5", + "sha256": "18gpanlv7cfjzbd952a987ac3i9wn5ss7myvxz798al3jrivv9dv" }, "stable": { "version": [ @@ -73347,8 +73393,8 @@ "repo": "dickmao/nnreddit", "unstable": { "version": [ - 20210912, - 236 + 20211116, + 1718 ], "deps": [ "anaphora", @@ -73358,8 +73404,8 @@ "s", "virtualenvwrapper" ], - "commit": "cb22a8480e9688f16f3764953cebebe64df31ccf", - "sha256": "0qpy3xymzryncbiz4cay4bzmmarbs575dgh3db2iibaffwb4qb0x" + "commit": "7347ad1f3db7351c2e7f9a06d2ca8873130dbbfb", + "sha256": "178sq7rsghqhmhjdxixrybls00g7mp6wbmsx9lzg8c0ywpr9n332" } }, { @@ -73405,14 +73451,14 @@ "repo": "emacscollective/no-littering", "unstable": { "version": [ - 20211103, - 1646 + 20211110, + 1900 ], "deps": [ "cl-lib" ], - "commit": "3a30eb7aa7db56072652c43b1b27595ff8c52a32", - "sha256": "0xgz2hsiy1z0vv69xkls2mbqw6361sqb8vp9ljbyrx42616ziq28" + "commit": "4a7bcaf077d049931120255edf476f34ced8c73d", + "sha256": "0p8jm5fms4krij7ydhrj2jwayyx6979bdq2w7v88ybk6b0md9yw1" }, "stable": { "version": [ @@ -73710,11 +73756,11 @@ "repo": "MetroWind/notink-theme", "unstable": { "version": [ - 20210816, - 2337 + 20211109, + 2122 ], - "commit": "ede878ee06d4f94b5819ed3ccffe121823fbcf44", - "sha256": "0iyxdbdgv1d3hflndfrbp3zbafa2zn3kpwj2lp32rm9sh3bcp79c" + "commit": "fa26294a43431ac7b42931c44c10e22813fe1ce3", + "sha256": "0wnkjncgdhak3j34b3rmnz0n06f4yx35khajjzlzyh91j2f14j6m" } }, { @@ -73728,8 +73774,8 @@ 20211030, 1819 ], - "commit": "78416a3e97fd19df5c89cdaf564c76be0edea740", - "sha256": "1m8x5q9q1q5lzfjjxvyqvm36wh7s0csr38hb3qidy75jg707p0py" + "commit": "fc3c79dd37d4bae938a5d0a1d7773bea48dd09b4", + "sha256": "02bv1fvbww9gk3phpd7ifzxfzjxm17k7ssd3ddizr6yvmkpsz7h0" }, "stable": { "version": [ @@ -74066,37 +74112,6 @@ } }, { - "ename": "nroam", - "commit": "55bc37011ae1754549b910be84fa25ca28a8e6fe", - "sha256": "0g6d4nhj08hr6b6aiy1mlszz1k90vk3bw4kgnwzxmlmv43qxbcx4", - "fetcher": "github", - "repo": "NicolasPetton/nroam", - "unstable": { - "version": [ - 20210325, - 2015 - ], - "deps": [ - "org", - "org-roam" - ], - "commit": "9a76f16d3fdd49a1733e5f2777036f1f83068a40", - "sha256": "1lf56iq7iy545q8pcq4scvk8ialkw8nxc7gn97jyihpkxfhq7fi3" - }, - "stable": { - "version": [ - 0, - 9, - 0 - ], - "deps": [ - "org-roam" - ], - "commit": "c150603a25445d65b7b08d658793a6019fd763ea", - "sha256": "0qip0vhyvif5az7zph1m41gwamz84v01ay9qzicydzbizhzp4n5i" - } - }, - { "ename": "ns-auto-titlebar", "commit": "d22ebb5ef16df0c56d6031cb1c7f312dca514482", "sha256": "1wk4y2jwl65z18cv57m8zkcg31wp9by74z2zvccxzl7mwlhy7kqg", @@ -74532,8 +74547,8 @@ "deps": [ "axiom-environment" ], - "commit": "7d72e6319b98b334f74b78f3d4151e92fb7dcbad", - "sha256": "1hwcndb1x3i51l0kvzk4mj6sil8h10mxmazic9zvwjhia9qz9hz3" + "commit": "3266c5b2e4865337da86043b53a4e6609dbc8308", + "sha256": "11k53vvw5df66f54mh3zkghspmi7zsgls3mlkfvl19hz2z1pyhwq" } }, { @@ -75005,8 +75020,8 @@ "deps": [ "julia-vterm" ], - "commit": "3e7ff901687c320869c5e17e3273185af68e8cd6", - "sha256": "0i155p3k2xf0p00xazqjw4llylb13svgad9a9m6as6lcvrvc0zsp" + "commit": "e04ee53d67cbd715c2d84fe5bc367526edfadc74", + "sha256": "18866agjrkx2gv38zr14mhf3rlvjdjvn3i8hxg12lrbv6q4rn8aq" }, "stable": { "version": [ @@ -75174,6 +75189,24 @@ } }, { + "ename": "ob-php", + "commit": "a3ac7a1d9390785abbd006956846d4f67f89dd9f", + "sha256": "0n6m6rpd0rsk6idhxs9qf5pb6p9ch2immczj5br7h5xf1bc7x2fp", + "fetcher": "github", + "repo": "stardiviner/ob-php", + "unstable": { + "version": [ + 20211109, + 146 + ], + "deps": [ + "org" + ], + "commit": "3699808eb1ba56268ccc2e366151183e91e8c711", + "sha256": "0m0qgssa0rxh7apcxr7lz0wi5vsrgnsysjw0zj2mk6fz1drg02dw" + } + }, + { "ename": "ob-prolog", "commit": "fb87868cd74325f0a4a38c5542c264501000951d", "sha256": "0ki8yd20yk5xwn0zpk06zjxzgrsf8paydif9n98svb9s2l9wrh1s", @@ -75198,6 +75231,24 @@ } }, { + "ename": "ob-redis", + "commit": "a3ac7a1d9390785abbd006956846d4f67f89dd9f", + "sha256": "1xsz4cc8cqx03ckpcwi7dc3l6v4c5mdbby37a9i0n5q6wd4r92mm", + "fetcher": "github", + "repo": "stardiviner/ob-redis", + "unstable": { + "version": [ + 20210527, + 1336 + ], + "deps": [ + "org" + ], + "commit": "ad31bf482a081b9c595a02ee6053c1426e3d8faf", + "sha256": "1w8wbiwzi8b3gm376yyynvc833skkvgylmrn803pnqsa1ij77jni" + } + }, + { "ename": "ob-restclient", "commit": "28c1d3af3f8b2f598b80b03b64de5d15cbb3f13d", "sha256": "0nv2wsqmpschym6ch8fr4a79hlnpz31jc8y2flsygaqj0annjkfk", @@ -75280,6 +75331,25 @@ } }, { + "ename": "ob-smiles", + "commit": "a3ac7a1d9390785abbd006956846d4f67f89dd9f", + "sha256": "0d07ph6mlbcwmw0rd18yfd35bx9w3f5mb3nifczjg7xwlm8gd7jb", + "fetcher": "github", + "repo": "stardiviner/ob-smiles", + "unstable": { + "version": [ + 20210527, + 1401 + ], + "deps": [ + "org", + "smiles-mode" + ], + "commit": "9f1fed213eb194924ab7d12b9d6e1074578a791c", + "sha256": "1x0rq9l9j3khp47q2j9bnyhhj2xrs4zggw9p8rmmai165drh1i9r" + } + }, + { "ename": "ob-sml", "commit": "d1b0fbe1198fa624771c2f61249db502de57942a", "sha256": "04qvzhwjr8ipvq3znnhn0wbl4pbb1rwxi90iidavzk3phbkpaskn", @@ -75309,6 +75379,38 @@ } }, { + "ename": "ob-spice", + "commit": "a3ac7a1d9390785abbd006956846d4f67f89dd9f", + "sha256": "0nhdcvq7yvprz4323836k507w0g1lh3rdfr6dqrbj29yvsqfw0x2", + "fetcher": "github", + "repo": "stardiviner/ob-spice", + "unstable": { + "version": [ + 20210527, + 1355 + ], + "deps": [ + "org", + "spice-mode" + ], + "commit": "3c77144ecb059411441730bb47f6d5892b62d13d", + "sha256": "00cnym62hp0masikr3ndk2a0mpafjw0cjx0xavcq486w2xi7r8rm" + }, + "stable": { + "version": [ + 0, + 4, + 2 + ], + "deps": [ + "org", + "spice-mode" + ], + "commit": "790faa67b0c57ca76e8814a1fa60b4dd774412c0", + "sha256": "0rn3j88ry38500vfaj0myx148nd5kh1jwja6j221ydd6v5wqws6d" + } + }, + { "ename": "ob-sql-mode", "commit": "855ea20024b606314f8590129259747cac0bcc97", "sha256": "143agagkmwqwdqc0mbdsqp6v02y12q437v4x6dlh81yihif56rdk", @@ -75605,8 +75707,8 @@ 20210923, 1348 ], - "commit": "54f41596355394cd0ce08435c21c3cc3d1f7eda3", - "sha256": "15f3ix73jjw41jcvnz70lgyrm0bh3287i1rcnl5x95wk0czkmhnj" + "commit": "f2f50d6fb0371b85bde2eda15c440b68d46059ac", + "sha256": "01ac3k1kq6hy2n332775jlh2rg1pmqs8gvkx4qskxmpga87753m7" }, "stable": { "version": [ @@ -76708,26 +76810,30 @@ "repo": "eyeinsky/org-anki", "unstable": { "version": [ - 20210816, - 2047 + 20211108, + 751 ], "deps": [ + "dash", + "promise", "request" ], - "commit": "4e70c6869181f020c6989f91f5e916e085ba73df", - "sha256": "12iwllz9mbcv7q652v4bc1wkaml065wr7gvqm08kjds8hmc6f1pl" + "commit": "e6221b1654d34bc3a06500ae4706419bc176b575", + "sha256": "1xnqih87sipqd6q5cvgvw2mpn5m4j605bxhlbmpr4kzhni9vd9sh" }, "stable": { "version": [ 0, 0, - 6 + 7 ], "deps": [ + "dash", + "promise", "request" ], - "commit": "c86394d5fd8933d1b6cafbc1dbc36bf61bcc871e", - "sha256": "0jg00hw5k6n7jf19vz1gf9599ad7skm399ng115hpywhas9ly01i" + "commit": "e6221b1654d34bc3a06500ae4706419bc176b575", + "sha256": "1xnqih87sipqd6q5cvgvw2mpn5m4j605bxhlbmpr4kzhni9vd9sh" } }, { @@ -76806,14 +76912,14 @@ "repo": "yilkalargaw/org-auto-tangle", "unstable": { "version": [ - 20211010, - 958 + 20211115, + 543 ], "deps": [ "async" ], - "commit": "50292af50d275846baa28e52d94eb8ef69c8d00b", - "sha256": "0n0divfnk4635aanjm0b3swdjkcj4qxr0x95q05pdlb67s6lfp5d" + "commit": "ad3c332f062b5830e88b2ab13287a096ae434657", + "sha256": "05yrw59zrzxj1p8n65sk6mvy7jzik812mp9i2nsimwhlhn3si1pj" }, "stable": { "version": [ @@ -77956,16 +78062,16 @@ "repo": "marcIhm/org-index", "unstable": { "version": [ - 20211029, - 1604 + 20211110, + 1423 ], "deps": [ "dash", "org", "s" ], - "commit": "450dbacacfc0828e40a76a48a5933db60ec7d197", - "sha256": "1aqn97lqisa4v48pg3zs877ws9cqivby7mrzqacr7n29q44kvmmn" + "commit": "399020d435d296014f92fa5f632d7481ee002661", + "sha256": "01q8w49dh9fpr2sc70p92cxjm66fnrrgnk4ba321aq9dlfmly2zg" }, "stable": { "version": [ @@ -77983,6 +78089,35 @@ } }, { + "ename": "org-inline-anim", + "commit": "340b9cfda110987a9306cc579dc7c2b53eeb605e", + "sha256": "1z245pws6y6z0gw7zwnljllg03jn2payv95fnriswymb86cdsdj0", + "fetcher": "github", + "repo": "shg/org-inline-anim.el", + "unstable": { + "version": [ + 20211101, + 413 + ], + "deps": [ + "org" + ], + "commit": "ea7feb924c991f3a2cdc4a70fb176eaceae87938", + "sha256": "1ai7zgx4sr7lzxnbkgj0dzd326dj18dzf0nqm12bza7bqbnck2dv" + }, + "stable": { + "version": [ + 0, + 2 + ], + "deps": [ + "org" + ], + "commit": "1808574ff04ed66b7382247f3f13815fae2a4929", + "sha256": "1h1ha5njzv2ibp11dbka8lqx6d3q4hqjz11vzi4yi4x4ksiczqrc" + } + }, + { "ename": "org-inline-pdf", "commit": "d069aa75232fff5d8b5db485f037191181d8c4b6", "sha256": "00f8gd34lsp96j20s6sax4hjwqsnrz4647xdchzxav7cpqjmky8m", @@ -78039,16 +78174,16 @@ "repo": "ahungry/org-jira", "unstable": { "version": [ - 20211002, - 344 + 20211114, + 1616 ], "deps": [ "cl-lib", "dash", "request" ], - "commit": "24f2d83bc2f6a2b88b084090f877814e36dcf4da", - "sha256": "0f5bij9gvgv8954v80xymvgnwf2ayxg7q4khmfd2djc5sbhj9ch3" + "commit": "01e6a7c17e210dac0608154dd69d637e9733498d", + "sha256": "19nljq73gnhjk7zz8y5wgap8j41jd7zifjcmfddrj27kmprw2h5z" }, "stable": { "version": [ @@ -79341,8 +79476,8 @@ "repo": "jkitchin/org-ref", "unstable": { "version": [ - 20211103, - 1318 + 20211110, + 1229 ], "deps": [ "avy", @@ -79355,8 +79490,8 @@ "parsebib", "s" ], - "commit": "4a465be9f8a4093a4afa22abc77a2012624f5e90", - "sha256": "16pnx1j1zg90yawsw29nxqq97sjigc9vmaxgc3aw18rnhardv0s3" + "commit": "c87b4155cd2f60ca3a9bed2e6e366c1fa47aec33", + "sha256": "1idshb4g1d7ghdwwfyglvqqdjbdi3lrigkgq2rsbhrv7lpxcb8vn" }, "stable": { "version": [ @@ -79389,15 +79524,15 @@ "repo": "alezost/org-ref-prettify.el", "unstable": { "version": [ - 20210920, - 634 + 20211111, + 742 ], "deps": [ "bibtex-completion", "org-ref" ], - "commit": "29e05416f102ceca50ac8b118a19a16f9fe7eb2f", - "sha256": "1215hrinfggvwz89i15lhpqraa3rhafnqx8iwvfzb0p9fyqfgwg5" + "commit": "0cecd7b2611bd9d282876ab46d490ce3e635ba86", + "sha256": "0jhspfp2mm69q7p1n986pal88ywm5zm9a6f2q073slnpiv4qwvz2" } }, { @@ -79503,8 +79638,8 @@ "repo": "org-roam/org-roam", "unstable": { "version": [ - 20211101, - 639 + 20211114, + 913 ], "deps": [ "dash", @@ -79514,8 +79649,8 @@ "magit-section", "org" ], - "commit": "3e47f198c7b6c3254944d98357e41840e5e1b102", - "sha256": "1bfrpljx95bqk2gwabsf80igp206nlb6d7b4dr0mlsj8rlzwv96s" + "commit": "d93423d4e11da95bcf177b2bc3c74cb1d1acf807", + "sha256": "1az6i7031ff63gxz3wfdg00w1b57r10j12a6s5w3vgchsz896skm" }, "stable": { "version": [ @@ -79543,16 +79678,16 @@ "repo": "org-roam/org-roam-bibtex", "unstable": { "version": [ - 20211001, - 1038 + 20211117, + 1225 ], "deps": [ "bibtex-completion", "org-ref", "org-roam" ], - "commit": "ed35826fdefda8b5a3f7156c19e892e5e2984ea4", - "sha256": "135g8grk7dh0mcn76d7h35larm9z38dqjajs4kclzxkvsrmmfhxb" + "commit": "f399b85f5c38bd52f6eb41da18fccfb971a04fe1", + "sha256": "1da5yv204qvnw5rrczyi5k2982a03l9lygkqh4nbpknm8i7nhrbv" }, "stable": { "version": [ @@ -79570,6 +79705,44 @@ } }, { + "ename": "org-roam-timestamps", + "commit": "5141a8f5505427e8d5cb898015587972c2eb2f34", + "sha256": "060sjq9icpabdvi5dz0im7acdc8k21iprhpa6mga6zynpqhshsjs", + "fetcher": "github", + "repo": "ThomasFKJorna/org-roam-timestamps", + "unstable": { + "version": [ + 20211108, + 943 + ], + "deps": [ + "org-roam" + ], + "commit": "f4de72c09cd2cace275ede19c39a56b68ca56b83", + "sha256": "050jnyqdnx4l946hl9cw08l4sk8z70c2063z08m4qh2sxrdh3nzw" + } + }, + { + "ename": "org-roam-ui", + "commit": "eb639f7da134200de36c7f82431c200a5d01344b", + "sha256": "15i68kxmhl7iv10f4abamm4yg9qp5mafwinvv88clpa62yiv62i5", + "fetcher": "github", + "repo": "org-roam/org-roam-ui", + "unstable": { + "version": [ + 20211117, + 1208 + ], + "deps": [ + "org-roam", + "simple-httpd", + "websocket" + ], + "commit": "2b167cd03f29714267057e4c0b437a4d6a01b299", + "sha256": "0k6i69afzswqvg4zl6b4m5gl7rrrr15yli2kn0g8nlfg0z2ay6dm" + } + }, + { "ename": "org-rtm", "commit": "855ea20024b606314f8590129259747cac0bcc97", "sha256": "1hdcwmiv2qivdr2g78xz9fl38wn45vj0bn55dbsdj3qx7k7wgfx6", @@ -80110,15 +80283,15 @@ "repo": "stardiviner/org-tag-beautify", "unstable": { "version": [ - 20210729, - 929 + 20210904, + 1643 ], "deps": [ "all-the-icons", "org-pretty-tags" ], - "commit": "69e7dcb50278ff0d7b220cda9562d4fe7e4db0ec", - "sha256": "0wyqjzb2ph7092ghrnq0gxaf4r57mvcm0007kqpzqvknc3byd38d" + "commit": "bdf438847e05f1f9c08c69e93c3d5e717b589074", + "sha256": "09k7zmdcyy5mymij4a2wq6s6r60njkxrmiybbwvln322wl0ldgsh" } }, { @@ -80238,14 +80411,14 @@ "repo": "Fuco1/org-timeline", "unstable": { "version": [ - 20210210, - 2306 + 20211110, + 1952 ], "deps": [ "dash" ], - "commit": "af1b44e18048278a116da89faf138310f09c74c6", - "sha256": "05gp5hqfwx668a0qvpx1wn8957qgn6g9jhrhiwgscnnxch2dp0c0" + "commit": "2b300abc8adc9955418fa2334f55e0610bff79f5", + "sha256": "09girkfkddn5xl5h6ji2hmsp2asip14cqrp8l9k9dpyhc4r9qp7g" }, "stable": { "version": [ @@ -80615,16 +80788,16 @@ "repo": "marcIhm/org-working-set", "unstable": { "version": [ - 20210802, - 1435 + 20211112, + 1600 ], "deps": [ "dash", "org", "s" ], - "commit": "bced50755c45047565a3ab395c3b5e59ab15cc8e", - "sha256": "155gxp0ysfwgiykw0zjzrm86pd9f2nz5whlcjm51apqd0439jjv9" + "commit": "729445496d94ea0050706007391817ef84dc0226", + "sha256": "0xa545wbh7kjbpry74x2bkw6rs9dshlajb5i17zc6v8zf400ds4r" }, "stable": { "version": [ @@ -81392,11 +81565,11 @@ "repo": "raghavgautam/osx-lib", "unstable": { "version": [ - 20191121, - 1440 + 20211113, + 1849 ], - "commit": "01cba80ccc20412759f87b8f7531580bb04ec9c1", - "sha256": "0izkifcxk6cp9y4xcmpkhpd2vv1rqapxxa74ks12a55sflyxx36f" + "commit": "06744dae53b4ade99b0cd733823e1c8f6b0aa2c4", + "sha256": "0rfb9nh5xvfqpnk8k0hxaiv7ywzzzn8dpx3gxx6d2jn25glwp8ql" } }, { @@ -82064,8 +82237,8 @@ "deps": [ "org" ], - "commit": "9438efc34f3837ed18da5a97bb705e945b234bff", - "sha256": "01zgyawwqsq4w29w8da3kff0r8qyzh5zmmpm63b6zrb71dxx5yzg" + "commit": "3442d8cf1f60f28cf28daaca06f524dd660681f8", + "sha256": "123zg67bribf86i98rzvha1fyh72a12bkjrcgn06vph5vm5m08q1" }, "stable": { "version": [ @@ -82316,23 +82489,22 @@ }, { "ename": "ox-pandoc", - "commit": "ca17de8cdd53bb32a9d3faaeb38f19f92b18ee38", - "sha256": "0wy6yvwd4vyq6xalkrshnfjjxlh1p24y52z49894nz5fl63b74xc", + "commit": "864fce840ab2ebad3e1d5952b14a33019da3732b", + "sha256": "08xv4dp0ycchqfwr8syvf54r0575nivvy2x80h723plrq3faddvi", "fetcher": "github", - "repo": "kawabata/ox-pandoc", + "repo": "emacsorphanage/ox-pandoc", "unstable": { "version": [ - 20180510, - 1338 + 20211009, + 1414 ], "deps": [ - "cl-lib", "dash", "ht", "org" ], - "commit": "aa37dc7e94213d4ebedb85c384c1ba35007da18e", - "sha256": "0iibxplgdp34bpq1yll2gmqjd8d8lnqn4mqjvx6cdf0y438yr4jz" + "commit": "e76324ecf1b9be6353bf22ff5e13652ea2714674", + "sha256": "1x1klhj4570mzcnrdlj56qs9hi41nvdmghgj6ddwg6n0lm2kglys" }, "stable": { "version": [ @@ -82418,14 +82590,14 @@ "repo": "yjwen/org-reveal", "unstable": { "version": [ - 20211030, - 838 + 20211114, + 1307 ], "deps": [ "org" ], - "commit": "c06c88812bb2db267366c2bb95123235e20aa5bc", - "sha256": "0lsxrgbpgac9hclcnrk49nhllyvjfqs0fxik9mxsf22bl1vdds1z" + "commit": "2adca68b2be22bcc05d5136b571472667ffab4fd", + "sha256": "1x0ksafnq2fsqg7vls2qdhnk189bfk3184303whircbs0rgiz6md" } }, { @@ -82899,15 +83071,15 @@ "repo": "purcell/package-lint", "unstable": { "version": [ - 20210528, - 2348 + 20211107, + 1614 ], "deps": [ "cl-lib", "let-alist" ], - "commit": "10b6f3aab4f7c014ce339694255cf2c6dfd2bdea", - "sha256": "0ps3v3v4279rbma8fscrpm13dimv2d93hgbq3fqcq4j9kfd25jzq" + "commit": "786d8b5f382ee5f254a783378e904305cc41367f", + "sha256": "19mrzb2ligkz8gyihlrqvb3wbzmsqkpn58kfcnx6dldvk4s2ykdn" }, "stable": { "version": [ @@ -82936,8 +83108,8 @@ "deps": [ "package-lint" ], - "commit": "10b6f3aab4f7c014ce339694255cf2c6dfd2bdea", - "sha256": "0ps3v3v4279rbma8fscrpm13dimv2d93hgbq3fqcq4j9kfd25jzq" + "commit": "786d8b5f382ee5f254a783378e904305cc41367f", + "sha256": "19mrzb2ligkz8gyihlrqvb3wbzmsqkpn58kfcnx6dldvk4s2ykdn" }, "stable": { "version": [ @@ -84463,15 +84635,15 @@ "repo": "vedang/pdf-tools", "unstable": { "version": [ - 20211004, - 514 + 20211110, + 513 ], "deps": [ "let-alist", "tablist" ], - "commit": "f68899cf0646255ca763f1144f7a9520e7cd46db", - "sha256": "13f0c0a9cyhc2snshjqw8dl0hdnhb89fba6ffcv7avb2cwnxdpk7" + "commit": "a8847b75d3487d60e27762816bdbdd23b6dc1c11", + "sha256": "1dv244rxlgb56fzx1d1w9ngdjdrc7bgssshvkrfkxbwy69i803b3" }, "stable": { "version": [ @@ -85343,8 +85515,8 @@ 20210808, 1745 ], - "commit": "535aec81739e8e766e0420fda616efc8846f2911", - "sha256": "1z4fds5priq8dsr8gm845ykk8blghm5kz5sspnpzclgk3prwkx26" + "commit": "d66b4986117f621c143bc295205619e036f291d5", + "sha256": "0jj0xmmb65shi8x5l32c0piin4dbiz94fsixzcn13x6ljsv8kd21" }, "stable": { "version": [ @@ -87216,6 +87388,40 @@ } }, { + "ename": "pomm", + "commit": "01cad9c9e0b9277160fbb7a5139157a1573ae641", + "sha256": "1jdinqimn7ybcwb61dwvpv9hizjkrbp0c59kh2nppw4m1lyw9ar6", + "fetcher": "github", + "repo": "SqrtMinusOne/pomm.el", + "unstable": { + "version": [ + 20211110, + 1040 + ], + "deps": [ + "alert", + "seq", + "transient" + ], + "commit": "62832704ba72613af8dbe0a6bf6d4daa89a21e12", + "sha256": "06if507c163fia28zzax735r7mwlpa5vi0mmgddyn3vxsirnh4qw" + }, + "stable": { + "version": [ + 0, + 1, + 2 + ], + "deps": [ + "alert", + "seq", + "transient" + ], + "commit": "62832704ba72613af8dbe0a6bf6d4daa89a21e12", + "sha256": "06if507c163fia28zzax735r7mwlpa5vi0mmgddyn3vxsirnh4qw" + } + }, + { "ename": "pomodoro", "commit": "0b5c2c50eb87952d01c1b338b7d3e4b3a4546555", "sha256": "075sbypas8xlhsw8wg3mgi3fn5yf7xb3klyjgyy8wfkgdz0269f8", @@ -87374,11 +87580,11 @@ "repo": "karthink/popper", "unstable": { "version": [ - 20211011, - 435 + 20211116, + 624 ], - "commit": "1ffc269afa46a9e7a5c1e5511752e49cfcb3aad4", - "sha256": "1hpx2qi4ybh1fxjzkfkddj350r3rqrbjazjwas3nvqxwrs9ksqbr" + "commit": "4d58a6dbba5d488ff9ac9318e202d84da505e691", + "sha256": "0l4y8f6j6sfr91rqcdv0lx6bgzskpsamd4w4fb7lp6qghmm8iyvk" }, "stable": { "version": [ @@ -87642,11 +87848,11 @@ "repo": "tumashu/posframe", "unstable": { "version": [ - 20211104, - 512 + 20211110, + 40 ], - "commit": "c153c288a462e10fc468d7474f0082e6c8f5c527", - "sha256": "1wg1w7h0nzi2gbwyvhi93mnnzz71b415j7amnpv8migd81p6g3sa" + "commit": "66b16a20a7b43f19c27487c475799200ad81b3bd", + "sha256": "06n9zwbz6hk3k49hw9xjnizaadvgl2s5aqmaaijzfxxm0h0gqh43" }, "stable": { "version": [ @@ -88055,16 +88261,16 @@ "url": "https://gitee.com/shaqxu/prettify-math.git", "unstable": { "version": [ - 20211102, - 610 + 20211107, + 38 ], "deps": [ "dash", "jsonrpc", "s" ], - "commit": "491bdd6764afeaf3211dd0199e19a06b7bbb7e0a", - "sha256": "1v6qdkcwrnns22vlzxywv1rxkblbm3z6ms849fwzmabjvcbfaq1b" + "commit": "b766824d60e95720e28917b648e4957d7923370b", + "sha256": "0rq75pzbklgk0bq6ah7xrsb2czq1vryfvavvi81iqpp89nik2nrh" } }, { @@ -88486,8 +88692,8 @@ 20211013, 1954 ], - "commit": "e411432a33cd82f8a9ff95471c91e9fe1833841c", - "sha256": "03aiv70shxhcjcldahny7xxclnqdw5bf37f8496dxmzz0zx0v98j" + "commit": "69d44e5495185587ee8577f8b9d616063d6bd7f8", + "sha256": "1rv5zgbg003zhhjvikyv92pwjgl191ja14sba7hncs0pk580v075" } }, { @@ -88608,11 +88814,11 @@ "repo": "bbatsov/projectile", "unstable": { "version": [ - 20211103, - 2050 + 20211116, + 700 ], - "commit": "584ff420b2c5637b05be5c4808754d6e947ab6c1", - "sha256": "1vw392iv4nsdifhq8bf6bsw9mc15pvz05b6wg316j0rrjibmci6p" + "commit": "31069dc31469e0d5cddb53126a2993432a22399b", + "sha256": "1l86gm0kkszkyi4srknc7vjn589x2pkqdcralw44zwhppx7fcy35" }, "stable": { "version": [ @@ -88873,16 +89079,15 @@ "repo": "waymondo/projector.el", "unstable": { "version": [ - 20210421, - 1728 + 20211112, + 1514 ], "deps": [ "alert", - "cl-lib", - "projectile" + "cl-lib" ], - "commit": "7bbee0ef70817d52339119d4517dbbcbab930de6", - "sha256": "0zmng37fl8df1d3i66fbkjssv0x0hq74x68p1j01gb8sfayw4dgf" + "commit": "1d0f2d307591ea50888d31dcae7e463e2ada1316", + "sha256": "0psmb4bsnm9wws8g3v2n78hkih6b80lzbv5v52640v94w74hfdp5" } }, { @@ -89015,11 +89220,11 @@ "repo": "ProofGeneral/PG", "unstable": { "version": [ - 20211013, - 1911 + 20211109, + 1442 ], - "commit": "fd04605af1b07684da522c32d83ac346050926bb", - "sha256": "017j3vcwlg6k2h76wbads6jxmnmxj19g4c42zs3mi2vwqhfvgdqx" + "commit": "2145c23f44a0951a14240d3b85a1a3d08aade9bb", + "sha256": "0pilv79a9mqgv2j7915b2lbl3ir1hhaj7xjysliwn6h7rb4b1csg" }, "stable": { "version": [ @@ -89122,8 +89327,8 @@ 20211013, 1726 ], - "commit": "7ccf4d8f67878a6ceb2184df279478cb3314372b", - "sha256": "1fqf7vvha45dzgqcban2zd3kvf5w5nz69jlcw7ad7qg6kf97150l" + "commit": "edc8a3182811cc39272549ff894793e1fff4aaab", + "sha256": "08yfcnra0c9jx3fkicxl558vzll7cnx5qn847lxqsjv4f1ms37m1" }, "stable": { "version": [ @@ -89435,14 +89640,14 @@ "repo": "hlissner/emacs-pug-mode", "unstable": { "version": [ - 20210503, - 147 + 20211114, + 1645 ], "deps": [ "cl-lib" ], - "commit": "d08090485eb8c0488a7d2fbf63680dc0880c7d2f", - "sha256": "1f6bhdr1a72x94dlz2i1fwwln8crc2mbpc2iq23hvsbsfmj7xfzp" + "commit": "73f8c2f95eba695f701df20c8436f49abadebdc1", + "sha256": "0kjjwyxdbaaagjd0zmav2xj4075c8qcs33x29zpyqfxwj4410gp3" }, "stable": { "version": [ @@ -90028,15 +90233,15 @@ "repo": "tumashu/pyim", "unstable": { "version": [ - 20211020, - 612 + 20211117, + 158 ], "deps": [ "async", "xr" ], - "commit": "778a1eaff3dbb71692939da1fba7daf4ceb22abc", - "sha256": "10w0bydn4r8pjn1ygqnxcd39kxwgz397xzamdpb9ayyy72182h4c" + "commit": "a66e999435d9697a0d732576addf3c182fd363f7", + "sha256": "06pfpi2z48jhqanwlnq5d55xsnpmqhhrk64x15x7h01haf0wqy64" }, "stable": { "version": [ @@ -90213,8 +90418,8 @@ 20210411, 1931 ], - "commit": "65b552a7ce6734dc7bfe53a14342853750cc92a1", - "sha256": "1pshp0q3iv8jzmpyfiwb1myb1xw82hga1wnqm7x5vzdcrdmzc3ip" + "commit": "b91cc8dbb47ce622b73c766b3a53da270bdb24e9", + "sha256": "0w7bc2lcrr4axs9s8mgymjy8gwdafc3dl4fl9amaqfbph0xm0arl" }, "stable": { "version": [ @@ -90457,6 +90662,29 @@ } }, { + "ename": "python-insert-docstring", + "commit": "520c410e04bc7c60bd8d2a4d5507ed0be0720030", + "sha256": "1hh95nhrpggmpqapkpnwgn7sdzvyfxr64smz6p2v2sn3q7lkrkqk", + "fetcher": "github", + "repo": "macurovc/insert-docstring", + "unstable": { + "version": [ + 20211101, + 1653 + ], + "commit": "4d729f5b574ffa3fce41ccbeee7b8bdb9d005174", + "sha256": "0gn12bm3w7819j67bnh1m3jkqqb37pdmkagbcwqp4mc74zbpf01m" + }, + "stable": { + "version": [ + 2, + 0 + ], + "commit": "4d729f5b574ffa3fce41ccbeee7b8bdb9d005174", + "sha256": "0gn12bm3w7819j67bnh1m3jkqqb37pdmkagbcwqp4mc74zbpf01m" + } + }, + { "ename": "python-isort", "commit": "8b359787b5f0113793714fd9710fde831e7afee3", "sha256": "0svkcb68r3x1ajhrhhlnj71v33qp3pliv3if1mww19x970r69lmy", @@ -90518,8 +90746,8 @@ "repo": "wbolster/emacs-python-pytest", "unstable": { "version": [ - 20210219, - 1947 + 20211111, + 1912 ], "deps": [ "dash", @@ -90527,24 +90755,23 @@ "s", "transient" ], - "commit": "31ae5e0e6813de8d889103f7b8dde252b04b1ae4", - "sha256": "1kf62adlm5nf7r3qar8h1cx11xxrz95bfqii62i9xqdi3i8z7b2l" + "commit": "e77469fcb727f1b63f0d921ed15b1631a6bd0cae", + "sha256": "1dgk8s4wdjckaiv20gnlj3p6xbxp8g9i7q26lmmzbf40ri2qq7hk" }, "stable": { "version": [ 3, - 0, + 2, 0 ], "deps": [ "dash", - "dash-functional", "projectile", "s", "transient" ], - "commit": "10ad9afc840ac2d9d5616abf4bd92ab8fee2ce48", - "sha256": "1lc5qlsznzw8hdcdwjwn8fcgfmqjvb1wplsr2gaxwvm8rbw22g1l" + "commit": "02cf74617cf54d85bd58c75b8fe64b6f8ea36aba", + "sha256": "1l7lyni2vjzgqsnysf4dgww0adhhsfmjc07dn1l65m9jjsr99x2g" } }, { @@ -91138,11 +91365,11 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20211103, - 112 + 20211114, + 1656 ], - "commit": "d78c7381bd47bae8e5f9ae14681935f08206240a", - "sha256": "0g80y1hg7jk5291nf0yw6708lf17lwi8ka15a5y2lgrnahq8pd0g" + "commit": "6f94ac6e67c3ee00454e8b7e6d96ab5e9614cdb8", + "sha256": "01d2jkg32c7gsh39gil0kjh615fw125dl4nqilfcg23zfc8wlaf2" } }, { @@ -91161,8 +91388,8 @@ "projectile", "yaml" ], - "commit": "86be9e70f6fe90484f88d6c68c2f337f6ecd5651", - "sha256": "0z6icgg3hkn141yg7asnpdlir8nlmr4kcrddy2drclgn431pdl5l" + "commit": "5d7a3e46d801668f53efc4c974b5f46b2cd28a0c", + "sha256": "1r4x4j5d0i4v27mj0cdx6s3qs3vk9v6blxmgnldmbv2ychyxzrnr" } }, { @@ -91181,6 +91408,25 @@ } }, { + "ename": "rails-routes", + "commit": "46ceb4276966bee63c91ee02d3cd66fdfdb7a312", + "sha256": "0wgs6jp9rkchdjri924r81rrk13z6midhi4x8bd9hjph138j95jz", + "fetcher": "github", + "repo": "otavioschwanck/rails-routes.el", + "unstable": { + "version": [ + 20211108, + 347 + ], + "deps": [ + "inflections", + "projectile" + ], + "commit": "b1326e9f4ede6b3da0fada29697fa7f797d7576d", + "sha256": "017fcrnjhqp591q8j51b67qbb6idimy7w3mvlkshbj3pmxl0hzb2" + } + }, + { "ename": "railscasts-reloaded-theme", "commit": "9817851bd06cbae30fb8f429401f1bbc0dc7be09", "sha256": "1iy30mnm3s7p7qigrm3lvv7xjgwvinwg6yg0hry2aifwn88cnwmz", @@ -91275,14 +91521,14 @@ "repo": "stardiviner/emacs-rainbow-fart", "unstable": { "version": [ - 20210803, - 922 + 20211114, + 905 ], "deps": [ "flycheck" ], - "commit": "57fe85c0f03917f6867833636a5617cbfa663a29", - "sha256": "1y97a876gsva2pr75b4psfs8hd26vd2drfsbfg79hazcqvr51c5j" + "commit": "aaaec8e20b3bde3a567baa501623c451f796a46a", + "sha256": "1mrq585wq4c23jv6fvphh03y4s8wjrh02dhd0l2369axl6bdslz7" } }, { @@ -91854,16 +92100,16 @@ "repo": "realgud/realgud", "unstable": { "version": [ - 20210522, - 2151 + 20211107, + 2210 ], "deps": [ "load-relative", "loc-changes", "test-simple" ], - "commit": "7a70b27614c488be274898d0141ec82feb3a8d5a", - "sha256": "116f94sslg1cd5cy5w25ygazdwrrlh85pfib7692a180vk6kz8g6" + "commit": "978b455d7da4dc41995192bfabc32092622651dd", + "sha256": "00kjkc8fpvcjapnrk2fmnxspn9p3z9b3niyrqnyzif3kzmdsqz1i" }, "stable": { "version": [ @@ -92314,11 +92560,11 @@ "repo": "ideasman42/emacs-recomplete", "unstable": { "version": [ - 20211104, - 51 + 20211108, + 2240 ], - "commit": "7288211d9dd5bae411cc697f7782dc3e01ac0b04", - "sha256": "038wzg76spaqd6a766l9vr1lx1plkhbai7srbdasr0r7a464c746" + "commit": "9d64b65855464bd92ccecf93c19db8b1fc12d7a3", + "sha256": "1fixdmrpa9jbjmpqf201420lpg6wcgngzddz7h5c4j68gw1a7jd0" } }, { @@ -92398,6 +92644,30 @@ } }, { + "ename": "recur", + "commit": "c59ae78dc09225b8def8757d52c52988708638fa", + "sha256": "0xss7rd8n4wwbn2ryb3anh5nxwz6zby834mgbqblsvll4dcfkdxz", + "fetcher": "github", + "repo": "ROCKTAKEY/recur", + "unstable": { + "version": [ + 20211108, + 219 + ], + "commit": "627d88f2695336245527fcc77f5728575ecf742b", + "sha256": "1di685jq65g7f8s8j6lflqj6mkp05hpi10y1vfnqh1xln2pijapc" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "commit": "46d213633d5325113e857b1c212f2b2937cf29d5", + "sha256": "1p9phplk6pa6qdvgpbrya5b6jn7hbbbcs565f6jlswd26vjc087v" + } + }, + { "ename": "recursion-indicator", "commit": "2c8ad93fcf71be990ab1b97c4fbe7526ce66ca69", "sha256": "1nnbzl3a32hk721j37x3s865036j2m48xy13sdh8cxfhd6q4jwbv", @@ -93116,11 +93386,11 @@ "repo": "tkf/emacs-request", "unstable": { "version": [ - 20210816, - 200 + 20211107, + 1907 ], - "commit": "68003b3f859724de621d0e5a8b0aae51ce708d1e", - "sha256": "1xqxrr2law67zm68gxylxrhivashzl8prq21kl01hs4a4q87slja" + "commit": "3336eaa97de923f74b90dda3e35985e122d40805", + "sha256": "0jckwy5zhz95d6l3lz8b9b34pppcjjzy97fg1wn8mqzhf3h460ac" }, "stable": { "version": [ @@ -93147,8 +93417,8 @@ "deferred", "request" ], - "commit": "68003b3f859724de621d0e5a8b0aae51ce708d1e", - "sha256": "1xqxrr2law67zm68gxylxrhivashzl8prq21kl01hs4a4q87slja" + "commit": "3336eaa97de923f74b90dda3e35985e122d40805", + "sha256": "0jckwy5zhz95d6l3lz8b9b34pppcjjzy97fg1wn8mqzhf3h460ac" }, "stable": { "version": [ @@ -93294,8 +93564,8 @@ 20210923, 2234 ], - "commit": "94d2e8421fa14d0e3307d70e1d1e2db9d43b2f95", - "sha256": "0c9z6316pdi30w63a4zqn3b84ciqgxfi7mal6rd3micxg6qpv27c" + "commit": "f59a7f5abf366145a2c9c1e9f0a2184139d2adce", + "sha256": "0war99vbim62l010gxq3l68ac5w13gs5lh24yn1rpnq2jfp4jn3r" } }, { @@ -93313,8 +93583,8 @@ "helm", "restclient" ], - "commit": "94d2e8421fa14d0e3307d70e1d1e2db9d43b2f95", - "sha256": "0c9z6316pdi30w63a4zqn3b84ciqgxfi7mal6rd3micxg6qpv27c" + "commit": "f59a7f5abf366145a2c9c1e9f0a2184139d2adce", + "sha256": "0war99vbim62l010gxq3l68ac5w13gs5lh24yn1rpnq2jfp4jn3r" } }, { @@ -93570,15 +93840,15 @@ "repo": "dajva/rg.el", "unstable": { "version": [ - 20210912, - 1227 + 20211113, + 1958 ], "deps": [ "transient", "wgrep" ], - "commit": "fa7293df75e1a3f2fb26add6bc96058000e6fbe3", - "sha256": "0a9xhfs1knxxqilpbpw3li8vipg248nqhpqq5d6sqqn7gfz4zmjb" + "commit": "47bda7ee2f3c14082f9dd468063d45667a9d5256", + "sha256": "0m1ykfx2yfhqbzv1ppj2p2dbi7c3kck7p1k7s8z6c955wnday5xc" }, "stable": { "version": [ @@ -94746,11 +95016,11 @@ "repo": "rust-lang/rust-mode", "unstable": { "version": [ - 20211029, - 1133 + 20211116, + 2008 ], - "commit": "3b81e81097463e7161de047ad340e4fe572dcc2a", - "sha256": "0i05hhfdqg4p4f7l0ylqcw4b0wj9ni3s412d1fp04lpminb74sv3" + "commit": "aadd1dd8f0780692aea1637569aeadfa8f78fd5a", + "sha256": "18qqwm05rhbw6bbkg6iifh2xhjww1psah32d7dzjjyc42kswj2ab" }, "stable": { "version": [ @@ -94793,8 +95063,8 @@ "repo": "brotzeit/rustic", "unstable": { "version": [ - 20211103, - 1558 + 20211112, + 1404 ], "deps": [ "dash", @@ -94808,13 +95078,13 @@ "spinner", "xterm-color" ], - "commit": "fc2b1057ad848521a28631f049a1d95d7f088ad8", - "sha256": "1zj254rvizlzh96fvpxa1fkw86i0n5h2fv9zr75q9ysj1qrh31yg" + "commit": "28b9b6a69ba67e9715b7feb6b3ed56e00ac08acb", + "sha256": "0q2695hwrjw3jzy4wg96ma5z8f7ijw08ssvmkbcn57a77wh1xk6v" }, "stable": { "version": [ 2, - 0 + 1 ], "deps": [ "dash", @@ -94828,8 +95098,8 @@ "spinner", "xterm-color" ], - "commit": "ac0cb72de118b143d9a24584073550a7ab5ef9fe", - "sha256": "1x06lp0c656zm07n28lnkqp678y4f9zkd9n5m0lramndllrpk3x2" + "commit": "814775bc7c0ca2cf9041b6d012bf656df7eb554b", + "sha256": "0nklqpd24s83ng34xrm4rp80sbylajikj6svz1c6j721pz9crxg9" } }, { @@ -95318,8 +95588,8 @@ 20200830, 301 ], - "commit": "caadce26d0e6ed7039e7ba76ad05397aaa5a17f4", - "sha256": "02pwqgl0k7xq08rnz74xgha4w226qsds576z1kr106d3gz7mhscv" + "commit": "fc669b449c836d66dc9d542dad766e568952c986", + "sha256": "1i9aak2k8zzj2i1wj7xhi750rn8c4wsmcp95w3zabprwxwr790hh" } }, { @@ -96354,15 +96624,15 @@ "repo": "twlz0ne/separedit.el", "unstable": { "version": [ - 20210930, - 1319 + 20211116, + 326 ], "deps": [ "dash", "edit-indirect" ], - "commit": "62c037e2ab1bfcce79ea3316b2fb70ffff291b3d", - "sha256": "0a82mds1l7hnfkifirjq6mp2cdfdfkaxvz6dw4i8sqzygw1dn7dl" + "commit": "0a2dc1a22955fdd065f04dfdd5242f1b61b4a303", + "sha256": "1j1yd9d5hb5ryv0yx02lga0drgyfhkqwli5zrkrhili8h43g522d" }, "stable": { "version": [ @@ -97153,8 +97423,8 @@ 20211103, 1010 ], - "commit": "8e12d366ca371fc259294485047a431a7c610605", - "sha256": "09w57wq9mw3yjklxsqm87xl2q229qwqp48ssxlp5xpwhwljgwd2j" + "commit": "5b9a400cafbf4778cdb4ab26f7718f8cb0c84705", + "sha256": "143b5np4d8vmpdyw1pzxl6xgh6pzfp0phhli0j4wsly83ivcf7w2" }, "stable": { "version": [ @@ -98337,15 +98607,15 @@ "repo": "slime/slime", "unstable": { "version": [ - 20211021, - 807 + 20211108, + 2224 ], "deps": [ "cl-lib", "macrostep" ], - "commit": "1378aa718781ec6d359845f0116e12865261b2ca", - "sha256": "0h0bqmvwnddqj0b18kcmn990mmngpnq118h28w28lzr65aa33m2r" + "commit": "9005cdaac4c0adaa8e26ee5285c7b155762c0ce5", + "sha256": "18xywimwhfnqbsr4x9bs8v78qkc287ka3by022aqgpfasr1bi7ff" }, "stable": { "version": [ @@ -98577,11 +98847,11 @@ "repo": "joaotavora/sly", "unstable": { "version": [ - 20210729, - 1613 + 20211114, + 1021 ], - "commit": "540a8c5b9a04af0a6907e07cb070f1fed8a76f48", - "sha256": "13m15gcsqmagxmjvn28kd5rhh0ly7d4p4malhg5m7cbbms4svv68" + "commit": "8b1b968651c6d1a8699d16c3a03d0d1e83ecca3d", + "sha256": "10yx6mhfdd79nl3qz5bj275i400hnnr5r951h84xif0hclhr1bxn" }, "stable": { "version": [ @@ -99811,14 +100081,14 @@ "repo": "hlissner/emacs-solaire-mode", "unstable": { "version": [ - 20210927, - 1622 + 20211114, + 1644 ], "deps": [ "cl-lib" ], - "commit": "46408f4a105e216c3c2d88659b8b28601d37d80e", - "sha256": "0wq5ckwx3wv4c4l8f9hz3ak6v5wy4lg5yh8xlsgn1h1x6yf8afpp" + "commit": "87c2efd11b4b71e000d8a464eb694852e22aa0e7", + "sha256": "058cflb2199yb2qpzhf5hckz4cknsxqpglmz4nvnfv6k2xbnijpb" }, "stable": { "version": [ @@ -99841,11 +100111,11 @@ "repo": "bbatsov/solarized-emacs", "unstable": { "version": [ - 20210827, - 859 + 20211114, + 807 ], - "commit": "874694ed8569ae98959262cfb0c66a6528a60367", - "sha256": "1j6728229rrpamh4nn2v5mmlbb111i6ar7zh0g9d922k7vqr2nam" + "commit": "f34a171ff0e39549972edf533120f0b556f0b5ad", + "sha256": "07zxrf4xbh85d4sfxch6mcjgd6ga4a079k5fwqdm72pmi07659hf" }, "stable": { "version": [ @@ -99877,8 +100147,8 @@ "flycheck", "solidity-mode" ], - "commit": "9c77b390eab999e5e54dc5c1068f57201e6628bf", - "sha256": "0i6kjvd82bq3djh4makf4czdbmg3sb5q74wbdfhdyikx6kkzfj0m" + "commit": "bac439dbd2097664df45e9fac0ce57e23462c14c", + "sha256": "1vs64gwm6zn47fl4nvaizkwh8zwnqh764yqcmggyz4awsxsxg6ym" }, "stable": { "version": [ @@ -99902,11 +100172,11 @@ "repo": "ethereum/emacs-solidity", "unstable": { "version": [ - 20211004, - 1910 + 20211112, + 1959 ], - "commit": "9c77b390eab999e5e54dc5c1068f57201e6628bf", - "sha256": "0i6kjvd82bq3djh4makf4czdbmg3sb5q74wbdfhdyikx6kkzfj0m" + "commit": "bac439dbd2097664df45e9fac0ce57e23462c14c", + "sha256": "1vs64gwm6zn47fl4nvaizkwh8zwnqh764yqcmggyz4awsxsxg6ym" }, "stable": { "version": [ @@ -100653,11 +100923,11 @@ "repo": "ideasman42/emacs-spell-fu", "unstable": { "version": [ - 20211103, - 328 + 20211108, + 203 ], - "commit": "1159eeec13acbba5ecfc24aa8f6aa620c1274d17", - "sha256": "1fm40dkh0albrw2cv6wkkgssp4aka2gamxczkgnvwa4ifkf7p3i0" + "commit": "570ccd84edddb60e6fc0f6bde5a9fb9b07ed2aa0", + "sha256": "0n9b3b8lgr9g4xc5md11agbpr1b7ahpdxphnwy473vw1fzgnj1fl" } }, { @@ -101245,11 +101515,11 @@ "repo": "srfi-explorations/emacs-srfi", "unstable": { "version": [ - 20210902, - 626 + 20211116, + 1936 ], - "commit": "021239f0e2bcc60257b72916db9cdd110588ec28", - "sha256": "0v79z2d9l824j6chsviffdsfb4m9w93kgwcwdaksdb5rsfmryigp" + "commit": "8874e933643b91d9c545fd4ca3f0ea986561da31", + "sha256": "1s0ivhg6rbk5k9yzy8gy589ybba7dnc9cksz4wwsgcsm931sx9fz" }, "stable": { "version": [ @@ -101673,8 +101943,8 @@ 20200606, 1308 ], - "commit": "16a65055f92497b035d866fa4b39d1786c4f4b8c", - "sha256": "0dkg4ddj0bjn8drvx49ffb4y6q84r27cbh8dxrwi9ikcwqb61b6w" + "commit": "d5bef96e847b50bd436725fa3b102f0c41b56bae", + "sha256": "1x2fyh6xyd1xzyhk1pk5x23j3if11rm8zpl75izkc3y6vw37haa3" }, "stable": { "version": [ @@ -102401,20 +102671,18 @@ "repo": "tlikonen/suomalainen-kalenteri", "unstable": { "version": [ - 20200830, - 1107 + 20211108, + 1333 ], - "commit": "5b209ff7b7d3dcd09b623915aba1e137c875fa0e", - "sha256": "0ym0rfyrnj4f6c6nhz0yfvl1n1fsdb2n20gksw4blqg94ccafqh1" + "commit": "56927306d8046f2ba38b8cadabde47c5b6851262", + "sha256": "03y5hh2al8m75bdjxwa052nqa3iryp08dkhvmaaa9b0i2fq233z5" }, "stable": { "version": [ - 2020, - 8, - 30 + 2021 ], - "commit": "99fd77d25fc12c0a9f1fc75f0b83b31774d493bd", - "sha256": "12b2534cz9qqc923cf4nj76gmx3l19wrqmha077rlgl5pqlgqh6b" + "commit": "56927306d8046f2ba38b8cadabde47c5b6851262", + "sha256": "03y5hh2al8m75bdjxwa052nqa3iryp08dkhvmaaa9b0i2fq233z5" } }, { @@ -102634,26 +102902,25 @@ "repo": "thblt/sway.el", "unstable": { "version": [ - 20210501, - 2201 + 20211109, + 1601 ], "deps": [ "dash" ], - "commit": "8a4d9cc1a469efa707cf67b57b752f28547e331e", - "sha256": "0x5w3f07dsgbl7qlcqpmpm3831lrv5jx59g7xnv25giwc3w21d2d" + "commit": "d84adab82ca5f84847702671dd60c0377c82ccd9", + "sha256": "1xqlflk0k1zcsblydsx583mrh5zxpjbah8h1jb1lrfzwrbx0m627" }, "stable": { "version": [ 0, - 2, - 4 + 3 ], "deps": [ "dash" ], - "commit": "8a4d9cc1a469efa707cf67b57b752f28547e331e", - "sha256": "0x5w3f07dsgbl7qlcqpmpm3831lrv5jx59g7xnv25giwc3w21d2d" + "commit": "d84adab82ca5f84847702671dd60c0377c82ccd9", + "sha256": "1xqlflk0k1zcsblydsx583mrh5zxpjbah8h1jb1lrfzwrbx0m627" } }, { @@ -103127,11 +103394,11 @@ "repo": "lassik/emacs-symbolist", "unstable": { "version": [ - 20210503, - 1220 + 20211107, + 1615 ], - "commit": "f600e07fe06c19b67f917a8839bbcd6c78f1fbd4", - "sha256": "02x71kdnkhyzscc2bxayv55qfanqy0hm7rckq4mqhxbryjz7qcab" + "commit": "92b712734941a45da7d47fd61b95e4013ff53481", + "sha256": "0033qxn1zx90lws6a8ibg7xx5xxpiwzr08fj86k5w84nj6nvwras" } }, { @@ -103168,8 +103435,8 @@ "repo": "countvajhula/symex.el", "unstable": { "version": [ - 20211016, - 51 + 20211115, + 2045 ], "deps": [ "evil", @@ -103181,8 +103448,8 @@ "seq", "undo-tree" ], - "commit": "6dab41cf72fb5f25e0de30fde64fee960944a604", - "sha256": "1p8x7q1hf3bbblm43b4w3kns8ns6zjsz008x7pgvinqwi78a6nfs" + "commit": "ce33a7858481da2a1a07558b0932b19328d3449b", + "sha256": "017a6bmacfcwqy7x89pzpgkqpipl8i5hbp429cqpw7xdhjwgc2in" }, "stable": { "version": [ @@ -104045,15 +104312,15 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20211102, - 1327 + 20211116, + 1246 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "7829e605467a3177e143f5c6ff9e55ac00803c8f", - "sha256": "0v7pmj2y7d8pidlais20kk7qi5kksq6pc7pn2fsb5q90p2mdlw9q" + "commit": "9bc087dab6d2503da41881132664f5c0c979f4b6", + "sha256": "1s3p9ndwiv08wh30i9rgdm2lz3a4xj9in2y4rrhywq4gnd5zbz7d" }, "stable": { "version": [ @@ -105151,18 +105418,18 @@ 20200212, 1903 ], - "commit": "0d838c46aeb771ec5c1e3108faeb82cd3da935aa", - "sha256": "02drmjh4ay8krimf7bm32f72n5d6929ylc2znpnp70vihn40ybjr" + "commit": "c0cc1a6b7273feb1049206f58da5f469e28b56a9", + "sha256": "0pkwa42r33l30ddnmy8hkflwirf3xnv4fi5a6zxsm3ibi7z649fm" }, "stable": { "version": [ 2021, 11, - 1, + 15, 0 ], - "commit": "bea461a963aae123322e893bc3a03ba1ad0657d5", - "sha256": "0y9jsq8lmz1xj0r3ybs4qbqwfvc3jbawpd3h4516zw1k5nwgf7d4" + "commit": "7f44dce741f17712a5671b09f495059bd1f68d09", + "sha256": "1jldrq95cb2g27my88k98c8p33kbk04l0rc8vpwlyyxr602cx7k9" } }, { @@ -105218,8 +105485,8 @@ "deps": [ "haskell-mode" ], - "commit": "cff017c60a92d446f1c7f0eaf65b9b63a0224800", - "sha256": "0xfm3hniijpd3wky62khg57il1gfxza0byr64v1aa6drsw9ygc4i" + "commit": "be7c02a4df03d695c8f8dca80817a736905ecf47", + "sha256": "1lh92rzafapx6yi7r24yzrxgv2v6wqvzg62j0pd3zqa6s499v4k9" }, "stable": { "version": [ @@ -105467,11 +105734,11 @@ "repo": "aimebertrand/timu-spacegrey-theme", "unstable": { "version": [ - 20211101, - 1649 + 20211115, + 2323 ], - "commit": "3da96d529c09dc1000de425f937380895ab9efa6", - "sha256": "0k2l15lkk3b5y7qfzhjid8l1clam5j9nhm635a1qmhjgcdln18x3" + "commit": "2934363d32ba6e817e789d5ecf5e68a51cfc0e8d", + "sha256": "001h23yhqys90dpqka4m3zcdnwbfxvjii5lxmj67shblslx5f4sl" }, "stable": { "version": [ @@ -106072,14 +106339,14 @@ "repo": "trueroad/tr-emacs-ime-module", "unstable": { "version": [ - 20210202, - 1057 + 20211114, + 440 ], "deps": [ "w32-ime" ], - "commit": "92591f7c0b94f8b1875f1078d1ba3be40848f0b8", - "sha256": "0r5cmj8ih8n7m37fqwyymmd0swyxr6g124cw9cz24ri0dyiwi73k" + "commit": "c35be849f2cf5470e9d9cc40ff54e285e5170e93", + "sha256": "0sy33f8c9l0189qhm8q2whb6yrsir52fqqq3wh54qkbqc8vvg7py" }, "stable": { "version": [ @@ -106251,11 +106518,11 @@ "repo": "magit/transient", "unstable": { "version": [ - 20211104, - 143 + 20211105, + 100 ], - "commit": "202271f755497bacb50a1f2b3c93566e816f447e", - "sha256": "1y0rir7w12h85jagjdnww9wgwi1aazmm22ry7gz9wiax6mm1pcdn" + "commit": "349116159f707a474926b47e5f6b6240e8997a4d", + "sha256": "1yzjdr9rdxax8gcd0k978v9akb1wk2ff14wfigiaqkvqs3sd8zxy" }, "stable": { "version": [ @@ -106488,6 +106755,29 @@ } }, { + "ename": "tree-edit", + "commit": "43726f8e4c4f7f673ca892ec17329471dba77b3e", + "sha256": "0537g2m5k3hwdisbag9724nkzx97x45ry602gjpqr9dzywd30g65", + "fetcher": "github", + "repo": "ethan-leba/tree-edit", + "unstable": { + "version": [ + 20211116, + 1613 + ], + "deps": [ + "dash", + "reazon", + "s", + "tree-sitter", + "tree-sitter-langs", + "tsc" + ], + "commit": "6fd445dbeb158d05d785965077cc594aeeb73a61", + "sha256": "0h1zjdqxynxxlqdc9yxhmkjwarx4vn9anasv9i68fcmmnq7c0aw9" + } + }, + { "ename": "tree-mode", "commit": "84f836338818946a6bb31d35d6ae959571128ed5", "sha256": "1b15xgh96j4qas1kh4ghczcn7hb1ri86wnjgn9wz2d6bw3c6077b", @@ -106635,8 +106925,8 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20211101, - 1223 + 20211115, + 2031 ], "deps": [ "ace-window", @@ -106648,8 +106938,8 @@ "pfuture", "s" ], - "commit": "e4b15841c9671f9b26f370a8cbaa61632b459db4", - "sha256": "030k0pbzsnjwm2q0na7f5rfp2avrabf7rmanp3a4cxgf8dvdgm5c" + "commit": "d00cc19cab8df4fec7ed6608e00bd16fe797369a", + "sha256": "167jn29vqx5q5nd2ja9bi1srz623zmq7jpd79al0s98ngnw8hpr7" }, "stable": { "version": [ @@ -106679,15 +106969,15 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20211102, - 2155 + 20211107, + 1818 ], "deps": [ "all-the-icons", "treemacs" ], - "commit": "e4b15841c9671f9b26f370a8cbaa61632b459db4", - "sha256": "030k0pbzsnjwm2q0na7f5rfp2avrabf7rmanp3a4cxgf8dvdgm5c" + "commit": "d00cc19cab8df4fec7ed6608e00bd16fe797369a", + "sha256": "167jn29vqx5q5nd2ja9bi1srz623zmq7jpd79al0s98ngnw8hpr7" }, "stable": { "version": [ @@ -106718,8 +107008,8 @@ "evil", "treemacs" ], - "commit": "e4b15841c9671f9b26f370a8cbaa61632b459db4", - "sha256": "030k0pbzsnjwm2q0na7f5rfp2avrabf7rmanp3a4cxgf8dvdgm5c" + "commit": "d00cc19cab8df4fec7ed6608e00bd16fe797369a", + "sha256": "167jn29vqx5q5nd2ja9bi1srz623zmq7jpd79al0s98ngnw8hpr7" }, "stable": { "version": [ @@ -106749,8 +107039,8 @@ "deps": [ "treemacs" ], - "commit": "e4b15841c9671f9b26f370a8cbaa61632b459db4", - "sha256": "030k0pbzsnjwm2q0na7f5rfp2avrabf7rmanp3a4cxgf8dvdgm5c" + "commit": "d00cc19cab8df4fec7ed6608e00bd16fe797369a", + "sha256": "167jn29vqx5q5nd2ja9bi1srz623zmq7jpd79al0s98ngnw8hpr7" }, "stable": { "version": [ @@ -106781,8 +107071,8 @@ "pfuture", "treemacs" ], - "commit": "e4b15841c9671f9b26f370a8cbaa61632b459db4", - "sha256": "030k0pbzsnjwm2q0na7f5rfp2avrabf7rmanp3a4cxgf8dvdgm5c" + "commit": "d00cc19cab8df4fec7ed6608e00bd16fe797369a", + "sha256": "167jn29vqx5q5nd2ja9bi1srz623zmq7jpd79al0s98ngnw8hpr7" }, "stable": { "version": [ @@ -106815,8 +107105,8 @@ "persp-mode", "treemacs" ], - "commit": "e4b15841c9671f9b26f370a8cbaa61632b459db4", - "sha256": "030k0pbzsnjwm2q0na7f5rfp2avrabf7rmanp3a4cxgf8dvdgm5c" + "commit": "d00cc19cab8df4fec7ed6608e00bd16fe797369a", + "sha256": "167jn29vqx5q5nd2ja9bi1srz623zmq7jpd79al0s98ngnw8hpr7" }, "stable": { "version": [ @@ -106849,8 +107139,8 @@ "perspective", "treemacs" ], - "commit": "e4b15841c9671f9b26f370a8cbaa61632b459db4", - "sha256": "030k0pbzsnjwm2q0na7f5rfp2avrabf7rmanp3a4cxgf8dvdgm5c" + "commit": "d00cc19cab8df4fec7ed6608e00bd16fe797369a", + "sha256": "167jn29vqx5q5nd2ja9bi1srz623zmq7jpd79al0s98ngnw8hpr7" }, "stable": { "version": [ @@ -106882,8 +107172,8 @@ "projectile", "treemacs" ], - "commit": "e4b15841c9671f9b26f370a8cbaa61632b459db4", - "sha256": "030k0pbzsnjwm2q0na7f5rfp2avrabf7rmanp3a4cxgf8dvdgm5c" + "commit": "d00cc19cab8df4fec7ed6608e00bd16fe797369a", + "sha256": "167jn29vqx5q5nd2ja9bi1srz623zmq7jpd79al0s98ngnw8hpr7" }, "stable": { "version": [ @@ -107622,24 +107912,6 @@ } }, { - "ename": "typoscript-mode", - "commit": "701de09cb97cbfa49a3a81aaeb9577817566efa2", - "sha256": "18i2wwbn8vj5dbgxp2ds29n12v8ldvxjd1zb6h1g9lfh8iyrnjmx", - "fetcher": "github", - "repo": "ksjogo/typoscript-mode", - "unstable": { - "version": [ - 20170126, - 912 - ], - "deps": [ - "use-package" - ], - "commit": "44e7567e921573c4f33c537b827f71fb1f565c32", - "sha256": "0i7l9s3lhxnld32mqyrvasiv1hilhwnp2fwvpdv2cx9r902q6kc8" - } - }, - { "ename": "ubuntu-theme", "commit": "091dcc3775ec2137cb61d66df4e72aca4900897a", "sha256": "160z59aaxb2v6c24nki6bn7pjm9r4jl1mgxs4h4sivzxkaw811s2", @@ -109573,8 +109845,8 @@ 20211103, 1927 ], - "commit": "f9ea5780ec65e6f30451514b72ce99619dd8457f", - "sha256": "1l38ax1ms7s2qwjnqd0djf2gcy5jpqha55d17vyvkx1kgwjapja7" + "commit": "6250360b3b06f590dd37885f3c33a451a3eab5d3", + "sha256": "07xdl2ng435iy9zqrq1wgrmwygarc91kqmz6ck1ngvn4mh86ndxk" }, "stable": { "version": [ @@ -109650,8 +109922,8 @@ "repo": "mihaiolteanu/versuri", "unstable": { "version": [ - 20211102, - 1142 + 20211104, + 1301 ], "deps": [ "anaphora", @@ -109661,8 +109933,8 @@ "request", "s" ], - "commit": "eafc925e3089aa80cefd6ceeb0cb87abce5490a9", - "sha256": "1gqbd6iwfpicqrpigyki402jy73a58nx0k3akzybzgljdgw7xg9p" + "commit": "c8ea562304194f3379ed8f9c6a785ce8ee72898e", + "sha256": "1ak5f6g9sqd2dwplipnacg6kknkpf1j6df5am0hqcmlsk052d12s" } }, { @@ -110060,17 +110332,17 @@ }, { "ename": "visual-fill-column", - "commit": "c7628c805840c4687686d0b9dc5007342864721e", - "sha256": "19y0pwaybjal2rc7migdbnafpi4dfbxvrzgfqr8dlvd9q68v08y5", - "fetcher": "github", - "repo": "joostkremers/visual-fill-column", + "commit": "39ada1dc39158e956a1251cd41cfa2259b51da21", + "sha256": "1bbly6sd77cnxl1c4n24039cgfwn0mcq6l3jgyh8z7bk6lnsjfw2", + "fetcher": "git", + "url": "https://codeberg.org/joostkremers/visual-fill-column", "unstable": { "version": [ - 20211014, - 2141 + 20211110, + 2317 ], - "commit": "2df643827a4fd82b732ea93042916c61078d4206", - "sha256": "1j8x044s4xzmfmqrsabim9gv435scj2yhym3f3p9bf5vq5ds2smj" + "commit": "ae4edc225acea12a035c0586185847306ecb06ef", + "sha256": "18qac66mpvgmp1pw0lvarjngwh9cx75an44n1pg2msbxkkm98zkj" }, "stable": { "version": [ @@ -110500,8 +110772,8 @@ "repo": "mihaiolteanu/vuiet", "unstable": { "version": [ - 20210715, - 907 + 20211116, + 1109 ], "deps": [ "bind-key", @@ -110510,8 +110782,8 @@ "s", "versuri" ], - "commit": "b327a5224ab45f6689ce635878301e54ca753b3b", - "sha256": "1sq2nmmw8ga4jhkgb3a0mkps7v8ma1jrrz8c1vbypfn1b3amvj3b" + "commit": "ddfd4be99b46ddc042139028980ad8dd616b7d45", + "sha256": "10wjzx8vq8k16dwcjppnr28pkiilxl2ak78h60h68flakmdzibmg" }, "stable": { "version": [ @@ -110537,16 +110809,16 @@ "repo": "d12frosted/vulpea", "unstable": { "version": [ - 20211028, - 704 + 20211115, + 1433 ], "deps": [ "org", "org-roam", "s" ], - "commit": "a1cdaf43649e133e1d571b597195e2d17c7c5928", - "sha256": "0qqz7xy6yfscjac05klckf81pcmfwgl4jhd5i4g873xmrclmfzwi" + "commit": "0c16e1c1adb45e8aaa32f06edc604e18d39179eb", + "sha256": "1217gni713nc5y37wfspnc5b790chri96an4hzv1jra33lazn49y" }, "stable": { "version": [ @@ -110709,11 +110981,11 @@ "repo": "wakatime/wakatime-mode", "unstable": { "version": [ - 20210818, - 1556 + 20211104, + 1455 ], - "commit": "8dfe67c1581a0f3688c572dfdb5f8f71d3f874a0", - "sha256": "1rpl2hj1413kcxvxl27jycjl40js8cybf2qrhvjfwfhxncpwacxv" + "commit": "0f94ac2dd4fa125fc5f152700779edce75a6b03b", + "sha256": "1iqmd763gik32blrc8ki9rikm3k5iksm0xg12rffmilawc2vn480" } }, { @@ -110724,11 +110996,11 @@ "repo": "darkstego/wakib-keys", "unstable": { "version": [ - 20210903, - 1619 + 20211116, + 2049 ], - "commit": "627e94389fe754da9802a8c93e4a3d1a1831967b", - "sha256": "0i0a9imkpz0aq4r340vd2li22m1wnv7p83s4bcaihl1z8axfa611" + "commit": "b2a62fb74f2fdfd00fd56ff8343651fa0a079f50", + "sha256": "0j47xxch74j09xxi2v2m42cyzcfa6zbvb6wpyjk9dif6pjn1q3n8" } }, { @@ -110857,16 +111129,16 @@ "repo": "wanderlust/wanderlust", "unstable": { "version": [ - 20211028, - 1330 + 20211115, + 1206 ], "deps": [ "apel", "flim", "semi" ], - "commit": "475514f22c0869d7b84cdf0b957f9ae75a45605b", - "sha256": "050dglv2l5z7pgrkzpmplzjm5mx3b4yg4zaqp2ghd9ddd19kn3y8" + "commit": "aef23d6e50b7e29ff4ff11d288f36f6ba03f29ac", + "sha256": "06rj754ygv0455hkyb62ihqk844jx6cx18n5vixjmcws6hvpi9al" } }, { @@ -112375,8 +112647,8 @@ 20211028, 2105 ], - "commit": "521f75e3f37c7fe204bddb8a29ce862cae8f59bd", - "sha256": "0my9zbrzgn4h6wxl172iw6mn2dvcn3r85bdcl3pyv0hc5n7lkzxz" + "commit": "cfe70f43c551852125bc139df467e28e1b6087df", + "sha256": "0i38y7kw0fpb1ii8bfiidh5xkinldzzz1c0i33zvwym76a28birb" }, "stable": { "version": [ @@ -113677,6 +113949,21 @@ } }, { + "ename": "xwiki-mode", + "commit": "3288cf8d5b62e01c64ce9ab572275df5ab58a27f", + "sha256": "0ykgs5hnil5837x59x31xjf86l8l5fi9bf8jg71bmq61qvhxfkvi", + "fetcher": "github", + "repo": "ackerleytng/xwiki-mode", + "unstable": { + "version": [ + 20211112, + 511 + ], + "commit": "580e65296ca0ffb20270610ef16bfeb8850fc7c8", + "sha256": "0izsj9krl4lhm33w9hh6gjihns4lrgaf40qiiif43n05jha7fj0z" + } + }, + { "ename": "xwwp", "commit": "83c34ae5023410cc31f93255275d6465b6152a10", "sha256": "07r62haa1ks2xvfh4zkqadpsjdhk6kbafk1fmvcim3m13ma6gch1", @@ -114178,25 +114465,25 @@ "repo": "mineo/yatemplate", "unstable": { "version": [ - 20200625, - 1336 + 20211115, + 1208 ], "deps": [ "yasnippet" ], - "commit": "399564fc1afa100aa6049ac6de11fb065882d230", - "sha256": "0gvysijv659z843r692wzfjz5p8j2dr79m8fzcnajnrpim9jf2j8" + "commit": "275745ce1482edc08efb0b7807bc86d832bcc734", + "sha256": "1dkxzvsmz193nwybi3wi00k0wwhkbpnj4yi7gxdrgix6kxbpjd9i" }, "stable": { "version": [ - 4, + 5, 0 ], "deps": [ "yasnippet" ], - "commit": "bfee45cfc179d6b7fbc3ff06c9f79b76dc7fbf58", - "sha256": "0h2fc9vjwb94n3nklq35s3dy9i4ihrqffp2556cmsaq7gzlipb81" + "commit": "275745ce1482edc08efb0b7807bc86d832bcc734", + "sha256": "1dkxzvsmz193nwybi3wi00k0wwhkbpnj4yi7gxdrgix6kxbpjd9i" } }, { @@ -114562,14 +114849,14 @@ "repo": "zv/z3-mode", "unstable": { "version": [ - 20151120, - 2255 + 20211116, + 138 ], "deps": [ "flycheck" ], - "commit": "163dc01d59e9880b4dc188d4e1ad84d6c0c852e1", - "sha256": "1k7m3xk5ksbr2s3ypz5yqafz9sfav1m0qk2jz1xyi3fdaw2j0w2z" + "commit": "0356cbe1e1e2b780ba0ddb4aaa055fa246a67931", + "sha256": "0jlnxxzh9p7285m16w33l5529iglg5cihs6gqwnb6y34wpzwyar6" } }, { @@ -114712,10 +114999,10 @@ }, { "ename": "zeno-theme", - "commit": "8aef13a70809ee1fc00f0e8c2853936380b22422", - "sha256": "1hq3yx0l6v2wwgmmsq5c7h5chbila9flpvsr1a9fpq09lbq2yq7g", + "commit": "e6f007367d181005ebd1a4d73085d73e807d3583", + "sha256": "01kp0j27q9v62d45ail65al9zzfxpx7d7bj6gdzilbmwk3k7lxq5", "fetcher": "github", - "repo": "zenobharat/zeno-theme", + "repo": "zenobht/zeno-theme", "unstable": { "version": [ 20181027, @@ -114819,14 +115106,14 @@ "repo": "NicolasPetton/zerodark-theme", "unstable": { "version": [ - 20210216, - 1640 + 20211115, + 841 ], "deps": [ "all-the-icons" ], - "commit": "ee49ea9e875d7a3da63386880ca3a9e10b1051e5", - "sha256": "06q1v0fkxyxadrpgy28gh85j19vi4ars2xrbbm1bz28xrcbnps04" + "commit": "b463528704f6eb00684c0ee003fbd8e42901cde0", + "sha256": "1ajgz5mbvzv92p1g3k6p94v11z3xyj5w81fpfiwhlvh30imx6z9q" }, "stable": { "version": [ diff --git a/pkgs/applications/editors/lite-xl/default.nix b/pkgs/applications/editors/lite-xl/default.nix new file mode 100644 index 0000000000000..3b38004eddbac --- /dev/null +++ b/pkgs/applications/editors/lite-xl/default.nix @@ -0,0 +1,65 @@ +{ agg +, fetchFromGitHub +, fetchpatch +, Foundation +, freetype +, lib +, lua5_2 +, meson +, ninja +, pcre2 +, pkg-config +, reproc +, SDL2 +, stdenv +}: + +stdenv.mkDerivation rec { + pname = "lite-xl"; + version = "2.0.1"; + + src = fetchFromGitHub { + owner = "lite-xl"; + repo = "lite-xl"; + rev = "v${version}"; + sha256 = "sha256-+RbmT6H/5Ldhv3qOClxMjCSGMudbkGtkjo2SpGqExao="; + }; + + patches = [ + # Fixes compatibility with Lua5.2, remove patch when PR merged + # https://github.com/lite-xl/lite-xl/pull/435 + (fetchpatch { + name = "0001-replace-unpack-with-table.unpack.patch"; + url = "https://github.com/lite-xl/lite-xl/commit/30ccde896d1ffe37cbd8990e9b8aaef275e18935.patch"; + sha256 = "sha256-IAe3jIyD3OtZtu1V7MtPR4QzFKvU/aV/nLQ4U9nHyIQ="; + }) + # Lets meson fallback to the system reproc if available. + # remove patch when 2.0.2 is proposed. + (fetchpatch { + name = "0002-use-dependency-fallbacks-use-system-reproc-if-available.patch"; + url = "https://github.com/lite-xl/lite-xl/commit/973acb787aacb0164b2f4ae6fe335d250ba80a7b.patch"; + sha256 = "sha256-GmgATsRlj1FePmw3+AoWEMZIo2eujHYewKQCx583qbU="; + }) + ]; + + nativeBuildInputs = [ meson ninja pkg-config ]; + + buildInputs = [ + agg + freetype + lua5_2 + pcre2 + reproc + SDL2 + ] ++ lib.optionals stdenv.isDarwin [ + Foundation + ]; + + meta = with lib; { + description = "A lightweight text editor written in Lua"; + homepage = "https://github.com/lite-xl/lite-xl"; + license = licenses.mit; + maintainers = with maintainers; [ boppyt ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/misc/cloak/default.nix b/pkgs/applications/misc/cloak/default.nix index cb33aa595a466..7b25018412627 100644 --- a/pkgs/applications/misc/cloak/default.nix +++ b/pkgs/applications/misc/cloak/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, Security }: rustPlatform.buildRustPackage rec { pname = "cloak"; @@ -13,6 +13,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0af38wgwmsamnx63dwfm2nrkd8wmky3ai7zwy0knmifgkn4b7yyj"; + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + meta = with lib; { homepage = "https://github.com/evansmurithi/cloak"; description = "Command-line OTP authenticator application"; diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index 85fef2cbb00d6..84651b78121ae 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "gpxsee"; - version = "9.11"; + version = "9.12"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "sha256-5FGdcmkVOxjDngVQIlXnH3OPRMjaixqJ2Xb239usUuo="; + sha256 = "sha256-hIDphwmS4UNSTvE+Icupipo6AmT2fiPdaufT/I3EeJ4="; }; patches = (substituteAll { @@ -23,7 +23,7 @@ mkDerivation rec { lrelease gpxsee.pro ''; - postInstall = with stdenv; lib.optionalString isDarwin '' + postInstall = lib.optionalString stdenv.isDarwin '' mkdir -p $out/Applications mv GPXSee.app $out/Applications ''; diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index 4fb05b25c063a..3dca98c2cc773 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "logseq"; - version = "0.4.5"; + version = "0.4.6"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - sha256 = "EMybZH3heUWeCP74KdFr6zJY1R3hePo6RssbJXrkd9g="; + sha256 = "fGRPuv98sr3wcVbkVCJr2yKxBZ/IiQP854T9NBf/vCk="; name = "${pname}-${version}.AppImage"; }; diff --git a/pkgs/applications/misc/osmscout-server/default.nix b/pkgs/applications/misc/osmscout-server/default.nix index a3815dae00fc3..d6041554705e2 100644 --- a/pkgs/applications/misc/osmscout-server/default.nix +++ b/pkgs/applications/misc/osmscout-server/default.nix @@ -1,6 +1,6 @@ { lib, mkDerivation, fetchFromGitHub, fetchpatch, pkg-config , qmake, qttools, kirigami2, qtquickcontrols2, qtlocation -, libosmscout, mapnik, valhalla, libpostal, osrm-backend, protobuf +, libosmscout, valhalla, libpostal, osrm-backend, protobuf , libmicrohttpd_0_9_70, sqlite, marisa, kyotocabinet, boost }: @@ -41,7 +41,7 @@ mkDerivation rec { nativeBuildInputs = [ qmake pkg-config qttools ]; buildInputs = [ kirigami2 qtquickcontrols2 qtlocation - mapnik valhalla libosmscout osrm-backend libmicrohttpd_0_9_70 + valhalla libosmscout osrm-backend libmicrohttpd_0_9_70 libpostal sqlite marisa kyotocabinet boost protobuf date ]; @@ -52,8 +52,10 @@ mkDerivation rec { mv data/valhalla.json-3.1 data/valhalla.json ''; - # Choose to build the kirigami UI variant - qmakeFlags = [ "SCOUT_FLAVOR=kirigami" ]; + qmakeFlags = [ + "SCOUT_FLAVOR=kirigami" # Choose to build the kirigami UI variant + "CONFIG+=disable_mapnik" # Disable the optional mapnik backend + ]; meta = with lib; { description = "Maps server providing tiles, geocoder, and router"; diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/applications/misc/ulauncher/default.nix index d2df076dc23d5..63a8b485df533 100644 --- a/pkgs/applications/misc/ulauncher/default.nix +++ b/pkgs/applications/misc/ulauncher/default.nix @@ -33,6 +33,7 @@ python3Packages.buildPythonApplication rec { distutils_extra intltool wrapGAppsHook + gdk-pixbuf ]; buildInputs = [ @@ -58,6 +59,7 @@ python3Packages.buildPythonApplication rec { pyinotify python-Levenshtein pyxdg + pycairo requests websocket-client ]; @@ -105,7 +107,10 @@ python3Packages.buildPythonApplication rec { # do not double wrap dontWrapGApps = true; preFixup = '' - makeWrapperArgs+=("''${gappsWrapperArgs[@]}" --prefix PATH : "${lib.makeBinPath [ wmctrl ]}") + makeWrapperArgs+=( + "''${gappsWrapperArgs[@]}" + --prefix PATH : "${lib.makeBinPath [ wmctrl ]}" + ) ''; passthru = { diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 3023bb6c7ac15..2f2e143af7594 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -229,12 +229,13 @@ "version": "0.1.0" }, "consul": { - "owner": "terraform-providers", + "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/consul", "repo": "terraform-provider-consul", - "rev": "v2.8.0", - "sha256": "1brd0fp9ksc3x8cygxm0k2q1sh4v5x89298pnidg6xirn41lvcr4", - "version": "2.8.0" + "rev": "v2.14.0", + "sha256": "19kmjjg4f74askwwwslbh5wvi5ndcr4wzm0374qr8gc57qiwxkpy", + "vendorSha256": null, + "version": "2.14.0" }, "ct": { "owner": "poseidon", @@ -362,11 +363,13 @@ "version": "1.1.0" }, "github": { - "owner": "terraform-providers", + "owner": "integrations", + "provider-source-address": "registry.terraform.io/integrations/github", "repo": "terraform-provider-github", - "rev": "v3.1.0", - "sha256": "1xl4fd1lfbn1vnrdmg2xljnv8hy6rmf0iv7g8pzbnzbvj2pi7w3b", - "version": "3.1.0" + "rev": "v4.18.0", + "sha256": "0vr7vxlpq1lbp85qm2084w7mqkz5yp7gxj5ln29plhm7xjpd87bp", + "vendorSha256": null, + "version": "4.18.0" }, "gitlab": { "owner": "gitlabhq", @@ -687,11 +690,13 @@ "version": "0.0.1" }, "nomad": { - "owner": "terraform-providers", + "owner": "hashicorp", + "provider-source-address": "registry.terraform.io/hashicorp/nomad", "repo": "terraform-provider-nomad", - "rev": "v1.4.5", - "sha256": "1sccm4mspjn92ky6nscsrmbb573mx53wzsvvapsf2p4119h9s30i", - "version": "1.4.5" + "rev": "v1.4.15", + "sha256": "18rrvp7h27f51di8hajl2jb53v7wadqv4241rxdx1d180fas69k1", + "vendorSha256": "1y5wpilnqn17zbi88z23159gx2p57a9c10ajb7gn9isbxfdqj9mb", + "version": "1.4.15" }, "ns1": { "owner": "terraform-providers", @@ -1109,8 +1114,8 @@ "repo": "terraform-provider-vault", "rev": "v2.24.1", "sha256": "1xk14q06js774lqyylkbp53dnlsbgh3vi38mqqmndh80xigs6d99", - "version": "2.24.1", - "vendorSha256": "1ksla455qfgxpk2dmq3pg52nyyw3v0bg6fm5s60j6cb0lzvjbq48" + "vendorSha256": "1ksla455qfgxpk2dmq3pg52nyyw3v0bg6fm5s60j6cb0lzvjbq48", + "version": "2.24.1" }, "vcd": { "owner": "terraform-providers", diff --git a/pkgs/applications/networking/cluster/terraform-providers/update-provider b/pkgs/applications/networking/cluster/terraform-providers/update-provider index f97bbce83faac..03d92452ebc21 100755 --- a/pkgs/applications/networking/cluster/terraform-providers/update-provider +++ b/pkgs/applications/networking/cluster/terraform-providers/update-provider @@ -165,7 +165,7 @@ if [[ -z "$vendorSha256" ]]; then vendorSha256=$(echo "${BASH_REMATCH[1]#sha256:}" | head -n 1) # Deal with nix unstable if [[ $vendorSha256 = sha256-* ]]; then - vendorSha256=$(nix to-base32 "$vendorSha256") + vendorSha256=$(nix --extra-experimental-features nix-command hash to-base32 "$vendorSha256") fi fi fi diff --git a/pkgs/applications/networking/cluster/tgswitch/default.nix b/pkgs/applications/networking/cluster/tgswitch/default.nix new file mode 100644 index 0000000000000..9a1652f25d365 --- /dev/null +++ b/pkgs/applications/networking/cluster/tgswitch/default.nix @@ -0,0 +1,21 @@ +{ buildGoPackage, lib, fetchFromGitHub }: +buildGoPackage rec { + pname = "tgswitch"; + version = "0.5.378"; + + src = fetchFromGitHub { + owner = "warrensbox"; + repo = "tgswitch"; + rev = version; + sha256 = "0q2aqh75acbpkmvkws0rl3d5dzq3sisy637c0x6cnc88h34g3n3i"; + }; + + goPackagePath = "github.com/warrensbox/tgswitch"; + + meta = with lib; { + description = "A command line tool to switch between different versions of terragrunt"; + homepage = "https://github.com/warrensbox/tgswitch"; + license = licenses.mit; + maintainers = with maintainers; [ psibi ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix index a359f0a4ac0f4..cd29268bec68f 100644 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix @@ -3,6 +3,7 @@ , electron , esbuild , fetchFromGitHub +, fetchpatch , libdeltachat , makeDesktopItem , makeWrapper @@ -14,6 +15,33 @@ }: let + libdeltachat' = libdeltachat.overrideAttrs (old: rec { + version = "1.60.0"; + src = fetchFromGitHub { + owner = "deltachat"; + repo = "deltachat-core-rust"; + rev = version; + sha256 = "1agm5xyaib4ynmw4mhgmkhh4lnxs91wv0q9i1zfihv2vkckfm2s2"; + }; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${old.pname}-${version}"; + sha256 = "09d3mw2hb1gmqg7smaqwnfm7izw40znl0h1dz7s2imms2cnkjws1"; + }; + patches = [ + # https://github.com/deltachat/deltachat-core-rust/pull/2589 + (fetchpatch { + url = "https://github.com/deltachat/deltachat-core-rust/commit/408467e85d04fbbfd6bed5908d84d9e995943487.patch"; + sha256 = "1j2ywaazglgl6370js34acrg0wrh0b7krqg05dfjf65n527lzn59"; + }) + ./no-static-lib.patch + # https://github.com/deltachat/deltachat-core-rust/pull/2660 + (fetchpatch { + url = "https://github.com/deltachat/deltachat-core-rust/commit/8fb5e038a97d8ae68564c885d61b93127a68366d.patch"; + sha256 = "088pzfrrkgfi4646dc72404s3kykcpni7hgkppalwlzg0p4is41x"; + }) + ]; + }); electronExec = if stdenv.isDarwin then "${electron}/Applications/Electron.app/Contents/MacOS/Electron" else @@ -38,7 +66,7 @@ in nodePackages.deltachat-desktop.override rec { ]; buildInputs = [ - libdeltachat + libdeltachat' ] ++ lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/no-static-lib.patch b/pkgs/applications/networking/instant-messengers/deltachat-desktop/no-static-lib.patch new file mode 100644 index 0000000000000..95238cf885242 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/no-static-lib.patch @@ -0,0 +1,39 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fe7abe08..acdbe0d6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -13,7 +13,6 @@ find_program(CARGO cargo) + + add_custom_command( + OUTPUT +- "target/release/libdeltachat.a" + "target/release/libdeltachat.${DYNAMIC_EXT}" + "target/release/pkgconfig/deltachat.pc" + COMMAND +@@ -38,13 +37,11 @@ add_custom_target( + lib_deltachat + ALL + DEPENDS +- "target/release/libdeltachat.a" + "target/release/libdeltachat.${DYNAMIC_EXT}" + "target/release/pkgconfig/deltachat.pc" + ) + + include(GNUInstallDirs) + install(FILES "deltachat-ffi/deltachat.h" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) +-install(FILES "target/release/libdeltachat.a" DESTINATION ${CMAKE_INSTALL_LIBDIR}) + install(FILES "target/release/libdeltachat.${DYNAMIC_EXT}" DESTINATION ${CMAKE_INSTALL_LIBDIR}) + install(FILES "target/release/pkgconfig/deltachat.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) +diff --git a/deltachat-ffi/Cargo.toml b/deltachat-ffi/Cargo.toml +index a34a27ba..cf354abb 100644 +--- a/deltachat-ffi/Cargo.toml ++++ b/deltachat-ffi/Cargo.toml +@@ -12,7 +12,7 @@ categories = ["cryptography", "std", "email"] + + [lib] + name = "deltachat" +-crate-type = ["cdylib", "staticlib"] ++crate-type = ["cdylib"] + + [dependencies] + deltachat = { path = "../", default-features = false } diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/update.sh b/pkgs/applications/networking/instant-messengers/deltachat-desktop/update.sh index 162de501e6175..dbe249d56dae6 100755 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/update.sh +++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/update.sh @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -i bash -p curl jq nix-prefetch +#! nix-shell -i bash -p coreutils curl gnused jq moreutils nix-prefetch set -euo pipefail cd "$(dirname "$0")" @@ -13,7 +13,7 @@ rev=$( jq 'map(select(.prerelease | not)) | .[0].tag_name' --raw-output ) ver=$(echo "$rev" | sed 's/^v//') -old_ver=$(sed -n 's/.*\bversion = "\(.*\)".*/\1/p' default.nix) +old_ver=$(tac default.nix | sed -n 's/.*\bversion = "\(.*\)".*/\1/p' | head -1) if [ "$ver" = "$old_ver" ]; then echo "Up to date: $ver" exit @@ -21,9 +21,12 @@ fi echo "$old_ver -> $ver" sha256=$(nix-prefetch -f "$nixpkgs" deltachat-desktop --rev "$rev") -sed -e "s#\\bversion = \".*\"#version = \"$ver\"#" \ - -e "s#\\bsha256 = \".*\"#sha256 = \"$sha256\"#" \ - -i default.nix +tac default.nix \ + | sed -e "0,/version = \".*\"/s//version = \"$ver\"/" \ + -e "0,/sha256 = \".*\"/s//sha256 = \"$sha256\"/" \ + | tac \ + | sponge default.nix + src=$(nix-build "$nixpkgs" -A deltachat-desktop.src --no-out-link) jq '{ name, version, dependencies: (.dependencies + (.devDependencies | del(.["@typescript-eslint/eslint-plugin","@typescript-eslint/parser","esbuild","electron-builder","electron-devtools-installer","electron-notarize","esbuild","eslint","eslint-config-prettier","eslint-plugin-react-hooks","hallmark","prettier","tape","testcafe","testcafe-browser-provider-electron","testcafe-react-selectors","walk"]))) }' \ diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-googlechat/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-googlechat/default.nix new file mode 100644 index 0000000000000..b274b55ac228a --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-googlechat/default.nix @@ -0,0 +1,27 @@ +{ lib, stdenv, fetchFromGitHub, pidgin, glib, json-glib, protobuf, protobufc }: + +stdenv.mkDerivation { + pname = "purple-googlechat"; + version = "unstable-2021-10-18"; + + src = fetchFromGitHub { + owner = "EionRobb"; + repo = "purple-googlechat"; + rev = "56ba7f79883eca67d37629d365776f6c0b40abdc"; + sha256 = "sha256-iTYVgYI9+6rqqBl5goeEAXpK8FgHDv0MmPsV/82reWA="; + }; + + nativeBuildInputs = [ protobufc ]; + buildInputs = [ pidgin glib json-glib protobuf ]; + + PKG_CONFIG_PURPLE_PLUGINDIR = "${placeholder "out"}/lib/purple-2"; + PKG_CONFIG_PURPLE_DATADIR = "${placeholder "out"}/share"; + + meta = with lib; { + homepage = "https://github.com/EionRobb/purple-googlechat"; + description = "Native Google Chat support for pidgin"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ dtzWill ]; + }; +} diff --git a/pkgs/applications/networking/mailreaders/electron-mail/default.nix b/pkgs/applications/networking/mailreaders/electron-mail/default.nix index 1f7d663cf8e53..b6dca7e70b6b5 100644 --- a/pkgs/applications/networking/mailreaders/electron-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/electron-mail/default.nix @@ -1,13 +1,13 @@ -{ appimageTools, lib, fetchurl }: +{ appimageTools, lib, fetchurl, libsecret }: let pname = "electron-mail"; - version = "4.12.2"; + version = "4.12.7"; name = "ElectronMail-${version}"; src = fetchurl { url = "https://github.com/vladimiry/ElectronMail/releases/download/v${version}/electron-mail-${version}-linux-x86_64.AppImage"; - sha256 = "D+0qoIb0EwUVbgKOiKQpqoLDgm8l/UKDWm/BjhW4MYU="; + sha256 = "42d0b49a2feba628f4845940ffd9607739bd5fcdbe6ba37e15f993c511d21e46"; }; appimageContents = appimageTools.extract { inherit name src; }; @@ -16,13 +16,16 @@ in appimageTools.wrapType2 { extraInstallCommands = '' mv $out/bin/${name} $out/bin/${pname} - install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications substituteInPlace $out/share/applications/${pname}.desktop \ --replace 'Exec=AppRun' 'Exec=${pname}' cp -r ${appimageContents}/usr/share/icons $out/share ''; + extraPkgs = pkgs: with pkgs; [ + libsecret + ]; + meta = with lib; { description = "ElectronMail is an Electron-based unofficial desktop client for ProtonMail"; homepage = "https://github.com/vladimiry/ElectronMail"; diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 4bae5387255df..30770390e6cd6 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -10,12 +10,12 @@ in rec { thunderbird = common rec { pname = "thunderbird"; - version = "91.3.0"; + version = "91.3.1"; application = "comm/mail"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "938de817ed2cad90f665559da1dfc266f34b6ca2e688ee364112edfdb1167183a8225132ed50b672ceb14402be933be82fd1ef8b46f103cdf1534a403fb472d9"; + sha512 = "4938f676ddeeba37da1f2086d76a2ef2c870738169f7e10b35b83e4ed772df634825ee25c28232df1ac1e3a18a9466e97dc7ee318abbf43f1f4ce6479a13975b"; }; patches = [ ]; diff --git a/pkgs/applications/networking/mhost/default.nix b/pkgs/applications/networking/mhost/default.nix index f6aad5eaa081c..beed066e65e98 100644 --- a/pkgs/applications/networking/mhost/default.nix +++ b/pkgs/applications/networking/mhost/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, rustPlatform, lib }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, Security }: rustPlatform.buildRustPackage rec { pname = "mhost"; @@ -13,6 +13,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0gqrya0bpdd67k2sxib7f4npnrx84d9r4hjq2sg2xz4j8pmgs018"; + buildInputs = lib.optional stdenv.isDarwin Security; + CARGO_CRATE_NAME = "mhost"; doCheck = false; diff --git a/pkgs/applications/networking/p2p/ncdc/default.nix b/pkgs/applications/networking/p2p/ncdc/default.nix index dd7f4a7bb60fe..053f1d67882b4 100644 --- a/pkgs/applications/networking/p2p/ncdc/default.nix +++ b/pkgs/applications/networking/p2p/ncdc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, ncurses, zlib, bzip2, sqlite, pkg-config, glib, gnutls }: +{ lib, stdenv, fetchurl, fetchpatch, ncurses, zlib, bzip2, sqlite, pkg-config, glib, gnutls }: stdenv.mkDerivation rec { pname = "ncdc"; @@ -9,6 +9,15 @@ stdenv.mkDerivation rec { sha256 = "1bdgqd07f026qk6vpbxqsin536znd33931m3b4z44prlm9wd6pyi"; }; + patches = [ + # Upstream fix for ncurses-6.3 support: + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://g.blicky.net/ncdc.git/patch/?id=4126dd51e90deb9e22dfd139cc4518a7812fcad6"; + sha256 = "13hqkmhmbazj6cllb5b2ccgf51vsn5lri7jqkqc5xwivgcisfrij"; + }) + ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses zlib bzip2 sqlite glib gnutls ]; diff --git a/pkgs/applications/networking/synology-drive/default.nix b/pkgs/applications/networking/synology-drive/default.nix new file mode 100644 index 0000000000000..20b0f1168cb36 --- /dev/null +++ b/pkgs/applications/networking/synology-drive/default.nix @@ -0,0 +1,45 @@ +{ lib, mkDerivation, fetchurl, autoPatchelfHook, dpkg, glibc, gnome }: + +mkDerivation rec { + pname = "synology-drive"; + subVersion = "12674"; + version = "3.0.1-${subVersion}"; + + src = fetchurl { + url = "https://global.download.synology.com/download/Utility/SynologyDriveClient/${version}/Ubuntu/Installer/x86_64/synology-drive-client-${subVersion}.x86_64.deb"; + sha256 = "1yyv6zgszsym22kf4jvlan7n9lw09fw24fyrh7c8pzbb2029gp8a"; + }; + + nativeBuildInputs = [ autoPatchelfHook dpkg ]; + + buildInputs = [ glibc gnome.nautilus ]; + + unpackPhase = '' + mkdir -p $out + dpkg -x $src $out + ''; + + installPhase = '' + # synology-drive executable + cp -av $out/usr/* $out + rm -rf $out/usr + + runHook postInstall + ''; + + postInstall = '' + substituteInPlace $out/bin/synology-drive --replace /opt $out/opt + ''; + + meta = with lib; { + homepage = "https://www.synology.com/"; + description = "Synchronize files between client and Synology NAS."; + longDescription = '' + Drive for PC, the desktop utility of the DSM add-on package. + Drive, allows you to sync and share files owned by you or shared by others between a centralized Synology NAS and multiple client computers. + ''; + license = licenses.unfree; + maintainers = with maintainers; [ MoritzBoehme ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/video/ccextractor/default.nix b/pkgs/applications/video/ccextractor/default.nix index 5bb13e116174a..905034091a297 100644 --- a/pkgs/applications/video/ccextractor/default.nix +++ b/pkgs/applications/video/ccextractor/default.nix @@ -23,7 +23,12 @@ stdenv.mkDerivation rec { sha256 = "sha256-usVAKBkdd8uz9cD5eLd0hnwGonOJLscRdc+iWDlNXVc="; }; - sourceRoot = "source/src"; + postPatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace src/CMakeLists.txt \ + --replace 'add_definitions(-DGPAC_CONFIG_LINUX)' 'add_definitions(-DGPAC_CONFIG_DARWIN)' + ''; + + cmakeDir = "../src"; nativeBuildInputs = [ pkg-config cmake makeWrapper ]; diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index 4abc2b6546aa1..c82cfb47cc321 100644 --- a/pkgs/applications/video/streamlink/default.nix +++ b/pkgs/applications/video/streamlink/default.nix @@ -1,17 +1,16 @@ { lib , python3Packages -, rtmpdump , ffmpeg , fetchpatch }: python3Packages.buildPythonApplication rec { pname = "streamlink"; - version = "2.4.0"; + version = "3.0.1"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "e95588e222d1a7bd51e3171cd4bce84fd6f646418537aff37993d40f597810af"; + sha256 = "sha256-GDbUlu5tRL5mdT7KrIdmxCbeAtYL1xvZXyZFwiuvKXo="; }; checkInputs = with python3Packages; [ @@ -22,26 +21,20 @@ python3Packages.buildPythonApplication rec { ]; propagatedBuildInputs = (with python3Packages; [ + isodate + lxml + pycountry pycryptodome + pysocks requests - iso-639 - iso3166 websocket-client - isodate - lxml ]) ++ [ - rtmpdump ffmpeg ]; - patches = [ - # Patch failing tests to expect correct Accept-Encoding as generated by Requests - (fetchpatch { - url = "https://github.com/streamlink/streamlink/commit/ae747a113199c119bced4613d33edcc67a222bb9.patch"; - includes = [ "tests/test_stream_json.py" ]; - sha256 = "sha256-KEgyWdh5DNgNktmLSvKQowUQO9p9Q7zP4NbCQJPNgKw="; - }) - ]; + postPatch = '' + substituteInPlace setup.cfg --replace 'lxml >=4.6.4,<5.0' 'lxml' + ''; meta = with lib; { homepage = "https://streamlink.github.io/"; diff --git a/pkgs/applications/window-managers/ion-3/default.nix b/pkgs/applications/window-managers/ion-3/default.nix index 4794de1d5f845..45d56194bede9 100644 --- a/pkgs/applications/window-managers/ion-3/default.nix +++ b/pkgs/applications/window-managers/ion-3/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3-20090110"; src = fetchurl { - url = "http://tuomov.iki.fi/software/dl/ion-${version}.tar.gz"; + url = "https://tuomov.iki.fi/software/ion/dl/ion-${version}.tar.gz"; sha256 = "1nkks5a95986nyfkxvg2rik6zmwx0lh7szd5fji7yizccwzc9xns"; }; @@ -13,6 +13,11 @@ stdenv.mkDerivation rec { buildFlags = [ "LUA_DIR=${lua}" "X11_PREFIX=/no-such-path" "PREFIX=\${out}" ]; + # Build system is missing depends for autogenerated export headers: + # luac -o mod_tiling.lc mod_tiling.lua + # main.c:21:10: fatal error: exports.h: No such file or directory + enableParallelBuilding = false; + installFlags = [ "PREFIX=\${out}" ]; meta = with lib; { diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index a6633d11286f0..a0f3b5efbaeb1 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -110,7 +110,7 @@ rec { echo "mounting Nix store..." mkdir -p /fs${storeDir} - mount -t 9p store /fs${storeDir} -o trans=virtio,version=9p2000.L,cache=loose + mount -t 9p store /fs${storeDir} -o trans=virtio,version=9p2000.L,cache=loose,msize=${toString default9PMsizeBytes} mkdir -p /fs/tmp /fs/run /fs/var mount -t tmpfs -o "mode=1777" none /fs/tmp @@ -119,7 +119,7 @@ rec { echo "mounting host's temporary directory..." mkdir -p /fs/tmp/xchg - mount -t 9p xchg /fs/tmp/xchg -o trans=virtio,version=9p2000.L + mount -t 9p xchg /fs/tmp/xchg -o trans=virtio,version=9p2000.L,msize=${toString default9PMsizeBytes} mkdir -p /fs/proc mount -t proc none /fs/proc @@ -1174,4 +1174,9 @@ rec { `debDistros' sets. */ diskImages = lib.mapAttrs (name: f: f {}) diskImageFuns; + # The default 9P msize value is 8 KiB, which according to QEMU is + # insufficient and would degrade performance. + # See: https://wiki.qemu.org/Documentation/9psetup#msize + # Use 500 KiB as a conservative default, see also https://github.com/NixOS/nixpkgs/pull/142577#issuecomment-953848731 + default9PMsizeBytes = 512000; } diff --git a/pkgs/data/icons/la-capitaine-icon-theme/default.nix b/pkgs/data/icons/la-capitaine-icon-theme/default.nix new file mode 100644 index 0000000000000..b7febabacd5f4 --- /dev/null +++ b/pkgs/data/icons/la-capitaine-icon-theme/default.nix @@ -0,0 +1,52 @@ +{ lib +, stdenv +, fetchFromGitHub +, breeze-icons +, elementary-icon-theme +, gnome-icon-theme +, hicolor-icon-theme +}: + +stdenv.mkDerivation rec { + pname = "la-capitaine-icon-theme"; + version = "0.6.2"; + + src = fetchFromGitHub { + owner = "keeferrourke"; + repo = pname; + rev = "v${version}"; + sha256 = "0id2dddx6rl71472l47vafx968wnklmq6b980br68w82kcvqczzs"; + }; + + propagatedBuildInputs = [ + breeze-icons + elementary-icon-theme + gnome-icon-theme + hicolor-icon-theme + ]; + + dontDropIconThemeCache = true; + + postPatch = '' + patchShebangs configure + + substituteInPlace configure \ + --replace 'DISTRO=$(format "$(lsb_release -si 2>/dev/null)")' 'DISTRO=nixos' + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/icons/$pname + cp -a * $out/share/icons/$pname + rm $out/share/icons/$pname/{configure,COPYING,LICENSE,*.md} + runHook postInstall + ''; + + meta = with lib; { + description = "Icon theme inspired by macOS and Google's Material Design"; + homepage = "https://github.com/keeferrourke/la-capitaine-icon-theme"; + license = with licenses; [ gpl3Plus mit ]; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index 996e993d80034..ba70f6f76ad0a 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "da98cdcb5ec11aea3b1979174b3b1cab24014908", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/da98cdcb5ec11aea3b1979174b3b1cab24014908.tar.gz", - "sha256": "14qdmvlqkaixv331g1lfr8hghrvzdx45xhn69fz1g7zhv4w88jix", - "msg": "Update from Hackage at 2021-11-05T06:34:09Z" + "commit": "f38385b8e3e064360be513204f114418ea0206de", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/f38385b8e3e064360be513204f114418ea0206de.tar.gz", + "sha256": "08yrxx2cslwbbrcrjn13va2vbynjrwfbkc3fs4mf9qc17bdvxmgj", + "msg": "Update from Hackage at 2021-11-12T03:22:57Z" } diff --git a/pkgs/data/themes/gtk-theme-framework/default.nix b/pkgs/data/themes/gtk-theme-framework/default.nix new file mode 100644 index 0000000000000..99b9edfc3aca9 --- /dev/null +++ b/pkgs/data/themes/gtk-theme-framework/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, theme, lib }: + +stdenv.mkDerivation rec { + pname = "gtk-theme-framework"; + version = "0.2.3"; + + src = fetchFromGitHub { + owner = "jaxwilko"; + repo = pname; + rev = "v${version}"; + sha256 = "1z5s5rsgiypanf2z0avaisbflnvwrc8aiy5qskrsvbbaja63jy3s"; + }; + + postPatch = '' + substituteInPlace main.sh \ + --replace "#!/usr/bin/env bash" "#!/bin/sh" + + substituteInPlace scripts/install.sh \ + --replace "#!/usr/bin/env bash" "#!/bin/sh" + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/themes + ./main.sh -i -t ${theme} -d $out/share/themes + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/jaxwilko/gtk-theme-framework"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ flexagoon ]; + }; +} diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 9c0dd63f1b9d4..cb56087fe1b2c 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -41,7 +41,7 @@ , # Whether to build terminfo. enableTerminfo ? !stdenv.targetPlatform.isWindows -, version ? "9.3.20210913" +, version ? "9.3.20211111" , # What flavour to build. An empty string indicates no # specific flavour and falls back to ghc default values. ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) @@ -160,8 +160,8 @@ stdenv.mkDerivation (rec { src = fetchgit { url = "https://gitlab.haskell.org/ghc/ghc.git/"; - rev = "64923cf295ea914db458547432237a5ed1eff571"; - sha256 = "1s9sm4gf4r71lk0s7h9v217rxfwjf435q1jji90hlxz23wvmhr6d"; + rev = "cc635da167fdec2dead0603b0026cb841f0aa645"; + sha256 = "1lj76l546zriwkcn2r7i5a4j35bx9fh5iggwfz2xvhh8aq8j2i46"; }; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/ghcjs/8.10/default.nix b/pkgs/development/compilers/ghcjs/8.10/default.nix index 6b8a251197d8c..b6c2f7e72ee01 100644 --- a/pkgs/development/compilers/ghcjs/8.10/default.nix +++ b/pkgs/development/compilers/ghcjs/8.10/default.nix @@ -3,7 +3,7 @@ , callPackage , fetchgit , ghcjsSrcJson ? null -, ghcjsSrc ? fetchgit lib.importJSON ghcjsSrcJson +, ghcjsSrc ? fetchgit (lib.importJSON ghcjsSrcJson) , bootPkgs , stage0 , haskellLib diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index 9f2efdb409b93..4a92fd87f2676 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "kotlin"; - version = "1.5.31"; + version = "1.6.0"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "sha256-ZhERKG8+WsBqrzqUA9hp2alqF2tisUGBS+YmpHJJ/p4="; + sha256 = "sha256-F0yS4SpUwJAf2fC62s8VFMKLUZepVlTk2rF3UpPd4dw="; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/kotlin/native.nix b/pkgs/development/compilers/kotlin/native.nix index 34f38b3a8e9e8..b1a50cdcf40fa 100644 --- a/pkgs/development/compilers/kotlin/native.nix +++ b/pkgs/development/compilers/kotlin/native.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "kotlin-native"; - version = "1.5.31"; + version = "1.6.0"; src = let getArch = { @@ -20,9 +20,9 @@ stdenv.mkDerivation rec { "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-native-${arch}-${version}.tar.gz"; getHash = arch: { - "macos-aarch64" = "sha256-+9AF42AlPn1/8c14t8u+NN8FkoEmdt6tpmIKU9Rp2AM="; - "macos-x86_64" = "sha256-/eciSo4Eps2TTsv1XU1Rlm+KBmgQT0MWp2s/OAYtGt4="; - "linux-x86_64" = "sha256-Y2t+nlTu+j+h0oRneo7CJx0PmLAkqKYBJ+8go7rargM="; + "macos-aarch64" = "sha256-HLI6E3Y8l/5vAgjT39ezBCEYhCGV3pdjx1B1fL57qO4="; + "macos-x86_64" = "sha256-cJV+dP9/pJHlJx55HMqd7KC/OIWEzPXKmobCZLBZ+ec="; + "linux-x86_64" = "sha256-C5R2hdPg1cOA9WcSZYkN22Ca3/pslEcp554tuy/HxnQ="; }.${arch}; in fetchurl { diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 8622debdf5859..83e9ea32509fd 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -15,6 +15,9 @@ with haskellLib; self: super: { + # There are numerical tests on random data, that may fail occasionally + lapack = dontCheck super.lapack; + # Arion's test suite needs a Nixpkgs, which is cumbersome to do from Nixpkgs # itself. For instance, pkgs.path has dirty sources and puts a huge .git in the # store. Testing is done upstream. @@ -60,7 +63,7 @@ self: super: { # The Hackage tarball is purposefully broken, because it's not intended to be, like, useful. # https://git-annex.branchable.com/bugs/bash_completion_file_is_missing_in_the_6.20160527_tarball_on_hackage/ - git-annex = (overrideSrc { + git-annex = overrideCabal (drv: { src = pkgs.fetchgit { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; @@ -74,11 +77,15 @@ self: super: { rm -r $out/doc/?ndroid* ''; }; - } super.git-annex).override { - dbus = if pkgs.stdenv.isLinux then self.dbus else null; - fdo-notify = if pkgs.stdenv.isLinux then self.fdo-notify else null; - hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify; - }; + patches = [ + # Allows compilation with git-lfs 1.2.0 + (pkgs.fetchpatch { + url = "https://git.joeyh.name/index.cgi/git-annex.git/patch/?id=f3326b8b5ae4d1caa5c6e3e192c58c6e064c425a"; + sha256 = "1nzg4mna462ndylisyy3nfih49aznhzzf7b3krb4p9p0j1zrcy2s"; + excludes = [ "doc/**" "CHANGELOG" ]; + }) + ] ++ (drv.patches or []); + }) super.git-annex; # Fix test trying to access /home directory shell-conduit = overrideCabal (drv: { @@ -844,7 +851,7 @@ self: super: { # hledger-lib 1.23 depends on doctest >= 0.18 hledger-lib_1_23 = super.hledger-lib_1_23.override { - doctest = self.doctest_0_18_1; + doctest = self.doctest_0_18_2; }; # Copy hledger man pages from data directory into the proper place. This code @@ -1338,21 +1345,21 @@ self: super: { resource-pool = self.hasura-resource-pool; ekg-core = self.hasura-ekg-core; ekg-json = self.hasura-ekg-json; - hspec = dontCheck self.hspec_2_8_3; - hspec-core = dontCheck self.hspec-core_2_8_3; - hspec-discover = dontCheck super.hspec-discover_2_8_3; + hspec = dontCheck self.hspec_2_8_4; + hspec-core = dontCheck self.hspec-core_2_8_4; + hspec-discover = dontCheck super.hspec-discover_2_8_4; tasty-hspec = self.tasty-hspec_1_2; })); hasura-ekg-core = super.hasura-ekg-core.overrideScope (self: super: { - hspec = dontCheck self.hspec_2_8_3; - hspec-core = dontCheck self.hspec-core_2_8_3; - hspec-discover = dontCheck super.hspec-discover_2_8_3; + hspec = dontCheck self.hspec_2_8_4; + hspec-core = dontCheck self.hspec-core_2_8_4; + hspec-discover = dontCheck super.hspec-discover_2_8_4; }); hasura-ekg-json = super.hasura-ekg-json.overrideScope (self: super: { ekg-core = self.hasura-ekg-core; - hspec = dontCheck self.hspec_2_8_3; - hspec-core = dontCheck self.hspec-core_2_8_3; - hspec-discover = dontCheck super.hspec-discover_2_8_3; + hspec = dontCheck self.hspec_2_8_4; + hspec-core = dontCheck self.hspec-core_2_8_4; + hspec-discover = dontCheck super.hspec-discover_2_8_4; }); pg-client = overrideCabal (drv: { librarySystemDepends = with pkgs; [ postgresql krb5.dev openssl.dev ]; @@ -1427,9 +1434,10 @@ self: super: { # 2021-09-14: Tests are broken because of undeterministic variable names hls-tactics-plugin = dontCheck super.hls-tactics-plugin; - # 2021-03-21 Test hangs + # 2021-03-21: Test hangs # https://github.com/haskell/haskell-language-server/issues/1562 - ghcide = dontCheck super.ghcide; + # 2021-11-13: Too strict upper bound on implicit-hie-cradle + ghcide = doJailbreak (dontCheck super.ghcide); data-tree-print = doJailbreak super.data-tree-print; @@ -2070,15 +2078,13 @@ EOT # file revision on hackage was gifted CRLF line endings gogol-core = appendPatch ./patches/gogol-core-144.patch super.gogol-core; - # 2021-11-05: patch to permit our language-docker version - # This is based on c931c0a9689cd6dff4d2083fa002414c1f08a586 from - # language-docker upstream - hadolint = appendPatch (pkgs.fetchpatch { - url = "https://github.com/hadolint/hadolint/commit/c931c0a9689cd6dff4d2083fa002414c1f08a586.patch"; - sha256 = "1kv06hfn7lgrcrg56q8lq0pvdffqvmjbshazg3prlhl3kjs541f8"; - excludes = [ "stack.yaml" "package.yaml" "hadolint.cabal" ]; - }) (super.hadolint.override { + # Jailbreak isn't sufficient, but this is ok as it's a leaf package. + hadolint = super.hadolint.overrideScope (self: super: { language-docker = self.language-docker_10_3_0; + hspec = dontCheck self.hspec_2_8_4; + hspec-core = dontCheck self.hspec-core_2_8_4; + hspec-discover = dontCheck self.hspec-discover_2_8_4; + colourista = doJailbreak super.colourista; }); # These should be updated in lockstep @@ -2086,4 +2092,9 @@ EOT hledger-lib = self.hledger-lib_1_23; }; + # Needs brick > 0.64 + nix-tree = super.nix-tree.override { + brick = self.brick_0_64_2; + }; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix index b461b45af02d3..6aae6f1c63851 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -92,7 +92,7 @@ self: super: { url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/fe192e12b88b09499d4aff0e562713e820544bd6/patches/alex-3.2.6.patch"; sha256 = "1rzs764a0nhx002v4fadbys98s6qblw4kx4g46galzjf5f7n2dn4"; }) (dontCheck super.alex); - doctest = dontCheck (doJailbreak super.doctest_0_18_1); + doctest = dontCheck (doJailbreak super.doctest_0_18_2); language-haskell-extract = appendPatch (pkgs.fetchpatch { url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/language-haskell-extract-0.2.4.patch"; sha256 = "0rgzrq0513nlc1vw7nw4km4bcwn4ivxcgi33jly4a7n3c1r32v1f"; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index ffe7f0868cf04..e2fca5199a61a 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -66,11 +66,6 @@ self: super: { sha256 = "0c8n2krz827cv87p3vb1vpl3v0k255aysjx9lq44gz3z1dhxd64z"; }) super.basement); - cereal = appendPatch (pkgs.fetchpatch { - url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/cereal-0.5.8.1.patch"; - sha256 = "03v4nxwz9y6viaa8anxcmp4zdf2clczv4pf9fqq6lnpplpz5i128"; - }) (doJailbreak super.cereal); - # Tests fail because of typechecking changes conduit = dontCheck super.conduit; @@ -84,10 +79,7 @@ self: super: { Cabal = self.Cabal_3_6_2_0; }); - doctest = appendPatch (pkgs.fetchpatch { - url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/doctest-0.18.1.patch"; - sha256 = "030kdsk0fg08cgdcjpyv6z8ym1vkkrbd34aacs91y5hqzc9g79y1"; - }) (dontCheck (doJailbreak super.doctest_0_18_1)); + doctest = dontCheck (doJailbreak super.doctest_0_18_2); # Tests fail in GHC 9.2 extra = dontCheck super.extra; @@ -115,7 +107,7 @@ self: super: { ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_1; hackage-security = doJailbreak super.hackage-security; hashable = super.hashable_1_4_0_0; - hashable-time = doJailbreak super.hashable-time; + hashable-time = doJailbreak super.hashable-time_0_3; hedgehog = doJailbreak super.hedgehog; HTTP = overrideCabal (drv: { postPatch = "sed -i -e 's,! Socket,!Socket,' Network/TCP.hs"; }) (doJailbreak super.HTTP); integer-logarithms = overrideCabal (drv: { postPatch = "sed -i -e 's, <1.1, <1.3,' integer-logarithms.cabal"; }) (doJailbreak super.integer-logarithms); @@ -142,7 +134,7 @@ self: super: { tasty-hspec = doJailbreak super.tasty-hspec; th-desugar = self.th-desugar_1_13; these = doJailbreak super.these; - time-compat = doJailbreak super.time-compat; + time-compat = doJailbreak super.time-compat_1_9_6_1; type-equality = doJailbreak super.type-equality; unordered-containers = doJailbreak super.unordered-containers; vector = doJailbreak (dontCheck super.vector); diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 34592e29dd6b0..951047fb54fd6 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -834,6 +834,7 @@ broken-packages: - contstuff-monads-tf - contstuff-transformers - convert-annotation + - copilot-core - copilot-sbv - copr - COrdering @@ -1841,7 +1842,6 @@ broken-packages: - haddock-cheatsheet - haddock-leksah - haddock-test - - hadolint - hadoop-formats - hadoop-rpc - hafar @@ -2790,7 +2790,7 @@ broken-packages: - language-typescript - language-vhdl - language-webidl - - lapack + - lapack-hmatrix - LargeCardinalHierarchy - Lastik - latest-npm-version @@ -2918,10 +2918,8 @@ broken-packages: - llsd - llvm-base - llvm-ffi - - llvm-ffi-tools - llvm-general-pure - llvm-ht - - llvm-pkg-config - llvm-pretty - lmonad - load-balancing @@ -3205,6 +3203,7 @@ broken-packages: - morfette - morfeusz - morpheus-graphql-cli + - morpheus-graphql-code-gen - morphisms-functors - morphisms-objects - morte @@ -4034,6 +4033,7 @@ broken-packages: - read-bounded - read-ctags - read-io + - readline-in-other-words - readline-statevar - readme-lhs - readshp @@ -4792,7 +4792,6 @@ broken-packages: - syntax-trees - syntax-trees-fork-bairyn - synthesizer - - synthesizer-alsa - Sysmon - sys-process - system-canonicalpath @@ -5354,6 +5353,7 @@ broken-packages: - web-encodings - WeberLogic - webfinger-client + - webkitgtk3 - webkit-javascriptcore - webmention - web-output diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index c95eb289f6c5e..7c106393dd9fc 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -98,6 +98,9 @@ default-package-overrides: - futhark < 0.20.6 # 2021-11-09: ghc-bignum is bundled starting with 9.0.1; only 1.0 builds with GHCs prior to 9.2.1 - ghc-bignum == 1.0 + # 2021-11-18: lucid-{alpine, htmx} are not in stackage, so we need to downgrade them + - lucid-alpine == 0.1.0.2 + - lucid-htmx == 0.1.0.2 extra-packages: - base16-bytestring < 1 # required for cabal-install etc. diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index 09e2a314977e7..858eeac1e297e 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage LTS 18.15 +# Stackage LTS 18.16 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -363,7 +363,7 @@ default-package-overrides: - cborg-json ==0.2.3.0 - cdar-mBound ==0.1.0.4 - c-enum ==0.1.0.1 - - cereal ==0.5.8.1 + - cereal ==0.5.8.2 - cereal-conduit ==0.8.0 - cereal-text ==0.1.0.2 - cereal-vector ==0.2.0.1 @@ -716,7 +716,7 @@ default-package-overrides: - event-list ==0.1.2 - eventstore ==1.4.1 - every ==0.0.1 - - exact-combinatorics ==0.2.0.10 + - exact-combinatorics ==0.2.0.11 - exact-pi ==0.5.0.1 - exception-hierarchy ==0.1.0.4 - exception-mtl ==0.4.0.1 @@ -835,7 +835,7 @@ default-package-overrides: - gd ==3000.7.3 - gdp ==0.0.3.0 - general-games ==1.1.1 - - generic-aeson ==0.2.0.12 + - generic-aeson ==0.2.0.13 - generic-arbitrary ==0.1.0 - generic-constraints ==1.1.1.1 - generic-data ==0.9.2.1 @@ -1090,7 +1090,7 @@ default-package-overrides: - hruby ==0.3.8.1 - hsass ==0.8.0 - hs-bibutils ==6.10.0.0 - - hsc2hs ==0.68.7 + - hsc2hs ==0.68.8 - hscolour ==1.24.4 - hsdns ==1.8 - hsebaysdk ==0.4.1.0 @@ -1269,7 +1269,7 @@ default-package-overrides: - io-streams-haproxy ==1.0.1.0 - ip6addr ==1.0.2 - ipa ==0.3.1.1 - - iproute ==1.7.11 + - iproute ==1.7.12 - IPv6Addr ==2.0.3 - ipynb ==0.1.0.2 - ipython-kernel ==0.10.2.1 @@ -1313,7 +1313,7 @@ default-package-overrides: - jwt ==0.10.0 - kan-extensions ==5.2.3 - kanji ==3.4.1 - - katip ==0.8.6.0 + - katip ==0.8.7.0 - katip-logstash ==0.1.0.0 - kawhi ==0.3.0 - kazura-queue ==0.1.0.4 @@ -1458,7 +1458,7 @@ default-package-overrides: - mathexpr ==0.3.0.0 - math-extras ==0.1.1.0 - math-functions ==0.3.4.2 - - matplotlib ==0.7.5 + - matplotlib ==0.7.6 - matrices ==0.5.0 - matrix ==0.3.6.1 - matrix-as-xyz ==0.1.2.2 @@ -1875,7 +1875,7 @@ default-package-overrides: - protocol-radius-test ==0.1.0.1 - protolude ==0.3.0 - proxied ==0.3.1 - - psqueues ==0.2.7.2 + - psqueues ==0.2.7.3 - ptr-poker ==0.1.1.4 - publicsuffix ==0.20200526 - pulse-simple ==0.1.14 @@ -1946,7 +1946,7 @@ default-package-overrides: - reanimate ==1.1.4.0 - reanimate-svg ==0.13.0.1 - rebase ==1.13.0.1 - - record-dot-preprocessor ==0.2.12 + - record-dot-preprocessor ==0.2.13 - record-hasfield ==1.0 - records-sop ==0.1.1.0 - record-wrangler ==0.1.1.0 @@ -2386,7 +2386,7 @@ default-package-overrides: - th-constraint-compat ==0.0.1.0 - th-data-compat ==0.1.0.0 - th-desugar ==1.11 - - th-env ==0.1.0.2 + - th-env ==0.1.0.3 - these ==1.1.1.1 - these-lens ==1.0.1.2 - these-optics ==1.0.1.2 @@ -2520,7 +2520,7 @@ default-package-overrides: - universe-reverse-instances ==1.1.1 - universe-some ==1.2.1 - universum ==1.7.2 - - unix-bytestring ==0.3.7.5 + - unix-bytestring ==0.3.7.6 - unix-compat ==0.5.3 - unix-time ==0.4.7 - unliftio ==0.2.20 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 3afd15cb44840..505358dd4c400 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -822,6 +822,7 @@ dont-distribute-packages: - convertible-text - coordinate - copilot + - copilot-c99 - copilot-cbmc - copilot-language - copilot-libraries @@ -948,6 +949,7 @@ dont-distribute-packages: - diagrams-pgf - diagrams-reflex - diagrams-wx + - dialog - difference-monoid - digestive-functors-hsp - dingo-core @@ -1222,6 +1224,7 @@ dont-distribute-packages: - ghc-mod - ghc-tags-plugin - ghci-pretty + - ghcjs-dom-webkit - ghcjs-hplay - ght - gi-cairo-again @@ -1485,6 +1488,8 @@ dont-distribute-packages: - hbb - hbcd - hbf + - hbro + - hbro-contrib - hcg-minus-cairo - hcheat - hcheckers @@ -1570,7 +1575,6 @@ dont-distribute-packages: - hmeap - hmeap-utils - hmep - - hmm-lapack - hmm-lapack_0_4_1 - hmt - hmt-diagrams @@ -1917,7 +1921,7 @@ dont-distribute-packages: - language-python-colour - language-qux - language-spelling - - lapack-hmatrix + - lapack_0_4 - lat - latex-formulae-hakyll - latex-formulae-pandoc @@ -1962,8 +1966,6 @@ dont-distribute-packages: - lightstep-haskell - lighttpd-conf - lighttpd-conf-qq - - linear-circuit - - linear-circuit_0_1_0_3 - linearmap-category - linearscan-hoopl - linkchk @@ -2043,8 +2045,6 @@ dont-distribute-packages: - macosx-make-standalone - magic-wormhole - magicbane - - magico - - magico_0_0_2_2 - mahoro - maid - mail-pool @@ -2122,6 +2122,7 @@ dont-distribute-packages: - mmark-cli - mmark-cli_0_0_5_1 - mmark-ext + - mmark-ext_0_2_1_4 - mmtl-base - moan - modify-fasta @@ -2143,6 +2144,8 @@ dont-distribute-packages: - moo-nad - morley - morloc + - morpheus-graphql-client_0_18_0 + - morpheus-graphql_0_18_0 - morphisms-functors-inventory - mosaico-lib - motor-diagrams @@ -2333,6 +2336,7 @@ dont-distribute-packages: - persona-idp - peyotls - peyotls-codec + - pg-entity - pgsql-simple - phonetic-languages-examples - phonetic-languages-general @@ -2577,8 +2581,6 @@ dont-distribute-packages: - replicant - repr - representable-tries - - resistor-cube - - resistor-cube_0_0_1_3 - resource-pool-catchio - resource-simple - respond diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index fb08481a39de0..67224af62b392 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -155,6 +155,7 @@ self: super: builtins.intersectAttrs super { github-types = dontCheck super.github-types; # http://hydra.cryp.to/build/1114046/nixlog/1/raw hadoop-rpc = dontCheck super.hadoop-rpc; # http://hydra.cryp.to/build/527461/nixlog/2/raw hasql = dontCheck super.hasql; # http://hydra.cryp.to/build/502489/nixlog/4/raw + hasql-interpolate = dontCheck super.hasql-interpolate; # wants to connect to postgresql hasql-transaction = dontCheck super.hasql-transaction; # wants to connect to postgresql hjsonschema = overrideCabal (drv: { testTarget = "local"; }) super.hjsonschema; marmalade-upload = dontCheck super.marmalade-upload; # http://hydra.cryp.to/build/501904/nixlog/1/raw @@ -516,25 +517,30 @@ self: super: builtins.intersectAttrs super { }) (addBuildTools (with pkgs.buildPackages; [makeWrapper python3Packages.sphinx]) super.futhark); - git-annex = with pkgs; - if (!stdenv.isLinux) then - let path = lib.makeBinPath [ coreutils ]; - in overrideCabal (_drv: { - # This is an instance of https://github.com/NixOS/nix/pull/1085 - # Fails with: - # gpg: can't connect to the agent: File name too long - postPatch = lib.optionalString stdenv.isDarwin '' - substituteInPlace Test.hs \ - --replace ', testCase "crypto" test_crypto' "" - ''; - # On Darwin, git-annex mis-detects options to `cp`, so we wrap the - # binary to ensure it uses Nixpkgs' coreutils. - postFixup = '' - wrapProgram $out/bin/git-annex \ - --prefix PATH : "${path}" - ''; - }) (addBuildTool buildPackages.makeWrapper super.git-annex) - else super.git-annex; + git-annex = let + pathForDarwin = pkgs.lib.makeBinPath [ pkgs.coreutils ]; + in overrideCabal (drv: pkgs.lib.optionalAttrs (!pkgs.stdenv.isLinux) { + # This is an instance of https://github.com/NixOS/nix/pull/1085 + # Fails with: + # gpg: can't connect to the agent: File name too long + postPatch = pkgs.lib.optionalString pkgs.stdenv.isDarwin '' + substituteInPlace Test.hs \ + --replace ', testCase "crypto" test_crypto' "" + '' + (drv.postPatch or ""); + # On Darwin, git-annex mis-detects options to `cp`, so we wrap the + # binary to ensure it uses Nixpkgs' coreutils. + postFixup = '' + wrapProgram $out/bin/git-annex \ + --prefix PATH : "${pathForDarwin}" + '' + (drv.postFixup or ""); + buildTools = [ + pkgs.buildPackages.makeWrapper + ] ++ (drv.buildTools or []); + }) (super.git-annex.override { + dbus = if pkgs.stdenv.isLinux then self.dbus else null; + fdo-notify = if pkgs.stdenv.isLinux then self.fdo-notify else null; + hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify; + }); # The test suite has undeclared dependencies on git. githash = dontCheck super.githash; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 93fb82954d570..d35033dff8fe9 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -7320,6 +7320,29 @@ self: { license = lib.licenses.bsd3; }) {}; + "Glob_0_10_2" = callPackage + ({ mkDerivation, base, containers, directory, dlist, filepath + , HUnit, QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2, transformers, transformers-compat + }: + mkDerivation { + pname = "Glob"; + version = "0.10.2"; + sha256 = "1h3kh46qds4nqvixm4myy1kb5slg53f44hfn8aymrlr7hjn75xka"; + libraryHaskellDepends = [ + base containers directory dlist filepath transformers + transformers-compat + ]; + testHaskellDepends = [ + base containers directory dlist filepath HUnit QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 + transformers transformers-compat + ]; + description = "Globbing library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "GlomeTrace" = callPackage ({ mkDerivation, array, base, GlomeVec }: mkDerivation { @@ -10906,8 +10929,8 @@ self: { pname = "HsYAML"; version = "0.2.1.0"; sha256 = "10qzhsg789h37q22hm9p27dx4rhbykcbxp7p3pvkws8fr7ajgxv0"; - revision = "2"; - editedCabalFile = "0f7867jfzlmlqnkv3fjrzjvvfzjlvhbm10kmg7n0qk69ic8grkbc"; + revision = "3"; + editedCabalFile = "0qj6180459mx08v3m8x8nw2a8a7srw2q48dh4d9qgwd1rl499a5i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -10939,6 +10962,25 @@ self: { license = lib.licenses.gpl2Plus; }) {}; + "HsYAML-aeson_0_2_0_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, HsYAML, mtl + , scientific, text, unordered-containers, vector + }: + mkDerivation { + pname = "HsYAML-aeson"; + version = "0.2.0.1"; + sha256 = "139hqd07hkr8ykvrgmcshh9f3vp9dnrj6ks5nl8hgrpi990jsy5r"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers HsYAML mtl scientific text + unordered-containers vector + ]; + description = "JSON to YAML Adapter"; + license = lib.licenses.gpl2Plus; + hydraPlatforms = lib.platforms.none; + }) {}; + "Hsed" = callPackage ({ mkDerivation, array, base, bytestring, cmdargs, data-accessor , data-accessor-template, data-accessor-transformers, directory @@ -17107,6 +17149,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "Rattus_0_5_0_1" = callPackage + ({ mkDerivation, base, Cabal, containers, ghc, ghc-prim + , simple-affine-space, transformers + }: + mkDerivation { + pname = "Rattus"; + version = "0.5.0.1"; + sha256 = "1rj29wbhk9bn7mazhrqcgas8m7rnfcak10krimsn08v2nzw2af79"; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ + base containers ghc ghc-prim simple-affine-space transformers + ]; + testHaskellDepends = [ base containers ]; + description = "A modal FRP language"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ReadArgs" = callPackage ({ mkDerivation, base, hspec, system-filepath, text }: mkDerivation { @@ -17356,8 +17416,8 @@ self: { }: mkDerivation { pname = "RtMidi"; - version = "0.5.0.1"; - sha256 = "13fzqfq47zx3anpc1y9ypfa2h7bxzzj95zd7hpm3niykjrl9zadr"; + version = "0.5.0.2"; + sha256 = "1mlb611ilamjd884da57zy5c2jga4d5nbjy2yphnn0fcn7lzymyk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base deepseq unliftio-core vector ]; @@ -18326,6 +18386,34 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "ShellCheck_0_8_0" = callPackage + ({ mkDerivation, aeson, array, base, bytestring, containers + , deepseq, Diff, directory, filepath, mtl, parsec, process + , QuickCheck, regex-tdfa + }: + mkDerivation { + pname = "ShellCheck"; + version = "0.8.0"; + sha256 = "05jlapp4m997w36h2wszdxz9gvczdczaylypsbn14jqpb650w232"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson array base bytestring containers deepseq Diff directory + filepath mtl parsec process QuickCheck regex-tdfa + ]; + executableHaskellDepends = [ + aeson array base bytestring containers deepseq Diff directory + filepath mtl parsec QuickCheck regex-tdfa + ]; + testHaskellDepends = [ + aeson array base bytestring containers deepseq Diff directory + filepath mtl parsec QuickCheck regex-tdfa + ]; + description = "Shell script analysis tool"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "Shellac" = callPackage ({ mkDerivation, base, directory, mtl, unix }: mkDerivation { @@ -20915,8 +21003,8 @@ self: { ({ mkDerivation, base, bytestring, transformers, vector, vulkan }: mkDerivation { pname = "VulkanMemoryAllocator"; - version = "0.7.3"; - sha256 = "0ff8ik1y4cxf408kwpasqrkdimh3afvjhpbsjd40zf8h3aywv10b"; + version = "0.7.4"; + sha256 = "0rzvishkjp4vjwc64a12knj1kr7c793ncpgf9x54l2xj6q7a9mrj"; libraryHaskellDepends = [ base bytestring transformers vector vulkan ]; @@ -21275,12 +21363,12 @@ self: { platforms = lib.platforms.none; }) {}; - "Win32_2_13_0_0" = callPackage + "Win32_2_13_1_0" = callPackage ({ mkDerivation }: mkDerivation { pname = "Win32"; - version = "2.13.0.0"; - sha256 = "0i4ws3d7s94vv6gh3cjj9nr0l88rwx7bwjk9jk0grzvw734dd9a2"; + version = "2.13.1.0"; + sha256 = "1a86hmkba4gd1qqfanl06vi2r77ip53l3dcbgvjp7wlp6rjampvc"; description = "A binding to Windows Win32 API"; license = lib.licenses.bsd3; platforms = lib.platforms.none; @@ -24104,6 +24192,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "ad_4_5" = callPackage + ({ mkDerivation, adjunctions, array, base, comonad, containers + , criterion, data-reify, erf, free, nats, reflection, semigroups + , transformers + }: + mkDerivation { + pname = "ad"; + version = "4.5"; + sha256 = "1v37ckxcav3aicv4vv7y77mmvinfwd8mxzcnm672mmxq1d29vpsc"; + libraryHaskellDepends = [ + adjunctions array base comonad containers data-reify erf free nats + reflection semigroups transformers + ]; + benchmarkHaskellDepends = [ base criterion erf ]; + description = "Automatic Differentiation"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ad-delcont" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -26703,8 +26810,8 @@ self: { }: mkDerivation { pname = "algorithmic-composition-basic"; - version = "0.4.0.0"; - sha256 = "17kajlfr02kq82g281i1bm6x171106wyqz797p6j3iq3jxwp3x91"; + version = "0.4.1.0"; + sha256 = "1k5rsz1c67zzdxh56w9rr1mgnv7jmwbfn4z2ysq1ny1vgyi4m7ry"; libraryHaskellDepends = [ base bytestring directory foldable-ix mmsyn2-array mmsyn3 mmsyn7l mmsyn7ukr-common process process-sequential @@ -30567,8 +30674,8 @@ self: { }: mkDerivation { pname = "ansi-terminal-game"; - version = "1.4.0.0"; - sha256 = "0pxkqjv6xqqyn98y2vpsyyx6n91cjsdwxpx9y636l5n3lk8iq14z"; + version = "1.5.0.0"; + sha256 = "161n02iywllrr49b1mzpa8lav9w41cmng7ca5vfhpxjjydd5rcbx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -32772,8 +32879,8 @@ self: { }: mkDerivation { pname = "arduino-copilot"; - version = "1.5.5"; - sha256 = "0g2zw7xngaz5xhp4zrnhrkscnyck0474mngvp2j14p87sc7qn20w"; + version = "1.5.6"; + sha256 = "06aqavds6lh4iazrlz62dhdxim0q8xqdgafj7y3f8nnmv8w37g41"; libraryHaskellDepends = [ base containers copilot copilot-c99 copilot-language directory filepath mtl optparse-applicative temporary @@ -32849,8 +32956,8 @@ self: { }: mkDerivation { pname = "argo"; - version = "0.2021.11.2"; - sha256 = "1jlh8m03ncwx5pckdbi6c620xc45pg1phspp0cmvqgrvy6wkiyjz"; + version = "0.2021.11.7"; + sha256 = "1lmx938ydl94rmzifk5jbgmfx0p64chkl7dfp1rfxwvbmlp1aydy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -34541,6 +34648,8 @@ self: { pname = "async"; version = "2.2.4"; sha256 = "09d7w3krfhnmf9dp6yffa9wykinhw541wibnjgnlyv77w1dzhka8"; + revision = "1"; + editedCabalFile = "1w3hlcaq444qid3iqizb8sdl08jxwjmcfgfxqs2dw81mllsfqgdq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base hashable stm ]; @@ -38262,11 +38371,11 @@ self: { ({ mkDerivation, base, hspec, HUnit, QuickCheck, time }: mkDerivation { pname = "bank-holiday-usa"; - version = "0.1.1"; - sha256 = "12s473bjbv5wgsxwi5vf6ffh9z72dw7fbnih0i9ifry8kim4pgaz"; + version = "0.2.0"; + sha256 = "03zh4cg7sghryb1d06szvn69c5lsbmsg068j00xbpk3w4xrgphjk"; libraryHaskellDepends = [ base time ]; testHaskellDepends = [ base hspec HUnit QuickCheck time ]; - description = "A library for determining US bank holidays"; + description = "US bank holidays"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; broken = true; @@ -38342,6 +38451,8 @@ self: { pname = "barbies-th"; version = "0.1.9"; sha256 = "1brikm7qr2yi3426vgwjjxjrvw060sb0v7jbxrhazjps28f6aa3n"; + revision = "1"; + editedCabalFile = "0iij1y72q28wvj8hfx000cpckl1wlcgj050380lx526cmwavy151"; libraryHaskellDepends = [ barbies base split template-haskell ]; testHaskellDepends = [ barbies base ]; description = "Create strippable HKD via TH"; @@ -40044,6 +40155,35 @@ self: { broken = true; }) {}; + "bech32_1_1_2" = callPackage + ({ mkDerivation, array, base, base58-bytestring, bytestring + , containers, deepseq, extra, hspec, hspec-discover, memory + , optparse-applicative, process, QuickCheck, text, vector + }: + mkDerivation { + pname = "bech32"; + version = "1.1.2"; + sha256 = "1iyjnyy7l0jf2azbgg6lc5k7n25h1r41fyyqfagyaz79vhi1k7j8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base bytestring containers extra text + ]; + executableHaskellDepends = [ + base base58-bytestring bytestring extra memory optparse-applicative + text + ]; + testHaskellDepends = [ + base base58-bytestring bytestring containers deepseq extra hspec + memory process QuickCheck text vector + ]; + testToolDepends = [ hspec-discover ]; + description = "Implementation of the Bech32 cryptocurrency address format (BIP 0173)"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "bech32-th" = callPackage ({ mkDerivation, base, bech32, hspec, hspec-discover , template-haskell, text @@ -42968,8 +43108,8 @@ self: { }: mkDerivation { pname = "bishbosh"; - version = "0.1.1.0"; - sha256 = "0raryshzgahldn03dzpin6hi9vyq4w81dxgmgcq34z7h2salia5m"; + version = "0.1.2.0"; + sha256 = "1ldzl2f93nqaxs9wbf3s9w8wjrx1fx69w95y5fz7rla7szhrckdq"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -43511,6 +43651,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "bits_0_6" = callPackage + ({ mkDerivation, base, bytes, mtl, transformers }: + mkDerivation { + pname = "bits"; + version = "0.6"; + sha256 = "18s2aa99cwcshcws2zl2ll7xgqn9dpznpkv1nplamc9h4vmqqs93"; + libraryHaskellDepends = [ base bytes mtl transformers ]; + description = "Various bit twiddling and bitwise serialization primitives"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "bits-atomic" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -44846,6 +44998,8 @@ self: { pname = "bloomfilter"; version = "2.0.1.0"; sha256 = "03vrmncg1c10a2wcg5skq30m1yiknn7nwxz2gblyyfaxglshspkc"; + revision = "1"; + editedCabalFile = "1dqlwmmcy7s6gsjqcm4xhk3cgbam0hyzpry2ha4064xvdb4rlks3"; libraryHaskellDepends = [ array base bytestring deepseq ]; testHaskellDepends = [ base bytestring QuickCheck random test-framework @@ -46002,6 +46156,31 @@ self: { license = lib.licenses.bsd3; }) {}; + "bound_2_0_4" = callPackage + ({ mkDerivation, base, bifunctors, binary, bytes, cereal, comonad + , deepseq, deriving-compat, hashable, mmorph, profunctors + , template-haskell, th-abstraction, transformers + , transformers-compat, vector, void + }: + mkDerivation { + pname = "bound"; + version = "2.0.4"; + sha256 = "06wyjiswi5fnnw7ndjdln3fkfgab5c8qh9v1d1s0f0s6rzlb85xs"; + revision = "1"; + editedCabalFile = "008i9lm53p0vwahrl61lfpv33yjchi6jyby7j37rlw9shr4h06qg"; + libraryHaskellDepends = [ + base bifunctors binary bytes cereal comonad deepseq hashable mmorph + profunctors template-haskell th-abstraction transformers + transformers-compat + ]; + testHaskellDepends = [ + base deriving-compat transformers transformers-compat vector void + ]; + description = "Making de Bruijn Succ Less"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "bound-extras" = callPackage ({ mkDerivation, base, bound, containers, deepseq, filepath , hashable, pretty, tasty, tasty-golden, text-short, transformers @@ -48208,6 +48387,8 @@ self: { pname = "bytes"; version = "0.17.1"; sha256 = "1qmps8vvg98wfm9xm734hwzi56bsk8r1zc6vx20rlhc79krv5s9s"; + revision = "2"; + editedCabalFile = "1gayyk4sgd8r48x2cgil8392wlxir0qq059m5k966jrwrqdqg2m4"; libraryHaskellDepends = [ base binary binary-orphans bytestring cereal containers hashable mtl scientific text time transformers transformers-compat @@ -49468,6 +49649,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "cabal-doctest_1_0_9" = callPackage + ({ mkDerivation, base, Cabal, directory, filepath }: + mkDerivation { + pname = "cabal-doctest"; + version = "1.0.9"; + sha256 = "0wxs0xkspc80h0g8ks792lrzldxvcnhc9rja1j0k678ijs20hmjm"; + libraryHaskellDepends = [ base Cabal directory filepath ]; + description = "A Setup.hs helper for running doctests"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "cabal-edit" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, directory , filepath, Glob, hackage-db, optparse-applicative, process, store @@ -52605,8 +52798,8 @@ self: { pname = "cassava"; version = "0.5.2.0"; sha256 = "01h1zrdqb313cjd4rqm1107azzx4czqi018c2djf66a5i7ajl3dk"; - revision = "4"; - editedCabalFile = "19rkq41r5vj8drnj850b1wqnc54mxpw0x5z54brq0nvyww5f8ai8"; + revision = "5"; + editedCabalFile = "0d2zfs9a5rzljaz2dr47rypsj7aamgsfqn0gs0pwjhkwi8p1504y"; configureFlags = [ "-f-bytestring--lt-0_10_4" ]; libraryHaskellDepends = [ array attoparsec base bytestring containers deepseq hashable Only @@ -53492,27 +53685,6 @@ self: { }: mkDerivation { pname = "cereal"; - version = "0.5.8.1"; - sha256 = "1mqvd1iwzr50az4y24332x3g3wsrzw8j1iwph02vr7jbjfn8i7id"; - revision = "1"; - editedCabalFile = "02v1nivac478nzzykjbq3rawnqskxjc4sb54m6s5jcgbigfnb2x0"; - libraryHaskellDepends = [ - array base bytestring containers ghc-prim - ]; - testHaskellDepends = [ - base bytestring QuickCheck test-framework - test-framework-quickcheck2 - ]; - description = "A binary serialization library"; - license = lib.licenses.bsd3; - }) {}; - - "cereal_0_5_8_2" = callPackage - ({ mkDerivation, array, base, bytestring, containers, ghc-prim - , QuickCheck, test-framework, test-framework-quickcheck2 - }: - mkDerivation { - pname = "cereal"; version = "0.5.8.2"; sha256 = "0kvnlm22qdmb7g2jz7imsvh799q4nvms1ni0cbba5vigp5ai64hp"; libraryHaskellDepends = [ @@ -53524,7 +53696,6 @@ self: { ]; description = "A binary serialization library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "cereal-conduit" = callPackage @@ -54011,47 +54182,40 @@ self: { }) {}; "chakra" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base, bytestring, cryptonite - , data-default, data-has, dotenv, envy, fast-logger, hspec - , http-types, iproute, jose, lens, mtl, network, network-uri - , options, optparse-simple, prometheus-client + ({ mkDerivation, aeson, base, bytestring, cryptonite, data-default + , data-has, dotenv, envy, fast-logger, hspec, http-types, iproute + , jose, network, network-uri, optparse-simple, prometheus-client , prometheus-metrics-ghc, rio, servant-auth, servant-auth-server - , servant-server, streaming-commons, string-conversions, text, time - , transformers, unordered-containers, wai, wai-cli, wai-extra - , wai-middleware-prometheus, warp + , servant-server, transformers, unordered-containers, wai, wai-cli + , wai-extra, wai-middleware-prometheus, warp }: mkDerivation { pname = "chakra"; - version = "0.1.0"; - sha256 = "00ygnyvif8z8x9xasa3s9yahsawdmkjg43afczd5i0p3clfg6385"; + version = "0.1.2"; + sha256 = "0fnq9djvsphnrmlds97mjw9idp2s448vqbk1lhj3m6bfhsdx5mdr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson ansi-terminal base bytestring cryptonite data-default - data-has dotenv envy fast-logger http-types iproute jose lens mtl - network network-uri options prometheus-client - prometheus-metrics-ghc rio servant-auth servant-auth-server - servant-server streaming-commons string-conversions text time - transformers unordered-containers wai wai-cli wai-extra - wai-middleware-prometheus warp + aeson base bytestring cryptonite data-default data-has envy + fast-logger http-types iproute jose network network-uri + prometheus-client prometheus-metrics-ghc rio servant-auth + servant-auth-server servant-server transformers wai wai-cli + wai-extra wai-middleware-prometheus warp ]; executableHaskellDepends = [ - aeson ansi-terminal base bytestring cryptonite data-default - data-has dotenv envy fast-logger http-types iproute jose lens mtl - network network-uri options optparse-simple prometheus-client - prometheus-metrics-ghc rio servant-auth servant-auth-server - servant-server streaming-commons string-conversions text time - transformers unordered-containers wai wai-cli wai-extra + aeson base bytestring cryptonite data-default data-has dotenv envy + fast-logger http-types iproute jose network network-uri + optparse-simple prometheus-client prometheus-metrics-ghc rio + servant-auth servant-auth-server servant-server transformers + unordered-containers wai wai-cli wai-extra wai-middleware-prometheus warp ]; testHaskellDepends = [ - aeson ansi-terminal base bytestring cryptonite data-default - data-has dotenv envy fast-logger hspec http-types iproute jose lens - mtl network network-uri options prometheus-client - prometheus-metrics-ghc rio servant-auth servant-auth-server - servant-server streaming-commons string-conversions text time - transformers unordered-containers wai wai-cli wai-extra - wai-middleware-prometheus warp + aeson base bytestring cryptonite data-default data-has envy + fast-logger hspec http-types iproute jose network network-uri + prometheus-client prometheus-metrics-ghc rio servant-auth + servant-auth-server servant-server transformers wai wai-cli + wai-extra wai-middleware-prometheus warp ]; description = "A REST Web Api server template for building (micro)services"; license = lib.licenses.mit; @@ -56734,6 +56898,8 @@ self: { pname = "classy-prelude"; version = "1.5.0"; sha256 = "1nm4lygxqb1wq503maki6dsah2gpn5rd22jmbwjxfwyzgyqy9fnk"; + revision = "1"; + editedCabalFile = "1jivh1bmcvqn6bhh5z8x69v93zjcriklljm7gx342d8k5d5rsf4s"; libraryHaskellDepends = [ async base basic-prelude bifunctors bytestring chunked-data containers deepseq dlist ghc-prim hashable mono-traversable @@ -63848,6 +64014,27 @@ self: { pname = "constraints"; version = "0.13.1"; sha256 = "0j10sn0i1pk0dsxnf728v0mjg9bcxblkhd8f4fm8rgi32v2sby6k"; + revision = "1"; + editedCabalFile = "115n8pqc26gqxgvvf4h4y1wkf3gw6nb3jfjfmdb4svlnk4jlyjm9"; + libraryHaskellDepends = [ + base binary deepseq ghc-prim hashable mtl transformers + transformers-compat type-equality + ]; + testHaskellDepends = [ base hspec ]; + testToolDepends = [ hspec-discover ]; + description = "Constraint manipulation"; + license = lib.licenses.bsd2; + }) {}; + + "constraints_0_13_2" = callPackage + ({ mkDerivation, base, binary, deepseq, ghc-prim, hashable, hspec + , hspec-discover, mtl, transformers, transformers-compat + , type-equality + }: + mkDerivation { + pname = "constraints"; + version = "0.13.2"; + sha256 = "1zfijh3jpdfrh8nwn5xv2z05jnxyf0ciqlfaja6g6ls654svrj70"; libraryHaskellDepends = [ base binary deepseq ghc-prim hashable mtl transformers transformers-compat type-equality @@ -63856,6 +64043,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "Constraint manipulation"; license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; }) {}; "constraints-deriving" = callPackage @@ -63952,8 +64140,8 @@ self: { }: mkDerivation { pname = "constructible"; - version = "0.1.1"; - sha256 = "19g62i3cv39fww55xcayrzh1v7flghg43ygj41g9cq6qsbq345wr"; + version = "0.1.2"; + sha256 = "1fdxbw33rjyh0gmknzng8sl8gcbz99ib3ks5rq3kjvqn4ibmyqpf"; libraryHaskellDepends = [ base binary-search complex-generic integer-roots ]; @@ -65017,8 +65205,8 @@ self: { }: mkDerivation { pname = "copilot"; - version = "3.5"; - sha256 = "1cia936fm14bzkd8qh8g8zri2lfx7n0jfbjqiqwpwhpgmxvfhznj"; + version = "3.6"; + sha256 = "0h43slh084wj7kwn2rdn0s63pqzy930h6z2vk38kn6yqic8d9s9y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -65037,14 +65225,15 @@ self: { }: mkDerivation { pname = "copilot-c99"; - version = "3.5"; - sha256 = "1svcshxqrqp9m7pj7k77vfxzmzkanj0zyjq4ry985zzhcqgzcank"; + version = "3.6"; + sha256 = "18p7pijx2f7bw61bzfs5994xpkygghf7hvwpklhp72jkshjdjj1m"; libraryHaskellDepends = [ base containers copilot-core directory filepath language-c99 language-c99-simple language-c99-util mtl pretty ]; description = "A compiler for Copilot targeting C99"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "copilot-cbmc" = callPackage @@ -65065,14 +65254,22 @@ self: { }) {}; "copilot-core" = callPackage - ({ mkDerivation, base, dlist, mtl, pretty }: + ({ mkDerivation, base, dlist, HUnit, mtl, pretty, QuickCheck + , test-framework, test-framework-hunit, test-framework-quickcheck2 + }: mkDerivation { pname = "copilot-core"; - version = "3.5"; - sha256 = "0i5jj4hzk0gqsjx24xswjna9cdwxbyv5hln5jsmhdhgw05c4z5g4"; + version = "3.6"; + sha256 = "00v8la4q15qj27wyqcbsv0h7m5k5ln98y4zkdzpng3z5gw4mpkm9"; libraryHaskellDepends = [ base dlist mtl pretty ]; + testHaskellDepends = [ + base HUnit pretty QuickCheck test-framework test-framework-hunit + test-framework-quickcheck2 + ]; description = "An intermediate representation for Copilot"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "copilot-language" = callPackage @@ -65081,8 +65278,8 @@ self: { }: mkDerivation { pname = "copilot-language"; - version = "3.5"; - sha256 = "0s1yn4la8pbdwlcfrlx79031anagp235dbapm3c715mv67dgcs2b"; + version = "3.6"; + sha256 = "0b1cl4v5w54nx007mmnsx49hh3zxjm55ninlzkd78balnyah8nlk"; libraryHaskellDepends = [ array base containers copilot-core copilot-theorem data-reify mtl ]; @@ -65097,8 +65294,8 @@ self: { }: mkDerivation { pname = "copilot-libraries"; - version = "3.5"; - sha256 = "1glz1x00abyavyca7kz19ji7jipl5fjxwqi47mql4b3wr9ksc0y4"; + version = "3.6"; + sha256 = "0s6y1is91nbvlrb9fdp9xhaq9wx3j5pm67gjrlajiik4029a2dxd"; libraryHaskellDepends = [ array base containers copilot-language data-reify mtl parsec ]; @@ -65132,8 +65329,8 @@ self: { }: mkDerivation { pname = "copilot-theorem"; - version = "3.5"; - sha256 = "0cb22695jp502iilyjkfhr8lzl97rdrpjvs9fbknrr0zbwn1m7p9"; + version = "3.6"; + sha256 = "17l8xq4zd9jfih5p21l6xkahdgrfbmpy8wxc38w88w98qmz5ix59"; libraryHaskellDepends = [ ansi-terminal base bimap bv-sized containers copilot-core data-default directory filepath libBF mtl panic parameterized-utils @@ -65296,7 +65493,7 @@ self: { license = lib.licenses.mit; }) {}; - "core-program_0_3_4_0" = callPackage + "core-program_0_3_4_1" = callPackage ({ mkDerivation, async, base, bytestring, chronologique, core-data , core-text, directory, exceptions, filepath, fsnotify, hashable , hourglass, mtl, prettyprinter, safe-exceptions, stm @@ -65305,8 +65502,8 @@ self: { }: mkDerivation { pname = "core-program"; - version = "0.3.4.0"; - sha256 = "079wiijdgr2vy7i8n4590p0rfakrmsxk4vx50dg992r2gfjlfzfa"; + version = "0.3.4.1"; + sha256 = "01yk1dyr6z1g541v0y7cpnilbnqwvcn5si38r8flzq35svrk1bjn"; libraryHaskellDepends = [ async base bytestring chronologique core-data core-text directory exceptions filepath fsnotify hashable hourglass mtl prettyprinter @@ -69285,6 +69482,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "czipwith_1_0_1_4" = callPackage + ({ mkDerivation, base, template-haskell, transformers }: + mkDerivation { + pname = "czipwith"; + version = "1.0.1.4"; + sha256 = "0zvi7wmbh09ngbyvavvhn6s3vz1pnps59fl1sq3vih6s03s0zmai"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base transformers ]; + description = "CZipWith class and deriving via TH"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "d-bus" = callPackage ({ mkDerivation, async, attoparsec, base, binary, blaze-builder , bytestring, conduit, conduit-extra, containers @@ -73488,14 +73698,14 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "deepseq_1_4_5_0" = callPackage + "deepseq_1_4_6_0" = callPackage ({ mkDerivation, array, base, ghc-prim, HUnit, test-framework , test-framework-hunit }: mkDerivation { pname = "deepseq"; - version = "1.4.5.0"; - sha256 = "0d3yw95xkyx7wwx3anfj1fqb10080xykqic483xpl7rvi1mik6js"; + version = "1.4.6.0"; + sha256 = "0j6pxm9q3xanhxrdmxgzkfdlnpilnlvnnvazq61szl1q9d3mn6ql"; libraryHaskellDepends = [ array base ]; testHaskellDepends = [ array base ghc-prim HUnit test-framework test-framework-hunit @@ -74132,16 +74342,14 @@ self: { "dependent-literals" = callPackage ({ mkDerivation, base, fin-int, numeric-kinds, sint, snumber - , tagged, wrapped + , tagged, type-compare, wrapped }: mkDerivation { pname = "dependent-literals"; - version = "0.1.1.0"; - sha256 = "0dw2xc5l8cmhsmr2akyyhyfj8m3qx02pz81fn52ii9mkhzs6rcjb"; - revision = "5"; - editedCabalFile = "1z2afnvgdkw6swvc1mavd8rzqcq1s124n0j13n7zd9pcjha9i4nb"; + version = "0.2.0"; + sha256 = "1i3mzijqk2pf7am9kh1ydhrw9qj1ijfq8kwvxhrqcx28kaz63rvd"; libraryHaskellDepends = [ - base fin-int numeric-kinds sint snumber tagged wrapped + base fin-int numeric-kinds sint snumber tagged type-compare wrapped ]; description = "Library for dependent-literals-plugin"; license = lib.licenses.asl20; @@ -74153,10 +74361,8 @@ self: { }: mkDerivation { pname = "dependent-literals-plugin"; - version = "0.1.0.1"; - sha256 = "1rpjlcv3g150rcmxidn48n25xxv2ghdz4x9jnap1swkz0fb10i3a"; - revision = "4"; - editedCabalFile = "1330hiqvcvl73y8pd3wpsqicvysl8l0mizkr8my7a628fwh6018p"; + version = "0.1.0.2"; + sha256 = "0bllcf19psak7sfhlqh78lbrdgx3ylqislrvdhjc9syvhaw5khq1"; libraryHaskellDepends = [ base ghc syb ]; testHaskellDepends = [ base dependent-literals fin-int numeric-kinds short-vec sint @@ -74637,6 +74843,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "deriving-aeson_0_2_8" = callPackage + ({ mkDerivation, aeson, base, bytestring }: + mkDerivation { + pname = "deriving-aeson"; + version = "0.2.8"; + sha256 = "0f59ar4cax7g0h6wrk8ckni7i4gw5wls5ybzbrji2a0qpd7q5lrd"; + libraryHaskellDepends = [ aeson base ]; + testHaskellDepends = [ aeson base bytestring ]; + description = "Type driven generic aeson instance customisation"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "deriving-compat" = callPackage ({ mkDerivation, base, base-compat, base-orphans, containers , ghc-boot-th, ghc-prim, hspec, hspec-discover, QuickCheck, tagged @@ -75339,8 +75558,8 @@ self: { pname = "dhall"; version = "1.40.1"; sha256 = "0m2fw9ak9l6fz8ylpbi0cdihf2j66jlnd5j3vf56r7wlqgbkxhi1"; - revision = "2"; - editedCabalFile = "0vywq222wyy8rs4114d0pq70yji7xh440i0ilqbmfywjfj2gm1pj"; + revision = "5"; + editedCabalFile = "1dp9byzmjd2kvydc0q5s3mv59a131jqwhc9cl22jgbhp0whq9jgc"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -75710,8 +75929,8 @@ self: { pname = "dhall-nixpkgs"; version = "1.0.6"; sha256 = "12sfxz7n86m69m1xbnrrr1ybggh70rfwmr4maflq522bhkc2hgvk"; - revision = "1"; - editedCabalFile = "0xy1g9ab355mdkcq30z091rr33sfw98jqjldmawrcq0yxb2gb2s6"; + revision = "2"; + editedCabalFile = "13i04l52jb8xyhqa48r8rlr0d4p657aarfhsxm407ziph5pi60vk"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -75733,8 +75952,8 @@ self: { pname = "dhall-openapi"; version = "1.0.2"; sha256 = "1p678nn1gfj2xp0kmw8i5pzsv6s5bpnsmyng45adb9pnpiyxbcyj"; - revision = "1"; - editedCabalFile = "1mbl9ximmblz1cdm07sk8lwsxdxknhlipx91amd155xpqs72i8jg"; + revision = "2"; + editedCabalFile = "0gkxzfadkpz4dcmcfbyf66s2xa656lf2vw0n282qnc1rsy74ra85"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -75885,6 +76104,8 @@ self: { pname = "dhall-yaml"; version = "1.2.8"; sha256 = "1p766ybwib3f2i5h7m1hh71vc255ahvf7237bpprdapqw3ag8nak"; + revision = "1"; + editedCabalFile = "06jr2b5zj82zcsq7dp6d8v9rfarkpqkp6m1s61d76vlzv9kc2pp2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -76310,10 +76531,8 @@ self: { }: mkDerivation { pname = "diagrams-haddock"; - version = "0.4.1"; - sha256 = "0p978saxsfad6d8wkjnp6i300cf58ps02yw7a1zzhjfgk5ih2qlb"; - revision = "1"; - editedCabalFile = "063j6drlybzbm6bf9yfix86hs3hvgb98sgh4rzgrqkq9kvarj2ij"; + version = "0.4.1.1"; + sha256 = "1azc42pr0hb5qamgf8i0kpkvpzxqlgc9npmi21sxnsw66bnzxw7i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -80053,7 +80272,7 @@ self: { license = lib.licenses.mit; }) {}; - "doctest_0_18_1" = callPackage + "doctest_0_18_2" = callPackage ({ mkDerivation, base, base-compat, code-page, deepseq, directory , exceptions, filepath, ghc, ghc-paths, hspec, hspec-core, HUnit , mockery, process, QuickCheck, setenv, silently, stringbuilder @@ -80061,8 +80280,8 @@ self: { }: mkDerivation { pname = "doctest"; - version = "0.18.1"; - sha256 = "07w77cik8p3kpcl5vx4l3cr93r1dhk3wc98k1g50l9pby5argrzb"; + version = "0.18.2"; + sha256 = "0c48dpxa8i3q5xh2shd2p2xxhrsy7wdil6dg4mayr3lkk1dlwbfp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -80137,6 +80356,8 @@ self: { pname = "doctest-driver-gen"; version = "0.3.0.4"; sha256 = "1fbqi4s4ajxhyv4a7nbh3v98limla0z8rfqlh02pwc1a90qpwy1a"; + revision = "1"; + editedCabalFile = "19xaynf2zzrvls6l57jzzxp3862d0d2q43amsgsch5ri8479m4dn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -88762,23 +88983,11 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "exact-combinatorics"; - version = "0.2.0.10"; - sha256 = "08xdn2dl9r1zkphm9ja3lp4qin9cn889q184lsmk432icbvw5r2h"; - libraryHaskellDepends = [ base ]; - description = "Efficient exact computation of combinatoric functions"; - license = lib.licenses.bsd3; - }) {}; - - "exact-combinatorics_0_2_0_11" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "exact-combinatorics"; version = "0.2.0.11"; sha256 = "0qrhgd468ljpnfciaxzimmn1rhvapcrrsy4wb2r08hn3vjflmd3n"; libraryHaskellDepends = [ base ]; description = "Efficient exact computation of combinatoric functions"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "exact-cover" = callPackage @@ -90399,8 +90608,8 @@ self: { }: mkDerivation { pname = "extralife"; - version = "0.1.1.0"; - sha256 = "0kw5lqfldncl1ci6x6izgs16hl0brrlaxin2yis279a5q4kh8xpz"; + version = "0.2.0.0"; + sha256 = "0bpaz123qg91rw4b97p528w4l7wbb17x4h61dmy1v2sr01l82q58"; libraryHaskellDepends = [ aeson base bytestring http-client http-client-tls text time ]; @@ -97526,14 +97735,15 @@ self: { , http-link-header, http-types, immortal, iproute, lens, lens-aeson , load-env, monad-control, monad-logger, MonadRandom, mtl, network , network-uri, persistent, persistent-postgresql, postgresql-simple - , primitive, process, resource-pool, retry, rio, temporary, text - , time, transformers, transformers-base, unliftio, unliftio-core - , unordered-containers, wai, wai-extra, yaml, yesod, yesod-core + , primitive, process, resource-pool, retry, rio, template-haskell + , temporary, text, time, transformers, transformers-base, unliftio + , unliftio-core, unordered-containers, wai, wai-extra, yaml, yesod + , yesod-core }: mkDerivation { pname = "freckle-app"; - version = "1.0.1.0"; - sha256 = "1lak6iyid14wxydzs77jlwrayrwcg3n4favrf3qf3yd46306a2f3"; + version = "1.0.2.0"; + sha256 = "060yspa1qb0qp7yf7s71pfkq6jdd7bn9xy5kll45d8rvjazf10y6"; libraryHaskellDepends = [ aeson ansi-terminal base bytestring case-insensitive conduit data-default datadog doctest ekg-core errors exceptions fast-logger @@ -97542,9 +97752,9 @@ self: { http-types immortal iproute lens load-env monad-control monad-logger MonadRandom mtl network network-uri persistent persistent-postgresql postgresql-simple primitive process - resource-pool retry rio text time transformers transformers-base - unliftio unliftio-core unordered-containers wai wai-extra yaml - yesod yesod-core + resource-pool retry rio template-haskell text time transformers + transformers-base unliftio unliftio-core unordered-containers wai + wai-extra yaml yesod yesod-core ]; testHaskellDepends = [ aeson base bytestring directory hspec http-types lens lens-aeson @@ -101431,24 +101641,6 @@ self: { }: mkDerivation { pname = "generic-aeson"; - version = "0.2.0.12"; - sha256 = "17br2dl9gd2hyflgp0fzqs5ghp4my4l234pjfvvnhk9n4szxzcr3"; - revision = "1"; - editedCabalFile = "0nd40p8iqr6bk7py9rblpis2s8i4p5wgg6kfp607mpp4y17xq1dr"; - libraryHaskellDepends = [ - aeson attoparsec base generic-deriving mtl tagged text - unordered-containers vector - ]; - description = "Derivation of Aeson instances using GHC generics"; - license = lib.licenses.bsd3; - }) {}; - - "generic-aeson_0_2_0_13" = callPackage - ({ mkDerivation, aeson, attoparsec, base, generic-deriving, mtl - , tagged, text, unordered-containers, vector - }: - mkDerivation { - pname = "generic-aeson"; version = "0.2.0.13"; sha256 = "0w5xp1rfg3r90ja1f0s48i4x7yyynfv52p6b9ncsdqyrq3y9qvl0"; libraryHaskellDepends = [ @@ -101457,7 +101649,6 @@ self: { ]; description = "Derivation of Aeson instances using GHC generics"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "generic-arbitrary" = callPackage @@ -101915,6 +102106,8 @@ self: { pname = "generic-random"; version = "1.4.0.0"; sha256 = "12rvb1dzrfjc46n9vdcw3yv773iih8vwhrac3hpzq70yp2z77jdw"; + revision = "1"; + editedCabalFile = "0k8hk2fpm53x5788nvqy8pd1vgpdwidbz5syryf8imhqqq0837w1"; libraryHaskellDepends = [ base QuickCheck ]; testHaskellDepends = [ base deepseq QuickCheck ]; description = "Generic random generators for QuickCheck"; @@ -101927,6 +102120,8 @@ self: { pname = "generic-random"; version = "1.5.0.0"; sha256 = "033cs5vkx57ny035ngndhg3n32jbzyp98li9559gyiz8glp79pzg"; + revision = "1"; + editedCabalFile = "0p0im7py1hrarad8pg5vcggz52d702p749nvx3h5glcygzlag14v"; libraryHaskellDepends = [ base QuickCheck ]; testHaskellDepends = [ base deepseq QuickCheck ]; description = "Generic random generators for QuickCheck"; @@ -104932,6 +105127,32 @@ self: { license = lib.licenses.bsd3; }) {}; + "ghc-typelits-presburger_0_6_1_0" = callPackage + ({ mkDerivation, base, containers, equational-reasoning, ghc + , ghc-tcplugins-extra, mtl, pretty, reflection, syb, tasty + , tasty-discover, tasty-expected-failure, tasty-hunit, text + , transformers + }: + mkDerivation { + pname = "ghc-typelits-presburger"; + version = "0.6.1.0"; + sha256 = "1k9mh0w1xaz85jkdvwm5pxkqzwzrjmhzn1sj2nmilhbnhgfwm9vd"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers ghc ghc-tcplugins-extra mtl pretty reflection syb + transformers + ]; + testHaskellDepends = [ + base equational-reasoning tasty tasty-discover + tasty-expected-failure tasty-hunit text + ]; + testToolDepends = [ tasty-discover ]; + description = "Presburger Arithmetic Solver for GHC Type-level natural numbers"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-usage" = callPackage ({ mkDerivation, base, containers, ghc, ghc-paths, unix }: mkDerivation { @@ -107369,8 +107590,8 @@ self: { }: mkDerivation { pname = "git-lfs"; - version = "1.1.2"; - sha256 = "1kfrlpq54s5z84l5sk19vmvlqrybnyqg2nwgh452bdh13z67scmw"; + version = "1.2.0"; + sha256 = "1iv3s1c7gwmsima9z3rsphjligpnf7h3vc5c96zgq9b71cx81lba"; libraryHaskellDepends = [ aeson base bytestring case-insensitive containers http-client http-types network-uri text @@ -113897,6 +114118,29 @@ self: { license = lib.licenses.bsd3; }) {}; + "greskell_1_2_0_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, doctest, doctest-discover + , exceptions, greskell-core, hashable, hint, hspec, hspec-discover + , semigroups, text, transformers, unordered-containers, vector + }: + mkDerivation { + pname = "greskell"; + version = "1.2.0.2"; + sha256 = "0zqxln8gcjb3i88b9x156rv3v4d0zlrkca11w1bmbjly8zpgrl4x"; + libraryHaskellDepends = [ + aeson base exceptions greskell-core hashable semigroups text + transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring doctest doctest-discover greskell-core hint + hspec text unordered-containers + ]; + testToolDepends = [ doctest-discover hspec-discover ]; + description = "Haskell binding for Gremlin graph query language"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "greskell-core" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, doctest , doctest-discover, hashable, hspec, hspec-discover, QuickCheck @@ -113919,6 +114163,29 @@ self: { license = lib.licenses.bsd3; }) {}; + "greskell-core_0_1_3_7" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, doctest + , doctest-discover, hashable, hspec, hspec-discover, QuickCheck + , scientific, semigroups, text, unordered-containers, uuid, vector + }: + mkDerivation { + pname = "greskell-core"; + version = "0.1.3.7"; + sha256 = "1lffgrc4q9iwfdgn7qfxyhk459x47fl2fg6rvgqr4jqz1xp7x9cy"; + libraryHaskellDepends = [ + aeson base containers hashable scientific semigroups text + unordered-containers uuid vector + ]; + testHaskellDepends = [ + aeson base bytestring doctest doctest-discover hspec QuickCheck + text unordered-containers vector + ]; + testToolDepends = [ doctest-discover hspec-discover ]; + description = "Haskell binding for Gremlin graph query language - core data types and tools"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "greskell-websocket" = callPackage ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring , greskell-core, hashtables, hspec, safe-exceptions, stm, text @@ -113941,6 +114208,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "greskell-websocket_0_1_2_6" = callPackage + ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring + , greskell-core, hashtables, hspec, hspec-discover, safe-exceptions + , stm, text, unordered-containers, uuid, vector, websockets + }: + mkDerivation { + pname = "greskell-websocket"; + version = "0.1.2.6"; + sha256 = "1wjfvx25k603ymsalvgzrpnyw20mliky5mclrx6caxqyh0plqdak"; + libraryHaskellDepends = [ + aeson async base base64-bytestring bytestring greskell-core + hashtables safe-exceptions stm text unordered-containers uuid + vector websockets + ]; + testHaskellDepends = [ + aeson base bytestring greskell-core hspec unordered-containers uuid + vector + ]; + testToolDepends = [ hspec-discover ]; + description = "Haskell client for Gremlin Server using WebSocket serializer"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "grid" = callPackage ({ mkDerivation, base, containers, QuickCheck, test-framework , test-framework-quickcheck2 @@ -117210,36 +117501,36 @@ self: { "hadolint" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, colourista - , containers, cryptonite, deepseq, directory, email-validate - , filepath, foldl, gitrev, hspec, HsYAML, HUnit, ilist - , language-docker, megaparsec, mtl, network-uri - , optparse-applicative, parallel, parsec, semver, ShellCheck, spdx - , split, text, time, timerep, void + , containers, cryptonite, data-default, deepseq, directory + , email-validate, filepath, foldl, gitrev, hspec, HsYAML, HUnit + , ilist, language-docker, megaparsec, mtl, network-uri + , optparse-applicative, parallel, parsec, prettyprinter, semver + , ShellCheck, silently, spdx, split, text, time, timerep, void }: mkDerivation { pname = "hadolint"; - version = "2.7.0"; - sha256 = "11jpqx6i7qbg4yjh8rbdz7zqjmp9r9ch9z299h72af48wrwr16fl"; + version = "2.8.0"; + sha256 = "07dqm4jcglshwqyvp17773xd07bhk5mdybn4ax5ff4xrvg4pj9ah"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bytestring Cabal colourista containers cryptonite - deepseq directory email-validate filepath foldl HsYAML ilist - language-docker megaparsec mtl network-uri parallel parsec semver + data-default deepseq directory email-validate filepath foldl gitrev + HsYAML ilist language-docker megaparsec mtl network-uri + optparse-applicative parallel parsec prettyprinter semver ShellCheck spdx split text time timerep void ]; executableHaskellDepends = [ - base containers gitrev language-docker megaparsec - optparse-applicative text + base containers data-default language-docker megaparsec + optparse-applicative prettyprinter text ]; testHaskellDepends = [ - aeson base bytestring containers foldl hspec HsYAML HUnit - language-docker megaparsec ShellCheck split text + aeson base bytestring containers data-default foldl hspec HsYAML + HUnit language-docker megaparsec optparse-applicative ShellCheck + silently split text ]; description = "Dockerfile Linter JavaScript API"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hadoop-formats" = callPackage @@ -125052,6 +125343,28 @@ self: { license = lib.licenses.mit; }) {}; + "hasql-interpolate" = callPackage + ({ mkDerivation, aeson, array, base, bytestring, containers + , haskell-src-meta, hasql, megaparsec, mtl, scientific, tasty + , tasty-hunit, template-haskell, text, time, transformers, uuid + , vector + }: + mkDerivation { + pname = "hasql-interpolate"; + version = "0.1.0.0"; + sha256 = "0l9gpkkwkypvz3020p5khvxzrq6x62z3i1xjrbzal7yj0gic4klg"; + libraryHaskellDepends = [ + aeson array base bytestring containers haskell-src-meta hasql + megaparsec mtl scientific template-haskell text time transformers + uuid vector + ]; + testHaskellDepends = [ + base hasql tasty tasty-hunit template-haskell text + ]; + description = "QuasiQuoter that supports expression interpolation for hasql"; + license = lib.licenses.bsd3; + }) {}; + "hasql-migration" = callPackage ({ mkDerivation, base, bytestring, contravariant, cryptonite , directory, hasql, hasql-transaction, hspec, memory, text, time @@ -126227,6 +126540,7 @@ self: { platforms = [ "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" ]; + hydraPlatforms = lib.platforms.none; }) {}; "hbro-contrib" = callPackage @@ -126262,6 +126576,7 @@ self: { platforms = [ "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" ]; + hydraPlatforms = lib.platforms.none; }) {}; "hburg" = callPackage @@ -134309,7 +134624,6 @@ self: { testHaskellDepends = [ base QuickCheck ]; description = "Hidden Markov Models using LAPACK primitives"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hmm-lapack_0_4_1" = callPackage @@ -137064,18 +137378,16 @@ self: { , cryptohash, deepseq, exceptions, extra, fields-json, hpqtypes , lifted-base, log-base, monad-control, mtl, QuickCheck, safe , semigroups, tasty, tasty-bench, tasty-hunit, text, text-show - , time, transformers, uuid-types + , time, transformers, transformers-base, uuid-types }: mkDerivation { pname = "hpqtypes-extras"; - version = "1.12.0.1"; - sha256 = "0qpydy2hg6fmwhwg0azgraxhjijfarns3syrv2an4ynfqcxrds9k"; - revision = "2"; - editedCabalFile = "0xbflhmnibji9sj1yhsm9xzy0rd9k9mhyw41ixlbdvz70jjmjykb"; + version = "1.13.0.0"; + sha256 = "07pma23i8cy8153g3grb1jr4sasaaczlqym1jv9q5vzb03mdqcaw"; libraryHaskellDepends = [ base base16-bytestring bytestring containers cryptohash exceptions extra fields-json hpqtypes lifted-base log-base monad-control mtl - safe semigroups text text-show + safe semigroups text text-show transformers-base ]; testHaskellDepends = [ base exceptions hpqtypes lifted-base log-base monad-control @@ -138931,27 +139243,6 @@ self: { }) {}; "hsc2hs" = callPackage - ({ mkDerivation, base, containers, directory, filepath, process - , tasty, tasty-hspec - }: - mkDerivation { - pname = "hsc2hs"; - version = "0.68.7"; - sha256 = "0jl94cr2jhjmvz7l9idpr352vwxlsanyiq7ya1vvrlry3vj1aygx"; - revision = "1"; - editedCabalFile = "0nzmlx0kdsq5231m6dbvdb5zssj1h4lkqplp8rb28z3yl5h6h3sa"; - isLibrary = false; - isExecutable = true; - enableSeparateDataOutput = true; - executableHaskellDepends = [ - base containers directory filepath process - ]; - testHaskellDepends = [ base tasty tasty-hspec ]; - description = "A preprocessor that helps with writing Haskell bindings to C code"; - license = lib.licenses.bsd3; - }) {}; - - "hsc2hs_0_68_8" = callPackage ({ mkDerivation, base, containers, directory, filepath, HUnit , process, test-framework, test-framework-hunit }: @@ -138970,7 +139261,6 @@ self: { ]; description = "A preprocessor that helps with writing Haskell bindings to C code"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hsc3" = callPackage @@ -141107,14 +141397,14 @@ self: { license = lib.licenses.mit; }) {}; - "hspec_2_8_3" = callPackage + "hspec_2_8_4" = callPackage ({ mkDerivation, base, hspec-core, hspec-discover , hspec-expectations, QuickCheck }: mkDerivation { pname = "hspec"; - version = "2.8.3"; - sha256 = "1ryv1qad2rw40ak6n7agfd0sib1xk2iyqpz0qhgyxwp3kkjhrn49"; + version = "2.8.4"; + sha256 = "08br1ln5drvw1b9sf9cpxbz31v88p9b7b3hb00qn9vcim5yridz1"; libraryHaskellDepends = [ base hspec-core hspec-discover hspec-expectations QuickCheck ]; @@ -141205,7 +141495,7 @@ self: { license = lib.licenses.mit; }) {}; - "hspec-core_2_8_3" = callPackage + "hspec-core_2_8_4" = callPackage ({ mkDerivation, ansi-terminal, array, base, call-stack, clock , deepseq, directory, filepath, hspec-expectations, hspec-meta , HUnit, process, QuickCheck, quickcheck-io, random, setenv @@ -141213,8 +141503,8 @@ self: { }: mkDerivation { pname = "hspec-core"; - version = "2.8.3"; - sha256 = "0khq0xa6agqcvbngzlxnvd9xwh7dmp4rsb2nzvfwsaknw2674i0k"; + version = "2.8.4"; + sha256 = "11iii063vhsr3qpcadwllmgfhyvykkh1chzpm3bzqfjm1n00vy6d"; libraryHaskellDepends = [ ansi-terminal array base call-stack clock deepseq directory filepath hspec-expectations HUnit QuickCheck quickcheck-io random @@ -141271,14 +141561,16 @@ self: { maintainers = with lib.maintainers; [ maralorn ]; }) {}; - "hspec-discover_2_8_3" = callPackage + "hspec-discover_2_8_4" = callPackage ({ mkDerivation, base, directory, filepath, hspec-meta, mockery , QuickCheck }: mkDerivation { pname = "hspec-discover"; - version = "2.8.3"; - sha256 = "09rjrq289si08cza48gcp29780rv21rs0b12xglkmbd6vfqzp6cs"; + version = "2.8.4"; + sha256 = "0nwayx09i7dfqc56gxq6pq629gnwy10bbn3px7lrq4rkbz3l86y6"; + revision = "1"; + editedCabalFile = "1wi0lq9zhgd5v9zavlw65dhzyw7hyivp8rv3i2ik54pk4j5gp36q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath ]; @@ -150091,8 +150383,8 @@ self: { }: mkDerivation { pname = "implicit-hie-cradle"; - version = "0.3.0.5"; - sha256 = "0c8pyw5nx8b05wqdczy892n0knsniysrxllg2y8q5905mns8h7pc"; + version = "0.4.0.1"; + sha256 = "07k0d2lda4kj20121h8lzbjl074s90cnhbins1dvgngxbz0ddxa2"; libraryHaskellDepends = [ base base16-bytestring bytestring containers directory extra filepath hie-bios hslogger implicit-hie process temporary text time @@ -150290,8 +150582,8 @@ self: { }: mkDerivation { pname = "in-other-words"; - version = "0.2.0.0"; - sha256 = "0adl539jilc3rnwx9ir39y97f6h60xavzhhc8pa9vc6gqp1v4g20"; + version = "0.2.1.0"; + sha256 = "0cm0fxf3snk4ah3jvb9g6f711gs6zg1l7avdj51rgqnlxhsbycqb"; libraryHaskellDepends = [ async base exceptions monad-control mtl stm transformers transformers-base @@ -150389,6 +150681,8 @@ self: { pname = "inchworm"; version = "1.1.1.2"; sha256 = "1dsrx48srmrqcw4y60prgnzxzr7nc7vyzjv0nnr2vaay3j6pxkii"; + revision = "1"; + editedCabalFile = "0xdak2ngj44p0p40k7pavq52f9x6yfglpixz2dp4a7sjw9hk1cxy"; libraryHaskellDepends = [ base ]; description = "Simple parser combinators for lexical analysis"; license = lib.licenses.mit; @@ -151929,6 +152223,24 @@ self: { license = lib.licenses.mit; }) {}; + "integer-roots_1_0_1_0" = callPackage + ({ mkDerivation, base, doctest, integer-gmp, smallcheck, tasty + , tasty-hunit, tasty-quickcheck, tasty-smallcheck + }: + mkDerivation { + pname = "integer-roots"; + version = "1.0.1.0"; + sha256 = "13x74gdh5wh9cr1yfx5l57p06aslcb3pncf8rhn6ihsfk2ni1sm4"; + libraryHaskellDepends = [ base integer-gmp ]; + testHaskellDepends = [ + base doctest smallcheck tasty tasty-hunit tasty-quickcheck + tasty-smallcheck + ]; + description = "Integer roots and perfect powers"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "integer-simple" = callPackage ({ mkDerivation, ghc-prim }: mkDerivation { @@ -152145,6 +152457,8 @@ self: { pname = "intern"; version = "0.9.4"; sha256 = "00c74apc2ap1pjxmzk1c975zzqrc94p69l7v1fvfakv87mbrg8j0"; + revision = "1"; + editedCabalFile = "0xkv6g1aadm5biiqvbfp8f9jsr75prs5aqbhmcskq7s475p1fglp"; libraryHaskellDepends = [ array base bytestring hashable text unordered-containers ]; @@ -153364,25 +153678,6 @@ self: { }: mkDerivation { pname = "iproute"; - version = "1.7.11"; - sha256 = "12wa59b1zgjqp8dmygq2x44ml0cb89fhn1k0zkj4aqz7rhkwsp90"; - libraryHaskellDepends = [ - appar base byteorder bytestring containers network - ]; - testHaskellDepends = [ - appar base byteorder bytestring containers doctest hspec network - QuickCheck safe - ]; - description = "IP Routing Table"; - license = lib.licenses.bsd3; - }) {}; - - "iproute_1_7_12" = callPackage - ({ mkDerivation, appar, base, byteorder, bytestring, containers - , doctest, hspec, network, QuickCheck, safe - }: - mkDerivation { - pname = "iproute"; version = "1.7.12"; sha256 = "0qvb4d7nw8f6j4s09cnpn6z1rdwcwknwklfrhsgivg7wg4aisxgi"; libraryHaskellDepends = [ @@ -153394,7 +153689,6 @@ self: { ]; description = "IP Routing Table"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "iptables-helpers" = callPackage @@ -157459,6 +157753,22 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "jsonrpc-tinyclient" = callPackage + ({ mkDerivation, aeson, base, bytestring, exceptions, http-client + , http-client-tls, mtl, random, text, websockets + }: + mkDerivation { + pname = "jsonrpc-tinyclient"; + version = "1.0.0.0"; + sha256 = "02xhijk3rk4c9yqh1ghs8gvi1r7fwbxba0h21nb23545wflg0bz9"; + libraryHaskellDepends = [ + aeson base bytestring exceptions http-client http-client-tls mtl + random text websockets + ]; + description = "Tiny JSON-RPC client for Haskell Web3 library"; + license = lib.licenses.asl20; + }) {}; + "jsons-to-schema" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, conduit , conduit-combinators, containers, Glob, hjsonschema, hspec @@ -158463,8 +158773,8 @@ self: { }: mkDerivation { pname = "katip"; - version = "0.8.6.0"; - sha256 = "02rq2rl9cgxfay6bnxzh7r354x20hj8zdc60pfhvh3l8naslyk5z"; + version = "0.8.7.0"; + sha256 = "1m74n6fyxczfgg3swkkgr6864mzji1l0dpwpxk5zd93488zrij9v"; libraryHaskellDepends = [ aeson async auto-update base bytestring containers either hostname microlens microlens-th monad-control mtl old-locale resourcet @@ -159564,27 +159874,27 @@ self: { , blaze-builder, bytestring, case-insensitive, conduit , conduit-extra, containers, data-default, directory, filepath , fsnotify, hspec, http-client, http-conduit, http-reverse-proxy - , http-types, HUnit, lifted-base, mtl, network, process, random - , regex-tdfa, stm, tar, template-haskell, text, time, tls - , tls-session-manager, transformers, unix, unix-compat - , unordered-containers, vector, wai, wai-app-static, wai-extra - , warp, warp-tls, yaml, zlib + , http-types, HUnit, indexed-traversable, lifted-base, mtl, network + , optparse-applicative, process, random, regex-tdfa, stm, tar + , template-haskell, text, time, tls, tls-session-manager + , transformers, unix, unix-compat, unordered-containers, vector + , wai, wai-app-static, wai-extra, warp, warp-tls, yaml, zlib }: mkDerivation { pname = "keter"; - version = "1.5"; - sha256 = "0ifz4la1hxv53cz21p3b6cn2mj4ivqj77y5ppyy47dfsbsr1ihal"; + version = "1.6"; + sha256 = "1adqib4zk0a32hi3i0cxf3z0ljx12hymzxh5mag6sr0mx64qcsr1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson array async attoparsec base blaze-builder bytestring case-insensitive conduit conduit-extra containers data-default directory filepath fsnotify http-client http-conduit - http-reverse-proxy http-types lifted-base mtl network process - random regex-tdfa stm tar template-haskell text time tls - tls-session-manager transformers unix unix-compat - unordered-containers vector wai wai-app-static wai-extra warp - warp-tls yaml zlib + http-reverse-proxy http-types indexed-traversable lifted-base mtl + network optparse-applicative process random regex-tdfa stm tar + template-haskell text time tls tls-session-manager transformers + unix unix-compat unordered-containers vector wai wai-app-static + wai-extra warp warp-tls yaml zlib ]; executableHaskellDepends = [ base data-default filepath ]; testHaskellDepends = [ @@ -159740,6 +160050,8 @@ self: { pname = "keys"; version = "3.12.3"; sha256 = "0ik6wsff306dnbz0v3gpiajlj5b558hrk9176fzcb2fclf4447nm"; + revision = "1"; + editedCabalFile = "18fapd53nby46p5103y1m2hwpixn5p12mbyvb8va71pk4b77qlcy"; libraryHaskellDepends = [ array base comonad containers free hashable semigroupoids semigroups tagged transformers transformers-compat @@ -160956,8 +161268,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "lacroix"; - version = "0.1.0.0"; - sha256 = "0d65dqvbfrrvgdnagjyiq8xf7635rd46wda722g85dxzxr1l7mbn"; + version = "0.2.0.0"; + sha256 = "131h3fnr8wxvbr8b7qqf82zjxnidpq4v6qx1bimcnby366nc7val"; libraryHaskellDepends = [ base ]; description = "fizzy n dizzy"; license = lib.licenses.mit; @@ -163291,8 +163603,6 @@ self: { ]; description = "Numerical Linear Algebra using LAPACK"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lapack_0_4" = callPackage @@ -163324,7 +163634,6 @@ self: { description = "Numerical Linear Algebra using LAPACK"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lapack-carray" = callPackage @@ -163410,6 +163719,7 @@ self: { description = "Conversion of objects between 'lapack' and 'hmatrix'"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "large-hashable" = callPackage @@ -165116,6 +165426,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "lens-family-th_0_5_2_1" = callPackage + ({ mkDerivation, base, hspec, template-haskell, transformers }: + mkDerivation { + pname = "lens-family-th"; + version = "0.5.2.1"; + sha256 = "1w8k68a1lyfd79xkc4fbf6z7p5gpriq4pjgb4n9p58az6awnn7dh"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base hspec template-haskell transformers ]; + description = "Generate lens-family style lenses"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "lens-filesystem" = callPackage ({ mkDerivation, base, directory, filepath, hspec, lens , lens-action @@ -166040,8 +166363,8 @@ self: { pname = "libfuse3"; version = "0.1.2.0"; sha256 = "0a59b4xag5vzisrnvf4v1zkdsdzky96h8w2mdj6cip3vgr196frb"; - revision = "3"; - editedCabalFile = "1w59kyc8hvlmbq8n6i7nz8cg8mkzzhfizfpgcm17adxlh6a68ana"; + revision = "4"; + editedCabalFile = "1ra0c9yaihppggv1qy66iy8lhswlyd58qql49v3gwmzb81cccmjp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -167080,6 +167403,8 @@ self: { pname = "lift-generics"; version = "0.2.1"; sha256 = "1qkzq8hcb6j15cslv577bmhjcxmljzsrryysdgd7r99kr3q445b4"; + revision = "1"; + editedCabalFile = "0i0qxm2fi34bnpnwk5k61yjx72pc9j8jhbx44xk176pw7y2pinxd"; libraryHaskellDepends = [ base generic-deriving ghc-prim template-haskell th-compat ]; @@ -167260,6 +167585,8 @@ self: { pname = "lifx-lan"; version = "0.5.0.1"; sha256 = "0rww31gcp5asbc0zb6fz7ddgw3dih6l2mc0rln7nf3qd04hplk6v"; + revision = "2"; + editedCabalFile = "0k4lm2qbqq4xb5rxb0nik5sc898g4w7k050j4gs1ri4xbz32z7cn"; libraryHaskellDepends = [ base binary bytestring composition containers extra monad-loops mtl network random safe text time transformers @@ -167766,7 +168093,6 @@ self: { ]; description = "Compute resistance of linear electrical circuits"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "linear-circuit_0_1_0_3" = callPackage @@ -167824,8 +168150,8 @@ self: { }: mkDerivation { pname = "linear-generics"; - version = "0.1.0.1"; - sha256 = "0ck7gx1chrxyyn7lwbv4gn15zxgfgg7ai0i6404jprvvh72j7b8r"; + version = "0.2"; + sha256 = "16l117m3zblla1cn5866mknvhc1s9737qhld6bym4xsyqsgvh2sz"; libraryHaskellDepends = [ base containers ghc-prim template-haskell th-abstraction ]; @@ -169835,6 +170161,8 @@ self: { pname = "llvm-ffi-tools"; version = "0.0.0.1"; sha256 = "0nicgcdlywb8w5fr7hi5hgayv9phwslp5s47p2c30kavj7c3f3zk"; + revision = "1"; + editedCabalFile = "1wmwrhjs732izgbihbbb7l856pgxa1q5f32z06935ykwfwy160x7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -169842,8 +170170,6 @@ self: { ]; description = "Tools for maintaining the llvm-ffi package"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "llvm-general" = callPackage @@ -170019,8 +170345,6 @@ self: { ]; description = "Generate Pkg-Config configuration file for LLVM"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "llvm-pretty" = callPackage @@ -171915,8 +172239,8 @@ self: { ({ mkDerivation, base, lua, tasty, tasty-hunit }: mkDerivation { pname = "lpeg"; - version = "1.0.0"; - sha256 = "01502izg6fkkp93vc2sr4csx7crqlx7zxgk85rm5kfdx7vh7qjfs"; + version = "1.0.1"; + sha256 = "0zhg7d85s6rx1dh3mndpjjy3k8b5ixyz28wl6i8zvn2mxyx40y98"; libraryHaskellDepends = [ base lua ]; testHaskellDepends = [ base lua tasty tasty-hunit ]; description = "LPeg – Parsing Expression Grammars For Lua"; @@ -172468,15 +172792,17 @@ self: { license = lib.licenses.bsd3; }) {}; - "lucid_2_10_0" = callPackage + "lucid_2_11_0" = callPackage ({ mkDerivation, base, bifunctors, blaze-builder, bytestring , containers, criterion, deepseq, hashable, hspec, HUnit, mmorph , mtl, parsec, text, transformers, unordered-containers }: mkDerivation { pname = "lucid"; - version = "2.10.0"; - sha256 = "1xzrb31n1kx6ym8za32ggy0cxmm2pcv9vm5czzsip5va6p5411yg"; + version = "2.11.0"; + sha256 = "1m1f13vxn3pwc7wvhx0czzxlx2ws8lzdgxlxd1707cx79jyib5sl"; + revision = "1"; + editedCabalFile = "0ai0rxiyni9cxzad3ix50vkxqqmgxfd1vpqzfrmmll1swxpicd8q"; libraryHaskellDepends = [ base blaze-builder bytestring containers hashable mmorph mtl text transformers unordered-containers @@ -172507,6 +172833,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "lucid-alpine_0_1_0_4" = callPackage + ({ mkDerivation, base, lucid, text }: + mkDerivation { + pname = "lucid-alpine"; + version = "0.1.0.4"; + sha256 = "1pr2fg5r43jvgh694lhqbmwl1dida9ymgw161j16dcj66jx8fjk6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base lucid text ]; + executableHaskellDepends = [ base lucid text ]; + testHaskellDepends = [ base lucid text ]; + description = "Use Alpine.js in your lucid templates"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "lucid-cdn" = callPackage ({ mkDerivation, base, lucid }: mkDerivation { @@ -172574,6 +172916,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "lucid-htmx_0_1_0_3" = callPackage + ({ mkDerivation, base, lucid, servant, text }: + mkDerivation { + pname = "lucid-htmx"; + version = "0.1.0.3"; + sha256 = "1fgb4gika5f3bbba2as4bkg6m8nn2w25k17m45b389rwmhyg6syj"; + libraryHaskellDepends = [ base lucid servant text ]; + testHaskellDepends = [ base lucid servant text ]; + description = "Use htmx in your lucid templates"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "lucid-svg" = callPackage ({ mkDerivation, base, blaze-builder, lucid, text, transformers }: mkDerivation { @@ -173803,7 +174158,6 @@ self: { ]; description = "Compute solutions for Magico puzzle"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "magico_0_0_2_2" = callPackage @@ -176016,8 +176370,8 @@ self: { }: mkDerivation { pname = "matplotlib"; - version = "0.7.5"; - sha256 = "0iyjr6j5jp7lqrk9rqqvxz3rx8221hwz56p82zqkj3aarrvy21cs"; + version = "0.7.6"; + sha256 = "0wykzz4d6a55x3bxn9r01bvgvz26yvldgyrnz87rqncxymdawmd4"; libraryHaskellDepends = [ aeson base bytestring containers deepseq filepath process split temporary @@ -176030,7 +176384,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "matplotlib_0_7_6" = callPackage + "matplotlib_0_7_7" = callPackage ({ mkDerivation, ad, aeson, base, bytestring, containers, deepseq , directory, filepath, process, random, raw-strings-qq, split , tasty, tasty-expected-failure, tasty-golden, tasty-hunit @@ -176038,8 +176392,8 @@ self: { }: mkDerivation { pname = "matplotlib"; - version = "0.7.6"; - sha256 = "0wykzz4d6a55x3bxn9r01bvgvz26yvldgyrnz87rqncxymdawmd4"; + version = "0.7.7"; + sha256 = "08qwqnsdch7hzyy0jiz6yvirf0gqm9xx24i3ikm5q993prsdpi2h"; libraryHaskellDepends = [ aeson base bytestring containers deepseq filepath process split temporary @@ -176283,8 +176637,8 @@ self: { }: mkDerivation { pname = "matterhorn"; - version = "50200.14.0"; - sha256 = "0x0f7s4pz0ds1vg8v8qycafmg2i21542p8bmhhrzzwj2m99bgx5d"; + version = "50200.14.1"; + sha256 = "0bxz54881pypwwr2acxarsk362708vwii2krq1ya0kg2ybhcxh72"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -177858,8 +178212,8 @@ self: { pname = "mercury-api"; version = "0.1.0.2"; sha256 = "0ybpc1kai85rflgdr80jd8cvwxaxmbphv82nz2p17502jrmdfkhg"; - revision = "6"; - editedCabalFile = "03d71mfq8nvqjr7hcpkh1q25fi1avqj35mfrrf7rkm13fr49bi7i"; + revision = "7"; + editedCabalFile = "1qgcph7cmdxijxfgpwwszbyh07kwalnqli4fp85s7z1fxqfwl5n8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -178620,8 +178974,8 @@ self: { pname = "microaeson"; version = "0.1.0.0"; sha256 = "1hbpyz6p9snnd85h2y0pdqp20svxrggavbv0q8z33sc5i4p8b7iz"; - revision = "3"; - editedCabalFile = "09fbsmxlhcjazd99r05n1cla9akficbnfylszg9jkpic7g0p5pa3"; + revision = "4"; + editedCabalFile = "0rrdyk6clik8g3biv40rpg50qzfacb9yrd45ah85xpmk8flbzcfx"; libraryHaskellDepends = [ array base bytestring containers deepseq text ]; @@ -178867,6 +179221,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "microlens-platform_0_4_2_1" = callPackage + ({ mkDerivation, base, hashable, microlens, microlens-ghc + , microlens-mtl, microlens-th, text, unordered-containers, vector + }: + mkDerivation { + pname = "microlens-platform"; + version = "0.4.2.1"; + sha256 = "0z8snyzy18kqj32fb89mzgscjrg6w2z0jkkj4b9vl2jvbps0gkg6"; + libraryHaskellDepends = [ + base hashable microlens microlens-ghc microlens-mtl microlens-th + text unordered-containers vector + ]; + description = "microlens + all batteries included (best for apps)"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "microlens-process" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, doctest, filepath , microlens, process @@ -179208,8 +179579,8 @@ self: { }: mkDerivation { pname = "mighttpd2"; - version = "4.0.1"; - sha256 = "1vgdva68dmkmfchgf3lpa2lrs7di2v3s7snpaxbpyjbr9zrqw6gn"; + version = "4.0.2"; + sha256 = "0q09adyhaa9mxajj5fg3fsdpckdh3icp2bvm1f64l1m3jqxw8k8x"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -180008,6 +180379,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "mintty_0_1_3" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "mintty"; + version = "0.1.3"; + sha256 = "07gy5w0zbx9q64kdr6rzkwdxrgxh2h188bkdvbbgxwk86m9q9i7x"; + libraryHaskellDepends = [ base ]; + description = "A reliable way to detect the presence of a MinTTY console on Windows"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "mios" = callPackage ({ mkDerivation, base, bytestring, ghc-prim, gitrev, hspec , primitive, vector @@ -180692,6 +181075,27 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "mmark-ext_0_2_1_4" = callPackage + ({ mkDerivation, base, foldl, ghc-syntax-highlighter, hspec + , hspec-discover, lucid, microlens, mmark, modern-uri, skylighting + , text + }: + mkDerivation { + pname = "mmark-ext"; + version = "0.2.1.4"; + sha256 = "02ygx0kkp69gd2n4bnqjzbwzhs9ksqm148jf6zfgn3z8w1p9glzh"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base foldl ghc-syntax-highlighter lucid microlens mmark modern-uri + skylighting text + ]; + testHaskellDepends = [ base hspec lucid mmark skylighting text ]; + testToolDepends = [ hspec-discover ]; + description = "Commonly useful extensions for the MMark markdown processor"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "mmorph_1_1_3" = callPackage ({ mkDerivation, base, mtl, transformers, transformers-compat }: mkDerivation { @@ -180838,8 +181242,8 @@ self: { }: mkDerivation { pname = "mmsyn6ukr-array"; - version = "0.3.0.0"; - sha256 = "16niig3irz25g8lpx4bg6mf3i74n5162pv7555rkraxd91wy7hhw"; + version = "0.3.1.0"; + sha256 = "1xmi3qbifk4hw9lgm33ldh6cfrwhppr7kg0cimlv2vmzpcz2ski2"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -182679,12 +183083,12 @@ self: { }) {}; "monad-tree" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, mtl, transformers }: mkDerivation { pname = "monad-tree"; - version = "0.1.0"; - sha256 = "1rjrcai2wqz3qkn3sk1fj6c0vvzk58gmghzwp9w9xvr09kd7zyd2"; - libraryHaskellDepends = [ base ]; + version = "0.2.0.0"; + sha256 = "1k3vbxc4z03inryalw725nwgb9xh92lwdw31746irzhwgbvrfqjk"; + libraryHaskellDepends = [ base mtl transformers ]; description = "Tree data structure for nondeterministic computations"; license = lib.licenses.mit; }) {}; @@ -183341,6 +183745,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "mono-traversable-keys_0_2_0" = callPackage + ({ mkDerivation, base, bytestring, containers, hashable, keys + , mono-traversable, text, transformers, unordered-containers + , vector, vector-instances + }: + mkDerivation { + pname = "mono-traversable-keys"; + version = "0.2.0"; + sha256 = "0v0bh73l6fa3bvyfakm2sbp9qi7bd8aw468kr8d51zsl8r0b6nil"; + libraryHaskellDepends = [ + base bytestring containers hashable keys mono-traversable text + transformers unordered-containers vector vector-instances + ]; + description = "Type-classes for interacting with monomorphic containers with a key"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "mono-traversable-wrapper" = callPackage ({ mkDerivation, base, mono-traversable }: mkDerivation { @@ -184043,6 +184465,36 @@ self: { license = lib.licenses.mit; }) {}; + "morpheus-graphql_0_18_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers + , morpheus-graphql-app, morpheus-graphql-code-gen + , morpheus-graphql-core, morpheus-graphql-subscriptions + , morpheus-graphql-tests, mtl, relude, tasty, tasty-hunit + , template-haskell, text, transformers, unordered-containers + , vector + }: + mkDerivation { + pname = "morpheus-graphql"; + version = "0.18.0"; + sha256 = "1358hjnxla83v7rkn49r07cs8n49czm5shfdpc3avl564w1bzmzi"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring containers morpheus-graphql-app + morpheus-graphql-code-gen morpheus-graphql-core mtl relude + template-haskell text transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring containers morpheus-graphql-app + morpheus-graphql-code-gen morpheus-graphql-core + morpheus-graphql-subscriptions morpheus-graphql-tests mtl relude + tasty tasty-hunit template-haskell text transformers + unordered-containers vector + ]; + description = "Morpheus GraphQL"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "morpheus-graphql-app" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , hashable, megaparsec, morpheus-graphql-core, mtl, relude @@ -184069,6 +184521,34 @@ self: { license = lib.licenses.mit; }) {}; + "morpheus-graphql-app_0_18_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , hashable, megaparsec, morpheus-graphql-core + , morpheus-graphql-tests, mtl, relude, scientific, tasty + , tasty-hunit, template-haskell, text, th-lift-instances + , transformers, unordered-containers, vector + }: + mkDerivation { + pname = "morpheus-graphql-app"; + version = "0.18.0"; + sha256 = "1s9v87pgn7fdnyx1776y4nvf0kx0ry08r5522dyqgwzfgd4s059z"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring containers hashable megaparsec + morpheus-graphql-core mtl relude scientific template-haskell text + th-lift-instances transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring containers directory hashable megaparsec + morpheus-graphql-core morpheus-graphql-tests mtl relude scientific + tasty tasty-hunit template-haskell text th-lift-instances + transformers unordered-containers vector + ]; + description = "Morpheus GraphQL App"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "morpheus-graphql-cli" = callPackage ({ mkDerivation, base, bytestring, filepath, morpheus-graphql , optparse-applicative @@ -184114,6 +184594,58 @@ self: { license = lib.licenses.mit; }) {}; + "morpheus-graphql-client_0_18_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory + , morpheus-graphql-code-gen, morpheus-graphql-core, mtl, relude + , tasty, tasty-hunit, template-haskell, text, transformers + , unordered-containers + }: + mkDerivation { + pname = "morpheus-graphql-client"; + version = "0.18.0"; + sha256 = "0i8f932gq3p1ybh764pkr189iisbjqcjcq92awqyzxgpj39j0gg0"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring morpheus-graphql-code-gen + morpheus-graphql-core mtl relude template-haskell text transformers + unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring directory morpheus-graphql-code-gen + morpheus-graphql-core mtl relude tasty tasty-hunit template-haskell + text transformers unordered-containers + ]; + description = "Morpheus GraphQL Client"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + + "morpheus-graphql-code-gen" = callPackage + ({ mkDerivation, base, bytestring, containers, filepath + , morpheus-graphql-core, optparse-applicative, prettyprinter + , relude, template-haskell, text, unordered-containers + }: + mkDerivation { + pname = "morpheus-graphql-code-gen"; + version = "0.18.0"; + sha256 = "1965y2wd813y82mllzrnhiyjk2mp0vi7j6x7phwlmpabmsij5x0f"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers morpheus-graphql-core prettyprinter + relude template-haskell text unordered-containers + ]; + executableHaskellDepends = [ + base bytestring containers filepath morpheus-graphql-core + optparse-applicative prettyprinter relude template-haskell text + unordered-containers + ]; + description = "Morpheus GraphQL CLI"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "morpheus-graphql-core" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , hashable, megaparsec, mtl, relude, scientific, tasty, tasty-hunit @@ -184139,6 +184671,33 @@ self: { license = lib.licenses.mit; }) {}; + "morpheus-graphql-core_0_18_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , hashable, megaparsec, morpheus-graphql-tests, mtl, relude + , scientific, tasty, tasty-hunit, template-haskell, text + , th-lift-instances, transformers, unordered-containers, vector + }: + mkDerivation { + pname = "morpheus-graphql-core"; + version = "0.18.0"; + sha256 = "07j3i5dfc245l9gil3dk6c5sd7853m5923dxa993fj4gd564mwfd"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring containers hashable megaparsec mtl relude + scientific template-haskell text th-lift-instances transformers + unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring containers directory hashable megaparsec + morpheus-graphql-tests mtl relude scientific tasty tasty-hunit + template-haskell text th-lift-instances transformers + unordered-containers vector + ]; + description = "Morpheus GraphQL Core"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "morpheus-graphql-subscriptions" = callPackage ({ mkDerivation, aeson, base, bytestring, directory , morpheus-graphql-app, morpheus-graphql-core, mtl, relude, tasty @@ -184163,6 +184722,47 @@ self: { license = lib.licenses.mit; }) {}; + "morpheus-graphql-subscriptions_0_18_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory + , morpheus-graphql-app, morpheus-graphql-core, mtl, relude, tasty + , tasty-hunit, text, transformers, unliftio-core + , unordered-containers, uuid, websockets + }: + mkDerivation { + pname = "morpheus-graphql-subscriptions"; + version = "0.18.0"; + sha256 = "02xpnrvd8wydp1b7jvk2pqcrx6ldn8nvffz22g0l5xrrpcvhg9s4"; + libraryHaskellDepends = [ + aeson base bytestring morpheus-graphql-app morpheus-graphql-core + mtl relude text transformers unliftio-core unordered-containers + uuid websockets + ]; + testHaskellDepends = [ + aeson base bytestring directory morpheus-graphql-app + morpheus-graphql-core mtl relude tasty tasty-hunit text + transformers unliftio-core unordered-containers uuid websockets + ]; + description = "Morpheus GraphQL Subscriptions"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + + "morpheus-graphql-tests" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory, relude, tasty + , tasty-hunit, text, unordered-containers + }: + mkDerivation { + pname = "morpheus-graphql-tests"; + version = "0.18.0"; + sha256 = "0l89mmsl09ph412l8f9xjlyx8yp5g69ffmajynxcqvj501n21s9z"; + libraryHaskellDepends = [ + aeson base bytestring directory relude tasty tasty-hunit text + unordered-containers + ]; + description = "Morpheus GraphQL Test"; + license = lib.licenses.mit; + }) {}; + "morphisms" = callPackage ({ mkDerivation }: mkDerivation { @@ -188597,8 +189197,8 @@ self: { pname = "nats"; version = "1.1.2"; sha256 = "1v40drmhixck3pz3mdfghamh73l4rp71mzcviipv1y8jhrfxilmr"; - revision = "3"; - editedCabalFile = "02ww45nskca28fsbh74iy0z4rm0yshws7lrxld45y053hrn1jdzc"; + revision = "4"; + editedCabalFile = "0qccypqkfs7hi0v2bsjfqfhpi2jgsnpfwi9vmcqh7jxk5g08njk0"; doHaddock = false; description = "Natural numbers"; license = lib.licenses.bsd3; @@ -190858,6 +191458,8 @@ self: { pname = "network-transport"; version = "0.5.4"; sha256 = "0izcqi3zl7ynav0qqrrfmiax8vziqwrhflprddhjj6x6nkzhp1sv"; + revision = "1"; + editedCabalFile = "03parnmzh2mffs6fadqbf4lw1d5bsmvr347rzamp230s303nr6yc"; libraryHaskellDepends = [ base binary bytestring deepseq hashable transformers ]; @@ -190952,6 +191554,8 @@ self: { pname = "network-transport-tests"; version = "0.3.0"; sha256 = "1552mgccfyyvvnplhflkfxgg3246jgx9iiv71a0gwblllbsh5y8p"; + revision = "1"; + editedCabalFile = "0kk8kib742s3iiah6d9g94ma776m4nyh14syvibsssfj1immf3jd"; libraryHaskellDepends = [ ansi-terminal base bytestring containers mtl network-transport random @@ -191984,19 +192588,19 @@ self: { }) {}; "nix-diff" = callPackage - ({ mkDerivation, attoparsec, base, containers, directory, mtl - , nix-derivation, optparse-applicative, patience, text, unix - , vector + ({ mkDerivation, attoparsec, base, containers, directory, filepath + , mtl, nix-derivation, optparse-applicative, patience, process + , text, unix, vector }: mkDerivation { pname = "nix-diff"; - version = "1.0.15"; - sha256 = "0sjnihdhiib45chc04hr38g12sgp9rmjx2fibha9qsqla3rjnx3y"; + version = "1.0.16"; + sha256 = "1l6d43d4pr9ql4lbcslk9cjw1lxj9y0bbgxdfqxrj46lg9w63h6g"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - attoparsec base containers directory mtl nix-derivation - optparse-applicative patience text unix vector + attoparsec base containers directory filepath mtl nix-derivation + optparse-applicative patience process text unix vector ]; description = "Explain why two Nix derivations differ"; license = lib.licenses.bsd3; @@ -192174,8 +192778,8 @@ self: { }: mkDerivation { pname = "nix-tree"; - version = "0.1.8"; - sha256 = "0bbisb0n7jg5ng17qyh92rbx1qphvd8w4gr6v773j8m72j24vj0c"; + version = "0.1.9"; + sha256 = "1xgb7f735afq0x7y3lsdciv9mk7cf9szbazn9fksb7fxf437w27m"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -193062,6 +193666,8 @@ self: { pname = "normalization-insensitive"; version = "2.0.2"; sha256 = "1rr12rrij64hi6jkd42h4x2m86k1ra10ykzpzc38n6rfdhyiswpn"; + revision = "1"; + editedCabalFile = "0q5h2017r0zwgi2xdrznhq2llljz9bslqnhq1l5zczrm9xs3304x"; libraryHaskellDepends = [ base bytestring deepseq hashable text unicode-transforms ]; @@ -193974,14 +194580,12 @@ self: { }) {}; "numeric-kinds" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, type-compare }: mkDerivation { pname = "numeric-kinds"; - version = "0.1.0.0"; - sha256 = "0rdx39wa7kklx9a7i5rdwf541fxpz9v3n32rvy2fa6i7n4hr64s4"; - revision = "2"; - editedCabalFile = "1zlgarjmhp9mhlp8l1cygk570l0bc3yabid4c2bi1xm4ckii8cyc"; - libraryHaskellDepends = [ base ]; + version = "0.2.0"; + sha256 = "0ba882bjp7gzqdfy15jgi8kbls2cjbp7860vzc7winzlsf0zqdy1"; + libraryHaskellDepends = [ base type-compare ]; description = "Type-level numeric types and classes"; license = lib.licenses.asl20; }) {}; @@ -196005,6 +196609,36 @@ self: { license = lib.licenses.bsd3; }) {}; + "opaleye_0_7_6_2" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , case-insensitive, containers, contravariant, dotenv, hspec + , hspec-discover, multiset, postgresql-simple, pretty + , product-profunctors, profunctors, QuickCheck, scientific + , semigroups, text, time, time-compat, time-locale-compat + , transformers, uuid, void + }: + mkDerivation { + pname = "opaleye"; + version = "0.7.6.2"; + sha256 = "0dln0r4qk5k4gmjg06275zgbzgivwxw471sd0y4l01j3x7ix3q46"; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring case-insensitive + contravariant postgresql-simple pretty product-profunctors + profunctors scientific semigroups text time-compat + time-locale-compat transformers uuid void + ]; + testHaskellDepends = [ + aeson base bytestring containers contravariant dotenv hspec + hspec-discover multiset postgresql-simple product-profunctors + profunctors QuickCheck semigroups text time time-compat + transformers uuid + ]; + testToolDepends = [ hspec-discover ]; + description = "An SQL-generating DSL targeting PostgreSQL"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "opaleye-classy" = callPackage ({ mkDerivation, base, bytestring, lens, mtl, opaleye , postgresql-simple, product-profunctors, transformers @@ -196372,8 +197006,8 @@ self: { pname = "openapi3"; version = "3.1.0"; sha256 = "011754qyxxw5mn06hdmxalvsiff7a4x4k2yb2r6ylzr6zhyz818z"; - revision = "1"; - editedCabalFile = "1rbsfjwraizp0b6j2zaimz63b46k7d8abfxw7jyb7j1cv6jkcll1"; + revision = "2"; + editedCabalFile = "0hjczkslbn7m9vpn6vqxsr0b8aqa6im8pms3jbfcd7pfkp810z2s"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -197262,8 +197896,8 @@ self: { }: mkDerivation { pname = "opentracing"; - version = "0.2.0"; - sha256 = "1yl3hhg32npj4ncqc9j5gl2jikzvczkpnrwp124nk45mzi13aszq"; + version = "0.2.1"; + sha256 = "0p2y996cl5hfw85kdr0majymxccv2d1ka15wbyc2qxgskz3dy9cq"; libraryHaskellDepends = [ aeson async base base64-bytestring bytestring case-insensitive clock containers http-types iproute lens mtl mwc-random network @@ -197441,6 +198075,21 @@ self: { license = lib.licenses.bsd3; }) {}; + "operational_0_2_4_1" = callPackage + ({ mkDerivation, base, mtl, random }: + mkDerivation { + pname = "operational"; + version = "0.2.4.1"; + sha256 = "0aa1pxymvkhbs0x03ikfiap2skzyf2z7307kz5adkmb3qmykcqa2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base mtl ]; + executableHaskellDepends = [ base mtl random ]; + description = "Implementation of difficult monads made easy with operational semantics"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "operational-alacarte" = callPackage ({ mkDerivation, base, mtl }: mkDerivation { @@ -198008,6 +198657,25 @@ self: { maintainers = with lib.maintainers; [ Gabriel439 ]; }) {}; + "optparse-generic_1_4_7" = callPackage + ({ mkDerivation, base, bytestring, Only, optparse-applicative + , system-filepath, text, time, transformers, transformers-compat + , void + }: + mkDerivation { + pname = "optparse-generic"; + version = "1.4.7"; + sha256 = "03s6iwfr2iiypnx3wmnrb37zz7kflk40dj38v8j4ccqxkkf9h0kk"; + libraryHaskellDepends = [ + base bytestring Only optparse-applicative system-filepath text time + transformers transformers-compat void + ]; + description = "Auto-generate a command-line parser for your datatype"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ Gabriel439 ]; + }) {}; + "optparse-helper" = callPackage ({ mkDerivation, base, optparse-applicative }: mkDerivation { @@ -198617,8 +199285,8 @@ self: { }: mkDerivation { pname = "orthotope"; - version = "0.1.0.0"; - sha256 = "0nx97r1svhzayf0f4chj8mprqp524hliffnw5y612lwsx41c671k"; + version = "0.1.1.0"; + sha256 = "0hjhy9i73r223s3p9xnbw2ac34dvnanrsdnnl6c9707ymjhy57jq"; libraryHaskellDepends = [ base deepseq dlist pretty QuickCheck vector ]; @@ -198630,6 +199298,17 @@ self: { license = lib.licenses.asl20; }) {}; + "orthotope-hmatrix" = callPackage + ({ mkDerivation, base, hmatrix, orthotope }: + mkDerivation { + pname = "orthotope-hmatrix"; + version = "0.1.0.1"; + sha256 = "0xibg10wx0adchksxfr8087lrbp0h384lddq0dmvpk9hvc5j2qhl"; + libraryHaskellDepends = [ base hmatrix orthotope ]; + description = "Some algorithms from hmatrix"; + license = lib.licenses.asl20; + }) {}; + "ory-hydra-client" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , case-insensitive, containers, deepseq, exceptions, hspec @@ -199885,10 +200564,8 @@ self: { }: mkDerivation { pname = "pandoc-crossref"; - version = "0.3.12.0"; - sha256 = "0y991lp6bgjiz67b1w6jywhwzwq5kf385pzl91s4g22lfnhwc7sz"; - revision = "2"; - editedCabalFile = "1gms6jaj21sycg3r1yc61xb2p1a5x2cd1z29y6jcjrh02n96g3g4"; + version = "0.3.12.1"; + sha256 = "036lw5qa23bg292hgfj3ybfykbqj80fb2f8a26rnivj5pfqblm3w"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -205714,6 +206391,31 @@ self: { broken = true; }) {}; + "pg-entity" = callPackage + ({ mkDerivation, base, bytestring, colourista, exceptions, hspec + , hspec-expectations-lifted, hspec-pg-transact, monad-control + , parsec, pg-transact, postgresql-simple + , postgresql-simple-migration, resource-pool, safe-exceptions + , template-haskell, text, text-manipulate, time, uuid, vector + }: + mkDerivation { + pname = "pg-entity"; + version = "0.0.1.0"; + sha256 = "0njmlxxisigza4k6v5ci36xm6mpf5jdls2mrlarlw91agxiz8zd9"; + libraryHaskellDepends = [ + base bytestring colourista exceptions monad-control parsec + pg-transact postgresql-simple resource-pool safe-exceptions + template-haskell text text-manipulate time uuid vector + ]; + testHaskellDepends = [ + base hspec hspec-expectations-lifted hspec-pg-transact pg-transact + postgresql-simple postgresql-simple-migration text time uuid vector + ]; + description = "A pleasant PostgreSQL layer"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "pg-extras" = callPackage ({ mkDerivation, base, bytestring, HUnit, postgresql-simple , raw-strings-qq, text, time @@ -206371,8 +207073,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-base"; - version = "0.4.0.0"; - sha256 = "1hifw367zc5zkrka4lpjl412ka9zsbdlmn58v2hmbm3j4c09phmj"; + version = "0.4.1.0"; + sha256 = "0jwwa1xj1k2bj9iw89lpks04q62zg6sp5ixfhlbs83zwhfz2jplb"; libraryHaskellDepends = [ base phonetic-languages-permutations-array subG ]; @@ -206409,8 +207111,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-examples-array"; - version = "0.14.1.0"; - sha256 = "170r88sys7xzdxmrq2l31a6g0pwzpwg601aj827f3gn5c0rm3l2p"; + version = "0.15.1.0"; + sha256 = "1y9i8278737dqil8gx8m27c8fwlzi949wb86z31r9v8k8irsx3p1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -206561,8 +207263,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-properties-array"; - version = "0.11.0.0"; - sha256 = "1aazfaqvaf7sjidsnvs54nw4bbsnkygv1i3fw0xvcqqzygzns9gk"; + version = "0.12.0.0"; + sha256 = "1m4ficmkzp3k6xsg9dby8ch8k8zlc4jvgxxr76pnhy29dkgs8yxp"; libraryHaskellDepends = [ base phonetic-languages-rhythmicity phonetic-languages-simplified-base ukrainian-phonetics-basic-array @@ -209808,6 +210510,8 @@ self: { pname = "pointed"; version = "5.0.3"; sha256 = "0999bba0gbb2qhk1ydaslmdf7ca17ip751psi4phi1lhb250fl8b"; + revision = "1"; + editedCabalFile = "00x5chjb3l43n35g7amaj3x32ahlwffp7v5khc1qmzxfqz6z50mv"; libraryHaskellDepends = [ base comonad containers data-default-class hashable kan-extensions semigroupoids semigroups stm tagged transformers @@ -210505,8 +211209,8 @@ self: { }: mkDerivation { pname = "polysemy-RandomFu"; - version = "0.4.3.0"; - sha256 = "054v54kwkrg13nx9kznkclnmjnynh9j48bk2fjylwd9xqrj1r63a"; + version = "0.4.4.0"; + sha256 = "0mh6iiyz859446l8r54bqg8hmaig40kdapq9k4niry35nba6fdr1"; libraryHaskellDepends = [ base polysemy polysemy-plugin polysemy-zoo random-fu random-source ]; @@ -212513,10 +213217,8 @@ self: { }: mkDerivation { pname = "postgresql-migration"; - version = "0.2.1.2"; - sha256 = "168da2n2ky17mygrxnh9z95nwscw2b769xhykmg9d398mnz9a188"; - revision = "1"; - editedCabalFile = "09vzsig1jm9n6i6h7ybqlg3ffmgzyg7cpjlwaha9p7w70afjvmgh"; + version = "0.2.1.3"; + sha256 = "1qxkan5f328rv3nl31pvhz305k7b4ah98s0j1bc4hcaa5g5d3052"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -217720,6 +218422,8 @@ self: { pname = "pseudo-boolean"; version = "0.1.10.0"; sha256 = "1p9w1d80d2kp7wp7wp6xf9dz1iv9knhy8b75mklz7zq3cf5gvnrh"; + revision = "1"; + editedCabalFile = "05jvm2bhvzsxwiazsvgk6xwzjg1isabqnx8grx1v9hrxr6hjhlap"; libraryHaskellDepends = [ attoparsec base bytestring bytestring-builder containers deepseq dlist hashable megaparsec parsec void @@ -217805,10 +218509,8 @@ self: { }: mkDerivation { pname = "psqueues"; - version = "0.2.7.2"; - sha256 = "1yckx2csqswghiy9nfj03cybmza8104nmnpbpcc9ngwlbmakn9i6"; - revision = "1"; - editedCabalFile = "0d0mm3c8x31dasfzp1884r2irkm3c9irvvbahjzfr1bzzxfb7vyv"; + version = "0.2.7.3"; + sha256 = "1cmz7spfzx7niglmsphnndh0m4b8njkn0fhb9nshbnbq6nx515yh"; libraryHaskellDepends = [ base deepseq ghc-prim hashable ]; testHaskellDepends = [ array base deepseq ghc-prim hashable HUnit QuickCheck tagged tasty @@ -218868,6 +219570,28 @@ self: { license = lib.licenses.mit; }) {}; + "pusher-http-haskell_2_1_0_6" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , cryptonite, hashable, hspec, http-client, http-client-tls + , http-types, memory, QuickCheck, text, time, unordered-containers + }: + mkDerivation { + pname = "pusher-http-haskell"; + version = "2.1.0.6"; + sha256 = "029pxzidmflsa19417bcx82hbxj3yq1khzb6skf97xbzzf3hs6ki"; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring cryptonite hashable + http-client http-client-tls http-types memory text time + unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring hspec QuickCheck text unordered-containers + ]; + description = "Haskell client library for the Pusher Channels HTTP API"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "pusher-ws" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, deepseq , hashable, http-conduit, lens, lens-aeson, network, scientific @@ -221254,8 +221978,8 @@ self: { }: mkDerivation { pname = "r-glpk-phonetic-languages-ukrainian-durations"; - version = "0.4.0.0"; - sha256 = "0rw9scbxhk5v61b7d4hwvwv4jxkkglsnzphslwashalhcfxc39p7"; + version = "0.4.1.0"; + sha256 = "1zgxr7c2szzmwk9n9hdir2nfg4gzpzwk4jgzlb95m5wlpagsz3fl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -223875,8 +224599,8 @@ self: { }: mkDerivation { pname = "readline-in-other-words"; - version = "0.1.0.0"; - sha256 = "180arjxnwz6gp4ccjk7kjhyhmic4hgcbcc8klrl79c9vqjjp6hnq"; + version = "0.1.0.2"; + sha256 = "1wldgk1dfq4kalxi3mmsyja39mvk2hb40fl83cwqbvhn39brfmq9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -223889,6 +224613,8 @@ self: { ]; description = "Readline effect for in-other-words"; license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "readline-statevar" = callPackage @@ -224135,6 +224861,28 @@ self: { license = lib.licenses.mit; }) {}; + "rebase_1_13_1" = callPackage + ({ mkDerivation, base, bifunctors, bytestring, comonad, containers + , contravariant, deepseq, dlist, either, hashable, hashable-time + , mtl, profunctors, scientific, selective, semigroupoids, stm, text + , time, transformers, unordered-containers, uuid-types, vector + , vector-instances, void + }: + mkDerivation { + pname = "rebase"; + version = "1.13.1"; + sha256 = "1ffl4lxan27g6fkhyddbgf7n0b57l4zbzngrz0fajdfp96xklsn4"; + libraryHaskellDepends = [ + base bifunctors bytestring comonad containers contravariant deepseq + dlist either hashable hashable-time mtl profunctors scientific + selective semigroupoids stm text time transformers + unordered-containers uuid-types vector vector-instances void + ]; + description = "A more progressive alternative to the \"base\" package"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "rebindable" = callPackage ({ mkDerivation, base, data-default-class, indexed }: mkDerivation { @@ -224212,23 +224960,6 @@ self: { }: mkDerivation { pname = "record-dot-preprocessor"; - version = "0.2.12"; - sha256 = "02vyfcfanf09nd33q37jmnq0wbncvkfjn4hx4yzr62dkmh47bkkf"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base extra ghc uniplate ]; - executableHaskellDepends = [ base extra ]; - testHaskellDepends = [ base extra filepath record-hasfield ]; - description = "Preprocessor to allow record.field syntax"; - license = lib.licenses.bsd3; - }) {}; - - "record-dot-preprocessor_0_2_13" = callPackage - ({ mkDerivation, base, extra, filepath, ghc, record-hasfield - , uniplate - }: - mkDerivation { - pname = "record-dot-preprocessor"; version = "0.2.13"; sha256 = "0kqk8iiqhpqrr0b0bxcy0vqp159cnsf9zri45hbp4npqm2lvcw37"; isLibrary = true; @@ -224238,7 +224969,6 @@ self: { testHaskellDepends = [ base extra filepath record-hasfield ]; description = "Preprocessor to allow record.field syntax"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "record-encode" = callPackage @@ -224807,6 +225537,8 @@ self: { pname = "reducers"; version = "3.12.4"; sha256 = "0hsycdir52jdijnnvc77jj971fjrrc722v952wr62ivrvx2zarn0"; + revision = "1"; + editedCabalFile = "0i5mvhfp5b6dmmk8l93492cyjxn6n9dncmijpbp4hbqi40pr9g47"; libraryHaskellDepends = [ array base bytestring containers fingertree hashable semigroupoids text transformers unordered-containers @@ -228564,6 +229296,18 @@ self: { license = lib.licenses.mit; }) {}; + "rerebase_1_13_1" = callPackage + ({ mkDerivation, rebase }: + mkDerivation { + pname = "rerebase"; + version = "1.13.1"; + sha256 = "1g3lwnkykl4np2fzylhi7469y10a3vpxxn1i5mqhm0mmx5lwrhw3"; + libraryHaskellDepends = [ rebase ]; + description = "Reexports from \"base\" with a bunch of other standard libraries"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "reroute" = callPackage ({ mkDerivation, base, criterion, deepseq, graph-core, hashable , hspec, http-api-data, hvect, mtl, random, regex-compat, text @@ -228682,7 +229426,6 @@ self: { executableHaskellDepends = [ base comfort-array lapack ]; description = "Compute total resistance of a cube of resistors"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "resistor-cube_0_0_1_3" = callPackage @@ -233712,8 +234455,8 @@ self: { pname = "salak"; version = "0.3.6"; sha256 = "00qyd09az0ldfidfgcki8z3r9gcpxmss3iyr99as5bky29rlz9n3"; - revision = "5"; - editedCabalFile = "1dqanr95rrmjxfw882fa6as7n999883gfsy2765f3rprl7wlmigl"; + revision = "6"; + editedCabalFile = "1wrq2rdrxk96an5k1igcn09cma3dz9y2yp58xjlg2lh22djm297m"; libraryHaskellDepends = [ base bytestring containers data-default directory dlist exceptions filepath hashable heaps megaparsec mtl scientific text time @@ -234466,8 +235209,8 @@ self: { }: mkDerivation { pname = "satyros"; - version = "0.2.0.0"; - sha256 = "12mk86a46i5k4ng8r3f7s3ccs2p9kz345v3b8p8hrmmcgksimkds"; + version = "0.3.1.3"; + sha256 = "1d0x3cm0wf4bpncb73b3mzmpcwdnwyf3pi7848hr3blnz5v3aj2b"; libraryHaskellDepends = [ base containers extra free lens mtl random vector ]; @@ -237765,8 +238508,8 @@ self: { pname = "semigroupoids"; version = "5.3.6"; sha256 = "0glhqc9x8i5z3bdg23xvl2lfns95msid3h3x0jksna7i6c8j869n"; - revision = "1"; - editedCabalFile = "0inbks8x588bpcw7kyap69iy0zrkygycp8hwgrd9yhbxlvj9hmh9"; + revision = "2"; + editedCabalFile = "0gnkd1kf1s412p7g4c1l1d1yykhl5hlvdnnn1c85c0h8pi19y4an"; libraryHaskellDepends = [ base base-orphans bifunctors comonad containers contravariant distributive hashable tagged template-haskell transformers @@ -238014,8 +238757,8 @@ self: { }: mkDerivation { pname = "sensei"; - version = "0.5.0"; - sha256 = "011lck879q12npszqf2cjsxyjrcyfhrs77dh8kbififm53dfglf4"; + version = "0.6.0"; + sha256 = "19hbm83v3bn2ximfd5bqjzq1xb079ajxbw1kc8gkm9ds4mg7aw0b"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -240010,8 +240753,8 @@ self: { }: mkDerivation { pname = "servant-lucid"; - version = "0.9.0.2"; - sha256 = "0l68dffx746j3p2l5x59cj5cdng2dw6vjq5x5h44m0ccbsmlckpz"; + version = "0.9.0.3"; + sha256 = "10g7radhkh50hpwf97syh3kpdacw096bnawni0hwwbi6rfgz38nm"; libraryHaskellDepends = [ base http-media lucid servant text ]; testHaskellDepends = [ base lucid servant-server wai warp ]; description = "Servant support for lucid"; @@ -244417,6 +245160,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "silently_1_2_5_2" = callPackage + ({ mkDerivation, base, deepseq, directory, nanospec, temporary }: + mkDerivation { + pname = "silently"; + version = "1.2.5.2"; + sha256 = "15dnp83b0wj7m5v4r2yfrwxg9g6szv94ldcb74fpidninrqgqns6"; + libraryHaskellDepends = [ base deepseq directory ]; + testHaskellDepends = [ base deepseq directory nanospec temporary ]; + description = "Prevent or capture writing to stdout and other handles"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "silkscreen" = callPackage ({ mkDerivation, base, prettyprinter }: mkDerivation { @@ -245936,6 +246692,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "singletons-presburger_0_6_1_0" = callPackage + ({ mkDerivation, base, ghc-typelits-presburger, mtl, reflection + , singletons + }: + mkDerivation { + pname = "singletons-presburger"; + version = "0.6.1.0"; + sha256 = "1s12g1qcdz035y2lzjivw2m2jm9hqvbwvgmxvahn4a2j89f4zgky"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base ghc-typelits-presburger mtl reflection singletons + ]; + description = "Presburger Arithmetic Solver for GHC Type-level natural numbers with Singletons package"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "singletons-th" = callPackage ({ mkDerivation, base, containers, ghc-boot-th, mtl, singletons , syb, template-haskell, th-desugar, th-orphans, transformers @@ -249704,14 +250478,12 @@ self: { }) {}; "snumber" = callPackage - ({ mkDerivation, base, numeric-kinds }: + ({ mkDerivation, base, numeric-kinds, type-compare }: mkDerivation { pname = "snumber"; - version = "0.2.0"; - sha256 = "0q1xswnh1rymnyi3jpn4fn6fwj36haamwri7ifd4f7jm2a9v1isx"; - revision = "1"; - editedCabalFile = "1ai6syqkwa0rl23f23hv6wkqg274lrdsh6jqyy9xiklcl8j3bz5w"; - libraryHaskellDepends = [ base numeric-kinds ]; + version = "0.3.0"; + sha256 = "16kgy0chysxws8n4651qq6bfwyk184v67iv2h2kbiyxl8wqsjq4l"; + libraryHaskellDepends = [ base numeric-kinds type-compare ]; description = "Integer singletons with flexible representation"; license = lib.licenses.asl20; }) {}; @@ -251185,6 +251957,8 @@ self: { pname = "special-values"; version = "0.1.0.0"; sha256 = "1kkdw2c4d2hha99v9f89ahmifjxp7fxmxyfwq9a8xk6s0h9xs51w"; + revision = "1"; + editedCabalFile = "10pbx4px4kmg6nwb78bayi26dlzbzvji5zv9fa6f45rk19p2sdlc"; libraryHaskellDepends = [ base bytestring ieee754 scientific text ]; @@ -256205,6 +256979,29 @@ self: { license = lib.licenses.mit; }) {}; + "streaming-commons_0_2_2_2" = callPackage + ({ mkDerivation, array, async, base, bytestring, deepseq, directory + , gauge, hspec, network, process, QuickCheck, random, stm, text + , transformers, unix, zlib + }: + mkDerivation { + pname = "streaming-commons"; + version = "0.2.2.2"; + sha256 = "0j1hwqadczg4rw9pmiv21qs9kvqxarxqg4dv4cpcrxx72b4xssvq"; + libraryHaskellDepends = [ + array async base bytestring directory network process random stm + text transformers unix zlib + ]; + testHaskellDepends = [ + array async base bytestring deepseq hspec network QuickCheck text + unix zlib + ]; + benchmarkHaskellDepends = [ base bytestring deepseq gauge text ]; + description = "Common lower-level functions needed by various streaming data libraries"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "streaming-concurrency" = callPackage ({ mkDerivation, base, exceptions, hspec, HUnit, lifted-async , monad-control, QuickCheck, quickcheck-instances, stm, streaming @@ -259669,6 +260466,39 @@ self: { license = lib.licenses.bsd3; }) {}; + "swagger2_2_7" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, base-compat-batteries + , bytestring, Cabal, cabal-doctest, containers, cookie, doctest + , generics-sop, Glob, hashable, hspec, hspec-discover, http-media + , HUnit, insert-ordered-containers, lens, mtl, network, optics-core + , optics-th, QuickCheck, quickcheck-instances, scientific + , template-haskell, text, time, transformers, unordered-containers + , utf8-string, uuid-types, vector + }: + mkDerivation { + pname = "swagger2"; + version = "2.7"; + sha256 = "1p3vi90siylgg94s7izmdvp2i36g017q2hnl90d1rpphi0nd1f6b"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + aeson aeson-pretty base base-compat-batteries bytestring containers + cookie generics-sop hashable http-media insert-ordered-containers + lens mtl network optics-core optics-th QuickCheck scientific + template-haskell text time transformers unordered-containers + uuid-types vector + ]; + testHaskellDepends = [ + aeson base base-compat-batteries bytestring containers doctest Glob + hashable hspec HUnit insert-ordered-containers lens mtl QuickCheck + quickcheck-instances template-haskell text time + unordered-containers utf8-string vector + ]; + testToolDepends = [ hspec-discover ]; + description = "Swagger 2.0 data model"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "swapper" = callPackage ({ mkDerivation, base, binary, bytestring, deepseq, happstack-data , happstack-state, parallel, tokyocabinet @@ -259786,15 +260616,44 @@ self: { license = lib.licenses.lgpl21Only; }) {}; + "swish_0_10_0_8" = callPackage + ({ mkDerivation, base, containers, directory, filepath, hashable + , HUnit, intern, mtl, network-uri, old-locale, polyparse + , semigroups, test-framework, test-framework-hunit, text, time + }: + mkDerivation { + pname = "swish"; + version = "0.10.0.8"; + sha256 = "1a7iz3d78r00mgkq370zy5fxjkb5x34c9iq3kc3gbl6hs6m6l579"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base containers directory filepath hashable intern mtl network-uri + old-locale polyparse text time + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base containers hashable HUnit network-uri old-locale semigroups + test-framework test-framework-hunit text time + ]; + description = "A semantic web toolkit"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "swiss-ephemeris" = callPackage ({ mkDerivation, base, directory, hspec, hspec-discover, QuickCheck + , random, time, vector }: mkDerivation { pname = "swiss-ephemeris"; - version = "1.3.0.2"; - sha256 = "0p8fzkd4wqvmc5fjlsb0ri6645n1rg304m8nm9085ipy1svi7sn0"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base directory hspec QuickCheck ]; + version = "1.4.0.0"; + sha256 = "0ss502h2083qbiprspylwv02lbgidqgi106qs6k4s6jppgay34gx"; + libraryHaskellDepends = [ base time vector ]; + testHaskellDepends = [ + base directory hspec QuickCheck random time vector + ]; testToolDepends = [ hspec-discover ]; description = "Haskell bindings for the Swiss Ephemeris C library"; license = lib.licenses.agpl3Only; @@ -261283,8 +262142,6 @@ self: { platforms = [ "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" ]; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "synthesizer-core" = callPackage @@ -262890,13 +263747,18 @@ self: { }) {}; "tangle" = callPackage - ({ mkDerivation, base, transformers }: + ({ mkDerivation, barbies, base, containers, lens, transformers }: mkDerivation { pname = "tangle"; - version = "0"; - sha256 = "1ylv73v6ydf39zfks9762dsz27sxr7sbmmk7k628yqc9czj3nj60"; - libraryHaskellDepends = [ base transformers ]; - description = "HKD record builder"; + version = "0.1"; + sha256 = "0gx8zcshi465wxxrmjrl40l8bph0md764fkjzqrq7w517x8cxdhb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ barbies base transformers ]; + executableHaskellDepends = [ + barbies base containers lens transformers + ]; + description = "Heterogenous memoisation monad"; license = lib.licenses.bsd3; }) {}; @@ -267436,6 +268298,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "text-printer_0_5_0_2" = callPackage + ({ mkDerivation, base, bytestring, pretty, QuickCheck + , test-framework, test-framework-quickcheck2, text, text-latin1 + }: + mkDerivation { + pname = "text-printer"; + version = "0.5.0.2"; + sha256 = "1qzmgqcr1bmz34h24gvnfaxaqr3c7z727xv676sd1x51y2qjj2dl"; + libraryHaskellDepends = [ + base bytestring pretty text text-latin1 + ]; + testHaskellDepends = [ + base QuickCheck test-framework test-framework-quickcheck2 + ]; + description = "Abstract interface for text builders/printers"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "text-regex-replace" = callPackage ({ mkDerivation, attoparsec, base, hspec, QuickCheck, smallcheck , text, text-icu @@ -268230,19 +269111,6 @@ self: { }) {}; "th-env" = callPackage - ({ mkDerivation, base, markdown-unlit, template-haskell }: - mkDerivation { - pname = "th-env"; - version = "0.1.0.2"; - sha256 = "13rs6p5mq92am9i80c829dcmsrpbihdq8ds6ad7rdl2d23i9pln0"; - libraryHaskellDepends = [ base template-haskell ]; - testHaskellDepends = [ base markdown-unlit ]; - testToolDepends = [ markdown-unlit ]; - description = "Template Haskell splice that expands to an environment variable"; - license = lib.licenses.bsd3; - }) {}; - - "th-env_0_1_0_3" = callPackage ({ mkDerivation, base, markdown-unlit, template-haskell, th-compat }: mkDerivation { @@ -268254,7 +269122,6 @@ self: { testToolDepends = [ markdown-unlit ]; description = "Template Haskell splice that expands to an environment variable"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "th-expand-syns" = callPackage @@ -268641,6 +269508,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "th-test-utils_1_1_1" = callPackage + ({ mkDerivation, base, bytestring, tasty, tasty-golden, tasty-hunit + , template-haskell, th-orphans, transformers + }: + mkDerivation { + pname = "th-test-utils"; + version = "1.1.1"; + sha256 = "03qpszfhb58nmm673zhbkvsmw1ynjr2h19qpggyay2fk5zgq7n3q"; + libraryHaskellDepends = [ + base template-haskell th-orphans transformers + ]; + testHaskellDepends = [ + base bytestring tasty tasty-golden tasty-hunit template-haskell + th-orphans transformers + ]; + description = "Utility functions for testing Template Haskell code"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "th-to-exp" = callPackage ({ mkDerivation, base, hspec, template-haskell }: mkDerivation { @@ -269269,8 +270156,8 @@ self: { pname = "threepenny-gui"; version = "0.9.1.0"; sha256 = "00sjkfa9qfnnwqfdw68yb8hq6nm1y5qv9896rzn5aachr7mlfpx2"; - revision = "2"; - editedCabalFile = "0pbdkl9gvs6jrwfhrkfyrzra5mw8zy8pycp49czbhghwck51bf8i"; + revision = "3"; + editedCabalFile = "0pk2vy2lqifjdm3cw9lhl5nx7aw4ff4g8p6l8p7yc9x7h9m6va16"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -270589,13 +271476,13 @@ self: { }) {}; "timers-tick" = callPackage - ({ mkDerivation, base, hspec }: + ({ mkDerivation, base, hspec, QuickCheck }: mkDerivation { pname = "timers-tick"; - version = "0.4.3.0"; - sha256 = "02qsla7az60ch515hns1nychpdb35xlz2g4iy7jp2d5ak6jzma5r"; + version = "0.5.0.0"; + sha256 = "0j4nf3l939dwn35q2qan58pxs4v82s1nh6zm5jgbpq38bhxvjvmc"; libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base hspec ]; + testHaskellDepends = [ base hspec QuickCheck ]; description = "tick based timers"; license = lib.licenses.bsd3; }) {}; @@ -272095,16 +272982,16 @@ self: { license = lib.licenses.mpl20; }) {}; - "tomland_1_3_3_0" = callPackage + "tomland_1_3_3_1" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, directory , hashable, hedgehog, hspec, hspec-hedgehog, hspec-megaparsec - , markdown-unlit, megaparsec, mtl, parser-combinators, text, time - , transformers, unordered-containers, validation-selective + , megaparsec, mtl, parser-combinators, text, time, transformers + , unordered-containers, validation-selective }: mkDerivation { pname = "tomland"; - version = "1.3.3.0"; - sha256 = "1masnbr5x75727k2rmgcmxqm91139v9wy434ml5a4c3dsry7xyhv"; + version = "1.3.3.1"; + sha256 = "1hg6hx9ak43gzzn3h643z54jkp5x0wjad313j8299fsi31768wgg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -272112,10 +272999,6 @@ self: { parser-combinators text time transformers unordered-containers validation-selective ]; - executableHaskellDepends = [ - base bytestring containers hashable text time unordered-containers - ]; - executableToolDepends = [ markdown-unlit ]; testHaskellDepends = [ base bytestring containers directory hashable hedgehog hspec hspec-hedgehog hspec-megaparsec megaparsec text time @@ -276318,6 +277201,17 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "type-compare" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "type-compare"; + version = "0.1.1"; + sha256 = "0k0mb43cx87i7gp6w391gvsnqzfcxdyzmn3fnwqp7nn5vy8x851c"; + libraryHaskellDepends = [ base ]; + description = "Type-level Ord compatibility layer"; + license = lib.licenses.asl20; + }) {}; + "type-digits" = callPackage ({ mkDerivation, base, template-haskell, type-spine }: mkDerivation { @@ -277448,8 +278342,8 @@ self: { }: mkDerivation { pname = "typesafe-precure"; - version = "0.8.0.1"; - sha256 = "05rsyiksmw3gilr944hr1q12alinsy842qwzvc444iwyvc4f0i17"; + version = "0.8.1.1"; + sha256 = "10siihvba8c4zbwvw247zrx9z5v5sgr8vswjbbiw9gn7qdiq8ppa"; libraryHaskellDepends = [ aeson aeson-pretty autoexporter base bytestring dlist monad-skeleton template-haskell text th-data-compat @@ -278147,8 +279041,8 @@ self: { ({ mkDerivation, base, bytestring, mmsyn2-array, mmsyn5 }: mkDerivation { pname = "ukrainian-phonetics-basic-array"; - version = "0.4.1.0"; - sha256 = "09gs3d37njv5acr6nqcw899y0pycy4qxnqc36d7f4r8ny4w8lvp5"; + version = "0.4.2.0"; + sha256 = "1qw75wp493bnzwcbmhaifm4m7dj71f5q16xcscmgsysf1lj2y3m3"; libraryHaskellDepends = [ base bytestring mmsyn2-array mmsyn5 ]; description = "A library to work with the basic Ukrainian phonetics and syllable segmentation"; license = lib.licenses.mit; @@ -278769,6 +279663,34 @@ self: { license = lib.licenses.bsd2; }) {}; + "unicode-collation_0_1_3_1" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, parsec + , QuickCheck, quickcheck-instances, tasty, tasty-bench, tasty-hunit + , tasty-quickcheck, template-haskell, text, text-icu + , th-lift-instances, unicode-transforms + }: + mkDerivation { + pname = "unicode-collation"; + version = "0.1.3.1"; + sha256 = "1b04ml07ghfsh9cmp6b0l8c6ywxrn3c4xs7swvlmxx64asmicf3i"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring containers parsec template-haskell text + th-lift-instances + ]; + testHaskellDepends = [ + base bytestring tasty tasty-hunit tasty-quickcheck text + unicode-transforms + ]; + benchmarkHaskellDepends = [ + base QuickCheck quickcheck-instances tasty-bench text text-icu + ]; + description = "Haskell implementation of the Unicode Collation Algorithm"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "unicode-data" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -278864,6 +279786,20 @@ self: { broken = true; }) {}; + "unicode-show_0_1_0_5" = callPackage + ({ mkDerivation, base, hspec, QuickCheck }: + mkDerivation { + pname = "unicode-show"; + version = "0.1.0.5"; + sha256 = "0iq2fivi6fclra32y5yqc6p18pd7qlyxb042hkc082pvgmj8b40v"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec QuickCheck ]; + description = "print and show in unicode"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "unicode-symbols" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -279134,8 +280070,8 @@ self: { pname = "union"; version = "0.1.2"; sha256 = "1i4fvlwkw1wx64a6l8342aqfqsdq7fqa4p24g3i5gn5704lxrsb3"; - revision = "6"; - editedCabalFile = "1n1innjiqksancaazsczryyjfr7905q1iq9radwqq5ngl8xi83wz"; + revision = "7"; + editedCabalFile = "1xcm1v2dipdahd4c6hki0fx9a7vg52q3wz5aa8nw5lxjkc4s3xn8"; libraryHaskellDepends = [ base deepseq hashable profunctors tagged vinyl ]; @@ -279262,6 +280198,8 @@ self: { pname = "unique"; version = "0.0.1"; sha256 = "1dgln2dr64ma1isqskj1qnjslg9smmr7jssg8hmk68wp36i3rwkd"; + revision = "1"; + editedCabalFile = "0l95cgs8hbvakrcqzqk5l9rkz3cr3jnnszq7pgjnxrqfhgsp58r7"; libraryHaskellDepends = [ base hashable ]; description = "Fully concurrent unique identifiers"; license = lib.licenses.bsd3; @@ -279896,23 +280834,11 @@ self: { ({ mkDerivation, base, bytestring }: mkDerivation { pname = "unix-bytestring"; - version = "0.3.7.5"; - sha256 = "003003nh00aww2k8wdygjp0z7f61z8nz8840iinww83xph5wsih5"; - libraryHaskellDepends = [ base bytestring ]; - description = "Unix/Posix-specific functions for ByteStrings"; - license = lib.licenses.bsd3; - }) {}; - - "unix-bytestring_0_3_7_6" = callPackage - ({ mkDerivation, base, bytestring }: - mkDerivation { - pname = "unix-bytestring"; version = "0.3.7.6"; sha256 = "1f9hf7blxy8ckakd0klrs16q0hfvxfarbjgyrc7azgbb86m1skb3"; libraryHaskellDepends = [ base bytestring ]; description = "Unix/Posix-specific functions for ByteStrings"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "unix-compat" = callPackage @@ -280321,6 +281247,29 @@ self: { license = lib.licenses.bsd3; }) {}; + "unordered-containers_0_2_15_0" = callPackage + ({ mkDerivation, base, bytestring, ChasingBottoms, containers + , deepseq, gauge, hashable, hashmap, HUnit, mtl, QuickCheck, random + , test-framework, test-framework-hunit, test-framework-quickcheck2 + }: + mkDerivation { + pname = "unordered-containers"; + version = "0.2.15.0"; + sha256 = "0s6kmkz0p5iw5bkmbv4fhgd6cb7v8a75wkv7h5acxp52h3qfm4kc"; + libraryHaskellDepends = [ base deepseq hashable ]; + testHaskellDepends = [ + base ChasingBottoms containers hashable HUnit QuickCheck random + test-framework test-framework-hunit test-framework-quickcheck2 + ]; + benchmarkHaskellDepends = [ + base bytestring containers deepseq gauge hashable hashmap mtl + random + ]; + description = "Efficient hashing-based container types"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "unordered-containers-rematch" = callPackage ({ mkDerivation, base, hashable, hspec, HUnit, rematch , unordered-containers @@ -283963,6 +284912,21 @@ self: { license = lib.licenses.bsd3; }) {}; + "vector-th-unbox_0_2_2" = callPackage + ({ mkDerivation, base, data-default, template-haskell, vector }: + mkDerivation { + pname = "vector-th-unbox"; + version = "0.2.2"; + sha256 = "0j81m09xxv24zziv0nanfppckzmas5184jr3npjhc9w49r3cm94a"; + revision = "1"; + editedCabalFile = "1kwjmjmp5pk9n9hps2y8kzjz4p42mcmzki8mypfhc0360n97r0wn"; + libraryHaskellDepends = [ base template-haskell vector ]; + testHaskellDepends = [ base data-default vector ]; + description = "Deriver for Data.Vector.Unboxed using Template Haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "vectortiles" = callPackage ({ mkDerivation, base, bytestring, containers, criterion, deepseq , hashable, microlens, microlens-platform, mtl, protocol-buffers @@ -284016,8 +284980,8 @@ self: { }: mkDerivation { pname = "venzone"; - version = "1.0.0.6"; - sha256 = "1x0034ww13apr1g6mscncacri3nvnmjll7spsip1dnc70ilffk77"; + version = "1.1.0.0"; + sha256 = "19ivc72skzl8h06h5bfl6lfnph3knd9zz7842rsarjknbmszrgqg"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -285421,8 +286385,8 @@ self: { }: mkDerivation { pname = "vulkan"; - version = "3.13.1"; - sha256 = "1z5a7flk0c68p70l4mqc8ws45l4yqj4rfrcqshbbfqq54dwc5nlx"; + version = "3.13.2"; + sha256 = "1bbqz5xpd3jw71m70pdg6nifi63m0s42jvnldf55nj2ms0mzjmhr"; libraryHaskellDepends = [ base bytestring transformers vector ]; libraryPkgconfigDepends = [ vulkan ]; testHaskellDepends = [ @@ -289014,6 +289978,7 @@ self: { description = "Binding to the Webkit library"; license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) webkitgtk;}; "webkitgtk3-javascriptcore" = callPackage @@ -290266,6 +291231,8 @@ self: { pname = "witherable"; version = "0.4.2"; sha256 = "0121ic4xkv3k568j23zp22a5lrv0k11h94fq7cbijd18fjr2n3br"; + revision = "1"; + editedCabalFile = "1mwmnc4pdsw0v8p9bh8n49xjjmbyf5bd0kvlg970iyq3cqik546f"; libraryHaskellDepends = [ base base-orphans containers hashable indexed-traversable indexed-traversable-instances transformers unordered-containers @@ -293832,8 +294799,8 @@ self: { }: mkDerivation { pname = "xmobar"; - version = "0.39"; - sha256 = "1k1n3ff0ikdmfq0mi8r2vpqg1iq6hsw1drvxps6k98rvvn87pws6"; + version = "0.40"; + sha256 = "1mrdiblm8vilkm1w23pz6xbi16zh1b1lvql26czjzw5k79vd67sf"; configureFlags = [ "-fwith_alsa" "-fwith_conduit" "-fwith_datezone" "-fwith_dbus" "-fwith_inotify" "-fwith_iwlib" "-fwith_mpd" "-fwith_mpris" diff --git a/pkgs/development/interpreters/erlang/R24.nix b/pkgs/development/interpreters/erlang/R24.nix index 589a836967c05..544bfbec5305a 100644 --- a/pkgs/development/interpreters/erlang/R24.nix +++ b/pkgs/development/interpreters/erlang/R24.nix @@ -3,6 +3,6 @@ # How to obtain `sha256`: # nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz mkDerivation { - version = "24.1.4"; - sha256 = "sha256-QE2VRayIswVrAOv9/bq+ebv3xxIL3fFMnfm5u1Wh8j4="; + version = "24.1.6"; + sha256 = "sha256-Jh9w3+ft1RZjmb4PriCmHPj0tgkx8LBFjsg1s4BGojs="; } diff --git a/pkgs/development/libraries/agg/default.nix b/pkgs/development/libraries/agg/default.nix index 39e27c909b50a..e5ce7537f250a 100644 --- a/pkgs/development/libraries/agg/default.nix +++ b/pkgs/development/libraries/agg/default.nix @@ -8,8 +8,18 @@ stdenv.mkDerivation rec { url = "https://www.antigrain.com/${pname}-${version}.tar.gz"; sha256 = "07wii4i824vy9qsvjsgqxppgqmfdxq0xa87i5yk53fijriadq7mb"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ autoconf automake libtool freetype SDL libX11 ]; + nativeBuildInputs = [ + pkg-config + autoconf + automake + libtool + ]; + buildInputs = [ + freetype + SDL + ] ++ lib.optionals stdenv.isLinux [ + libX11 + ]; postPatch = '' substituteInPlace include/agg_renderer_outline_aa.h \ @@ -22,7 +32,11 @@ stdenv.mkDerivation rec { sh autogen.sh ''; - configureFlags = [ "--x-includes=${libX11.dev}/include" "--x-libraries=${libX11.out}/lib" "--enable-examples=no" ]; + configureFlags = lib.optionals stdenv.isLinux [ + "--x-includes=${lib.getDev libX11}/include" + "--x-libraries=${lib.getLib libX11}/lib" + "--enable-examples=no" + ]; # libtool --tag=CXX --mode=link g++ -g -O2 libexamples.la ../src/platform/X11/libaggplatformX11.la ../src/libagg.la -o alpha_mask2 alpha_mask2.o # libtool: error: cannot find the library 'libexamples.la' @@ -43,6 +57,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; homepage = "http://www.antigrain.com/"; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/faudio/default.nix b/pkgs/development/libraries/faudio/default.nix index 4082ccfb1d0e1..baf2b10243796 100644 --- a/pkgs/development/libraries/faudio/default.nix +++ b/pkgs/development/libraries/faudio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "faudio"; - version = "21.09"; + version = "21.10"; src = fetchFromGitHub { owner = "FNA-XNA"; repo = "FAudio"; rev = version; - sha256 = "sha256-/hc++LEqH7vg2IK/x6sVP5864QF+3xd++HK/tIp0IRA="; + sha256 = "sha256-gh/QYH25j9A+XalW6ajRjs+yOYEfkZmw11CHjR6LK1E="; }; nativeBuildInputs = [cmake]; diff --git a/pkgs/development/libraries/iqueue/default.nix b/pkgs/development/libraries/iqueue/default.nix new file mode 100644 index 0000000000000..04fd7202d1d16 --- /dev/null +++ b/pkgs/development/libraries/iqueue/default.nix @@ -0,0 +1,22 @@ +{ lib, stdenv, fetchurl, pkg-config, libbsd, microsoft_gsl }: + +stdenv.mkDerivation rec { + pname = "iqueue"; + version = "0.1.0"; + src = fetchurl { + url = "https://github.com/twosigma/iqueue/releases/download/v${version}/iqueue-${version}.tar.gz"; + sha256 = "0049fnr02k15gr21adav33swrwxrpbananilnrp63vp5zs5v9m4x"; + }; + + doCheck = true; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libbsd microsoft_gsl ]; + + meta = with lib; { + homepage = "https://github.com/twosigma/iqueue"; + description = "Indexed queue"; + license = licenses.asl20; + platforms = [ "x86_64-linux" ]; + maintainers = [ maintainers.catern ]; + }; +} diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix index c401240f7d506..8f6beb01ea39b 100644 --- a/pkgs/development/libraries/libdeltachat/default.nix +++ b/pkgs/development/libraries/libdeltachat/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.64.0"; + version = "1.65.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = version; - sha256 = "04a1ncikapx53jjrx0ac1qi907wlj6javylz4aksg4nfbph6y9j4"; + sha256 = "1k906pll4k8bc2xc9qd9g7q10rikbij2sy0w2wg9mf335rfym6z4"; }; patches = [ @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "0skrzxn99c1gqil7z0dv0xhg883k98v6mh96nycf7whl2d25965x"; + sha256 = "0jc9kyn5h3cn2ni5h3km47sfprpxr7hc96ca01yal2zyksm7zqxn"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index baee67cb826da..54843486e1372 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -3,6 +3,7 @@ , documentationSupport ? false, doxygen, graphviz # Documentation , eventGUISupport ? false, cairo, glib, gtk3 # GUI event viewer support , testsSupport ? false, check, valgrind, python3 +, nixosTests }: let @@ -76,6 +77,10 @@ stdenv.mkDerivation rec { doCheck = testsSupport && stdenv.hostPlatform == stdenv.buildPlatform; + passthru.tests = { + libinput-module = nixosTests.libinput; + }; + meta = with lib; { description = "Handles input devices in Wayland compositors and provides a generic X.Org input driver"; homepage = "https://www.freedesktop.org/wiki/Software/libinput/"; diff --git a/pkgs/development/libraries/liburing/default.nix b/pkgs/development/libraries/liburing/default.nix index 595f9a5a9cd41..97a0ebda18daa 100644 --- a/pkgs/development/libraries/liburing/default.nix +++ b/pkgs/development/libraries/liburing/default.nix @@ -33,16 +33,15 @@ stdenv.mkDerivation rec { outputs = [ "out" "bin" "dev" "man" ]; - postInstall = - # Copy the examples into $bin. Most reverse dependency of this package should - # reference only the $out output - '' + postInstall = '' + # Copy the examples into $bin. Most reverse dependency of this package should + # reference only the $out output mkdir -p $bin/bin cp ./examples/io_uring-cp examples/io_uring-test $bin/bin cp ./examples/link-cp $bin/bin/io_uring-link-cp + '' + lib.optionalString stdenv.hostPlatform.isGnu '' cp ./examples/ucontext-cp $bin/bin/io_uring-ucontext-cp - '' - ; + ''; meta = with lib; { description = "Userspace library for the Linux io_uring API"; diff --git a/pkgs/development/libraries/mumlib/default.nix b/pkgs/development/libraries/mumlib/default.nix deleted file mode 100644 index 02f0cd671f280..0000000000000 --- a/pkgs/development/libraries/mumlib/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkg-config -, boost, openssl, log4cpp, libopus, protobuf }: -with lib; stdenv.mkDerivation { - pname = "mumlib"; - version = "unstable-2018-12-12"; - - src = fetchFromGitHub { - owner = "slomkowski"; - repo = "mumlib"; - rev = "f91720de264c0ab5e02bb30deafc5c4b2c245eac"; - sha256 = "0p29z8379dp2ra0420x8xjp4d3r2mf680lj38xmlc8npdzqjqjdp"; - }; - - buildInputs = [ boost openssl libopus protobuf log4cpp ]; - nativeBuildInputs = [ cmake pkg-config ]; - installPhase = '' - install -Dm555 libmumlib.so $out/lib/libmumlib.so - cp -a ../include $out - ''; - - meta = { - description = "Fairy simple Mumble library written in C++, using boost::asio asynchronous networking framework"; - homepage = "https://github.com/slomkowski/mumlib"; - maintainers = with maintainers; [ das_j ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix index 134532308c882..7ab64cf59c578 100644 --- a/pkgs/development/libraries/proj/default.nix +++ b/pkgs/development/libraries/proj/default.nix @@ -42,6 +42,11 @@ stdenv.mkDerivation rec { "-DRUN_NETWORK_DEPENDENT_TESTS=OFF" ]; + preCheck = '' + export HOME=$TMPDIR + export TMP=$TMPDIR + ''; + doCheck = true; meta = with lib; { diff --git a/pkgs/development/libraries/science/math/scs/default.nix b/pkgs/development/libraries/science/math/scs/default.nix index 96f543e430f0c..10ea82f93d268 100644 --- a/pkgs/development/libraries/science/math/scs/default.nix +++ b/pkgs/development/libraries/science/math/scs/default.nix @@ -4,13 +4,13 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "scs"; - version = "2.1.1"; + version = "3.0.0"; src = fetchFromGitHub { owner = "cvxgrp"; repo = "scs"; rev = version; - sha256 = "14g5m3lcvrbwpq1bq0liq00jh0gm1947lg3z4jfsp43f6p5alb20"; + sha256 = "sha256-Lly28KDDZ5hJyiMOhiX/3VaKs0iPcSqizOurZevhfCo="; }; # Actually link and add libgfortran to the rpath diff --git a/pkgs/development/libraries/sope/default.nix b/pkgs/development/libraries/sope/default.nix index df0aeeac32363..3b41495be7d42 100644 --- a/pkgs/development/libraries/sope/default.nix +++ b/pkgs/development/libraries/sope/default.nix @@ -4,13 +4,13 @@ with lib; gnustep.stdenv.mkDerivation rec { pname = "sope"; - version = "5.2.0"; + version = "5.3.0"; src = fetchFromGitHub { owner = "inverse-inc"; repo = pname; rev = "SOPE-${version}"; - sha256 = "14s9rcnglkwl0nmbmpdxxbiqqnr3m8n7x69idm1crgbbjkj4gi68"; + sha256 = "0xqa7fsf60acbri5dd9x8nmf1zdkalxnmkm559w4xz7sdi569ssa"; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 96028009e2cbf..acfce3d2e77af 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -1,10 +1,8 @@ -{ lib, stdenv, fetchurl, zlib, interactive ? false, readline ? null, ncurses ? null +{ lib, stdenv, fetchurl, zlib, interactive ? false, readline, ncurses , python3Packages , enableDeserialize ? false }: -assert interactive -> readline != null && ncurses != null; - with lib; let @@ -93,6 +91,7 @@ stdenv.mkDerivation rec { downloadPage = "https://sqlite.org/download.html"; homepage = "https://www.sqlite.org/"; license = licenses.publicDomain; + mainProgram = "sqlite3"; maintainers = with maintainers; [ eelco np ]; platforms = platforms.unix ++ platforms.windows; }; diff --git a/pkgs/development/libraries/stxxl/default.nix b/pkgs/development/libraries/stxxl/default.nix index 5cc0e6037a23d..391424ee2c93d 100644 --- a/pkgs/development/libraries/stxxl/default.nix +++ b/pkgs/development/libraries/stxxl/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitHub , cmake -, parallel ? true +, parallelSupport ? (!stdenv.isDarwin) }: let @@ -25,11 +25,12 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DBUILD_STATIC_LIBS=OFF" - (mkFlag parallel "USE_GNU_PARALLEL") + (mkFlag parallelSupport "USE_GNU_PARALLEL") + (mkFlag parallelSupport "USE_OPENMP") ]; passthru = { - inherit parallel; + inherit parallelSupport; }; meta = with lib; { diff --git a/pkgs/development/mobile/androidenv/emulator.nix b/pkgs/development/mobile/androidenv/emulator.nix index 2746a60247bfe..eec99498a1602 100644 --- a/pkgs/development/mobile/androidenv/emulator.nix +++ b/pkgs/development/mobile/androidenv/emulator.nix @@ -3,7 +3,7 @@ deployAndroidPackage { inherit package os; buildInputs = [ autoPatchelfHook makeWrapper ] - ++ lib.optional (os == "linux") [ + ++ lib.optionals (os == "linux") [ pkgs.glibc pkgs.xorg.libX11 pkgs.xorg.libXext @@ -18,6 +18,7 @@ deployAndroidPackage { pkgs.libcxx pkgs.libGL pkgs.libpulseaudio + pkgs.libuuid pkgs.zlib pkgs.ncurses5 pkgs.stdenv.cc.cc diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 025180d6869aa..7e5ac1fda5c02 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.0.10534"; + version = "9.0.10576"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-EmfbyXHoWEd2Yp1RFRkW94dzeRXw0rsBtvVcl+Vg0qI="; + sha256 = "sha256-s8GZV+hcuAZJhKVoLAtC2mwHlqr/vJ6P5mwlNDczEyY="; }; propagatedBuildInputs = [ pyvex ]; diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index d7b540f50ca96..488831e80080e 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -43,14 +43,14 @@ in buildPythonPackage rec { pname = "angr"; - version = "9.0.10534"; + version = "9.0.10576"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-A2dqCABkqkn/rjWGc8hrGs60BK+V8j2+jVAYxnEpx8Y="; + sha256 = "sha256-lRoJZX7HPZE6y7v5AuU1C6sjOIXXefv8M/qPiNQtobw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/angrop/default.nix b/pkgs/development/python-modules/angrop/default.nix index 35f98a172c7c9..7dc8d583958d2 100644 --- a/pkgs/development/python-modules/angrop/default.nix +++ b/pkgs/development/python-modules/angrop/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "angrop"; - version = "9.0.10534"; + version = "9.0.10576"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-PaAhEn/eJg1qfuq2sHWTGTiJKNfs60NJuvfS9hVObX4="; + sha256 = "sha256-i4F6VyJYJ6XON9G43Z2VwWAPHGRxR9DzxnEDGiJ8LSE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index ba23fc83b5392..8417d7d95af6c 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.0.10534"; + version = "9.0.10576"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8bGDl3rHVT2JKEOfYPHzFTxJ7t3Yz7aLQMVKAUNCSBo="; + sha256 = "sha256-K36tAsVfminDFK09jE6+ruROkaLfCTNPCL5ziZJOrVk="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/bimmer-connected/default.nix b/pkgs/development/python-modules/bimmer-connected/default.nix index 337d6951faf34..c91af48b9e9e8 100644 --- a/pkgs/development/python-modules/bimmer-connected/default.nix +++ b/pkgs/development/python-modules/bimmer-connected/default.nix @@ -5,20 +5,21 @@ , pbr , requests , pytestCheckHook +, requests-mock }: buildPythonPackage rec { pname = "bimmer-connected"; - version = "0.7.22"; + version = "0.8.0"; format = "setuptools"; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "bimmerconnected"; repo = "bimmer_connected"; rev = version; - sha256 = "sha256-tAkgOZvf9nyrAfFRxGkp7O/2oIAdBx+hNZbK9den+5c="; + sha256 = "sha256-sox24UpuIK5SP0IWVxa/NiyR5IrTzXe0SVTCd4FB6mo="; }; nativeBuildInputs = [ @@ -33,6 +34,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook + requests-mock ]; meta = with lib; { diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix index d26cd7e998558..9150e1c5298b0 100644 --- a/pkgs/development/python-modules/casbin/default.nix +++ b/pkgs/development/python-modules/casbin/default.nix @@ -2,22 +2,23 @@ , buildPythonPackage , fetchFromGitHub , simpleeval -, isPy27 +, pythonOlder , coveralls , wcmatch }: buildPythonPackage rec { pname = "casbin"; - version = "1.9.6"; + version = "1.9.7"; + format = "setuptools"; - disabled = isPy27; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = "pycasbin"; rev = "v${version}"; - sha256 = "0r3pmkcgmsk3z6iy714fpg05mrs4ckb7ldyjsws6hwidcijha8rk"; + sha256 = "sha256-wNygKs37PtMLij3f+pAh6PNLqQ45cvrpF43Aj+cO8p8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/chiapos/default.nix b/pkgs/development/python-modules/chiapos/default.nix index 587c2fbf3c70c..42bf21dd52166 100644 --- a/pkgs/development/python-modules/chiapos/default.nix +++ b/pkgs/development/python-modules/chiapos/default.nix @@ -6,6 +6,7 @@ , cxxopts , ghc_filesystem , pybind11 +, pytestCheckHook , pythonOlder , psutil , setuptools-scm @@ -13,12 +14,12 @@ buildPythonPackage rec { pname = "chiapos"; - version = "1.0.4"; + version = "1.0.6"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-flI1vwtD0H28UDMcEEELECewkXZ6vf/XEYMqRKy5R6w="; + sha256 = "sha256-Zh5AULPgbG0oYPcBZMp/vm94MPyfdtYn4P5V+1LeMqA="; }; patches = [ @@ -34,7 +35,11 @@ buildPythonPackage rec { buildInputs = [ pybind11 ]; - checkInputs = [ psutil ]; + checkInputs = [ + psutil + pytestCheckHook + ]; + # CMake needs to be run by setuptools rather than by its hook dontConfigure = true; diff --git a/pkgs/development/python-modules/chiapos/dont_fetch_dependencies.patch b/pkgs/development/python-modules/chiapos/dont_fetch_dependencies.patch index 2510211696915..85b7560f5d0d7 100644 --- a/pkgs/development/python-modules/chiapos/dont_fetch_dependencies.patch +++ b/pkgs/development/python-modules/chiapos/dont_fetch_dependencies.patch @@ -1,13 +1,13 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9b4a2f5..86f849c 100644 +index b757b70..fcce055 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -18,22 +18,19 @@ include(FetchContent) - else() +@@ -21,23 +21,20 @@ include(${CMAKE_INSTALL_PREFIX}/share/cmake/pybind11/pybind11Config.cmake) + else() FetchContent_Declare( pybind11-src - GIT_REPOSITORY https://github.com/pybind/pybind11.git -- GIT_TAG v2.6.2 +- GIT_TAG v2.7.1 + SOURCE_DIR @pybind11_src@ ) FetchContent_MakeAvailable(pybind11-src) @@ -29,4 +29,3 @@ index 9b4a2f5..86f849c 100644 ) FetchContent_MakeAvailable(gulrak) - diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 76d0f730401c3..ab8842d406141 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.0.10534"; + version = "9.0.10576"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WeqfNVGQio5ugC14iv0ls5b3O1ymEjfpV8J47cCqXeQ="; + sha256 = "sha256-86ySQ/2l1h5vayMfAsr9ShyE8oRKL37sT3bfrgIGFHY="; }; # Use upstream z3 implementation diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 950b6c903fb20..a5e458a6eb424 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -15,7 +15,7 @@ let # The binaries are following the argr projects release cycle - version = "9.0.10534"; + version = "9.0.10576"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-edZC0pZf6A2lpqJDfpMeslLQQGEokq4B9qywgS7wLxo="; + sha256 = "sha256-ftaFISU37GcCFTybxV31PwUl2vrbKVm/S00Qo+pUxgo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/clvm-rs/bump-cargo-lock.patch b/pkgs/development/python-modules/clvm-rs/bump-cargo-lock.patch new file mode 100644 index 0000000000000..9939e6fb43a09 --- /dev/null +++ b/pkgs/development/python-modules/clvm-rs/bump-cargo-lock.patch @@ -0,0 +1,11 @@ +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -80,7 +80,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + + [[package]] + name = "clvm_rs" +-version = "0.1.14" ++version = "0.1.15" + dependencies = [ + "bls12_381", + "hex", diff --git a/pkgs/development/python-modules/clvm-rs/default.nix b/pkgs/development/python-modules/clvm-rs/default.nix index 7cde70fd97f29..ec078970bc1ad 100644 --- a/pkgs/development/python-modules/clvm-rs/default.nix +++ b/pkgs/development/python-modules/clvm-rs/default.nix @@ -9,20 +9,25 @@ buildPythonPackage rec { pname = "clvm_rs"; - version = "0.1.14"; + version = "0.1.15"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Chia-Network"; repo = "clvm_rs"; rev = version; - sha256 = "sha256-sQ+jzBiIZYVQj2rb170wLFEx2NzOj7kEL0k0gx/JOAc="; + sha256 = "sha256-4QFreQlRjKqGhPvuXU/pZpxMfF8LkIf6X7C3K2q77MI="; }; + patches = [ + # upstream forgot to refresh the lock file + ./bump-cargo-lock.patch + ]; + cargoDeps = rustPlatform.fetchCargoTarball { - inherit src; + inherit src patches; name = "${pname}-${version}"; - sha256 = "sha256-ZSu3bu0MfxZEFqBwdHH/RM4WTF/yx9ju1IqSVfu+Upo="; + sha256 = "sha256-jPNU+P6JgxTPL1GYUBE4VPU3p6cgL8u/+AIELr7r5Mk="; }; format = "pyproject"; diff --git a/pkgs/development/python-modules/cvxpy/default.nix b/pkgs/development/python-modules/cvxpy/default.nix index b7b5c7f55af0c..6fc56c85e9eca 100644 --- a/pkgs/development/python-modules/cvxpy/default.nix +++ b/pkgs/development/python-modules/cvxpy/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "cvxpy"; - version = "1.1.13"; + version = "1.1.17"; format = "pyproject"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "012avhf0a8n9xyy4g3xcr5z8z2a3m6rnqic6gfs9fq6p9bkq3ix9"; + sha256 = "sha256-M5fTuJ13Dqnw/DWbHJs6/t5qDTvqHP8g4mU7E0Uc24o="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dnspythonchia/default.nix b/pkgs/development/python-modules/dnspythonchia/default.nix new file mode 100644 index 0000000000000..52243eac7d818 --- /dev/null +++ b/pkgs/development/python-modules/dnspythonchia/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "dnspythonchia"; + version = "2.2.0"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-iYaPYqOZ33R2DUXgIHxsewLi79iB5ja0WHOGkamffZk="; + }; + + nativeBuildInputs = [ setuptools-scm ]; + + # needs networking for some tests + doCheck = false; + pythonImportsCheck = [ "dns" ]; + + meta = with lib; { + description = "A DNS toolkit for Python (Chia Network fork)"; + homepage = "https://www.chia.net/"; + license = with licenses; [ isc ]; + maintainers = teams.chia.members; + }; +} diff --git a/pkgs/development/python-modules/flask-wtf/default.nix b/pkgs/development/python-modules/flask-wtf/default.nix index 36437ffafa91f..2c7dd221e9219 100644 --- a/pkgs/development/python-modules/flask-wtf/default.nix +++ b/pkgs/development/python-modules/flask-wtf/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Flask-WTF"; - version = "0.15.1"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "ff177185f891302dc253437fe63081e7a46a4e99aca61dfe086fb23e54fff2dc"; + sha256 = "872fbb17b5888bfc734edbdcf45bc08fb365ca39f69d25dc752465a455517b28"; }; propagatedBuildInputs = [ flask wtforms nose ]; diff --git a/pkgs/development/python-modules/gistyc/default.nix b/pkgs/development/python-modules/gistyc/default.nix new file mode 100644 index 0000000000000..2f49552df2369 --- /dev/null +++ b/pkgs/development/python-modules/gistyc/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, certifi +, click +, requests +}: + +buildPythonPackage rec { + pname = "gistyc"; + version = "1.3"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-WVK45U9e3qyZFi9wSRHNi9+1u4TetlZkYXAZN7LVqhE="; + }; + + propagatedBuildInputs = [ + certifi + click + requests + ]; + + meta = with lib; { + homepage = "https://github.com/ThomasAlbin/gistyc"; + description = "A Python based GitHub GIST management tool"; + longDescription = '' + gistyc is a Python-based library that enables developers to create, update + and delete their GitHub GISTs. CLI capabilities allow you to execute the + routines from the shell and can be integrated into your project's CI/CD + pipeline to automatically create or update your GISTs (e.g., via GitHub + actions). Files are separated in GIST sections depending on the separation + blocks. + ''; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ AndersonTorres ]; + }; +} diff --git a/pkgs/development/python-modules/git-filter-repo/default.nix b/pkgs/development/python-modules/git-filter-repo/default.nix index ac0ee80385828..e6a434c38bd3f 100644 --- a/pkgs/development/python-modules/git-filter-repo/default.nix +++ b/pkgs/development/python-modules/git-filter-repo/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "git-filter-repo"; - version = "2.33.0"; + version = "2.34.0"; format = "setuptools"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "1nxfd5yv8ri7w5pzxclxs0yd317nsdcwvw87ancmdkh69xvx1f2f"; + sha256 = "sha256-taCfODhl3goWSwa6F0Rh5V2RZ8xvuwbPKh5i2/DNumM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index 926f84798ad0f..37e5f5bcb8a52 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -3,18 +3,21 @@ , fetchFromGitHub , pytestCheckHook , editdistance-s +, pythonOlder }: buildPythonPackage rec { pname = "identify"; - version = "2.3.5"; + version = "2.3.7"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "pre-commit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XEwZ6OUEocE4dSDLCLagKqmJruvb9beC0u93SScrOho="; + sha256 = "sha256-L71Zi0SWFh7K4BRwF57prdrIdxLp8Igs0k/gc6k1+Mo="; }; checkInputs = [ @@ -22,7 +25,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "identify" ]; + pythonImportsCheck = [ + "identify" + ]; meta = with lib; { description = "File identification library for Python"; diff --git a/pkgs/development/python-modules/ihatemoney/default.nix b/pkgs/development/python-modules/ihatemoney/default.nix index 5d768170d806c..2c535ea79b576 100644 --- a/pkgs/development/python-modules/ihatemoney/default.nix +++ b/pkgs/development/python-modules/ihatemoney/default.nix @@ -132,6 +132,13 @@ buildPythonPackage rec { debts ]; + # upstream performed the update without needing to patch the code + # the original patch does not apply, sadly + # https://github.com/spiral-project/ihatemoney/pull/912 + postPatch = '' + substituteInPlace setup.cfg --replace "Flask-WTF>=0.14.3,<1" "Flask-WTF>=0.14.3,<2" + ''; + checkInputs = [ flask_testing pytestCheckHook diff --git a/pkgs/development/python-modules/ledgerwallet/default.nix b/pkgs/development/python-modules/ledgerwallet/default.nix index 7650e375b41f9..421a24e9ee127 100644 --- a/pkgs/development/python-modules/ledgerwallet/default.nix +++ b/pkgs/development/python-modules/ledgerwallet/default.nix @@ -25,6 +25,13 @@ buildPythonPackage rec { sha256 = "0fb93h2wxm9as9rsywlgz2ng4wrlbjphn6mgbhj6nls2i86rrdxk"; }; + patches = [ + # Fix removed function in construct library + # https://github.com/LedgerHQ/ledgerctl/issues/17 + # https://github.com/construct/construct/commit/8915512f53552b1493afdbce5bbf8bb6f2aa4411 + ./remove-iterateints.patch + ]; + buildInputs = lib.optionals stdenv.isDarwin [ AppKit ]; propagatedBuildInputs = [ cryptography click construct ecdsa hidapi intelhex pillow protobuf requests tabulate diff --git a/pkgs/development/python-modules/ledgerwallet/remove-iterateints.patch b/pkgs/development/python-modules/ledgerwallet/remove-iterateints.patch new file mode 100644 index 0000000000000..c97785f1d04b6 --- /dev/null +++ b/pkgs/development/python-modules/ledgerwallet/remove-iterateints.patch @@ -0,0 +1,19 @@ +--- a/ledgerwallet/params.py 2021-11-17 20:31:10.488954050 -0300 ++++ b/ledgerwallet/params.py 2021-11-17 20:31:30.619477930 -0300 +@@ -19,7 +19,6 @@ + ) + from construct.core import ( + byte2int, +- iterateints, + singleton, + stream_read, + stream_write, +@@ -40,7 +39,7 @@ + num_bytes = byte & 0x80 + encoded_len = stream_read(stream, num_bytes) + num = 0 +- for len_byte in iterateints(encoded_len): ++ for len_byte in encoded_len: + num = num << 8 + len_byte + return num + diff --git a/pkgs/development/python-modules/librouteros/default.nix b/pkgs/development/python-modules/librouteros/default.nix index 32c9889681ca3..6e9d3ebd52969 100644 --- a/pkgs/development/python-modules/librouteros/default.nix +++ b/pkgs/development/python-modules/librouteros/default.nix @@ -8,14 +8,16 @@ buildPythonPackage rec { pname = "librouteros"; - version = "3.1.0"; + version = "3.2.0"; + format = "setuptools"; + disabled = !isPy3k; src = fetchFromGitHub { owner = "luqasz"; repo = pname; rev = version; - sha256 = "1skjwnqa3vcpq9gzgpw93wdmisq15fp0q07kzyq3fgx4yg7b6sql"; + sha256 = "sha256-Zo9HCjYe9cCkqXhikAjDQKQXGkrMni3f+9KoqhZskNk="; }; checkInputs = [ @@ -33,7 +35,9 @@ buildPythonPackage rec { "test_generator_ditch" ]; - pythonImportsCheck = [ "librouteros" ]; + pythonImportsCheck = [ + "librouteros" + ]; meta = with lib; { description = "Python implementation of the MikroTik RouterOS API"; diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix index 90000de8985ce..c7aa300928f07 100644 --- a/pkgs/development/python-modules/mautrix/default.nix +++ b/pkgs/development/python-modules/mautrix/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "mautrix"; - version = "0.10.11"; + version = "0.11.3"; src = fetchPypi { inherit pname version; - sha256 = "b3905fbd1381031b4c54258fdef9e99dd342c3a211abe0b827b2c480db4b1771"; + sha256 = "sha256-eZ8fWemS808Hz6KoQWfMsk5WfaO+vj0kTyInhtE20Qk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/motionblinds/default.nix b/pkgs/development/python-modules/motionblinds/default.nix new file mode 100644 index 0000000000000..a8fb0ae58dd41 --- /dev/null +++ b/pkgs/development/python-modules/motionblinds/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pycryptodomex +, pythonOlder +}: + +buildPythonPackage rec { + pname = "motionblinds"; + version = "0.5.8.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "starkillerOG"; + repo = "motion-blinds"; + rev = version; + sha256 = "6aSwUuH5IpfcuVGXWVmb0DHglsUtGh/ATOe6iih6fXk="; + }; + + propagatedBuildInputs = [ + pycryptodomex + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ + "motionblinds" + ]; + + meta = with lib; { + description = "Python library for interfacing with Motion Blinds"; + homepage = "https://github.com/starkillerOG/motion-blinds"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/motioneye-client/default.nix b/pkgs/development/python-modules/motioneye-client/default.nix index 35632e780e7e1..c5a3a2cd4954b 100644 --- a/pkgs/development/python-modules/motioneye-client/default.nix +++ b/pkgs/development/python-modules/motioneye-client/default.nix @@ -11,15 +11,16 @@ buildPythonPackage rec { pname = "motioneye-client"; - version = "0.3.11"; + version = "0.3.12"; format = "pyproject"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "dermotduffy"; repo = pname; rev = "v${version}"; - sha256 = "0f34ig8njyn7dzy8272m0b1nlnnhir58ar3vx4zps10i0dc32hb2"; + sha256 = "sha256-vEB9ztz0RTGoolFUVQcMV7DUthCEAx1kpwkAS2186OU="; }; nativeBuildInputs = [ @@ -41,7 +42,9 @@ buildPythonPackage rec { --replace " --cov-report=html:htmlcov --cov-report=xml:coverage.xml --cov-report=term-missing --cov=motioneye_client --cov-fail-under=100" "" ''; - pythonImportsCheck = [ "motioneye_client" ]; + pythonImportsCheck = [ + "motioneye_client" + ]; meta = with lib; { description = "Python library for motionEye"; diff --git a/pkgs/development/python-modules/niko-home-control/default.nix b/pkgs/development/python-modules/niko-home-control/default.nix new file mode 100644 index 0000000000000..a7a696384dfbd --- /dev/null +++ b/pkgs/development/python-modules/niko-home-control/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, nclib +, netaddr +, netifaces +, pythonOlder +}: + +buildPythonPackage rec { + pname = "niko-home-control"; + version = "0.2.2"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "NoUseFreak"; + repo = pname; + rev = version; + sha256 = "0ah02dfnnbk98grvd180fp9rak5gpi58xiql1yyzig5pcbjidvk3"; + }; + + propagatedBuildInputs = [ + nclib + netaddr + netifaces + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ + "nikohomecontrol" + ]; + + meta = with lib; { + description = "Python SDK for Niko Home Control"; + homepage = "https://github.com/NoUseFreak/niko-home-control"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/oocsi/default.nix b/pkgs/development/python-modules/oocsi/default.nix new file mode 100644 index 0000000000000..2f0ae510d018d --- /dev/null +++ b/pkgs/development/python-modules/oocsi/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +}: + +buildPythonPackage rec { + pname = "oocsi"; + version = "0.4.2"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "020xfjvcgicj81zl3z9wnb2f9bha75bjw512b0cc38w66bniinjq"; + }; + + # Tests are not shipped + doCheck = false; + + pythonImportsCheck = [ + "oocsi" + ]; + + meta = with lib; { + description = "OOCSI library for Python"; + homepage = "https://github.com/iddi/oocsi-python"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pydyf/default.nix b/pkgs/development/python-modules/pydyf/default.nix new file mode 100644 index 0000000000000..346a6f6e39b59 --- /dev/null +++ b/pkgs/development/python-modules/pydyf/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy3k +, pytestCheckHook +, coverage +, ghostscript +, pillow +}: + +buildPythonPackage rec { + pname = "pydyf"; + version = "0.1.2"; + disabled = !isPy3k; + + src = fetchPypi { + inherit version; + pname = "pydyf"; + sha256 = "sha256-Hi9d5IF09QXeAlp9HnzwG73ZQiyoq5RReCvwDuF4YCw="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "--isort --flake8 --cov --no-cov-on-fail" "" + ''; + + checkInputs = [ + pytestCheckHook + coverage + ghostscript + pillow + ]; + + meta = with lib; { + homepage = "https://doc.courtbouillon.org/pydyf/stable/"; + description = "Low-level PDF generator written in Python and based on PDF specification 1.7"; + license = licenses.bsd3; + maintainers = with maintainers; [ rprecenth ]; + }; +} diff --git a/pkgs/development/python-modules/pyevilgenius/default.nix b/pkgs/development/python-modules/pyevilgenius/default.nix new file mode 100644 index 0000000000000..28bb1a2c4c0a2 --- /dev/null +++ b/pkgs/development/python-modules/pyevilgenius/default.nix @@ -0,0 +1,42 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, async-timeout +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pyevilgenius"; + version = "1.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "home-assistant-libs"; + repo = pname; + rev = version; + sha256 = "06xnl93sqklg7gx0z50vm79xwww0yyw05c1yynajc9aijfi8cmi3"; + }; + + propagatedBuildInputs = [ + aiohttp + async-timeout + ]; + + # Project has no test + doCheck = false; + + pythonImportsCheck = [ + "pyevilgenius" + ]; + + meta = with lib; { + description = "Python SDK to interact with Evil Genius Labs devices"; + homepage = "https://github.com/home-assistant-libs/pyevilgenius"; + changelog = "https://github.com/home-assistant-libs/pyevilgenius/releases/tag/${version}"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pylitterbot/default.nix b/pkgs/development/python-modules/pylitterbot/default.nix index 50afee3058cc9..be6d71aed5d36 100644 --- a/pkgs/development/python-modules/pylitterbot/default.nix +++ b/pkgs/development/python-modules/pylitterbot/default.nix @@ -11,14 +11,16 @@ buildPythonPackage rec { pname = "pylitterbot"; - version = "2021.10.1"; + version = "2021.11.0"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "natekspencer"; repo = pname; rev = version; - sha256 = "sha256-xE+H23AZR1OXfuLMvSuI7IeYKX7k2iEATHq5VheMLn4="; + sha256 = "sha256-HdIxi6RfdXBYEYFEcv/f9wAqKZg/MsEZd6mDYwE45to="; }; propagatedBuildInputs = [ @@ -32,7 +34,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "pylitterbot" ]; + pythonImportsCheck = [ + "pylitterbot" + ]; meta = with lib; { description = "Python package for controlling a Litter-Robot"; diff --git a/pkgs/development/python-modules/pypinyin/default.nix b/pkgs/development/python-modules/pypinyin/default.nix index 47e41434c469b..4cac927341de5 100644 --- a/pkgs/development/python-modules/pypinyin/default.nix +++ b/pkgs/development/python-modules/pypinyin/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "pypinyin"; - version = "0.43.0"; + version = "0.44.0"; src = fetchFromGitHub { owner = "mozillazg"; repo = "python-pinyin"; rev = "v${version}"; - sha256 = "0h3lpb8bw9zp8is5sx2zg931wz12x0zfan1kksnbhx16vwv1kgw3"; + sha256 = "sha256-LYiiZvpM/V3QRyTUXGWGnSnR0AnqWfTW0xJB4Vnw7lI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyscard/default.nix b/pkgs/development/python-modules/pyscard/default.nix index caa5e4e244059..9efc461cec2b5 100644 --- a/pkgs/development/python-modules/pyscard/default.nix +++ b/pkgs/development/python-modules/pyscard/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, swig, pcsclite, PCSC }: +{ lib, stdenv, fetchpatch, fetchPypi, buildPythonPackage, swig, pcsclite, PCSC }: let # Package does not support configuring the pcsc library. @@ -14,6 +14,15 @@ buildPythonPackage rec { sha256 = "05de0579c42b4eb433903aa2fb327d4821ebac262434b6584da18ed72053fd9e"; }; + patches = [ + # present in master - remove after 2.0.2 + (fetchpatch { + name = "darwin-typo-test-fix.patch"; + url = "https://github.com/LudovicRousseau/pyscard/commit/ce842fcc76fd61b8b6948d0b07306d82ad1ec12a.patch"; + sha256 = "0wsaj87wp9d2vnfzwncfxp2w95m0zhr7zpkmg5jccn06z52ihis3"; + }) + ]; + postPatch = if withApplePCSC then '' substituteInPlace smartcard/scard/winscarddll.c \ --replace "/System/Library/Frameworks/PCSC.framework/PCSC" \ diff --git a/pkgs/development/python-modules/pysmartapp/default.nix b/pkgs/development/python-modules/pysmartapp/default.nix index abf3796ae7f7b..a4ab8e58382c3 100644 --- a/pkgs/development/python-modules/pysmartapp/default.nix +++ b/pkgs/development/python-modules/pysmartapp/default.nix @@ -4,17 +4,21 @@ , httpsig , pytest-asyncio , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "pysmartapp"; - version = "0.3.3"; + version = "0.3.4"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "andrewsayre"; repo = pname; rev = version; - sha256 = "03wk44siqxl15pa46x5vkg4q0mnga34ir7qn897576z2ivbx7awh"; + sha256 = "sha256-zYjv7wRxQTS4PnNaY69bw9xE6I4DZMocwUzEICBfwqM="; }; propagatedBuildInputs = [ @@ -26,7 +30,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "pysmartapp" ]; + pythonImportsCheck = [ + "pysmartapp" + ]; meta = with lib; { description = "Python implementation to work with SmartApp lifecycle events"; diff --git a/pkgs/development/python-modules/python-gammu/default.nix b/pkgs/development/python-modules/python-gammu/default.nix index d61512bd6b1f9..ec8d5841bafd0 100644 --- a/pkgs/development/python-modules/python-gammu/default.nix +++ b/pkgs/development/python-modules/python-gammu/default.nix @@ -9,25 +9,34 @@ buildPythonPackage rec { pname = "python-gammu"; - version = "3.2.3"; + version = "3.2.4"; + format = "setuptools"; + disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "gammu"; repo = pname; rev = version; - sha256 = "sha256-MtFxKRE6CB/LZq9McMyYhjwfs/Rdke9gsNUqbOQdWYQ="; + sha256 = "sha256-lFQBrKWwdvUScwsBva08izZVeVDn1u+ldzixtL9YTpA="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + ]; - buildInputs = [ gammu ]; + buildInputs = [ + gammu + ]; # Check with the next release if tests could be run with pytest # checkInputs = [ pytestCheckHook ]; # Don't run tests for now doCheck = false; - pythonImportsCheck = [ "gammu" ]; + + pythonImportsCheck = [ + "gammu" + ]; meta = with lib; { description = "Python bindings for Gammu"; diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index ea8bf1b72c097..ba024bf5c6a1f 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.0.10534"; + version = "9.0.10576"; src = fetchPypi { inherit pname version; - sha256 = "sha256-tUjASwLQy/p3Q+XnkbpUQNM6VHk94bIle2BzRd4EYsg="; + sha256 = "sha256-pOQZXymIuffUfShAUrXqlxwWCIRKZpkMZcJS1fad2bs="; }; postPatch = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/python-modules/pywizlight/default.nix b/pkgs/development/python-modules/pywizlight/default.nix index 755e1555a4313..9098bf80dc5e9 100644 --- a/pkgs/development/python-modules/pywizlight/default.nix +++ b/pkgs/development/python-modules/pywizlight/default.nix @@ -5,16 +5,20 @@ , fetchFromGitHub , pytest-asyncio , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "pywizlight"; - version = "0.4.10"; + version = "0.4.13"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "sbidy"; repo = pname; - rev = "v${version}"; + rev = version; sha256 = "sha256-XO9KmsC3DXgVcGWr5ss3m2wB8rVboWyQUWBidynhkP8="; }; @@ -28,14 +32,16 @@ buildPythonPackage rec { pytestCheckHook ]; - # Tests requires network features (e. g., discovery testing) disabledTests = [ + # Tests requires network features (e. g., discovery testing) "test_Bulb_Discovery" "test_timeout" "test_timeout_PilotBuilder" ]; - pythonImportsCheck = [ "pywizlight" ]; + pythonImportsCheck = [ + "pywizlight" + ]; meta = with lib; { description = "Python connector for WiZ light bulbs"; diff --git a/pkgs/development/python-modules/qcs-api-client/default.nix b/pkgs/development/python-modules/qcs-api-client/default.nix index 8477ce29b7457..5a64bc5e9f976 100644 --- a/pkgs/development/python-modules/qcs-api-client/default.nix +++ b/pkgs/development/python-modules/qcs-api-client/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "qcs-api-client"; - version = "0.16.0"; + version = "0.18.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "4ac6cf55e414494095ac1e1258f5700fed8eefa37d3b8da80264bd674cbfac43"; + sha256 = "sha256-7qrE+XqXOCmfauD772epIbZ1Lzv+5pXrA7tgD8qCVSE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/qiskit-aer/default.nix b/pkgs/development/python-modules/qiskit-aer/default.nix index a550ea4b3cf4f..b2e708d586f77 100644 --- a/pkgs/development/python-modules/qiskit-aer/default.nix +++ b/pkgs/development/python-modules/qiskit-aer/default.nix @@ -88,6 +88,7 @@ buildPythonPackage rec { ]; # Slow tests disabledTests = [ + "test_clifford" # fails on cvxpy >= 1.1.15. https://github.com/Qiskit/qiskit-aer/pull/1318. Remove in future. "test_snapshot" # TODO: these ~30 tests fail on setup due to pytest fixture issues? "test_initialize_2" # TODO: simulations appear incorrect, off by >10%. @@ -111,7 +112,6 @@ buildPythonPackage rec { "_144" "test_sparse_output_probabilities" "test_reset_2_qubit" - # "test_clifford" ]; checkInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/rdflib-jsonld/default.nix b/pkgs/development/python-modules/rdflib-jsonld/default.nix deleted file mode 100644 index 3872ef5d2fe5b..0000000000000 --- a/pkgs/development/python-modules/rdflib-jsonld/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ buildPythonPackage, fetchPypi, lib, rdflib, nose }: - -buildPythonPackage rec { - pname = "rdflib-jsonld"; - version = "0.6.2"; - - src = fetchPypi { - inherit pname version; - sha256 = "107cd3019d41354c31687e64af5e3fd3c3e3fa5052ce635f5ce595fd31853a63"; - }; - - nativeBuildInputs = [ nose ]; - propagatedBuildInputs = [ rdflib ]; - - meta = with lib; { - homepage = "https://github.com/RDFLib/rdflib-jsonld"; - license = licenses.bsdOriginal; - description = "rdflib extension adding JSON-LD parser and serializer"; - maintainers = [ maintainers.koslambrou ]; - # incomptiable with rdflib 6.0.0, half of the test suite fails with import and atrribute errors - broken = true; - }; -} diff --git a/pkgs/development/python-modules/rtoml/default.nix b/pkgs/development/python-modules/rtoml/default.nix index e5043ca941a03..9ff43bce08432 100644 --- a/pkgs/development/python-modules/rtoml/default.nix +++ b/pkgs/development/python-modules/rtoml/default.nix @@ -5,6 +5,7 @@ , setuptools-rust , rustPlatform , pytestCheckHook +, libiconv }: buildPythonPackage rec { @@ -32,6 +33,8 @@ buildPythonPackage rec { cargoSetupHook ]; + buildInputs = [ libiconv ]; + pythonImportsCheck = [ "rtoml" ]; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/schema-salad/default.nix b/pkgs/development/python-modules/schema-salad/default.nix index a1771466cea04..c3445c1d3ad92 100644 --- a/pkgs/development/python-modules/schema-salad/default.nix +++ b/pkgs/development/python-modules/schema-salad/default.nix @@ -6,7 +6,6 @@ , lockfile , mistune , rdflib -, rdflib-jsonld , ruamel-yaml , pytestCheckHook , pythonOlder @@ -29,7 +28,6 @@ buildPythonPackage rec { lockfile mistune rdflib - rdflib-jsonld ruamel-yaml ]; diff --git a/pkgs/development/python-modules/scs/default.nix b/pkgs/development/python-modules/scs/default.nix index 128e9276608dd..24b7d36343a87 100644 --- a/pkgs/development/python-modules/scs/default.nix +++ b/pkgs/development/python-modules/scs/default.nix @@ -5,26 +5,22 @@ , lapack , numpy , scipy -, scs # check inputs -, nose +, pytestCheckHook }: buildPythonPackage rec { - inherit (scs) pname version; + pname = "scs"; + version = "3.0.0"; src = fetchFromGitHub { owner = "bodono"; repo = "scs-python"; - rev = "f02abdc0e2e0a5851464e30f6766ccdbb19d73f0"; # need to choose commit manually, untagged - sha256 = "174b5s7cwgrn1m55jlrszdl403zhpzc4yl9acs6kjv9slmg1mmjr"; + rev = version; + sha256 = "sha256-7OgqCo21S0FDev8xv6/8iGFXg8naVi93zd8v1f9iaWw="; + fetchSubmodules = true; }; - preConfigure = '' - rm -r scs - ln -s ${scs.src} scs - ''; - buildInputs = [ lapack blas @@ -35,10 +31,7 @@ buildPythonPackage rec { scipy ]; - checkInputs = [ nose ]; - checkPhase = '' - nosetests - ''; + checkInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "scs" ]; meta = with lib; { @@ -50,7 +43,7 @@ buildPythonPackage rec { ''; homepage = "https://github.com/cvxgrp/scs"; # upstream C package downloadPage = "https://github.com/bodono/scs-python"; - license = licenses.gpl3; + license = licenses.mit; maintainers = with maintainers; [ drewrisinger ]; }; } diff --git a/pkgs/development/python-modules/stanza/default.nix b/pkgs/development/python-modules/stanza/default.nix new file mode 100644 index 0000000000000..ce9719a75210a --- /dev/null +++ b/pkgs/development/python-modules/stanza/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, emoji +, numpy +, protobuf +, requests +, six +, pytorch +, tqdm +}: + +buildPythonPackage rec { + pname = "stanza"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "stanfordnlp"; + repo = pname; + rev = "v${version}"; + sha256 = "1j5918n875p3ibhzc5zp3vb97asbbnb04pj1igxwzl0xm6qcsbh8"; + }; + + disabled = pythonOlder "3.6"; + + propagatedBuildInputs = [ + emoji + numpy + protobuf + requests + six + pytorch + tqdm + ]; + + # disabled, because the tests try to connect to the internet which + # is forbidden in the sandbox + doCheck = false; + + pythonImportsCheck = [ "stanza" ]; + + meta = with lib; { + description = "Official Stanford NLP Python Library for Many Human Languages"; + homepage = "https://github.com/stanfordnlp/stanza/"; + license = licenses.asl20; + maintainers = with maintainers; [ riotbib ]; + }; +} diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix index a9f1a58b12987..4ad2f9f959c50 100644 --- a/pkgs/development/python-modules/trytond/default.nix +++ b/pkgs/development/python-modules/trytond/default.nix @@ -12,6 +12,7 @@ , werkzeug , wrapt , passlib +, pillow , bcrypt , pydot , python-Levenshtein @@ -23,12 +24,14 @@ buildPythonApplication rec { pname = "trytond"; - version = "6.0.8"; - disabled = pythonOlder "3.5"; + version = "6.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "686d498f9648875f48edc9fc2e97cd465ed4ea9270c4984b6f2db20a2eac4942"; + sha256 = "sha256-U73dzLTUJnOw24/ELQzjnxJ0PvjV+zE/PNuQHXbEukw="; }; # Tells the tests which database to use @@ -37,6 +40,7 @@ buildPythonApplication rec { buildInputs = [ mock ]; + propagatedBuildInputs = [ lxml relatorio @@ -46,6 +50,7 @@ buildPythonApplication rec { python-sql werkzeug wrapt + pillow passlib # extra dependencies diff --git a/pkgs/development/python-modules/uptime-kuma-monitor/default.nix b/pkgs/development/python-modules/uptime-kuma-monitor/default.nix new file mode 100644 index 0000000000000..f689942abf93e --- /dev/null +++ b/pkgs/development/python-modules/uptime-kuma-monitor/default.nix @@ -0,0 +1,40 @@ +{ lib +, requests +, buildPythonPackage +, fetchPypi +, prometheus-client +, pythonOlder +}: + +buildPythonPackage rec { + pname = "uptime-kuma-monitor"; + version = "1.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + pname = "uptime_kuma_monitor"; + inherit version; + sha256 = "0zi4856hj5ar4yidh7366kx3xnh8qzydw9z8vlalcn98jf3jlnk9"; + }; + + propagatedBuildInputs = [ + requests + prometheus-client + ]; + + # Project has no test + doCheck = false; + + pythonImportsCheck = [ + "uptime_kuma_monitor" + ]; + + meta = with lib; { + description = "Python wrapper around UptimeKuma /metrics endpoint"; + homepage = "https://github.com/meichthys/utptime_kuma_monitor"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/velbus-aio/default.nix b/pkgs/development/python-modules/velbus-aio/default.nix index 506f775abd31f..db9721641cfd9 100644 --- a/pkgs/development/python-modules/velbus-aio/default.nix +++ b/pkgs/development/python-modules/velbus-aio/default.nix @@ -3,13 +3,15 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, pyserial , pyserial-asyncio , pytestCheckHook }: buildPythonPackage rec { pname = "velbus-aio"; - version = "2021.11.6"; + version = "2021.11.7"; + format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,11 +19,12 @@ buildPythonPackage rec { owner = "Cereal2nd"; repo = pname; rev = version; - sha256 = "sha256-Vm/CgrSSCU76CzAxCtpMsE8/GtPE9SlfqDyzYp4Gc8E="; + sha256 = "sha256-itaYSfZm+/vF/tKRO2BW4qXrDXP0YfBrKiq9bMGFj0M="; }; propagatedBuildInputs = [ backoff + pyserial pyserial-asyncio ]; diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix index ecc13b1d63776..f43fd2d5462b6 100644 --- a/pkgs/development/python-modules/weasyprint/default.nix +++ b/pkgs/development/python-modules/weasyprint/default.nix @@ -1,57 +1,72 @@ -{ buildPythonPackage, - fetchPypi, - fetchpatch, - cairosvg, - pyphen, - cffi, - cssselect, - lxml, - html5lib, - tinycss, - glib, - pango, - fontconfig, - lib, stdenv, - pytest, - pytest-runner, - pytest-isort, - pytest-flake8, - pytest-cov, - isPy3k, - substituteAll +{ buildPythonPackage +, fetchPypi +, fetchpatch +, pytestCheckHook +, brotli +, cairosvg +, fonttools +, pydyf +, pyphen +, cffi +, cssselect +, lxml +, html5lib +, tinycss +, zopfli +, glib +, harfbuzz +, pango +, fontconfig +, lib +, stdenv +, ghostscript +, isPy3k +, substituteAll }: buildPythonPackage rec { pname = "weasyprint"; - version = "52"; + version = "53.4"; disabled = !isPy3k; - # excluded test needs the Ahem font - checkPhase = '' - runHook preCheck - pytest -k 'not test_font_stretch' - runHook postCheck - ''; + src = fetchPypi { + inherit version; + pname = "weasyprint"; + sha256 = "sha256-EMyxfVXHMJa98e3T7+WMuFWwfkwwfZutTryaPxP/RYA="; + }; - # ignore failing flake8-test - prePatch = '' - substituteInPlace setup.cfg \ - --replace '[tool:pytest]' '[tool:pytest]\nflake8-ignore = E501' + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "--isort --flake8 --cov --no-cov-on-fail" "" ''; - checkInputs = [ pytest pytest-runner pytest-isort pytest-flake8 pytest-cov ]; + disabledTests = [ + # needs the Ahem font (fails on macOS) + "test_font_stretch" + ]; + + checkInputs = [ + pytestCheckHook + ghostscript + ]; FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf"; - propagatedBuildInputs = [ cairosvg pyphen cffi cssselect lxml html5lib tinycss ]; + propagatedBuildInputs = [ + brotli + cairosvg + cffi + cssselect + fonttools + html5lib + lxml + pydyf + pyphen + tinycss + zopfli + ]; - # 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}"; @@ -59,15 +74,10 @@ buildPythonPackage rec { gobject = "${glib.out}/lib/libgobject-2.0${stdenv.hostPlatform.extensions.sharedLibrary}"; pango = "${pango.out}/lib/libpango-1.0${stdenv.hostPlatform.extensions.sharedLibrary}"; pangocairo = "${pango.out}/lib/libpangocairo-1.0${stdenv.hostPlatform.extensions.sharedLibrary}"; + harfbuzz = "${harfbuzz.out}/lib/libharfbuzz${stdenv.hostPlatform.extensions.sharedLibrary}"; }) ]; - src = fetchPypi { - inherit version; - pname = "WeasyPrint"; - sha256 = "0rwf43111ws74m8b1alkkxzz57g0np3vmd8as74adwnxslfcg4gs"; - }; - meta = with lib; { homepage = "https://weasyprint.org/"; description = "Converts web documents to PDF"; diff --git a/pkgs/development/python-modules/weasyprint/library-paths.patch b/pkgs/development/python-modules/weasyprint/library-paths.patch index c6eb87c94585d..9a10990fd43f0 100644 --- a/pkgs/development/python-modules/weasyprint/library-paths.patch +++ b/pkgs/development/python-modules/weasyprint/library-paths.patch @@ -1,38 +1,31 @@ -diff --git a/weasyprint/fonts.py b/weasyprint/fonts.py -index 79e3b5b..4438eb4 100644 ---- a/weasyprint/fonts.py -+++ b/weasyprint/fonts.py -@@ -45,11 +45,8 @@ else: - # with OSError: dlopen() failed to load a library: cairo / cairo-2 - # So let's hope we find the same file as cairo already did ;) - # Same applies to pangocairo requiring pangoft2 -- fontconfig = dlopen(ffi, 'fontconfig', 'libfontconfig', -- 'libfontconfig-1.dll', -- 'libfontconfig.so.1', 'libfontconfig-1.dylib') -- pangoft2 = dlopen(ffi, 'pangoft2-1.0', 'libpangoft2-1.0-0', -- 'libpangoft2-1.0.so.0', 'libpangoft2-1.0.dylib') -+ fontconfig = dlopen(ffi, '@fontconfig@') -+ pangoft2 = dlopen(ffi, '@pangoft2@') - - ffi.cdef(''' - // FontConfig -diff --git a/weasyprint/text.py b/weasyprint/text.py -index 1dc5e4d..b070bad 100644 ---- a/weasyprint/text.py -+++ b/weasyprint/text.py -@@ -255,12 +255,9 @@ def dlopen(ffi, *names): +diff --git a/weasyprint/text/ffi.py b/weasyprint/text/ffi.py +index 0734cbea..22e31a5e 100644 +--- a/weasyprint/text/ffi.py ++++ b/weasyprint/text/ffi.py +@@ -387,21 +387,11 @@ def _dlopen(ffi, *names): return ffi.dlopen(names[0]) # pragma: no cover --gobject = dlopen(ffi, 'gobject-2.0', 'libgobject-2.0-0', 'libgobject-2.0.so.0', -- 'libgobject-2.0.dylib') --pango = dlopen(ffi, 'pango-1.0', 'libpango-1.0-0', 'libpango-1.0.so.0', -- 'libpango-1.0.dylib') --pangocairo = dlopen(ffi, 'pangocairo-1.0', 'libpangocairo-1.0-0', -- 'libpangocairo-1.0.so.0', 'libpangocairo-1.0.dylib') -+gobject = dlopen(ffi, '@gobject@') -+pango = dlopen(ffi, '@pango@') -+pangocairo = dlopen(ffi, '@pangocairo@') +-gobject = _dlopen( +- ffi, 'gobject-2.0-0', 'gobject-2.0', 'libgobject-2.0-0', +- 'libgobject-2.0.so.0', 'libgobject-2.0.dylib') +-pango = _dlopen( +- ffi, 'pango-1.0-0', 'pango-1.0', 'libpango-1.0-0', 'libpango-1.0.so.0', +- 'libpango-1.0.dylib') +-harfbuzz = _dlopen( +- ffi, 'harfbuzz', 'harfbuzz-0.0', 'libharfbuzz-0', +- 'libharfbuzz.so.0', 'libharfbuzz.so.0', 'libharfbuzz.0.dylib') +-fontconfig = _dlopen( +- ffi, 'fontconfig-1', 'fontconfig', 'libfontconfig', 'libfontconfig-1.dll', +- 'libfontconfig.so.1', 'libfontconfig-1.dylib') +-pangoft2 = _dlopen( +- ffi, 'pangoft2-1.0-0', 'pangoft2-1.0', 'libpangoft2-1.0-0', +- 'libpangoft2-1.0.so.0', 'libpangoft2-1.0.dylib') ++gobject = _dlopen(ffi, '@gobject@') ++pango = _dlopen(ffi, '@pango@') ++harfbuzz = _dlopen(ffi, '@harfbuzz@') ++fontconfig = _dlopen(ffi, '@fontconfig@') ++pangoft2 = _dlopen(ffi, '@pangoft2@') gobject.g_type_init() - + diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 0bf46ed1b13ef..e4123a8f105e8 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -56,13 +56,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.574"; + version = "2.0.587"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - sha256 = "sha256-DM7fPwJcWEyOu55ThK/jP9jIUbiVCfEtltSP7puCoxQ="; + sha256 = "sha256-uLH3g3UeWdIZsMsUwCYpTehgxDKGraPBlENdTz+QYLI="; }; nativeBuildInputs = with py.pkgs; [ diff --git a/pkgs/development/tools/earthly/default.nix b/pkgs/development/tools/earthly/default.nix index b44ef14c6cabe..1cd5d9caf2829 100644 --- a/pkgs/development/tools/earthly/default.nix +++ b/pkgs/development/tools/earthly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "earthly"; - version = "0.5.22"; + version = "0.5.24"; src = fetchFromGitHub { owner = "earthly"; repo = "earthly"; rev = "v${version}"; - sha256 = "sha256-mwyL0o+f7hPvVhWBE7k5a56kzDpeM4rw8h5oLkgsqgc="; + sha256 = "sha256-d4TCuFj7nbQDxTLCStrGj698iUYTH0mCqoCZeeOGNIE="; }; - vendorSha256 = "sha256-pITTp9BqGfUFSF15pl5AM0npJuylJ+FcGw4xGaOi0/o="; + vendorSha256 = "sha256-3o+jizVVHcPZ6nNT2nCF8fLDynnFccI2Y50kbXp2qAI="; ldflags = [ "-s" "-w" @@ -24,6 +24,9 @@ buildGoModule rec { makeFlagsArray+=(BUILD_TAGS="${BUILDTAGS}") ''; + # For some reasons the tests fail, but the program itself seems to work. + doCheck = false; + postInstall = '' mv $out/bin/debugger $out/bin/earthly-debugger mv $out/bin/shellrepeater $out/bin/earthly-shellrepeater diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index ff61c109b671f..d3a62bf331bc0 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -22,7 +22,7 @@ let in rec { - electron = electron_15; + electron = electron_16; electron_3 = mkElectron "3.1.13" { x86_64-linux = "1psmbplz6jhnnf6hmfhxbmmhn4n1dpnhzbc12pxn645xhfpk9ark"; @@ -105,24 +105,24 @@ rec { headers = "1zkdgpjrh1dc9j8qyrrrh49v24960yhvwi2c530qbpf2azgqj71b"; }; - electron_12 = mkElectron "12.2.2" { - armv7l-linux = "aeee4acf40afa0397c10a4c76bc61ed2967433bab5c6f11de181fa33d0b168ff"; - aarch64-linux = "593a3fef97a7fed8e93b64d659af9c736dff445eedcbfd037f7d226a88d58862"; - x86_64-linux = "a8e88c67f375e41f3a6f8b8a8c3a1e41b8c0a46f1b731e05de21208caa005fb2"; - i686-linux = "5f0bdc9581237f2f87b5d34e232d711617bd8bf5ff5d7ebd66480779c13fba0a"; - x86_64-darwin = "8a33d2bed668e30a6d64856e01d2aa3b1f1d9efe4eb0e808e916694d32d5e8f2"; - aarch64-darwin = "256daa25a8375c565b32c3c2f0e12fbac8d5039a13a9edbb3673a863149b750a"; - headers = "1fvqkw08pync38ixi5cq4f8a108k2ajxpm1w2f8sn2hjph9kpbsd"; + electron_12 = mkElectron "12.2.3" { + armv7l-linux = "4de83c34987ac7b3b2d0c8c84f27f9a34d9ea2764ae1e54fb609a95064e7e71a"; + aarch64-linux = "d29d234c09ba810d89ed1fba9e405b6975916ea208d001348379f89b50d1835c"; + x86_64-linux = "deae6d0941762147716b8298476080d961df2a32d0f6f57b244cbe3a2553cd24"; + i686-linux = "11b4f159cd3b89d916cc05b5231c2cde53f0c6fb5be8e881824fde00daa5e8c2"; + x86_64-darwin = "5af34f1198ce9fd17e9fa581f57a8ad2c9333187fb617fe943f30b8cde9e6231"; + aarch64-darwin = "0db2c021a047a4cd5b28eea16490e16bc82592e3f8a4b96fbdc72a292ce13f50"; + headers = "1idam1xirxqxqg4g7n33kdx2skk0r351m00g59a8yx9z82g06ah9"; }; - electron_13 = mkElectron "13.6.1" { - armv7l-linux = "c8bba8da0baf5cde3eb4823c801c228abfa7943c69131b3701c74e2b342e1813"; - aarch64-linux = "09a1ff29c33a23f19cc702e0147dee03cfe2acedcff6bfb63c7911184b871a1a"; - x86_64-linux = "bfc09dd2d591ad614c8d598dad6e13b76c3baf4f48773e7819c493b524a0bb1a"; - i686-linux = "1ea7c7d19759fa0ee0ddef68c09bcc1c57265436d3f5dab37dad3567f117f317"; - x86_64-darwin = "ce45f17f875d72e791999eaf30a1af39b6e9143e57a653e7f06cfa0bee9b985d"; - aarch64-darwin = "e2f82720acae3a03d7d4b3e7dcc7697b84d5bb69a63d087a7420ace2412e7a28"; - headers = "1bd87c74863w0sjs8gfxl62kjjscc56dmmw85vhwz01s4niksr02"; + electron_13 = mkElectron "13.6.2" { + armv7l-linux = "aeb037e24cbcc532b09a604c3421dd1e330afbc3c34b3fb692fcdafbe2d63097"; + aarch64-linux = "c6014ac6842d81a612e907ce3655edde495f647784ba2bafebd2ada52c065702"; + x86_64-linux = "529fb7ceb2646324e527a0d9472bbb608e89756a310a8fe1cd929e3a218b45ec"; + i686-linux = "eeaec723f16adae8b6ba9375745cc143a038905cfa0a9e9ef59ea9026fe1a11b"; + x86_64-darwin = "86f7f7270ebd36e4957f56c1ef38eecd7d1725f032810c7fef3476955914d6ff"; + aarch64-darwin = "cc0a19b6ae73f953ce3a3f8d587da8220cd00a284aa705250e81be324b9271dd"; + headers = "0a5nnj3bd8ly9shx7palaiy0q7n70x8zp1myshcg5pz1qqjjmlw9"; }; electron_14 = mkElectron "14.2.1" { @@ -135,13 +135,23 @@ rec { headers = "14yaw3kml2kmi7sns8z32kv4cd8anyj5nd7rfxcg74hj2pbl9dvp"; }; - electron_15 = mkElectron "15.3.1" { - armv7l-linux = "b3e73ad174f692da36a4e1d2cd6b849080ee891027e37126868c88e6b89d82ac"; - aarch64-linux = "35ebfeeedcb71bd256c24550c75b9515fdda2db7a2ee1deb1097040480a26198"; - x86_64-linux = "941330103b9ab66a0195dd86e1503b5d2087f93a0b1e8453d8270d47cfe2bfc2"; - i686-linux = "1eeef6b189b4305845a0832b98efcba773c329e351181debe003562a7885afff"; - x86_64-darwin = "a91b089b5dc5b1279966511344b805ec84869b6cd60af44f800b363bba25b915"; - aarch64-darwin = "89fafef20426c0a3a2326172d222d29fc5d24d64c8910b7abddf61bd2c6a6700"; - headers = "0f665x7yp0xz1p1cl8c3vcw3k7g53c13rkbz8cz3phl6v3n1s1w0"; + electron_15 = mkElectron "15.3.2" { + armv7l-linux = "40d2f83a3cd29350edfff442ec1d9a5a681358ad9a7a086adf0ed8d0afa4145e"; + aarch64-linux = "c4c37b852a5576420d43c0a7d3b62be343fc0340134e9f0a7791c3c9285fe249"; + x86_64-linux = "10b85813d5280f97125437c65a002aa783f204247d501fb58786ac2a7144bb7d"; + i686-linux = "4a138dbf3d7e34915de73e0224c434666b0c9c5f335ed22e72014b20147378e6"; + x86_64-darwin = "0bd7e44d41bcdd048a2ac5dc4e1eb6807e80165ce5c06f1a220b20f10579be75"; + aarch64-darwin = "9eae07658b7d9a5eb318233a66c3933dba31661cf78b7b156d3d20ab7134f4c3"; + headers = "0r1qxgkpcn03fd28zbz86ilhsqg0gzp9clbghr5w6gy5ak8y68hz"; + }; + + electron_16 = mkElectron "16.0.0" { + armv7l-linux = "a3bec9664a17d3f8adc072f88d105601b5d25a42e339c73c26c3b59a0ab0f44a"; + aarch64-linux = "f4dc4ba8ce14f2e64943838c85654766522c46bb8e02914d3fdf1894b6e5b2fa"; + x86_64-linux = "a5c5c0547c989207ab63e0b06b46a04b545e4cc74e6fc8f94d7beda0c0bcb0b2"; + i686-linux = "e93e5eaaf33e4c30d2ba613b67858ada311a6e28b5fd42893499b50ef97b3695"; + x86_64-darwin = "f95847ea721cbf8632a72bec504137554aa262d111aaa5e2e30a74df66ff6c97"; + aarch64-darwin = "0c71b070cf6bcfa7dc4dad65ee14af926d5dda73e4a2f96e68cff844df8aba1d"; + headers = "1gr43w8pw9b7xl1bmpap8v1wp4ixmc2qkww02kbzfw53h6m4ccn3"; }; } diff --git a/pkgs/development/tools/haskell/hyper-haskell/default.nix b/pkgs/development/tools/haskell/hyper-haskell/default.nix index 331f78f7a1e2c..2b3fb76903e50 100644 --- a/pkgs/development/tools/haskell/hyper-haskell/default.nix +++ b/pkgs/development/tools/haskell/hyper-haskell/default.nix @@ -49,8 +49,5 @@ in stdenvNoCC.mkDerivation rec { homepage = "https://github.com/HeinrichApfelmus/hyper-haskell"; license = licenses.bsd3; maintainers = [ maintainers.rvl ]; - # depends on electron-10.4.7 which is marked as insecure: - # https://github.com/NixOS/nixpkgs/pull/142641#issuecomment-957358476 - broken = true; }; } diff --git a/pkgs/development/tools/ocaml/dune-release/default.nix b/pkgs/development/tools/ocaml/dune-release/default.nix index a5d97b65b2f32..32ff517178cb8 100644 --- a/pkgs/development/tools/ocaml/dune-release/default.nix +++ b/pkgs/development/tools/ocaml/dune-release/default.nix @@ -1,8 +1,8 @@ -{ lib, buildDunePackage, fetchurl, makeWrapper -, curly, fmt, bos, cmdliner, re, rresult, logs +{ lib, buildDunePackage, fetchurl, makeWrapper, fetchpatch +, curly, fmt, bos, cmdliner, re, rresult, logs, fpath , odoc, opam-format, opam-core, opam-state, yojson, astring , opam, git, findlib, mercurial, bzip2, gnutar, coreutils -, alcotest, mdx +, alcotest }: # don't include dune as runtime dep, so user can @@ -10,33 +10,36 @@ let runtimeInputs = [ opam findlib git mercurial bzip2 gnutar coreutils ]; in buildDunePackage rec { pname = "dune-release"; - version = "1.5.0"; + version = "1.5.2"; minimumOCamlVersion = "4.06"; src = fetchurl { url = "https://github.com/ocamllabs/${pname}/releases/download/${version}/${pname}-${version}.tbz"; - sha256 = "1lyfaczskdbqnhmpiy6wga9437frds3m8prfk2rhwyb96h69y3pv"; + sha256 = "1r6bz1zz1al5y762ws3w98d8bnyi5ipffajgczixacmbrxvp3zgx"; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ curly fmt cmdliner re opam-format opam-state opam-core - rresult logs odoc bos yojson astring ]; - checkInputs = [ alcotest mdx ] ++ runtimeInputs; + rresult logs odoc bos yojson astring fpath ]; + checkInputs = [ alcotest ] ++ runtimeInputs; doCheck = true; useDune2 = true; + patches = [ + # add missing git config calls to avoid failing due to the lack of a global git config + (fetchpatch { + name = "tests-missing-git-config.patch"; + url = "https://github.com/ocamllabs/dune-release/commit/87e7ffe2a9c574620d4e2fc0d79eed8772eab973.patch"; + sha256 = "0wrzcpzr54dwrdjdc75mijh78xk4bmsmqs1pci06fb2nf03vbd2k"; + }) + ]; + postPatch = '' # remove check for curl in PATH, since curly is patched # to have a fixed path to the binary in nix store sed -i '/must_exist (Cmd\.v "curl"/d' lib/github.ml - - # ignore weird yes error message - sed -i 's/yes |/yes 2>\/dev\/null |/' \ - tests/bin/no_doc/run.t \ - tests/bin/draft/run.t \ - tests/bin/url-file/run.t ''; preCheck = '' diff --git a/pkgs/development/tools/rust/cargo-crev/default.nix b/pkgs/development/tools/rust/cargo-crev/default.nix index 9803cd531e7e8..d7287f59e65fe 100644 --- a/pkgs/development/tools/rust/cargo-crev/default.nix +++ b/pkgs/development/tools/rust/cargo-crev/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-crev"; - version = "0.20.1"; + version = "0.21.3"; src = fetchFromGitHub { owner = "crev-dev"; repo = "cargo-crev"; - rev = version; - sha256 = "sha256-j2dafXUI6rDEYboSAciMeNma/YaBYKuQZgMUGVU+oBQ="; + rev = "v${version}"; + sha256 = "sha256-CwECZz+qS5+rgwudRutcKZsYxfMLcVbA/9SZASmF+k4="; }; - cargoSha256 = "sha256-khrpS6QFpweKbTbR0YhAJTTrgDoZl9fzYPDs+JE1mtA="; + cargoSha256 = "sha256-7c6Hu6UacQuRsCHlGKr1TtN+XHVGr1sw+HEGWeT9SJA="; preCheck = '' export HOME=$(mktemp -d) diff --git a/pkgs/development/tools/rust/devserver/default.nix b/pkgs/development/tools/rust/devserver/default.nix index 9e4545e5e87e9..305a01b69991d 100644 --- a/pkgs/development/tools/rust/devserver/default.nix +++ b/pkgs/development/tools/rust/devserver/default.nix @@ -1,8 +1,10 @@ { lib +, stdenv , fetchCrate , rustPlatform , openssl , pkg-config +, CoreServices }: rustPlatform.buildRustPackage rec { @@ -16,7 +18,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ]; + buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin CoreServices; cargoSha256 = "sha256-XlrQ6CvjeWnzvfaeNbe8FtMXMVSQNLxDVIEjyHm57Js="; diff --git a/pkgs/games/pacvim/default.nix b/pkgs/games/pacvim/default.nix index dc2c216b1bf19..a4347550c1d23 100644 --- a/pkgs/games/pacvim/default.nix +++ b/pkgs/games/pacvim/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, ncurses }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, ncurses }: stdenv.mkDerivation { pname = "pacvim"; @@ -9,6 +9,15 @@ stdenv.mkDerivation { rev = "ca7c8833c22c5fe97974ba5247ef1fcc00cedb8e"; sha256 = "1kq6j7xmsl5qfl1246lyglkb2rs9mnb2rhsdrp18965dpbj2mhx2"; }; + patches = [ + # Fix pending upstream inclusion for ncurses-6.3 support: + # https://github.com/jmoon018/PacVim/pull/53 + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://github.com/jmoon018/PacVim/commit/760682824cdbb328af616ff43bf822ade23924f7.patch"; + sha256 = "1y3928dc2nkfldqhpiqk0blbx7qj8ar35f1w7fb92qwxrj8p4i6g"; + }) + ]; buildInputs = [ ncurses ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index 715f33421210a..c7b94e29589a5 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -1,293 +1,257 @@ -{ lib, stdenv, fetchgit, fetchFromGitHub, fetchpatch, cmake, pkg-config, makeWrapper, python27, python3, retroarch -, alsa-lib, fluidsynth, curl, hidapi, libGLU, gettext, portaudio, SDL, SDL2, libGL -, ffmpeg, pcre, libevdev, libpng, libjpeg, libzip, udev, libvorbis, snappy, which, hexdump -, sfml, xorg, zlib, nasm, libpcap, boost, icu, openssl -, buildPackages }: +{ lib +, stdenv +, SDL +, alsa-lib +, boost +, buildPackages +, cmake +, curl +, fetchFromGitHub +, fetchpatch +, ffmpeg +, fluidsynth +, gettext +, hexdump +, hidapi +, icu +, libGL +, libGLU +, libevdev +, libjpeg +, libpcap +, libpng +, libvorbis +, libzip +, makeWrapper +, nasm +, openssl +, pcre +, pkg-config +, portaudio +, python27 +, python3 +, retroarch +, sfml +, snappy +, udev +, which +, xorg +, zlib +}: let - - d2u = lib.replaceChars ["-"] ["_"]; - - mkLibRetroCore = { core, src, description, license, broken ? false, version ? "2020-03-06", ... }@a: - lib.makeOverridable stdenv.mkDerivation ((rec { - - name = "libretro-${a.core}-${version}"; - inherit version; - inherit (a) src; - - buildInputs = [ zlib ] ++ a.extraBuildInputs or []; - nativeBuildInputs = [ makeWrapper ] ++ a.extraNativeBuildInputs or []; - - makefile = "Makefile.libretro"; - makeFlags = [ - "platform=${{ - linux = "unix"; - darwin = "osx"; - windows = "win"; - }.${stdenv.hostPlatform.parsed.kernel.name} or stdenv.hostPlatform.parsed.kernel.name}" - "ARCH=${{ - armv7l = "arm"; - armv6l = "arm"; - i686 = "x86"; - }.${stdenv.hostPlatform.parsed.cpu.name} or stdenv.hostPlatform.parsed.cpu.name}" - ] ++ (a.makeFlags or []); - - installPhase = '' - COREDIR="$out/lib/retroarch/cores" - mkdir -p $out/bin - mkdir -p $COREDIR - mv ${d2u a.core}_libretro${stdenv.hostPlatform.extensions.sharedLibrary} $COREDIR - makeWrapper ${retroarch}/bin/retroarch $out/bin/retroarch-${core} \ - --add-flags "-L $COREDIR/${d2u core}_libretro${stdenv.hostPlatform.extensions.sharedLibrary} $@" - ''; - - passthru = { - inherit (a) core; - libretroCore = "/lib/retroarch/cores"; - }; - - meta = with lib; { - inherit (a) description license; - broken = a.broken or false; - homepage = "https://www.libretro.com/"; - maintainers = with maintainers; [ edwtjo hrdinka MP2E ]; - platforms = platforms.unix; - }; - }) // builtins.removeAttrs a ["core" "src" "description" "license" "makeFlags"]); - - fetchRetro = { repo, rev, sha256 }: - fetchgit { - inherit rev sha256; - url = "https://github.com/libretro/${repo}.git"; - fetchSubmodules = true; - }; - -in with lib.licenses; - + d2u = lib.replaceChars [ "-" ] [ "_" ]; + + hashesFile = builtins.fromJSON (builtins.readFile ./hashes.json); + + getCoreSrc = core: + fetchFromGitHub (builtins.getAttr core hashesFile); + + mkLibRetroCore = + { core + , description + , license + , src ? null + , broken ? false + , version ? "unstable-2021-11-16" + , ... + }@args: + lib.makeOverridable stdenv.mkDerivation ( + let + finalSrc = if src == null then getCoreSrc core else src; + in + (rec { + pname = "libretro-${core}"; + inherit version; + src = finalSrc; + + buildInputs = [ zlib ] ++ args.extraBuildInputs or [ ]; + nativeBuildInputs = [ makeWrapper ] ++ args.extraNativeBuildInputs or [ ]; + + makefile = "Makefile.libretro"; + makeFlags = [ + "platform=${{ + linux = "unix"; + darwin = "osx"; + windows = "win"; + }.${stdenv.hostPlatform.parsed.kernel.name} or stdenv.hostPlatform.parsed.kernel.name}" + "ARCH=${{ + armv7l = "arm"; + armv6l = "arm"; + i686 = "x86"; + }.${stdenv.hostPlatform.parsed.cpu.name} or stdenv.hostPlatform.parsed.cpu.name}" + ] ++ (args.makeFlags or [ ]); + + installPhase = '' + COREDIR="$out/lib/retroarch/cores" + mkdir -p $out/bin + mkdir -p $COREDIR + mv ${d2u args.core}_libretro${stdenv.hostPlatform.extensions.sharedLibrary} $COREDIR + makeWrapper ${retroarch}/bin/retroarch $out/bin/retroarch-${core} \ + --add-flags "-L $COREDIR/${d2u core}_libretro${stdenv.hostPlatform.extensions.sharedLibrary} $@" + ''; + + passthru = { + inherit core; + libretroCore = "/lib/retroarch/cores"; + }; + + meta = with lib; { + inherit broken description license; + homepage = "https://www.libretro.com/"; + maintainers = with maintainers; [ edwtjo hrdinka MP2E thiagokokada ]; + platforms = platforms.unix; + }; + }) // builtins.removeAttrs args [ "core" "src" "description" "license" "makeFlags" ] + ); +in { - - atari800 = mkLibRetroCore rec { + atari800 = mkLibRetroCore { core = "atari800"; - src = fetchRetro { - repo = "libretro-" + core; - rev = "f9bf53b864344b8bbe8d425ed2f3c628eb10519c"; - sha256 = "0sgk93zs423pwiqzvj0x1gfwcn9gacnlrrdq53ps395k64lig6lk"; - }; description = "Port of Atari800 to libretro"; - license = gpl2; + license = lib.licenses.gpl2Only; makefile = "Makefile"; makeFlags = [ "GIT_VERSION=" ]; }; beetle-snes = mkLibRetroCore { core = "mednafen-snes"; - src = fetchRetro { - repo = "beetle-bsnes-libretro"; - rev = "de22d8420ea606f1b2f72afd4dda34619cf2cc20"; - sha256 = "1nd4f8frmlhp1lyxz9zpxvwwz70x0i0rrp560cn9qlm1jzdv3xvf"; - }; + src = getCoreSrc "beetle-snes"; description = "Port of Mednafen's SNES core to libretro"; - license = gpl2; + license = lib.licenses.gpl2Only; makefile = "Makefile"; }; beetle-gba = mkLibRetroCore { core = "mednafen-gba"; - src = fetchRetro { - repo = "beetle-gba-libretro"; - rev = "135afdbb9591655a3e016b75abba07e481f6d406"; - sha256 = "0fc0x24qn4y7pz3mp1mm1ain31aj9pznp1irr0k7hvazyklzy9g3"; - }; + src = getCoreSrc "beetle-gba"; description = "Port of Mednafen's GameBoy Advance core to libretro"; - license = gpl2; + license = lib.licenses.gpl2Only; makefile = "Makefile"; }; beetle-lynx = mkLibRetroCore { core = "mednafen-lynx"; - src = fetchRetro { - repo = "beetle-lynx-libretro"; - rev = "74dde204c0ec6c4bc4cd7821c14548387fbd9ce8"; - sha256 = "05kwibjr30laalqzazswvmn9smm3mwqsz1i0z1s0pj7idfdhjfw0"; - }; + src = getCoreSrc "beetle-lynx"; description = "Port of Mednafen's Lynx core to libretro"; - license = gpl2; + license = lib.licenses.gpl2Only; makefile = "Makefile"; }; beetle-ngp = mkLibRetroCore { core = "mednafen-ngp"; - src = fetchRetro { - repo = "beetle-ngp-libretro"; - rev = "6f15532b6ad17a2d5eb9dc8241d6af62416e796b"; - sha256 = "05r8mk9rc19nzs3gpfsjr6i7pm6xx3gn3b4xs8ab7v4vcmfg4cn2"; - }; + src = getCoreSrc "beetle-ngp"; description = "Port of Mednafen's NeoGeo Pocket core to libretro"; - license = gpl2; + license = lib.licenses.gpl2Only; makefile = "Makefile"; }; - beetle-pce-fast = let der = mkLibRetroCore { + beetle-pce-fast = mkLibRetroCore { core = "mednafen-pce-fast"; - src = fetchRetro { - repo = "beetle-pce-fast-libretro"; - rev = "40a42b7f43f029760c92bf0b2097e7d4b90ed29c"; - sha256 = "1gr6wg4bd4chm4c39w0c1b5zfzr05zd7234vvlmr1imk0v6m0wj6"; - }; + src = getCoreSrc "beetle-pce-fast"; description = "Port of Mednafen's PC Engine core to libretro"; - license = gpl2; + license = lib.licenses.gpl2Only; makefile = "Makefile"; - }; in der.override { - name = "beetle-pce-fast-${der.version}"; }; - beetle-pcfx = mkLibRetroCore rec { + beetle-pcfx = mkLibRetroCore { core = "mednafen-pcfx"; - src = fetchRetro { - repo = "beetle-pcfx-libretro"; - rev = "7bba6699d6f903bd701b0aa525d845de8427fee6"; - sha256 = "1lh7dh96fyi005fcg3xaf7r4ssgkq840p6anldlqy52vfwmglw3p"; - }; + src = getCoreSrc "beetle-pcfx"; description = "Port of Mednafen's PCFX core to libretro"; - license = gpl2; + license = lib.licenses.gpl2Only; makefile = "Makefile"; }; - beetle-psx = let der = (mkLibRetroCore { + beetle-psx = mkLibRetroCore { core = "mednafen-psx"; - src = fetchRetro { - repo = "beetle-psx-libretro"; - rev = "0f1e7e60827cad49ebba628abdc83ad97652ab89"; - sha256 = "1j92jgddyl970v775d6gyb50l8md6yfym2fpqhfxcr4gj1b4ivwq"; - }; + src = getCoreSrc "beetle-psx"; description = "Port of Mednafen's PSX Engine core to libretro"; - license = gpl2; + license = lib.licenses.gpl2Only; makefile = "Makefile"; makeFlags = [ "HAVE_HW=0" "HAVE_LIGHTREC=1" ]; - }); in der.override { - name = "beetle-psx-${der.version}"; }; - beetle-psx-hw = let der = (mkLibRetroCore { + beetle-psx-hw = mkLibRetroCore { core = "mednafen-psx-hw"; - src = fetchRetro { - repo = "beetle-psx-libretro"; - rev = "0f1e7e60827cad49ebba628abdc83ad97652ab89"; - sha256 = "1j92jgddyl970v775d6gyb50l8md6yfym2fpqhfxcr4gj1b4ivwq"; - }; + src = getCoreSrc "beetle-psx"; description = "Port of Mednafen's PSX Engine (with HW accel) core to libretro"; - license = gpl2; + license = lib.licenses.gpl2Only; extraBuildInputs = [ libGL libGLU ]; makefile = "Makefile"; makeFlags = [ "HAVE_VULKAN=1" "HAVE_OPENGL=1" "HAVE_HW=1" "HAVE_LIGHTREC=1" ]; - }); in der.override { - name = "beetle-psx-hw-${der.version}"; }; - beetle-saturn = let der = (mkLibRetroCore { + beetle-saturn = mkLibRetroCore { core = "mednafen-saturn"; - src = fetchRetro { - repo = "beetle-saturn-libretro"; - rev = "8a65943bb7bbc3183eeb0d57c4ac3e663f1bcc11"; - sha256 = "1f0cd9wmvarsmf4jw0p6h3lbzs6515aja7krrwapja7i4xmgbrnh"; - }; + src = getCoreSrc "beetle-saturn"; description = "Port of Mednafen's Saturn core to libretro"; - license = gpl2; + license = lib.licenses.gpl2Only; makefile = "Makefile"; makeFlags = [ "HAVE_HW=0" ]; meta.platforms = [ "x86_64-linux" "aarch64-linux" ]; - }); in der.override { - name = "beetle-saturn-${der.version}"; }; - beetle-saturn-hw = let der = (mkLibRetroCore { + beetle-saturn-hw = mkLibRetroCore { core = "mednafen-saturn-hw"; - src = fetchRetro { - repo = "beetle-saturn-libretro"; - rev = "8a65943bb7bbc3183eeb0d57c4ac3e663f1bcc11"; - sha256 = "1f0cd9wmvarsmf4jw0p6h3lbzs6515aja7krrwapja7i4xmgbrnh"; - }; + src = getCoreSrc "beetle-saturn"; description = "Port of Mednafen's Saturn core to libretro"; - license = gpl2; + license = lib.licenses.gpl2Only; extraBuildInputs = [ libGL libGLU ]; makefile = "Makefile"; makeFlags = [ "HAVE_OPENGL=1" "HAVE_HW=1" ]; meta.platforms = [ "x86_64-linux" "aarch64-linux" ]; - }); in der.override { - name = "beetle-saturn-${der.version}"; }; - beetle-supergrafx = mkLibRetroCore rec { + beetle-supergrafx = mkLibRetroCore { core = "mednafen-supergrafx"; - src = fetchRetro { - repo = "beetle-supergrafx-libretro"; - rev = "fadef23d59fa5ec17bc99e1e722cfd9e10535695"; - sha256 = "15rm7p5q38qy3xpyvamhphjnna8h91fsbcqnl9vhzx9cmjg0wf54"; - }; + src = getCoreSrc "beetle-supergrafx"; description = "Port of Mednafen's SuperGrafx core to libretro"; - license = gpl2; + license = lib.licenses.gpl2Only; makefile = "Makefile"; }; - beetle-wswan = mkLibRetroCore rec { + beetle-wswan = mkLibRetroCore { core = "mednafen-wswan"; - src = fetchRetro { - repo = "beetle-wswan-libretro"; - rev = "5b03d1b09f70dc208387d3c8b59e12e1f0d2692f"; - sha256 = "1sm6ww3y9m85lhp74dpxbs05yxdhhqqmj2022j9s0m235z29iygc"; - }; + src = getCoreSrc "beetle-wswan"; description = "Port of Mednafen's WonderSwan core to libretro"; - license = gpl2; + license = lib.licenses.gpl2Only; makefile = "Makefile"; }; - beetle-vb = mkLibRetroCore rec { + beetle-vb = mkLibRetroCore { core = "mednafen-vb"; - src = fetchRetro { - repo = "beetle-vb-libretro"; - rev = "9a4e604a7320a3c6ed30601989fe0bc417fa9ad3"; - sha256 = "1gallwbqxn5qbmwxr1vxb41nncksai4rxc739a7vqvp65k5kl0qp"; - }; + src = getCoreSrc "beetle-vb"; description = "Port of Mednafen's VirtualBoy core to libretro"; - license = gpl2; + license = lib.licenses.gpl2Only; makefile = "Makefile"; }; - bluemsx = mkLibRetroCore rec { + bluemsx = mkLibRetroCore { core = "bluemsx"; - src = fetchRetro { - repo = core + "-libretro"; - rev = "7a1d40e750860580ab7cc21fbc244b5bc6db6586"; - sha256 = "05hnkyr47djccspr8v438zimdfsgym7v0jn1hwpkqc4i5zf70981"; - }; description = "Port of BlueMSX to libretro"; - license = gpl2; + license = lib.licenses.gpl2Only; }; - bsnes-mercury = let bname = "bsnes-mercury"; in mkLibRetroCore { - core = bname + "-accuracy"; - src = fetchRetro { - repo = bname; - rev = "4a382621da58ae6da850f1bb003ace8b5f67968c"; - sha256 = "0z8psz24nx8497vpk2wya9vs451rzzw915lkw3qiq9bzlzg9r2wv"; - }; + bsnes-mercury = mkLibRetroCore { + core = "bsnes-mercury-accuracy"; + src = getCoreSrc "bsnes-mercury"; description = "Fork of bsnes with HLE DSP emulation restored"; - license = gpl3; + license = lib.licenses.gpl3Only; makefile = "Makefile"; - postBuild = "cd out"; + makeFlags = [ "PROFILE=accuracy" ]; }; - citra = mkLibRetroCore rec { + citra = mkLibRetroCore { core = "citra"; - src = fetchgit { - url = "https://github.com/libretro/citra.git"; - rev = "84f31e95160b029e6d614053705054ed6a34bb38"; - sha256 = "0gkgxpwrh0q098cpx56hprvmazi5qi448c23svwa8ar1myh8p248"; - fetchSubmodules = true; + # `nix-prefetch-github` doesn't support `deepClone`, necessary for citra + # https://github.com/seppeljordan/nix-prefetch-github/issues/41 + src = fetchFromGitHub { + inherit (hashesFile.citra) owner repo rev fetchSubmodules; deepClone = true; + sha256 = "sha256-bwnYkMvbtRF5bGZRYVtMWxnCu9P45qeX4+ntOj9eRds="; }; description = "Port of Citra to libretro"; - license = gpl2Plus; + license = lib.licenses.gpl2Plus; extraNativeBuildInputs = [ cmake pkg-config ]; extraBuildInputs = [ libGLU libGL boost ]; makefile = "Makefile"; @@ -302,52 +266,41 @@ in with lib.licenses; postBuild = "cd src/citra_libretro"; }; - desmume = mkLibRetroCore rec { + desmume = mkLibRetroCore { core = "desmume"; - src = fetchRetro { - repo = core; - rev = "e8cf461f83eebb195f09e70090f57b07d1bcdd9f"; - sha256 = "0rc8s5226wn39jqs5yxi30jc1snc0p106sfym7kgi98hy5na8yab"; - }; description = "libretro wrapper for desmume NDS emulator"; - license = gpl2; + license = lib.licenses.gpl2Plus; extraBuildInputs = [ libpcap libGLU libGL xorg.libX11 ]; preBuild = "cd desmume/src/frontend/libretro"; makeFlags = lib.optional stdenv.hostPlatform.isAarch32 "platform=armv-unix" - ++ lib.optional (!stdenv.hostPlatform.isx86) "DESMUME_JIT=0"; + ++ lib.optional (!stdenv.hostPlatform.isx86) "DESMUME_JIT=0"; }; - desmume2015 = mkLibRetroCore rec { + desmume2015 = mkLibRetroCore { core = "desmume2015"; - src = fetchRetro { - repo = core; - rev = "93d5789d60f82436e20ccad05ce9cb43c6e3656e"; - sha256 = "12nii2pbnqgh7f7jkphbwjpr2hiy2mzbwpas3xyhpf9wpy3qiasg"; - }; description = "libretro wrapper for desmume NDS emulator from 2015"; - license = gpl2; + license = lib.licenses.gpl2Plus; extraBuildInputs = [ libpcap libGLU libGL xorg.libX11 ]; makeFlags = lib.optional stdenv.hostPlatform.isAarch32 "platform=armv-unix" - ++ lib.optional (!stdenv.hostPlatform.isx86) "DESMUME_JIT=0"; + ++ lib.optional (!stdenv.hostPlatform.isx86) "DESMUME_JIT=0"; preBuild = "cd desmume"; }; dolphin = mkLibRetroCore { core = "dolphin"; - version = "2021-11-01"; - src = fetchRetro { - repo = "dolphin"; - rev = "3370f7693be95c23ac779e5172ff52b7eb2861a7"; - sha256 = "0ylxi25kbv0h2p24aid7z4i0w6drf7h92q02hjdl3h3gni98lk9i"; - }; description = "Port of Dolphin to libretro"; - license = gpl2Plus; + license = lib.licenses.gpl2Plus; extraNativeBuildInputs = [ cmake curl pkg-config ]; extraBuildInputs = [ - libGLU libGL pcre sfml - gettext hidapi - libevdev udev + libGLU + libGL + pcre + sfml + gettext + hidapi + libevdev + udev ] ++ (with xorg; [ libSM libX11 libXi libpthreadstubs libxcb xcbutil libXext libXrandr libXinerama libXxf86vm ]); makefile = "Makefile"; cmakeFlags = [ @@ -362,48 +315,29 @@ in with lib.licenses; dontUseCmakeBuildDir = true; }; - dosbox = mkLibRetroCore rec { + dosbox = mkLibRetroCore { core = "dosbox"; - src = fetchRetro { - repo = core + "-libretro"; - rev = "e4ed503b14ed59d5d745396ef1cc7d52cf912328"; - sha256 = "13bx0ln9hwn6hy4sv0ivqmjgjbfq8svx15dsa24hwd8lkf0kakl4"; - }; description = "Port of DOSBox to libretro"; - license = gpl2; + license = lib.licenses.gpl2Only; }; - eightyone = mkLibRetroCore rec { + eightyone = mkLibRetroCore { core = "81"; - src = fetchRetro { - repo = core + "-libretro"; - rev = "4352130bd2363954262a804b086f86b9d13d97f9"; - sha256 = "057ynnv85imjqhgixrx7p28wn42v88vsm3fc1lp3mpcfi2bk266h"; - }; + src = getCoreSrc "eightyone"; description = "Port of EightyOne to libretro"; - license = gpl3; + license = lib.licenses.gpl3Only; }; - fbalpha2012 = mkLibRetroCore rec { + fbalpha2012 = mkLibRetroCore { core = "fbalpha2012"; - src = fetchRetro { - repo = core; - rev = "fa97cd2784a337f8ac774c2ce8a136aee69b5f43"; - sha256 = "1i75k0r6838hl77bjjmzvan33ka5qjrdpirmclzj20g5j97lmas7"; - }; description = "Port of Final Burn Alpha ~2012 to libretro"; license = "Non-commercial"; makefile = "makefile.libretro"; preBuild = "cd svn-current/trunk"; }; - fbneo = mkLibRetroCore rec { + fbneo = mkLibRetroCore { core = "fbneo"; - src = fetchRetro { - repo = core; - rev = "cf43fdb1755f9f5c886266e86ba40d339bc8f5d7"; - sha256 = "13g3c6mbwhcf0rp95ga4klszh8dab2d4ahh2vzzlmd57r69lf2lv"; - }; description = "Port of FBNeo to libretro"; license = "Non-commercial"; makefile = "Makefile"; @@ -414,123 +348,73 @@ in with lib.licenses; makeFlags = [ "USE_EXPERIMENTAL_FLAGS=1" ]; }; - fceumm = mkLibRetroCore rec { + fceumm = mkLibRetroCore { core = "fceumm"; - src = fetchRetro { - repo = "libretro-" + core; - rev = "9ed22e5a9a1360a7f599a64283af9fe24b858e3d"; - sha256 = "0rz6iy281jpybmsz5rh06k5xvmd9id9w2q2gd0qdv9a2ylwv7s2j"; - }; description = "FCEUmm libretro port"; - license = gpl2; + license = lib.licenses.gpl2Only; }; - flycast = mkLibRetroCore rec { + flycast = mkLibRetroCore { core = "flycast"; - src = fetchRetro { - repo = core; - rev = "b12f3726d9093acb4e441b1cdcf6cd11403c8644"; - sha256 = "0nczjhdqr7svq9aflczf7rwz64bih1wqy9q0gyglb55xlslf5jqc"; - }; description = "Flycast libretro port"; - license = gpl2; + license = lib.licenses.gpl2Only; extraBuildInputs = [ libGL libGLU ]; makefile = "Makefile"; makeFlags = lib.optional stdenv.hostPlatform.isAarch64 [ "platform=arm64" ]; meta.platforms = [ "aarch64-linux" "x86_64-linux" ]; }; - fmsx = mkLibRetroCore rec { + fmsx = mkLibRetroCore { core = "fmsx"; - src = fetchRetro { - repo = core + "-libretro"; - rev = "3de916bbf15062de1ab322432d38a1fee29d5e68"; - sha256 = "1krr4lmdiv0d7bxk37fqz5y412znb5bmxapv9g7ci6fp87sr69jq"; - }; description = "FMSX libretro port"; license = "Non-commercial"; makefile = "Makefile"; }; - freeintv = mkLibRetroCore rec { + freeintv = mkLibRetroCore { core = "freeintv"; - src = fetchRetro { - repo = core; - rev = "45030e10cc1a50cf7a80c5d921aa8cba0aeaca91"; - sha256 = "10lngk3p012bgrg752426701hfzsiy359h8i0vzsa64pgyjbqlag"; - }; description = "FreeIntv libretro port"; - license = gpl3; + license = lib.licenses.gpl3Only; makefile = "Makefile"; }; - gambatte = mkLibRetroCore rec { + gambatte = mkLibRetroCore { core = "gambatte"; - src = fetchRetro { - repo = core + "-libretro"; - rev = "132f36e990dfc6effdafa6cf261373432464f9bf"; - sha256 = "19w5k9yc1cl99c5hiqbp6j54g6z06xcblpvd3x6nmhxij81yqxy7"; - }; description = "Gambatte libretro port"; - license = gpl2; + license = lib.licenses.gpl2Only; }; genesis-plus-gx = mkLibRetroCore { core = "genesis-plus-gx"; - src = fetchRetro { - repo = "Genesis-Plus-GX"; - rev = "50551066f71f8a5ea782ea3747891fd6d24ebe67"; - sha256 = "150lgdrv7idcq7jbd1jj7902rcsyixd7kfjs2m5xdinjvl22kihr"; - }; description = "Enhanced Genesis Plus libretro port"; license = "Non-commercial"; }; - gpsp = mkLibRetroCore rec { + gpsp = mkLibRetroCore { core = "gpsp"; - src = fetchRetro { - repo = core; - rev = "3f2f57c982ffead643957db5b26931df4913596f"; - sha256 = "09fa1c623rmy1w9zx85r75viv8q1vknhbs8fn6xbss9rhpxhivwg"; - }; description = "Port of gpSP to libretro"; - license = gpl2; + license = lib.licenses.gpl2Only; makefile = "Makefile"; }; - gw = mkLibRetroCore rec { + gw = mkLibRetroCore { core = "gw"; - src = fetchRetro { - repo = core + "-libretro"; - rev = "819b1dde560013003eeac86c2069c5be7af25c6d"; - sha256 = "1jhgfys8hiipvbwq3gc48d7v6wq645d10rbr4w5m6px0fk6csshk"; - }; description = "Port of Game and Watch to libretro"; license = lib.licenses.zlib; makefile = "Makefile"; }; - handy = mkLibRetroCore rec { + handy = mkLibRetroCore { core = "handy"; - src = fetchRetro { - repo = "libretro-" + core; - rev = "c9fe65d1a2df454ee11404ac27bdc9be319dd9a2"; - sha256 = "1l1gi8z68mv2cpdy7a6wvhd86q55khj3mv3drf43ak4kj2ij8cvq"; - }; description = "Port of Handy to libretro"; - license = "Handy-License"; + license = lib.licenses.zlib; makefile = "Makefile"; }; - hatari = mkLibRetroCore rec { + hatari = mkLibRetroCore { core = "hatari"; - src = fetchRetro { - repo = core; - rev = "ec1b59c4b6c7ca7d0d23d60cfe2cb61911b11173"; - sha256 = "1pm821s2cz93xr7qx7dv0imr44bi4pvdvlnjl486p83vff9yawfg"; - }; description = "Port of Hatari to libretro"; - license = gpl2; + license = lib.licenses.gpl2Only; extraBuildInputs = [ SDL zlib ]; extraNativeBuildInputs = [ cmake which ]; dontUseCmakeConfigure = true; @@ -541,15 +425,10 @@ in with lib.licenses; mame = mkLibRetroCore { core = "mame"; - src = fetchRetro { - repo = "mame"; - rev = "ed987ad07964a938351ff3cc1ad42e02ffd2af6d"; - sha256 = "0qc66mvraffx6ws972skx3wgblich17q6z42798qn13q1a264p4j"; - }; description = "Port of MAME to libretro"; - license = gpl2Plus; + license = with lib.licenses; [ bsd3 gpl2Plus ]; - extraBuildInputs = [ alsa-lib libGLU libGL portaudio python27 xorg.libX11 ]; + extraBuildInputs = [ alsa-lib libGLU libGL portaudio python3 xorg.libX11 ]; postPatch = '' # Prevent the failure during the parallel building of: # make -C 3rdparty/genie/build/gmake.linux -f genie.make obj/Release/src/host/lua-5.3.0/src/lgc.o @@ -558,77 +437,47 @@ in with lib.licenses; makefile = "Makefile.libretro"; }; - mame2000 = mkLibRetroCore rec { + mame2000 = mkLibRetroCore { core = "mame2000"; - src = fetchRetro { - repo = core + "-libretro"; - rev = "e5d4a934c60adc6d42a3f87319312aad89595a15"; - sha256 = "1zn63yqyrsnsk196v5f3nm7cx41mvsm3icpis1yxbma2r3dk3f89"; - }; description = "Port of MAME ~2000 to libretro"; - license = gpl2Plus; + license = "MAME"; makefile = "Makefile"; makeFlags = lib.optional (!stdenv.hostPlatform.isx86) "IS_X86=0"; }; - mame2003 = mkLibRetroCore rec { + mame2003 = mkLibRetroCore { core = "mame2003"; - src = fetchRetro { - repo = core + "-libretro"; - rev = "82596014905ad38c80c9eb322ab08c625d1d92cd"; - sha256 = "17dp2rz6p7q7nr0lajn3vhk9ghngxz16f7c6c87r6wgsy4y3xw0m"; - }; description = "Port of MAME ~2003 to libretro"; - license = gpl2Plus; + license = "MAME"; makefile = "Makefile"; }; - mame2003-plus = mkLibRetroCore rec { + mame2003-plus = mkLibRetroCore { core = "mame2003-plus"; - src = fetchRetro { - repo = core + "-libretro"; - rev = "0134c428b75882aa474f78dbbf2c6ecde49b97b7"; - sha256 = "0jln2ys6v9hrsrkhqd87jfslwvkca425f40mf7866g6b4pz56mwc"; - }; description = "Port of MAME ~2003+ to libretro"; - license = gpl2Plus; + license = "MAME"; makefile = "Makefile"; }; - mame2010 = mkLibRetroCore rec { + mame2010 = mkLibRetroCore { core = "mame2010"; - src = fetchRetro { - repo = core + "-libretro"; - rev = "d3151837758eade73c85c28c20e7d2a8706f30c6"; - sha256 = "0hj0yhc8zs32fkzn8j341ybhvrsknv0k6x0z2fv3l9ic7swgb93i"; - }; description = "Port of MAME ~2010 to libretro"; - license = gpl2Plus; + license = "MAME"; makefile = "Makefile"; makeFlags = lib.optionals stdenv.hostPlatform.isAarch64 [ "PTR64=1" "ARM_ENABLED=1" "X86_SH2DRC=0" "FORCE_DRC_C_BACKEND=1" ]; }; - mame2015 = mkLibRetroCore rec { + mame2015 = mkLibRetroCore { core = "mame2015"; - src = fetchRetro { - repo = core + "-libretro"; - rev = "37333ed6fda4c798a1d6b055fe4708f9f0dcf5a7"; - sha256 = "1asldlj1ywgmhabbhaagagg5hn0359122al07802q3l57ns41l64"; - }; description = "Port of MAME ~2015 to libretro"; - license = gpl2Plus; + license = "MAME"; extraNativeBuildInputs = [ python27 ]; extraBuildInputs = [ alsa-lib ]; makefile = "Makefile"; }; - mame2016 = mkLibRetroCore rec { + mame2016 = mkLibRetroCore { core = "mame2016"; - src = fetchRetro { - repo = core + "-libretro"; - rev = "02987af9b81a9c3294af8fb9d5a34f9826a2cf4d"; - sha256 = "0gl7irmn5d8lk7kf484vgw6kb325fq4ghwsni3il4nm5n2a8yglh"; - }; patches = [ (fetchpatch { name = "fix_mame_build_on_make-4.3.patch"; @@ -637,7 +486,7 @@ in with lib.licenses; }) ]; description = "Port of MAME ~2016 to libretro"; - license = gpl2Plus; + license = with lib.licenses; [ bsd3 gpl2Plus ]; extraNativeBuildInputs = [ python27 ]; extraBuildInputs = [ alsa-lib ]; postPatch = '' @@ -647,136 +496,86 @@ in with lib.licenses; ''; }; - mesen = mkLibRetroCore rec { + mesen = mkLibRetroCore { core = "mesen"; - src = fetchFromGitHub { - owner = "SourMesen"; - repo = core; - rev = "cfc5bf6976f62ebd42ea30d5a803c138fc357509"; - sha256 = "0ihlgvzvni1yqcyi5yxdvg36q20fsqd6n67zavwfb2ph09cqv7kz"; - }; description = "Port of Mesen to libretro"; - license = gpl3; + license = lib.licenses.gpl3Only; makefile = "Makefile"; preBuild = "cd Libretro"; }; - meteor = mkLibRetroCore rec { + meteor = mkLibRetroCore { core = "meteor"; - src = fetchRetro { - repo = core + "-libretro"; - rev = "3d21e3b5a7596918bee0fcaca5752ae76624c05e"; - sha256 = "0fghnxxbdrkdz6zswkd06w2r3dvr4ikvcp8jbr7nb9fc5yzn0avw"; - }; description = "Port of Meteor to libretro"; - license = gpl3; + license = lib.licenses.gpl3Only; makefile = "Makefile"; preBuild = "cd libretro"; }; - mgba = mkLibRetroCore rec { + mgba = mkLibRetroCore { core = "mgba"; - src = fetchRetro { - repo = core; - rev = "f87f9ef6cb38537e07dcaedeb82aecac6537d42e"; - sha256 = "0yixvnzgk7qvcfz12r5y8i85czqxbxx6bvl1c7yms8riqn9ssvb7"; - }; description = "Port of mGBA to libretro"; - license = mpl20; + license = lib.licenses.mpl20; }; mupen64plus = mkLibRetroCore { core = "mupen64plus-next"; - src = fetchRetro { - repo = "mupen64plus-libretro-nx"; - rev = "81a58df0263c90b10b7fc11b6deee04d47e3aa40"; - sha256 = "1brqyrsdzdq53a68q7ph01q2bx5y4m8b3ymvpp25229imm88lgkn"; - }; + src = getCoreSrc "mupen64plus"; description = "Libretro port of Mupen64 Plus, GL only"; - license = gpl2; + license = lib.licenses.gpl3Only; extraBuildInputs = [ libGLU libGL libpng nasm xorg.libX11 ]; makefile = "Makefile"; }; - neocd = mkLibRetroCore rec { + neocd = mkLibRetroCore { core = "neocd"; - src = fetchRetro { - repo = core + "_libretro"; - rev = "3825848fe7dd7e0ef859729eefcb29e2ea2956b7"; - sha256 = "018vfmjsx62zk45yx3pwisp4j133yxjbm7fnwwr244gnyms57711"; - }; description = "NeoCD libretro port"; - license = gpl3; + license = lib.licenses.lgpl3Only; makefile = "Makefile"; }; - nestopia = mkLibRetroCore rec { + nestopia = mkLibRetroCore { core = "nestopia"; - src = fetchRetro { - repo = core; - rev = "70c53f08c0cc92e90d095d6558ab737ce20431ac"; - sha256 = "1hlfqml66wy6fn40f1iiy892vq9y9fj20vv3ynd2s3b3qxhwfx73"; - }; description = "Nestopia libretro port"; - license = gpl2; + license = lib.licenses.gpl2Only; makefile = "Makefile"; preBuild = "cd libretro"; }; np2kai = mkLibRetroCore rec { core = "np2kai"; - src = fetchFromGitHub rec { - owner = "AZO234"; - repo = "NP2kai"; - rev = "4a317747724669343e4c33ebdd34783fb7043221"; - sha256 = "0kxysxhx6jyk82mx30ni0ydzmwdcbnlxlnarrlq018rsnwb4md72"; - }; + src = getCoreSrc core; description = "Neko Project II kai libretro port"; - license = mit; + license = lib.licenses.mit; makefile = "Makefile.libretro"; - preBuild = '' - cd sdl2 - substituteInPlace ${makefile} \ - --replace 'GIT_VERSION :=' 'GIT_VERSION ?=' - export GIT_VERSION=${builtins.substring 0 7 src.rev} - ''; + makeFlags = [ + # See https://github.com/AZO234/NP2kai/tags + "NP2KAI_VERSION=rev.22" + "NP2KAI_HASH=${src.rev}" + ]; + preBuild = "cd sdl"; }; - o2em = mkLibRetroCore rec { + o2em = mkLibRetroCore { core = "o2em"; - src = fetchRetro { - repo = "libretro-" + core; - rev = "b23a796dd3490e979ff43710317df6d43bd661e1"; - sha256 = "1pkbq7nig394zdjdic0mzdsvx8xhzamsh53xh2hzznipyj46b7z0"; - }; description = "Port of O2EM to libretro"; - license = artistic1; + license = lib.licenses.artistic1; makefile = "Makefile"; }; - opera = mkLibRetroCore rec { + opera = mkLibRetroCore { core = "opera"; - src = fetchRetro { - repo = core + "-libretro"; - rev = "27bc2653ed469072a6a95102a8212a35fbb1e590"; - sha256 = "10cxjpsd35rb4fjc5ycs1h00gvshpn2mxxvwb6xzrfrzva0kjw1l"; - }; description = "Opera is a port of 4DO/libfreedo to libretro"; license = "Non-commercial"; makefile = "Makefile"; makeFlags = [ "CC_PREFIX=${stdenv.cc.targetPrefix}" ]; }; - parallel-n64 = mkLibRetroCore rec { + parallel-n64 = mkLibRetroCore { core = "parallel-n64"; - src = fetchRetro { - repo = core; - rev = "8fe07c62a364d0af1e22b7f75e839d42872dae7f"; - sha256 = "0p3fpldw6w4n4l60bv55c17vhqwq4q39fp36h8iqmnj7c32c61kf"; - }; description = "Parallel Mupen64plus rewrite for libretro."; - license = gpl2; + license = lib.licenses.gpl3Only; extraBuildInputs = [ libGLU libGL libpng ]; makefile = "Makefile"; postPatch = lib.optionalString stdenv.hostPlatform.isAarch64 '' @@ -785,44 +584,29 @@ in with lib.licenses; ''; }; - pcsx_rearmed = mkLibRetroCore rec { + pcsx_rearmed = mkLibRetroCore { core = "pcsx_rearmed"; - src = fetchRetro { - repo = core; - rev = "8fda5dd0e28fe46621fb1ab57781c316143017da"; - sha256 = "0k371d0xqzqwy8ishvxssgasm36q83qj7ksn2av110n879n4knwb"; - }; description = "Port of PCSX ReARMed with GNU lightning to libretro"; - license = gpl2; + license = lib.licenses.gpl2Only; dontConfigure = true; }; - picodrive = mkLibRetroCore rec { + picodrive = mkLibRetroCore { core = "picodrive"; - src = fetchRetro { - repo = core; - rev = "600894ec6eb657586a972a9ecd268f50907a279c"; - sha256 = "1bxphwnq4b80ssmairy8sfc5cp4m6jyvrcjcj63q1vk7cs6qls7p"; - }; description = "Fast MegaDrive/MegaCD/32X emulator"; license = "MAME"; extraBuildInputs = [ libpng SDL ]; SDL_CONFIG = "${SDL.dev}/bin/sdl-config"; dontAddPrefix = true; - configurePlatforms = []; + configurePlatforms = [ ]; makeFlags = lib.optional stdenv.hostPlatform.isAarch64 [ "platform=aarch64" ]; }; play = mkLibRetroCore { core = "play"; - src = fetchRetro { - repo = "play-"; - rev = "884ae3b96c631f235cd18b2643d1f318fa6951fb"; - sha256 = "0m9pk20jh4y02visgzfw64bpbw93bzs15x3a3bnd19yivm34dbfc"; - }; description = "Port of Play! to libretro"; - license = bsd2; + license = lib.licenses.bsd2; extraBuildInputs = [ boost ]; extraNativeBuildInputs = [ cmake openssl curl icu libGL libGLU xorg.libX11 ]; makefile = "Makefile"; @@ -832,22 +616,8 @@ in with lib.licenses; ppsspp = mkLibRetroCore { core = "ppsspp"; - src = fetchFromGitHub { - owner = "hrydgard"; - repo = "ppsspp"; - rev = "v1.11"; - fetchSubmodules = true; - sha256 = "sha256-vfp/vacIItlPP5dR7jzDT7oOUNFnjvvdR46yi79EJKU="; - }; - patches = [ - (fetchpatch { - name = "fix_ffmpeg_4.4.patch"; # to be removed with next release - url = "https://patch-diff.githubusercontent.com/raw/hrydgard/ppsspp/pull/14176.patch"; - sha256 = "sha256-ecDoOydaLfL6+eFpahcO1TnRl866mZZVHlr6Qrib1mo="; - }) - ]; description = "ppsspp libretro port"; - license = gpl2; + license = lib.licenses.gpl2Plus; extraNativeBuildInputs = [ cmake pkg-config python3 ]; extraBuildInputs = [ libGLU libGL libzip ffmpeg snappy xorg.libX11 ]; makefile = "Makefile"; @@ -855,114 +625,69 @@ in with lib.licenses; postBuild = "mv lib/ppsspp_libretro${stdenv.hostPlatform.extensions.sharedLibrary} ppsspp_libretro${stdenv.hostPlatform.extensions.sharedLibrary}"; }; - prboom = mkLibRetroCore rec { + prboom = mkLibRetroCore { core = "prboom"; - src = fetchRetro { - repo = "libretro-" + core; - rev = "991016b3c7a9c8b0e49b2bc9c72f68c60800fc7b"; - sha256 = "1abv9qgfvh3x84shgyl3y90bjz77mjj17vibag7bg6i8hgjikjgq"; - }; description = "Prboom libretro port"; - license = gpl2; + license = lib.licenses.gpl2Only; makefile = "Makefile"; }; - prosystem = mkLibRetroCore rec { + prosystem = mkLibRetroCore { core = "prosystem"; - src = fetchRetro { - repo = core + "-libretro"; - rev = "6f7e34aea89db5ba2fbf674e5ff0ad6fc68a198e"; - sha256 = "0pqkb0f51s8ma0l4m9xk2y85z2kh3fgay9g4g8fingbgqq1klvzs"; - }; description = "Port of ProSystem to libretro"; - license = gpl2; + license = lib.licenses.gpl2Only; makefile = "Makefile"; }; quicknes = mkLibRetroCore { core = "quicknes"; - src = fetchRetro { - repo = "QuickNES_Core"; - rev = "31654810b9ebf8b07f9c4dc27197af7714364ea7"; - sha256 = "15fr5a9hv7wgndb0fpmr6ws969him41jidzir2ix9xkb0mmvcm86"; - }; description = "QuickNES libretro port"; - license = lgpl21Plus; + license = lib.licenses.lgpl21Plus; makefile = "Makefile"; }; - sameboy = mkLibRetroCore rec { + sameboy = mkLibRetroCore { core = "sameboy"; - src = fetchRetro { - repo = "sameboy"; - rev = "c9e547c1063fd62c40a4b7a86e7db99dc9089051"; - sha256 = "0bff6gicm24d7h270aqvgd8il6mi7j689nj5zl9ij0wc77hrrpmq"; - }; description = "SameBoy libretro port"; - license = mit; + license = lib.licenses.mit; extraNativeBuildInputs = [ which hexdump ]; preBuild = "cd libretro"; makefile = "Makefile"; }; - scummvm = mkLibRetroCore rec { + scummvm = mkLibRetroCore { core = "scummvm"; - src = fetchRetro { - repo = core; - rev = "de91bf9bcbf4449f91e2f50fde173496a2b52ee0"; - sha256 = "06h9xaf2b1cjk85nbslpjj0fm9iy9b2lxr1wf3i09hgs4sh6x464"; - }; description = "Libretro port of ScummVM"; - license = gpl2; + license = lib.licenses.gpl2Only; extraBuildInputs = [ fluidsynth libjpeg libvorbis libGLU libGL SDL ]; makefile = "Makefile"; preConfigure = "cd backends/platform/libretro/build"; }; - smsplus-gx = mkLibRetroCore rec { + smsplus-gx = mkLibRetroCore { core = "smsplus"; - src = fetchRetro { - repo = core + "-gx"; - rev = "36c82768c03d889f1cf4b66369edac2297acba32"; - sha256 = "1f9waikyp7kp2abb76wlv9hmf2jpc76zjmfqyc7wk2pc70ljm3l4"; - }; + src = getCoreSrc "smsplus-gx"; description = "SMS Plus GX libretro port"; - license = gpl2Plus; + license = lib.licenses.gpl2Plus; }; - snes9x = mkLibRetroCore rec { + snes9x = mkLibRetroCore { core = "snes9x"; - src = fetchFromGitHub { - owner = "snes9xgit"; - repo = core; - rev = "bd9246ddd75a5e9f78d6189c8c57754d843630f7"; - sha256 = "10fm7ah3aha9lf4k9hgw0dlhdvshzpig2d0ylcb12gf9zz0i22ns"; - }; description = "Port of SNES9x git to libretro"; license = "Non-commercial"; makefile = "Makefile"; preBuild = "cd libretro"; }; - snes9x2002 = mkLibRetroCore rec { + snes9x2002 = mkLibRetroCore { core = "snes9x2002"; - src = fetchRetro { - repo = core; - rev = "a869da7f22c63ee1cb316f79c6dd7691a369da3e"; - sha256 = "11lcwscnxg6sk9as2xlr4nai051qhidbsymyis4nz3r4dmgzf8j8"; - }; description = "Optimized port/rewrite of SNES9x 1.39 to Libretro"; license = "Non-commercial"; makefile = "Makefile"; }; - snes9x2005 = mkLibRetroCore rec { + snes9x2005 = mkLibRetroCore { core = "snes9x2005"; - src = fetchRetro { - repo = core; - rev = "c216559b9e0dc3d7f059dcf31b813402ad47fea5"; - sha256 = "19b2rpj6i32c34ryvlna4yca84y5ypza78w4x9l17qlhp021h9pv"; - }; description = "Optimized port/rewrite of SNES9x 1.43 to Libretro"; license = "Non-commercial"; makefile = "Makefile"; @@ -970,66 +695,40 @@ in with lib.licenses; postBuild = "mv snes9x2005_plus_libretro${stdenv.hostPlatform.extensions.sharedLibrary} snes9x2005_libretro${stdenv.hostPlatform.extensions.sharedLibrary}"; }; - snes9x2010 = mkLibRetroCore rec { + snes9x2010 = mkLibRetroCore { core = "snes9x2010"; - src = fetchRetro { - repo = core; - rev = "ba9f2240360f8db270fb6ba5465c79c317070560"; - sha256 = "00y53sjrsp8sccpp1qqw88iawsz30g6d370cbqcxs4ya1r6awn5x"; - }; description = "Optimized port/rewrite of SNES9x 1.52+ to Libretro"; license = "Non-commercial"; }; - stella = mkLibRetroCore rec { + stella = mkLibRetroCore { core = "stella"; - src = fetchFromGitHub { - owner = "stella-emu"; - repo = core; - rev = "506bb0bd0618e676b1959931dcc00a9d0f5f0f3d"; - sha256 = "09nclx0ksixngnxkkjjcyhf3d0vl4ykm8fx7m307lvag8nxj7z03"; - }; description = "Port of Stella to libretro"; - license = gpl2; + license = lib.licenses.gpl2Only; extraBuildInputs = [ libpng pkg-config SDL ]; makefile = "Makefile"; preBuild = "cd src/libretro"; dontConfigure = true; }; - stella2014 = mkLibRetroCore rec { + stella2014 = mkLibRetroCore { core = "stella2014"; - src = fetchRetro { - repo = core + "-libretro"; - rev = "fc87f2c78d3b177f4b9b19698557dce452ac3ce7"; - sha256 = "0yqzavk1w0d0ngpls32c4wlihii97fz2g6zsgadhm48apwjvn3xx"; - }; description = "Port of Stella to libretro"; - license = gpl2; + license = lib.licenses.gpl2Only; makefile = "Makefile"; }; - tgbdual = mkLibRetroCore rec { + tgbdual = mkLibRetroCore { core = "tgbdual"; - src = fetchRetro { - repo = core + "-libretro"; - rev = "9be31d373224cbf288db404afc785df41e61b213"; - sha256 = "19m3f3hj3jyg711z1xq8qn1hgsr593krl6s6hi0r6vf8p5x0zbzw"; - }; description = "Port of TGBDual to libretro"; - license = gpl2; + license = lib.licenses.gpl2Only; makefile = "Makefile"; }; - thepowdertoy = mkLibRetroCore rec { + thepowdertoy = mkLibRetroCore { core = "thepowdertoy"; - src = fetchRetro { - repo = "ThePowderToy"; - rev = "0ff547e89ae9d6475b0226db76832daf03eec937"; - sha256 = "kDpmo/RPYRvROOX3AhsB5pIl0MfHbQmbyTMciLPDNew="; - }; description = "Port of The Powder Toy to libretro"; - license = gpl3Only; + license = lib.licenses.gpl3Only; extraNativeBuildInputs = [ cmake ]; makefile = "Makefile"; postBuild = "cd src/"; @@ -1037,14 +736,9 @@ in with lib.licenses; tic80 = mkLibRetroCore { core = "tic80"; - src = fetchRetro { - repo = "tic-80"; - rev = "f43bad908d5f05f2a66d5cd1d6f21b234d4abd2c"; - sha256 = "0bp34r8qqyw52alws1z4ib9j7bs4d641q6nvqszd07snp9lpvwym"; - }; description = "Port of TIC-80 to libretro"; - license = mit; - extraNativeBuildInputs = [ cmake pkg-config ]; + license = lib.licenses.mit; + extraNativeBuildInputs = [ cmake pkg-config libGL libGLU ]; makefile = "Makefile"; cmakeFlags = [ "-DBUILD_LIBRETRO=ON" @@ -1057,66 +751,42 @@ in with lib.licenses; postBuild = "cd lib"; }; - vba-next = mkLibRetroCore rec { + vba-next = mkLibRetroCore { core = "vba-next"; - src = fetchRetro { - repo = core; - rev = "019132daf41e33a9529036b8728891a221a8ce2e"; - sha256 = "0hab4rhvvcg30jifd9h9jq5q2vqk2hz5i1q456w6v2d10hl1lf15"; - }; description = "VBA-M libretro port with modifications for speed"; - license = gpl2; + license = lib.licenses.gpl2Only; }; - vba-m = mkLibRetroCore rec { + vba-m = mkLibRetroCore { core = "vbam"; - src = fetchRetro { - repo = core + "-libretro"; - rev = "7d88e045a2fe44e56b3f84846beec446b4c4b2d9"; - sha256 = "04f8adg99a36qkqhij54vkw5z18m5ld33p78lbmv8cxk7k7g7yhy"; - }; + src = getCoreSrc "vba-m"; description = "vanilla VBA-M libretro port"; - license = gpl2; + license = lib.licenses.gpl2Only; makefile = "Makefile"; preBuild = "cd src/libretro"; }; - vecx = mkLibRetroCore rec { + vecx = mkLibRetroCore { core = "vecx"; - src = fetchRetro { - repo = "libretro-" + core; - rev = "321205271b1c6be5dbdb8d309097a5b5c2032dbd"; - sha256 = "1w54394yhf2yqmq1b8wi5y7lvixc5hpjxpyiancrdbjd0af7pdvd"; - }; description = "Port of Vecx to libretro"; - license = gpl3; + license = lib.licenses.gpl3Only; + extraBuildInputs = [ libGL libGLU ]; }; - virtualjaguar = mkLibRetroCore rec { + virtualjaguar = mkLibRetroCore { core = "virtualjaguar"; - src = fetchRetro { - repo = core + "-libretro"; - rev = "a162fb75926f5509f187e9bfc69958bced40b0a6"; - sha256 = "06k8xpn5y9rzmi2lwfw0v9v9pz4wvmpalycc608bw9cl39lmz10h"; - }; description = "Port of VirtualJaguar to libretro"; - license = gpl3; + license = lib.licenses.gpl3Only; makefile = "Makefile"; }; - yabause = mkLibRetroCore rec { + yabause = mkLibRetroCore { core = "yabause"; - src = fetchRetro { - repo = core; - rev = "9be109f9032afa793d2a79b837c4cc232cea5929"; - sha256 = "0aj862bs4dmnldy62wdssj5l63ibfkbzqvkxcqa3wyvdz4i367jc"; - }; description = "Port of Yabause to libretro"; - license = gpl2; + license = lib.licenses.gpl2Only; makefile = "Makefile"; # Disable SSE for non-x86. DYNAREC doesn't build on either Aarch64 or x86_64. makeFlags = lib.optional (!stdenv.hostPlatform.isx86) "HAVE_SSE=0"; preBuild = "cd yabause/src/libretro"; }; - } diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix index f5db3d427f9ed..e4c09c3c8f6c0 100644 --- a/pkgs/misc/emulators/retroarch/default.nix +++ b/pkgs/misc/emulators/retroarch/default.nix @@ -22,12 +22,13 @@ with lib; stdenv.mkDerivation rec { pname = "retroarch-bare"; - version = "1.8.5"; + # FIXME: retroarch >=1.9.3 doesn't load the cores + version = "1.9.2"; src = fetchFromGitHub { owner = "libretro"; repo = "RetroArch"; - sha256 = "1pg8j9wvwgrzsv4xdai6i6jgdcc922v0m42rbqxvbghbksrc8la3"; + sha256 = "sha256-Dwv0hl+d99FbVMG4KnkjO1aYfAw0m4x+zvrbyb/wOX8="; rev = "v${version}"; }; @@ -55,8 +56,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://libretro.com"; description = "Multi-platform emulator frontend for libretro cores"; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.all; - maintainers = with maintainers; [ MP2E edwtjo matthewbauer kolbycrouch ]; + maintainers = with maintainers; [ MP2E edwtjo matthewbauer kolbycrouch thiagokokada ]; }; } diff --git a/pkgs/misc/emulators/retroarch/hashes.json b/pkgs/misc/emulators/retroarch/hashes.json new file mode 100644 index 0000000000000..a849a37bfab41 --- /dev/null +++ b/pkgs/misc/emulators/retroarch/hashes.json @@ -0,0 +1,513 @@ +{ + "atari800": { + "owner": "libretro", + "repo": "libretro-atari800", + "rev": "478a8ec99a7f8436a39d5ac193c5fe313233ee7b", + "sha256": "LJpRegJVR2+sS1UmTTpVest0rMrNDBMXmj/jRFVglWI=", + "fetchSubmodules": false + }, + "beetle-snes": { + "owner": "libretro", + "repo": "beetle-bsnes-libretro", + "rev": "bc867656d7438aaffc6818b3b92350587bc78a47", + "sha256": "TyUCRGK+uyXowDjXW9/4m+zL8Vh/3GGsX1eznrTCbAg=", + "fetchSubmodules": false + }, + "beetle-gba": { + "owner": "libretro", + "repo": "beetle-gba-libretro", + "rev": "38182572571a48cb58057cde64b915237c4e2d58", + "sha256": "4xnXWswozlcXBNI1lbGSNW/gAdIeLLO9Bf1SxOFLhSo=", + "fetchSubmodules": false + }, + "beetle-lynx": { + "owner": "libretro", + "repo": "beetle-lynx-libretro", + "rev": "b84c79b2f185482f9cec2b10f33cbe1bc5732dd9", + "sha256": "pR3EsFN/Wf77gPoAnjf/nI0XlB2098qIrmbdjB4jmMQ=", + "fetchSubmodules": false + }, + "beetle-ngp": { + "owner": "libretro", + "repo": "beetle-ngp-libretro", + "rev": "f969af2b52f20642aea7e800e3cfcce728f3aee9", + "sha256": "GIzLZ3iOJeHKdAowhM4S56iouaxX8v2XZgc/ZiCzCPk=", + "fetchSubmodules": false + }, + "beetle-pce-fast": { + "owner": "libretro", + "repo": "beetle-pce-fast-libretro", + "rev": "81d4c9d07a76c89c32ad0e7450b69bde6403836f", + "sha256": "LhQbAEUMhoIF3VfwLbhtD7xxSddzdgwIHHnSabQPAvs=", + "fetchSubmodules": false + }, + "beetle-pcfx": { + "owner": "libretro", + "repo": "beetle-pcfx-libretro", + "rev": "a1f1734509dd6acb11269f118d61f480ae8dbacf", + "sha256": "rvRDuYJLxb1TSwNXhp3ATJW0sQgWi8Cj4NR3hep/AJk=", + "fetchSubmodules": false + }, + "beetle-psx": { + "owner": "libretro", + "repo": "beetle-psx-libretro", + "rev": "ccca81930a078c0efd77b00327d2ee212698f3b4", + "sha256": "Hy8Zrp0kTR+Mfbq0nVYerSarRCxZI+ykgDOscakDMiU=", + "fetchSubmodules": false + }, + "beetle-saturn": { + "owner": "libretro", + "repo": "beetle-saturn-libretro", + "rev": "e1119e91a4e3f4b30971455aeb3c1a6f4cd05e59", + "sha256": "lKlNNAHK1ynFXY++Ya0m1Ax5YTZkd44eQjzuOLXfWa8=", + "fetchSubmodules": false + }, + "beetle-supergrafx": { + "owner": "libretro", + "repo": "beetle-supergrafx-libretro", + "rev": "59062662d6e925ad512fcbb9c1a0db97d1592bc1", + "sha256": "kGyl5XJMFUALPAEZf4IynY6bmXWfqy0o65eO8zS0RTE=", + "fetchSubmodules": false + }, + "beetle-wswan": { + "owner": "libretro", + "repo": "beetle-wswan-libretro", + "rev": "0c7faaf7f70b72ebb68e310530cd46a69e680d40", + "sha256": "UQyICcZe1DVotSFt0QVnGop+JG5NJwTBcGSZaFW0P0U=", + "fetchSubmodules": false + }, + "beetle-vb": { + "owner": "libretro", + "repo": "beetle-vb-libretro", + "rev": "1bd0da71c8f6add253ad76e2b6e1357cd09fc304", + "sha256": "KguKbRK0uXE+brpF8HdRwi8Gt76AMa4wkh1MFvNCbN4=", + "fetchSubmodules": false + }, + "bluemsx": { + "owner": "libretro", + "repo": "bluemsx-libretro", + "rev": "cfc1df4d026387883f21994bcce603c4a6be8730", + "sha256": "ix/AyYNer1R73ZJW1reXyj7geBr3ThrqXf5Ki5yrz9A=", + "fetchSubmodules": false + }, + "bsnes-mercury": { + "owner": "libretro", + "repo": "bsnes-mercury", + "rev": "d232c6ea90552f5921fec33a06626f08d3e18b24", + "sha256": "fpl7hmqz+Ca+9ZeM6E1JSikbiu+NJUU8xXtyl6Dd9Gg=", + "fetchSubmodules": false + }, + "citra": { + "owner": "libretro", + "repo": "citra", + "rev": "b1959d07a340bfd9af65ad464fd19eb6799a96ef", + "sha256": "Tw6Niba9gsZOMKGaXF9AZ5gdigB0mmFyqoRTMElM/Ps=", + "fetchSubmodules": true + }, + "desmume": { + "owner": "libretro", + "repo": "desmume", + "rev": "7ea0fc96804fcd9c8d33e8f76cf64b1be50cc5ea", + "sha256": "4S/CirRVOBN6PVbato5X5fu0tBn3Fu5FEAbdf3TBqng=", + "fetchSubmodules": false + }, + "desmume2015": { + "owner": "libretro", + "repo": "desmume2015", + "rev": "cd89fb7c48c735cb321311fbce7e6e9889dda1ce", + "sha256": "9Ou/n6pxRjJOp/Ybpyg4+Simosj2X26kLZCMEqeVL6U=", + "fetchSubmodules": false + }, + "dolphin": { + "owner": "libretro", + "repo": "dolphin", + "rev": "82e617439b622af5d1189e9fec67e7f1376be099", + "sha256": "Q3a+0SYocX1hBGLs1K9r932NkiCDFINPhtHeyzUknJE=", + "fetchSubmodules": false + }, + "dosbox": { + "owner": "libretro", + "repo": "dosbox-libretro", + "rev": "aa71b67d54eaaf9e41cdd3cb5153d9cff0ad116e", + "sha256": "L0Y67UROjldnXUlLQ+Xbd7RHLb96jDxlB/k+LR9Kbas=", + "fetchSubmodules": false + }, + "eightyone": { + "owner": "libretro", + "repo": "81-libretro", + "rev": "30344d3499fdb301ee33de136f7b390bebe0756a", + "sha256": "kMwga9MkjV+dKxW3VLu+rxst6H20HhREoiNBsCLa1G0=", + "fetchSubmodules": false + }, + "fbalpha2012": { + "owner": "libretro", + "repo": "fbalpha2012", + "rev": "23f98fc7cf4f2f216149c263cf5913d2e28be8d4", + "sha256": "dAInW6tTV7oXcPhKMnHWcmQaWQCTqRrYHD2yuaI1I1w=", + "fetchSubmodules": false + }, + "fbneo": { + "owner": "libretro", + "repo": "fbneo", + "rev": "4d6387b7f3e3f1a9c25015789d751c6db1a9ae8c", + "sha256": "bIOmvhu9mOfOXoOTbwbjMHIZ3JkGz96yyFZALmqkOmk=", + "fetchSubmodules": false + }, + "fceumm": { + "owner": "libretro", + "repo": "libretro-fceumm", + "rev": "a918869c18c9f30b84e04260b78b675b8a3c7be1", + "sha256": "nDYPrwIsvhWveDQDE0WEK7GO60iRE967p1XxXn+lNj4=", + "fetchSubmodules": false + }, + "flycast": { + "owner": "libretro", + "repo": "flycast", + "rev": "ae670ea28fdbb9f08149cb598312a71a0970ca67", + "sha256": "jmSOfyak5mX04HgZOtCF9cz8HqAApxDXHJ6IqhqGILE=", + "fetchSubmodules": false + }, + "fmsx": { + "owner": "libretro", + "repo": "fmsx-libretro", + "rev": "20c805409b8f6e1f9d61cb3dff0d5b28d82d1ee3", + "sha256": "uqqVF2+YpfWOKbe8aIreoImFb3/kL8ohslJkl+JivQI=", + "fetchSubmodules": false + }, + "freeintv": { + "owner": "libretro", + "repo": "freeintv", + "rev": "0058a09492c5c17a4fa59ebb3601ce66844b3b25", + "sha256": "DA6eAl9ZR84Ow8rH9q/DVbEU83nmidwMy3kqk+hWWLQ=", + "fetchSubmodules": false + }, + "gambatte": { + "owner": "libretro", + "repo": "gambatte-libretro", + "rev": "4b822bcf561856689e101dd5505d365de5ffcffe", + "sha256": "FsIQLd/UO5xs/aTpggSn8WLPgi83gsxRlwKR+UzH+TY=", + "fetchSubmodules": false + }, + "genesis-plus-gx": { + "owner": "libretro", + "repo": "Genesis-Plus-GX", + "rev": "309a4aacfd582c312dcad61b7abfdffba4a0c66e", + "sha256": "jnbey1USldDZGXGXLLR5TgSJZgD+6ZFpwfIf6c8xvyM=", + "fetchSubmodules": false + }, + "gpsp": { + "owner": "libretro", + "repo": "gpsp", + "rev": "a2aa78733d8daf1d550c9dc76c6ff94e8670b31c", + "sha256": "nKim7YkksUyZO97SvrW1TEYQlA+7Yi7xbLtyDPV4LWc=", + "fetchSubmodules": false + }, + "gw": { + "owner": "libretro", + "repo": "gw-libretro", + "rev": "0f1ccca156388880bf4507ad44741f80945dfc6f", + "sha256": "BVpx8pL224J2u9W6UDrxzfEv4qIsh6wrf3bDdd1R850=", + "fetchSubmodules": false + }, + "handy": { + "owner": "libretro", + "repo": "libretro-handy", + "rev": "e7b4e32d5f32d6e96630072072844a7dd16a02d9", + "sha256": "dQpEqxOcac7gdbmWu4HTvFx++us/spVMfroBlLTAgF0=", + "fetchSubmodules": false + }, + "hatari": { + "owner": "libretro", + "repo": "hatari", + "rev": "cea06eebf695b078fadc0e78bb0f2b2baaca799f", + "sha256": "Z05IGubwdgg7X/e2ZG49zVfXuITM59HW/1gicdpDXls=", + "fetchSubmodules": false + }, + "mame": { + "owner": "libretro", + "repo": "mame", + "rev": "031ac783585e7d5156a6f87a9ba20d88caf94ad6", + "sha256": "hLMQw5jvJTxojGwCY7iUDHcJdLZjcLzEDhW576TerJI=", + "fetchSubmodules": false + }, + "mame2000": { + "owner": "libretro", + "repo": "mame2000-libretro", + "rev": "4793742b457945afb74053c8a895e6ff0b36b033", + "sha256": "DA9fZTic/jlYzSAIiOjfhohyEyQZiBNdIa8YCZoKZNs=", + "fetchSubmodules": false + }, + "mame2003": { + "owner": "libretro", + "repo": "mame2003-libretro", + "rev": "d0ed1a565803cfada9f4088326eae616f6e5f8a3", + "sha256": "JGEy6Mp5qcZwaehzbj+qpdBfxHzqi6qIR7akxIj/WK8=", + "fetchSubmodules": false + }, + "mame2003-plus": { + "owner": "libretro", + "repo": "mame2003-plus-libretro", + "rev": "841e44dff953a346127f15be53cb34778e20ce1c", + "sha256": "aCXyeDcz0uSObe4S2bQWCxIAF5aA3kne5v0HT+oXHuw=", + "fetchSubmodules": false + }, + "mame2010": { + "owner": "libretro", + "repo": "mame2010-libretro", + "rev": "932e6f2c4f13b67b29ab33428a4037dee9a236a8", + "sha256": "HSZRSnc+0300UE9fPcUOMrXABlxHhTewkFPTqQ4Srxs=", + "fetchSubmodules": false + }, + "mame2015": { + "owner": "libretro", + "repo": "mame2015-libretro", + "rev": "ef41361dc9c88172617f7bbf6cd0ead4516a3c3f", + "sha256": "HZrw9KKwYAJyU4NH1BEvuod/TK/nqjN03qJuSX8JP8o=", + "fetchSubmodules": false + }, + "mame2016": { + "owner": "libretro", + "repo": "mame2016-libretro", + "rev": "d53c379892b0bd91b4a52fc2de491e1199f03e32", + "sha256": "GQ4Sdg/1nZRT4Z1Aqq1zPo96duqIGyt6sjghf9ap2Jg=", + "fetchSubmodules": false + }, + "mesen": { + "owner": "SourMesen", + "repo": "mesen", + "rev": "86326e832974d984846ae078e568c023a5f76f1f", + "sha256": "At5rhlJ6rAnXaQrmRA1NtCCi+Ff/ytlt5dwsaXZhxXg=", + "fetchSubmodules": false + }, + "meteor": { + "owner": "libretro", + "repo": "meteor-libretro", + "rev": "e533d300d0561564451bde55a2b73119c768453c", + "sha256": "zMkgzUz2rk0SD5ojY4AqaDlNM4k4QxuUxVBRBcn6TqQ=", + "fetchSubmodules": false + }, + "mgba": { + "owner": "libretro", + "repo": "mgba", + "rev": "033e067285745909722df930deaeead80ea2d54a", + "sha256": "ZFmiVOf8H3PtSCWTtYc3XsIpiJI6XZ2v/HsusQsg7H8=", + "fetchSubmodules": false + }, + "mupen64plus": { + "owner": "libretro", + "repo": "mupen64plus-libretro-nx", + "rev": "018ee72b4fe247b38ed161033ad12a19bb936f00", + "sha256": "vJz9S9lUgJp8O0NgJF6/EYymFqwZefvrT/HJLpMhgEk=", + "fetchSubmodules": false + }, + "neocd": { + "owner": "libretro", + "repo": "neocd_libretro", + "rev": "83d10f3be10fff2f28aa56fc674c687528cb7f5c", + "sha256": "yYZGoMsUfE8cpU9i826UWQGi1l0zPJPcBDb2CINxGeQ=", + "fetchSubmodules": false + }, + "nestopia": { + "owner": "libretro", + "repo": "nestopia", + "rev": "ea6f1c0631bb62bf15ab96493127dd9cfaf74d1c", + "sha256": "v+5000V1SR1sXWHryoZEi5sTgaRlVMrHmWKJX2stdSk=", + "fetchSubmodules": false + }, + "np2kai": { + "owner": "AZO234", + "repo": "NP2kai", + "rev": "3e8fedc7c1c6f68faa26589187512474a766ee9e", + "sha256": "5bfh/aZOqfHz1x2s5AzZo4zq9qA4w10d9vYuuILdKJQ=", + "fetchSubmodules": true + }, + "o2em": { + "owner": "libretro", + "repo": "libretro-o2em", + "rev": "c039e83f2589cb9d21b9aa5dc211954234ab8c97", + "sha256": "QQS4mS68C3aTZ4dw7ju6WyPlDjIBoDkIeQduCccAmDQ=", + "fetchSubmodules": false + }, + "opera": { + "owner": "libretro", + "repo": "opera-libretro", + "rev": "d8aa7cecf96298bd7ee51718086f7b1bc8c57e2a", + "sha256": "1t+zwCVmqiPFFNCNq9XzVfRGbEA1q8v4jzhOb+wV/nA=", + "fetchSubmodules": false + }, + "parallel-n64": { + "owner": "libretro", + "repo": "parallel-n64", + "rev": "0a67445ce63513584d92e5c57ea87efe0da9b3bd", + "sha256": "rms+T8JOp/TJ/T5a5uLj8lu1LLz/GAsJZ7UbK42C9yU=", + "fetchSubmodules": false + }, + "pcsx_rearmed": { + "owner": "libretro", + "repo": "pcsx_rearmed", + "rev": "589bd99ba31de8216624dbf0cbbc016f0663ce3d", + "sha256": "6OtsWXTo6ca0M/cofpvWPEd0Tqy3XDa8vaa7OUTxnMU=", + "fetchSubmodules": false + }, + "picodrive": { + "owner": "libretro", + "repo": "picodrive", + "rev": "9cb99ce36f93871b05c5adc2790b2e33e63b50b6", + "sha256": "hhdEuri1hSNLAkno8Rwd0Yls11Yh6Q7/+t4T2LH+BaE=", + "fetchSubmodules": true + }, + "play": { + "owner": "jpd002", + "repo": "Play-", + "rev": "b8e16159734c2068db0f2f12b11bc16ef55058ce", + "sha256": "qjp1rEjmDAAB2wXITA3lAS+ERJuZinoneJToYiYRi/w=", + "fetchSubmodules": true + }, + "ppsspp": { + "owner": "hrydgard", + "repo": "ppsspp", + "rev": "b6e7fe1aaf2bbb8f4faa1378bf14f434aea33cc1", + "sha256": "Kif6oF8Bjhgc02xKDivCG9RBxj5wxNFEwxl9nX3AZug=", + "fetchSubmodules": true + }, + "prboom": { + "owner": "libretro", + "repo": "libretro-prboom", + "rev": "0f5927db4fb7e61f32bc9eccc5f809e54f71a371", + "sha256": "DFpDxEUHjuCcHQGxT+impj98vYITeok1SHrRN5Hba4M=", + "fetchSubmodules": false + }, + "prosystem": { + "owner": "libretro", + "repo": "prosystem-libretro", + "rev": "f8652c7f2b0edc81685d03204d4963fc4ea9eccd", + "sha256": "Ki4Dyb//X8isP0tScqunA/qt2vkX6d2HH7rHhqk3D5k=", + "fetchSubmodules": false + }, + "quicknes": { + "owner": "libretro", + "repo": "QuickNES_Core", + "rev": "71b8000b33daab8ed488f8707ccd8d5b623443f8", + "sha256": "Wx8nFWy0DQaZlhEMiI2KRwBK0earSVSke7/qXbs0bQ0=", + "fetchSubmodules": false + }, + "sameboy": { + "owner": "libretro", + "repo": "sameboy", + "rev": "68f67b3db7747ba7aac84c5c253bc71d5a906525", + "sha256": "/4JQ1Tem3UgOUIcsLV0aLU+1R55hMTaT+wWElwj00Q4=", + "fetchSubmodules": false + }, + "scummvm": { + "owner": "libretro", + "repo": "scummvm", + "rev": "63e57573a9ffe71a1083ff46d9cd210203b87afb", + "sha256": "LTFe8HIX9OSJuJj5YfPigrPAE8nrbSpDckh0hj3w52s=", + "fetchSubmodules": false + }, + "smsplus-gx": { + "owner": "libretro", + "repo": "smsplus-gx", + "rev": "3f1ffede55bcfe0168caa484a00bf041ab591abf", + "sha256": "fD+grzMPk4uXvmzGf+f9Mor0eefBLHIumCydsSHUsck=", + "fetchSubmodules": false + }, + "snes9x": { + "owner": "snes9xgit", + "repo": "snes9x", + "rev": "edc32fc0bd6aea6d5645a03f0f94b72f3cbfa43e", + "sha256": "Zeojdoykmk+lpG1z5EdZToGWYDQvSSQqaEr7F68iyk0=", + "fetchSubmodules": false + }, + "snes9x2002": { + "owner": "libretro", + "repo": "snes9x2002", + "rev": "e16cb16efa00765b1bc3b8fee195680efb1542c7", + "sha256": "0dhLpNy+NUE3mE/ejEwbq3G28/a2HONS5NPslI5LOEc=", + "fetchSubmodules": false + }, + "snes9x2005": { + "owner": "libretro", + "repo": "snes9x2005", + "rev": "88a46f7c085f6e2accc4c777e264b9b5cd41cf0e", + "sha256": "5wVKK3xhCXkvonwQRyVtd8Afggb0gv8Sv7PEYkDfKRE=", + "fetchSubmodules": false + }, + "snes9x2010": { + "owner": "libretro", + "repo": "snes9x2010", + "rev": "714b1c8e08c7580430190119b07e793405773ac2", + "sha256": "yKSQEE+lT4V2V1XqemfziHuIt79TcvC0ranU9ounTXo=", + "fetchSubmodules": false + }, + "stella": { + "owner": "stella-emu", + "repo": "stella", + "rev": "e1035b74fce26932078d00e8625688927efce34c", + "sha256": "+ZvSCnnoKGyToSFqUQOArolFdgUcBBFNjFw8aoVDkYI=", + "fetchSubmodules": false + }, + "stella2014": { + "owner": "libretro", + "repo": "stella2014-libretro", + "rev": "934c7a2a44ef038af529b68950ddba4f7ea3478e", + "sha256": "s7LQ47sAPTyk4COONk4qnebxCq78zGLIjh3Y2+1fIak=", + "fetchSubmodules": false + }, + "tgbdual": { + "owner": "libretro", + "repo": "tgbdual-libretro", + "rev": "1e0c4f931d8c5e859e6d3255d67247d7a2987434", + "sha256": "0wHv9DpKuzJ/q5vERqCo4GBLre2ggClBIWSjGnMLQq8=", + "fetchSubmodules": false + }, + "thepowdertoy": { + "owner": "libretro", + "repo": "ThePowderToy", + "rev": "ac620c0a89a18774c3ad176a8a1bc596df23ff57", + "sha256": "C/X1DbmnucRddemEYml2zN3qr5yoXY3b+nvqfpboS0M=", + "fetchSubmodules": false + }, + "tic80": { + "owner": "libretro", + "repo": "tic-80", + "rev": "bd03e6a548676745e81fa95e60b233b5a56420c2", + "sha256": "SXJvWX6Q3BrdajNnT4HIf6H2z7dXXvnXTJXf/TYRw4I=", + "fetchSubmodules": true + }, + "vba-next": { + "owner": "libretro", + "repo": "vba-next", + "rev": "b218f48bb27b5d3885fa4076ff325922b5acd817", + "sha256": "idqGMbMA9mZlIh0QAba3BxpPDi/bFJJkUbnxV3xMOCo=", + "fetchSubmodules": false + }, + "vba-m": { + "owner": "libretro", + "repo": "vbam-libretro", + "rev": "254f6effebe882b7d3d29d9e417c6aeeabc08026", + "sha256": "vJWjdqJ913NLGL4G15sRPqO/wp9xPsuhUMLUuAbDRKk=", + "fetchSubmodules": false + }, + "vecx": { + "owner": "libretro", + "repo": "libretro-vecx", + "rev": "28d6efc8972313903d0802a736ff8c3bc115e78f", + "sha256": "VYa8s+HB8IYF+HS6SA+sO5DzpgCtnMGrh88KTVNGICY=", + "fetchSubmodules": false + }, + "virtualjaguar": { + "owner": "libretro", + "repo": "virtualjaguar-libretro", + "rev": "d1b1b28a6ad2518b746e3f7537ec6d66db96ec57", + "sha256": "Io25dt80fqIqIxwzF2DK9J5UFz6YCUQoqThcIuxdEBo=", + "fetchSubmodules": false + }, + "yabause": { + "owner": "libretro", + "repo": "yabause", + "rev": "811f9e81dbff4bed18644e19631fd4893e73e6ee", + "sha256": "VstPh0oMEZ7/ts58NjZxBYZZx/7dRTYePhDIQMu0WOo=", + "fetchSubmodules": false + } +} diff --git a/pkgs/misc/emulators/retroarch/update.py b/pkgs/misc/emulators/retroarch/update.py new file mode 100755 index 0000000000000..db43db13575f4 --- /dev/null +++ b/pkgs/misc/emulators/retroarch/update.py @@ -0,0 +1,135 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i python3 -p "python3.withPackages (ps: with ps; [ requests nix-prefetch-github ])" -p "git" + +import json +import sys +from pathlib import Path + +from nix_prefetch_github import nix_prefetch_github + +SCRIPT_PATH = Path(__file__).absolute().parent +HASHES_PATH = SCRIPT_PATH / "hashes.json" +CORES = { + "atari800": {"repo": "libretro-atari800"}, + "beetle-snes": {"repo": "beetle-bsnes-libretro"}, + "beetle-gba": {"repo": "beetle-gba-libretro"}, + "beetle-lynx": {"repo": "beetle-lynx-libretro"}, + "beetle-ngp": {"repo": "beetle-ngp-libretro"}, + "beetle-pce-fast": {"repo": "beetle-pce-fast-libretro"}, + "beetle-pcfx": {"repo": "beetle-pcfx-libretro"}, + "beetle-psx": {"repo": "beetle-psx-libretro"}, + "beetle-saturn": {"repo": "beetle-saturn-libretro"}, + "beetle-supergrafx": {"repo": "beetle-supergrafx-libretro"}, + "beetle-wswan": {"repo": "beetle-wswan-libretro"}, + "beetle-vb": {"repo": "beetle-vb-libretro"}, + "bluemsx": {"repo": "bluemsx-libretro"}, + "bsnes-mercury": {"repo": "bsnes-mercury"}, + "citra": {"repo": "citra", "fetch_submodules": True}, + "desmume": {"repo": "desmume"}, + "desmume2015": {"repo": "desmume2015"}, + "dolphin": {"repo": "dolphin"}, + "dosbox": {"repo": "dosbox-libretro"}, + "eightyone": {"repo": "81-libretro"}, + "fbalpha2012": {"repo": "fbalpha2012"}, + "fbneo": {"repo": "fbneo"}, + "fceumm": {"repo": "libretro-fceumm"}, + "flycast": {"repo": "flycast"}, + "fmsx": {"repo": "fmsx-libretro"}, + "freeintv": {"repo": "freeintv"}, + "gambatte": {"repo": "gambatte-libretro"}, + "genesis-plus-gx": {"repo": "Genesis-Plus-GX"}, + "gpsp": {"repo": "gpsp"}, + "gw": {"repo": "gw-libretro"}, + "handy": {"repo": "libretro-handy"}, + "hatari": {"repo": "hatari"}, + "mame": {"repo": "mame"}, + "mame2000": {"repo": "mame2000-libretro"}, + "mame2003": {"repo": "mame2003-libretro"}, + "mame2003-plus": {"repo": "mame2003-plus-libretro"}, + "mame2010": {"repo": "mame2010-libretro"}, + "mame2015": {"repo": "mame2015-libretro"}, + "mame2016": {"repo": "mame2016-libretro"}, + "mesen": {"repo": "mesen", "owner": "SourMesen"}, + "meteor": {"repo": "meteor-libretro"}, + "mgba": {"repo": "mgba"}, + "mupen64plus": {"repo": "mupen64plus-libretro-nx"}, + "neocd": {"repo": "neocd_libretro"}, + "nestopia": {"repo": "nestopia"}, + "np2kai": {"repo": "NP2kai", "owner": "AZO234", "fetch_submodules": True}, + "o2em": {"repo": "libretro-o2em"}, + "opera": {"repo": "opera-libretro"}, + "parallel-n64": {"repo": "parallel-n64"}, + "pcsx_rearmed": {"repo": "pcsx_rearmed"}, + "picodrive": {"repo": "picodrive", "fetch_submodules": True}, + "play": {"repo": "Play-", "owner": "jpd002", "fetch_submodules": True}, + "ppsspp": {"repo": "ppsspp", "owner": "hrydgard", "fetch_submodules": True}, + "prboom": {"repo": "libretro-prboom"}, + "prosystem": {"repo": "prosystem-libretro"}, + "quicknes": {"repo": "QuickNES_Core"}, + "sameboy": {"repo": "sameboy"}, + "scummvm": {"repo": "scummvm"}, + "smsplus-gx": {"repo": "smsplus-gx"}, + "snes9x": {"repo": "snes9x", "owner": "snes9xgit"}, + "snes9x2002": {"repo": "snes9x2002"}, + "snes9x2005": {"repo": "snes9x2005"}, + "snes9x2010": {"repo": "snes9x2010"}, + "stella": {"repo": "stella", "owner": "stella-emu"}, + "stella2014": {"repo": "stella2014-libretro"}, + "tgbdual": {"repo": "tgbdual-libretro"}, + "thepowdertoy": {"repo": "ThePowderToy"}, + "tic80": {"repo": "tic-80", "fetch_submodules": True}, + "vba-next": {"repo": "vba-next"}, + "vba-m": {"repo": "vbam-libretro"}, + "vecx": {"repo": "libretro-vecx"}, + "virtualjaguar": {"repo": "virtualjaguar-libretro"}, + "yabause": {"repo": "yabause"}, +} + + +def info(*msg): + print(*msg, file=sys.stderr) + + +def get_repo_hash_fetchFromGitHub(repo, owner="libretro", fetch_submodules=False): + assert repo is not None, "Parameter 'repo' can't be None." + + repo_hash = nix_prefetch_github( + owner=owner, repo=repo, fetch_submodules=fetch_submodules + ) + return { + "owner": repo_hash.repository.owner, + "repo": repo_hash.repository.name, + "rev": repo_hash.rev, + "sha256": repo_hash.sha256, + "fetchSubmodules": repo_hash.fetch_submodules, + } + + +def get_repo_hash(fetcher="fetchFromGitHub", **kwargs): + if fetcher == "fetchFromGitHub": + return get_repo_hash_fetchFromGitHub(**kwargs) + else: + raise ValueError(f"Unsupported fetcher: {fetcher}") + + +def get_repo_hashes(): + repo_hashes = {} + + for core, repo in CORES.items(): + info(f"Getting repo hash for '{core}'...") + repo_hashes[core] = get_repo_hash(**repo) + + return repo_hashes + + +def main(): + repo_hashes = get_repo_hashes() + info(f"Generating '{HASHES_PATH}'...") + with open(HASHES_PATH, "w") as f: + f.write(json.dumps(repo_hashes, indent=4)) + f.write("\n") + info("Finished!") + + +if __name__ == "__main__": + main() diff --git a/pkgs/misc/emulators/retroarch/wrapper.nix b/pkgs/misc/emulators/retroarch/wrapper.nix index 4cc7ad404be05..b8fbd70ecc463 100644 --- a/pkgs/misc/emulators/retroarch/wrapper.nix +++ b/pkgs/misc/emulators/retroarch/wrapper.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, makeWrapper, retroarch, cores }: +{ stdenv, lib, makeWrapper, retroarch, cores ? [ ] }: stdenv.mkDerivation { pname = "retroarch"; @@ -8,10 +8,10 @@ stdenv.mkDerivation { buildCommand = '' mkdir -p $out/lib - $(for coreDir in $cores + for coreDir in $cores do - $(ln -s $coreDir/* $out/lib/.) - done) + ln -s $coreDir/* $out/lib/. + done ln -s -t $out ${retroarch}/share diff --git a/pkgs/misc/emulators/ryujinx/default.nix b/pkgs/misc/emulators/ryujinx/default.nix index 43c98cbacac2b..86716ed5d535c 100644 --- a/pkgs/misc/emulators/ryujinx/default.nix +++ b/pkgs/misc/emulators/ryujinx/default.nix @@ -6,13 +6,13 @@ buildDotnetModule rec { pname = "ryujinx"; - version = "1.0.7101"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx + version = "1.0.7105"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx src = fetchFromGitHub { owner = "Ryujinx"; repo = "Ryujinx"; - rev = "911ea38e939459c652c6e27a28599340a61267dc"; - sha256 = "0znn5bcjhajs26y2ykizpya11ism27zlpbsrf12a25ak4vj6pzvx"; + rev = "b9d83cc97ee1cb8c60d9b01c162bab742567fe6e"; + sha256 = "0plchh8f9xhhza1wfw3ys78f0pa1bh3898fqhfhcc0kxb39px9is"; }; projectFile = "Ryujinx.sln"; diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index edef24895a847..ca190ee2b2b4d 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -77,12 +77,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2021-11-12"; + version = "2021-11-15"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "76c2293e68a6cad3b192062743d25b8daa082205"; - sha256 = "1fcc3qy425fp5qrhcgi8gagl2b33wa5m8r9xzqqawk47rkpjx5d0"; + rev = "31dc6a61a07839ea906f6f0b80be713fb8cad1c7"; + sha256 = "1j8fzyxl3lgc5xwklllvk7cq0qh7hdjjvv9r93xzbmr74w82410v"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -413,12 +413,12 @@ final: prev: bufferline-nvim = buildVimPluginFrom2Nix { pname = "bufferline.nvim"; - version = "2021-11-01"; + version = "2021-11-15"; src = fetchFromGitHub { owner = "akinsho"; repo = "bufferline.nvim"; - rev = "782fab8a2352e872dc991c42f806dae18e848b2d"; - sha256 = "0j5r0cgcdgnqdd0fd6y9b0nh301xyb6b2vgqc34rdk30gam7h5d1"; + rev = "463637a3ac86dcaacbcd47aa608f53aaad749696"; + sha256 = "0nphn0ks8xqf0l8xklqn2fv2wvizzpg1x399x9yd916q4ck92588"; }; meta.homepage = "https://github.com/akinsho/bufferline.nvim/"; }; @@ -473,12 +473,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-11-14"; + version = "2021-11-17"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "26068160899310b9029dc7508afe9b996be9b5a4"; - sha256 = "1hiqval4f02wz0lk54j9jagnn4rj9mfqazmwf1k8rz6zhw0im1fx"; + rev = "6202def5abfbc83acfbb86110753a03e00bc97bf"; + sha256 = "1gp0if044cqzpjfxrsn8kdk4siqm18bvdrngpqqar4rqgsx89kg1"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -581,12 +581,12 @@ final: prev: cmp-buffer = buildVimPluginFrom2Nix { pname = "cmp-buffer"; - version = "2021-11-10"; + version = "2021-11-15"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-buffer"; - rev = "2d85e76c725a389b72067f86fc3c65f3868b9a59"; - sha256 = "0lvx58nchrl08jjp2gvyfrxkqdqnyi97zj86nnx184vnx8a5qcqh"; + rev = "bfbc32a8aadbf3d21294aad45f069b7d204b34b1"; + sha256 = "11wmq4fh5nbyswcgmw17ihx7g4naqba06a55f1cxk913aqcqqnwx"; }; meta.homepage = "https://github.com/hrsh7th/cmp-buffer/"; }; @@ -833,12 +833,12 @@ final: prev: coc-lua = buildVimPluginFrom2Nix { pname = "coc-lua"; - version = "2021-11-09"; + version = "2021-11-16"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-lua"; - rev = "9672c9cde3cce32720fafbdb65618d817b7022d8"; - sha256 = "1y35xqzd17c8cvlrqfa10lninql2xkkkgy40wl1bwfzl5awk9rm7"; + rev = "3a5366b11ca3c11a9e894755d365328ba36de227"; + sha256 = "0qv73ph2wgn0j7il508zb29k04r4n5q601fih2hp264zvyqkw6sf"; }; meta.homepage = "https://github.com/josa42/coc-lua/"; }; @@ -1134,12 +1134,12 @@ final: prev: Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2021-11-11"; + version = "2021-11-15"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "91112aff209866d679fc89ca7d0697938f80e59f"; - sha256 = "0gp0a56zd1pf31z99yzwjrjq8zhinr68izqx9klj70r0h61hsm2z"; + rev = "f38e086135c5d9b69c9a5f70f82072419d952c29"; + sha256 = "01lf10b6b07s7ywrh16p5b52jj21hzv1vn216h9bnf4xdfz5pf9a"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -1242,12 +1242,12 @@ final: prev: ctrlp-vim = buildVimPluginFrom2Nix { pname = "ctrlp.vim"; - version = "2021-10-19"; + version = "2021-11-16"; src = fetchFromGitHub { owner = "ctrlpvim"; repo = "ctrlp.vim"; - rev = "61e964f2d168f52cb8e80e67d26605b52d726b16"; - sha256 = "0qi4ip94lxfxzbkhs779v1afmvh6q0wp8fcfxxdhzgl44qlhy6hx"; + rev = "d9388d89745bb30c20ad0051c53d301cd054f47c"; + sha256 = "1lsr0y4q57k65qk5y17gnm8cfi7rg8r6h2h7cxkmgzn11d4p34c0"; }; meta.homepage = "https://github.com/ctrlpvim/ctrlp.vim/"; }; @@ -2243,24 +2243,24 @@ final: prev: gitlinker-nvim = buildVimPluginFrom2Nix { pname = "gitlinker.nvim"; - version = "2021-10-18"; + version = "2021-11-15"; src = fetchFromGitHub { owner = "ruifm"; repo = "gitlinker.nvim"; - rev = "a6fb6d1ec2746fc18f81433648416edfb1a96d43"; - sha256 = "0c417li0jx970h8qkgrww7ifzjjknfi26i7n13qx96c5axjxady5"; + rev = "003ee482a25118cdac73faea8bd35df0399e8f8f"; + sha256 = "0zpy1cpviia9l4z3b87534arnxfja48bjhqqb88mxjzm9gkc4rbf"; }; meta.homepage = "https://github.com/ruifm/gitlinker.nvim/"; }; gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2021-11-12"; + version = "2021-11-17"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "bfc4543262442a336e257d2d9fac16aa1de532a9"; - sha256 = "0339qfryax4sk151p0vk3m5alpdpi52pc9zn2kwq3mqrnqf1q8d2"; + rev = "5e49bb09f324580519d1ef41cb03bcb07536a239"; + sha256 = "1zfwazv58y4r9cpalx522hnb9wics50m90n59yabmimb2iyp323z"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -2327,12 +2327,12 @@ final: prev: goto-preview = buildVimPluginFrom2Nix { pname = "goto-preview"; - version = "2021-11-09"; + version = "2021-11-17"; src = fetchFromGitHub { owner = "rmagatti"; repo = "goto-preview"; - rev = "b930629c018c6b30d42e8d271a32a37e0360c628"; - sha256 = "0mly30sqbs43xmkda04jzk4knxcv7f42sddm87ky6j8ii67147ys"; + rev = "817bae89f75c8f061f7c0198ce392dca5d16ac94"; + sha256 = "0pxz7mrl4fsdi6pyk7zizxb7g3a11n8s36ndg3l9qsbihfxiqk5y"; }; meta.homepage = "https://github.com/rmagatti/goto-preview/"; }; @@ -2519,12 +2519,12 @@ final: prev: hop-nvim = buildVimPluginFrom2Nix { pname = "hop.nvim"; - version = "2021-11-07"; + version = "2021-11-17"; src = fetchFromGitHub { owner = "phaazon"; repo = "hop.nvim"; - rev = "f0eaff8cc4e66820b17a08c518c22c687f714bb5"; - sha256 = "0a67fv1vabik4g7w5h2nl9h6j8jc2jb0yd92gzhbmfi4jjj2j19a"; + rev = "d2a9f2a6b0d075fc85ac346d3c03c4a3257bc805"; + sha256 = "1gpgln5bfvygpkqb1p2pawq1pw5rg9j5jwgl7wmal4fik9yixp0f"; }; meta.homepage = "https://github.com/phaazon/hop.nvim/"; }; @@ -2928,12 +2928,12 @@ final: prev: lean-nvim = buildVimPluginFrom2Nix { pname = "lean.nvim"; - version = "2021-11-13"; + version = "2021-11-17"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "ab2128f3b44b4314a51beb768cb70666e008a185"; - sha256 = "0db72fc9vvw7nib4z36r72m9vx1i9950d9npjgrlhhwdmb3sqg38"; + rev = "a74b5c09bee57c4c41a4fe7e4594416f92ea05aa"; + sha256 = "1zrzd0rahwzhyx46bfwz6gzwr513h3k5b1f5maf0qrc1jq2snd6g"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -3072,12 +3072,12 @@ final: prev: lightspeed-nvim = buildVimPluginFrom2Nix { pname = "lightspeed.nvim"; - version = "2021-11-14"; + version = "2021-11-17"; src = fetchFromGitHub { owner = "ggandor"; repo = "lightspeed.nvim"; - rev = "c0ebc350e65b1f7370ec2d5b6f83bdc1ce602761"; - sha256 = "1p5sdkbp4921ji5prylmr3idqagd0k871bfnbj4dj6fwz65ba75c"; + rev = "d60ee2ef756e89f51ee3f41be2fbacfac965091f"; + sha256 = "0m610jvk7zx7lri33d3b2dr60w2xy8kzlssigiciynhzs0lg9pyg"; }; meta.homepage = "https://github.com/ggandor/lightspeed.nvim/"; }; @@ -3228,24 +3228,24 @@ final: prev: lualine-nvim = buildVimPluginFrom2Nix { pname = "lualine.nvim"; - version = "2021-11-13"; + version = "2021-11-16"; src = fetchFromGitHub { owner = "nvim-lualine"; repo = "lualine.nvim"; - rev = "e6b6caa93b900c86d8c299d92282feae3934ec39"; - sha256 = "015pmiag8yj3ngqp6wq1mmsnwln2fq83nbji9c6z7p49cibk1anv"; + rev = "7b608cb5731087b157bd509103b1d82d8984cba4"; + sha256 = "04nbfml4j2yr4imvdzany4r6amakiwazgfjgd4y2h3c78pnlrb41"; }; meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/"; }; luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2021-11-09"; + version = "2021-11-16"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "366fd76ea226bed11966cd8b1a229cba08fa4394"; - sha256 = "17jla5yvi0vzgi0himl8fyfmc8sl8xg1k5bzl58iq0d2ycmr08as"; + rev = "6e10a30178240182781955ce062618c8d793a37b"; + sha256 = "0z1n838d8fvis88a603fzzmdh1iqm41svay8ypmkbm3wcjaafjyl"; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; @@ -3348,12 +3348,12 @@ final: prev: minimap-vim = buildVimPluginFrom2Nix { pname = "minimap.vim"; - version = "2021-10-15"; + version = "2021-11-16"; src = fetchFromGitHub { owner = "wfxr"; repo = "minimap.vim"; - rev = "5c54258d34b8ae4be70a8fbc09b400eb7be0bee8"; - sha256 = "0gy5c5v80xbgx511xk1zp2scxzmgipwad1zqpsff4grz80vzsa13"; + rev = "f699b8296c878a5d669f3a13a9d6f916f6276bef"; + sha256 = "1v4xhp82rw5f7zq8mfcj478p088qrcqbml1crhqi9v41gghwv9b5"; }; meta.homepage = "https://github.com/wfxr/minimap.vim/"; }; @@ -4044,12 +4044,12 @@ final: prev: null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2021-11-12"; + version = "2021-11-17"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "a3ded9b1525b06136e58a95f4d9ed2f090c0f908"; - sha256 = "0xc909lw73fbmmfvzvqwkba2akyv0c2msdfk94gcvxlm3dk910ng"; + rev = "e460ba050d074416a64ee7881b527fb87fbad981"; + sha256 = "1nksrmh5aj2h4r845vbz9lg7lxa8cr05p4gmcccagpmq9y0fk8fn"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -4092,12 +4092,12 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2021-11-09"; + version = "2021-11-15"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "f4f1c9f27d8514885cd851b3ae0a648e1eb15a17"; - sha256 = "0ipb2pvkc28zp5pdb5ih5rcnzj4wkwg5i59lb3ll4cv0yj398kr9"; + rev = "1f18e79ee9b30fec25c3f32b1ed22c3290f07bb2"; + sha256 = "0sy5p93vqbnz01blgsk085xm791iga1yk65lp147axbib7b760kq"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; @@ -4152,24 +4152,24 @@ final: prev: nvim-cmp = buildVimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2021-11-13"; + version = "2021-11-17"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "753f5b7c92da0302efffc5ce6780dffe0602bdf3"; - sha256 = "0b9il665jjc94bp8gdvj4ra5qsbpcfjkvlsvi8miylanfycfmqy5"; + rev = "27d4c21e8ff7a68e6abc930ff0e74a486c0026ad"; + sha256 = "0hp88j9r7l82nx4fbg42hmv2vcfd74f72v6aizj4zdmx3xnxnyb1"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; nvim-code-action-menu = buildVimPluginFrom2Nix { pname = "nvim-code-action-menu"; - version = "2021-10-28"; + version = "2021-11-16"; src = fetchFromGitHub { owner = "weilbith"; repo = "nvim-code-action-menu"; - rev = "32a02caf1cb6d5d31167945a2df9d371d68b1009"; - sha256 = "1cpl29lz2c3fahrrz8lf9dccwy2iwdj4mn71xgn12kq3qarjijdv"; + rev = "d3d059082eff3eb081167f8a232b1bde54bb2bdb"; + sha256 = "0d7imklcz39ir53nr5kr0s826yqrwhrmr5p9iabs07hshyq3khgx"; }; meta.homepage = "https://github.com/weilbith/nvim-code-action-menu/"; }; @@ -4356,36 +4356,36 @@ final: prev: nvim-lint = buildVimPluginFrom2Nix { pname = "nvim-lint"; - version = "2021-11-08"; + version = "2021-11-16"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "0116b78963fd24643faa34fa1bc02f8d425a73ef"; - sha256 = "07y1z3c2mqcwlbg682h9d98wghfh1l69y9j4igw77bdxrcmnlyrr"; + rev = "c3c8a247fda421b0db1f2cbf50ab4340ba0ffc61"; + sha256 = "1sa3mqm65aspa91vavg1ng36w51jsb5kdjsra4bjjmggwbphdz8w"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; nvim-lsp-ts-utils = buildVimPluginFrom2Nix { pname = "nvim-lsp-ts-utils"; - version = "2021-11-11"; + version = "2021-11-16"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "nvim-lsp-ts-utils"; - rev = "1af2922c3ab7f80654c09932c55bd5d70f13f1e3"; - sha256 = "1qcska723k2ajimmib7i57clhdbrbqlcp4b18capsrrnxsl92pq0"; + rev = "825630a5d28634fbb3663d1e605ff0a82b843d81"; + sha256 = "1zj7b0g3f9kqnpzqcvh0p9wg10y7kn5mq8vzcmwsyaiwqpdijgwv"; }; meta.homepage = "https://github.com/jose-elias-alvarez/nvim-lsp-ts-utils/"; }; nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-11-13"; + version = "2021-11-17"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "4191b1fca3bafe759ae5606d19e0f0e54e9fc83b"; - sha256 = "0fd7a9b0930kwd4c6hzfbqz6zq95skf06gc3nvb8g5my82xh5i2s"; + rev = "27d2c116fdea5614f422dcbcae63da01a1415fcf"; + sha256 = "10ip201ihd2jjs9mb0vafa7iqzxh0f0rs5s96rrpw4zaxzq49gkn"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -4692,12 +4692,12 @@ final: prev: onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2021-11-08"; + version = "2021-11-16"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "9015d8a1313b16cf3792830eb8d77553765adb80"; - sha256 = "19mhfr8ih2hp9jadgphwq0g576qsbnggiknv6ipkl60d8jrhxflk"; + rev = "fd4dd7a09bac975c94612ce3c8fa98a51bcce412"; + sha256 = "0drjpfvkk9mmp7v2v16vwc3halxbwkwc95n0x0cz47lp2q3b7kss"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -4921,12 +4921,12 @@ final: prev: presence-nvim = buildVimPluginFrom2Nix { pname = "presence.nvim"; - version = "2021-10-19"; + version = "2021-11-14"; src = fetchFromGitHub { owner = "andweeb"; repo = "presence.nvim"; - rev = "11adcec0db647625c5f4876257d2764db4621662"; - sha256 = "0jzks4nvsw69g0gvrb8qpqszhd957fmx0ly9a11h2m5wry179ppp"; + rev = "e0cab790474fe8bf952edeeaf9bba5128a2434f1"; + sha256 = "1p1knd67sf4pw88y73xakay50br4zhgxr5k7az24cxmqylnn89ra"; }; meta.homepage = "https://github.com/andweeb/presence.nvim/"; }; @@ -5065,12 +5065,12 @@ final: prev: rainbow = buildVimPluginFrom2Nix { pname = "rainbow"; - version = "2021-11-08"; + version = "2021-11-15"; src = fetchFromGitHub { owner = "luochen1990"; repo = "rainbow"; - rev = "f1cb0d3d4a4785428f7ccec9f0e69ad314d748d9"; - sha256 = "15227jrbhagbyvd56cq1byc32hwgbsh293r9fb96419pa3rm9j1l"; + rev = "c18071e5c7790928b763c2e88c487dfc93d84a15"; + sha256 = "1m691f3w1zraam4cmq0sj9a86bmd7g1bhirrzqy5mg089x6n3rdc"; }; meta.homepage = "https://github.com/luochen1990/rainbow/"; }; @@ -5149,12 +5149,12 @@ final: prev: refactoring-nvim = buildVimPluginFrom2Nix { pname = "refactoring.nvim"; - version = "2021-11-12"; + version = "2021-11-17"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "2fbbae64c6c27dfab5c9fae2e520bef9f778bdd8"; - sha256 = "02mi4jbpiya3sdx1f69wyhilmjis5w7bqx562335xmw7z84ksmz7"; + rev = "9f730d6a87a63c7bd8cbc460882ca7e673da3cf1"; + sha256 = "1qqan1g34k11kjf9j50yfdzlgagjv3fm5yxlla9kxg2pz13b2jfc"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; @@ -5269,12 +5269,12 @@ final: prev: rust-tools-nvim = buildVimPluginFrom2Nix { pname = "rust-tools.nvim"; - version = "2021-11-13"; + version = "2021-11-16"; src = fetchFromGitHub { owner = "simrat39"; repo = "rust-tools.nvim"; - rev = "8d0fe8490258f3439aaf132fa7cb71299995bf5e"; - sha256 = "1rbmlkyidng1s635cq4sv415p0231pnqsmds4q2fkzj2mn41wcsh"; + rev = "9f98538d36b5f2e3ac1a11a524b52d11bafdff74"; + sha256 = "0dfian3xi8cn4r537c8jp5qlnhgvppifgr9crrylvgj28y7vj9mw"; }; meta.homepage = "https://github.com/simrat39/rust-tools.nvim/"; }; @@ -5317,24 +5317,24 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2021-11-12"; + version = "2021-11-16"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "23aa17e29c081531a14c03802523ba5e29444de5"; - sha256 = "0890wncvhly5pg39sj2lyi6gnhlhj4v7bvaak9mn03pbzvljx3yi"; + rev = "fa321a8512c199e04e3361fa0679198e1176dc68"; + sha256 = "1ahsldfzqzwy83rhibyscr745s54571h6qmcmaz96rbv6k2wqyb5"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; scrollbar-nvim = buildVimPluginFrom2Nix { pname = "scrollbar.nvim"; - version = "2021-06-04"; + version = "2021-11-16"; src = fetchFromGitHub { owner = "Xuyuanp"; repo = "scrollbar.nvim"; - rev = "c338467dd6ef141fa8ce3172097a1f5be6c43779"; - sha256 = "1wvzdrj8gckhh6x4szipjjb6mg0v3ix5cq5dy83lfb28psyznshw"; + rev = "590b23af866a32277cf803aca0fd770d5b39c2e7"; + sha256 = "1dvlmmxykf3vyhyvv5aiqbz8fd7zvpw4xq1nxnf3wyj371caawaq"; }; meta.homepage = "https://github.com/Xuyuanp/scrollbar.nvim/"; }; @@ -5667,12 +5667,12 @@ final: prev: srcery-vim = buildVimPluginFrom2Nix { pname = "srcery-vim"; - version = "2021-09-25"; + version = "2021-11-17"; src = fetchFromGitHub { owner = "srcery-colors"; repo = "srcery-vim"; - rev = "0325ba54262c7d03450d877b44e692c88b17cf7a"; - sha256 = "1vrvmp3ihjb8zlg5f00hs7d6km8p30g7pakaw5rdk60pxj21sw2v"; + rev = "3d86afaa61aa45ca8d849494d9f8ceb5fc424353"; + sha256 = "16wx3wgmrslpsm1h5fskik2lkas390fj2gjz3vwii4c5mz2ijr9m"; }; meta.homepage = "https://github.com/srcery-colors/srcery-vim/"; }; @@ -6065,12 +6065,12 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope.nvim"; - version = "2021-11-14"; + version = "2021-11-15"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "729492406ec3b545c4ecf2beadf7bd30c81e70e4"; - sha256 = "0vh0r1149xqniggjdr6b92rniwcq5879y01glnsz8rzf6n236zwc"; + rev = "9ac89ebf6755e9a3f4bae86625ec76106526e57b"; + sha256 = "0bljlg2hwa531rp53hwx1w06awksbhxl4lm672rn74sfaxqnzv87"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -6210,12 +6210,12 @@ final: prev: toggleterm-nvim = buildVimPluginFrom2Nix { pname = "toggleterm.nvim"; - version = "2021-11-07"; + version = "2021-11-15"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "0b6d65d8b45e261bc17176e86abb3f631c88fc1b"; - sha256 = "07qj7z2rrdz2n5gks7nh1xvapvdc5s641vsvg0nm54q4y72lp2ds"; + rev = "ff168c8218b963cc7fc9d80b684d840488839bb5"; + sha256 = "09ap50nln9130h6px3x0df3vxlc09iyl419hnr8qf75qa58gbhmr"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; @@ -6234,12 +6234,12 @@ final: prev: traces-vim = buildVimPluginFrom2Nix { pname = "traces.vim"; - version = "2021-08-27"; + version = "2021-11-17"; src = fetchFromGitHub { owner = "markonm"; repo = "traces.vim"; - rev = "419ce02f68b13aa892735febc1d1887a9a11d5db"; - sha256 = "07va4rr9xfmr93qq4nn0d3ssay4mwdvxzl4f92akib36kxnv0m69"; + rev = "803d97786d0fbe95d33fe3c69e213518ea296839"; + sha256 = "1hqma8pjl1ladw8iraa6cnsp9jasx4w08zxq5q63ff5mzdb1avn1"; }; meta.homepage = "https://github.com/markonm/traces.vim/"; }; @@ -6438,12 +6438,12 @@ final: prev: vifm-vim = buildVimPluginFrom2Nix { pname = "vifm.vim"; - version = "2021-11-13"; + version = "2021-11-17"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "225e5ada593fda06504e0c469e98e41d3b739b03"; - sha256 = "0vrawikhv86f2g7qp8p28zcns3vfm1fyaqm1nml0hk3h4xzwnapa"; + rev = "31c80d4f77056e89cabd9ea3e617feea076499f8"; + sha256 = "0p64fr5l5khs4p7d677zkjq6j81mxkh5aailzk9jr82q5sskv3wf"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; @@ -7163,7 +7163,7 @@ final: prev: owner = "flazz"; repo = "vim-colorschemes"; rev = "fd8f122cef604330c96a6a6e434682dbdfb878c9"; - sha256 = "0kpsf6j20fgblc8vhqn7ymr52v2d1h52vc7rbxmxfwdm80nvv3g5"; + sha256 = "1cg8q7w0vgl73aw1b9zz0zh5vw5d2pm8pm54fhfzva4azg56f416"; }; meta.homepage = "https://github.com/flazz/vim-colorschemes/"; }; @@ -7710,12 +7710,12 @@ final: prev: vim-fireplace = buildVimPluginFrom2Nix { pname = "vim-fireplace"; - version = "2021-08-03"; + version = "2021-11-16"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fireplace"; - rev = "c9a155b88d629221628937eadb64a3e87f8d82d9"; - sha256 = "1h0y4k3xypbn4lyyksjddvcdnz8nqy73qnjxm21ahsz73xk6bpwk"; + rev = "18699186aad27dc92867527f5e3c2ad3ed51cb27"; + sha256 = "0681c6ica9xi7cvjzlhlwcvmdvq3109xx39c06d879n7yy6kjyqi"; }; meta.homepage = "https://github.com/tpope/vim-fireplace/"; }; @@ -7842,12 +7842,12 @@ final: prev: vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2021-11-11"; + version = "2021-11-16"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "2e4ee0b5d6e61c6b3bc48e844343f89615dfc6e0"; - sha256 = "0ibks13hicpv5syk6lgrzjfbacwxfp02cmp23ry8wjm2dkzmv81s"; + rev = "2dfaf17f9e9b2c8961eddc8ea51098fef500d189"; + sha256 = "1y5ac8sag0lcdkq8k6rzn1cfcwyrn8fwmm3imsiq4b9883qjw2v2"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -8287,12 +8287,12 @@ final: prev: vim-illuminate = buildVimPluginFrom2Nix { pname = "vim-illuminate"; - version = "2021-09-28"; + version = "2021-11-14"; src = fetchFromGitHub { owner = "RRethy"; repo = "vim-illuminate"; - rev = "084b012ce5bc1bf302b69eb73562146afe0a9756"; - sha256 = "0rl048hny15rq5m85vl0iy11c4xiv0plr0j8b65vqmmb5r1mxmbg"; + rev = "2beae0581caa66cf8c09fad7c7c557f92d49d2bd"; + sha256 = "1qrc789a3aps99x89hiwwrmnxm5hm1qsjp8xjhhls6jk8scqq2qv"; }; meta.homepage = "https://github.com/RRethy/vim-illuminate/"; }; @@ -8395,12 +8395,12 @@ final: prev: vim-javacomplete2 = buildVimPluginFrom2Nix { pname = "vim-javacomplete2"; - version = "2021-11-09"; + version = "2021-11-15"; src = fetchFromGitHub { owner = "artur-shaik"; repo = "vim-javacomplete2"; - rev = "19aec7d63eda429d056586d9bcc98f61f860c668"; - sha256 = "055f58342ai117gq0021zwhv8ck5sca8bxrqqixbv5cjywck0r17"; + rev = "b5c8d305df52e0cb85b3436ca1e958c22c6e2d79"; + sha256 = "1zv6k8ld938zg000svi9q6c5jkbmvlyllxzkl41jcsx2zhqkwdiw"; }; meta.homepage = "https://github.com/artur-shaik/vim-javacomplete2/"; }; @@ -8516,12 +8516,12 @@ final: prev: vim-kitty-navigator = buildVimPluginFrom2Nix { pname = "vim-kitty-navigator"; - version = "2021-11-12"; + version = "2021-11-15"; src = fetchFromGitHub { owner = "knubie"; repo = "vim-kitty-navigator"; - rev = "17b67e86fe25657473b6d191b1f686ef8f451e8d"; - sha256 = "1v1aw2964f5fmfdaymdc1inrw8a0yx3scdcqnxzm2b58l735hbk6"; + rev = "e097580586e802352f225eed467fafa90f11223e"; + sha256 = "1lzgqaxw0y53r1qrcqx3fxb1fdqkswzkl8b6yk4xmdxig6kyhm46"; }; meta.homepage = "https://github.com/knubie/vim-kitty-navigator/"; }; @@ -10558,12 +10558,12 @@ final: prev: vim-vsnip = buildVimPluginFrom2Nix { pname = "vim-vsnip"; - version = "2021-11-02"; + version = "2021-11-15"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip"; - rev = "4d57a1f4efce38e0d05196f9beba4bcc6e9d1ed5"; - sha256 = "0p6bqhddbqnfcd0wq1wy3ix082phhgiqrx593wq54fjx4wqg9xvi"; + rev = "60ee20318550f4a5b6f7a5a8b827540c2c386898"; + sha256 = "0gl34m17pxgyfbdqghhfcgxhbhxwvjc9r048sim1gf86wga4mq39"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; }; @@ -10594,12 +10594,12 @@ final: prev: vim-wakatime = buildVimPluginFrom2Nix { pname = "vim-wakatime"; - version = "2021-11-05"; + version = "2021-11-17"; src = fetchFromGitHub { owner = "wakatime"; repo = "vim-wakatime"; - rev = "2464b7a65c002b3ec92f8a8fc300d52582e9eefd"; - sha256 = "06i33hk0q41dvcr75kqq57jr88sqczqiwfhmssyxifhxfhcb6x2r"; + rev = "0d66dd3596e414368e2b2b77e694e431a4b0bca3"; + sha256 = "157shaarg4xdnfzp47v5nv34py0wii6s7fdgzagh4h1b5czgszyv"; }; meta.homepage = "https://github.com/wakatime/vim-wakatime/"; }; @@ -10882,12 +10882,12 @@ final: prev: vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2021-11-04"; + version = "2021-11-17"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "15eddb7445c6dc9131058631a03140d03443647a"; - sha256 = "0xv1afx1yah867ksxf5a60v3fk1qg5g3vn72bhybqmcjidxz29p8"; + rev = "d80485393139d15df237e856b8ef6675cfb88f6b"; + sha256 = "1cvj7k9xxg4hp0m6lxnqklrnj5dqp4pyx4w6x0p8wh81a94r0wvw"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -10895,12 +10895,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-11-13"; + version = "2021-11-16"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "228bfcfbf8766a39e2e582af13a8fb95b93a6a0a"; - sha256 = "0kpzdk8p8nxj76iqnzkjprymw6bykqr53nkipy4wiajv1940xpvq"; + rev = "c3991f8a53dc8a193a23dba7645ce6b9b8d5038b"; + sha256 = "1zn094xjskqc0pjpjp21j18s9b01j5k0kpczcwf8nxi52bb8815v"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -10955,12 +10955,12 @@ final: prev: vista-vim = buildVimPluginFrom2Nix { pname = "vista.vim"; - version = "2021-10-26"; + version = "2021-11-15"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vista.vim"; - rev = "587b6b2de244491c3fbe118ebe6739a90f3c91b2"; - sha256 = "14qxc1f8nx5ahc8809ywgrzcq08v0qkyw6hnrd9ps7mjxqgrsppf"; + rev = "a0469c645dcbe4033b857da27d35491f39e2f776"; + sha256 = "1i0j11lbqdych2914chb9rlmr902q52v400y3ifzi38g5md9zv3w"; }; meta.homepage = "https://github.com/liuchengxu/vista.vim/"; }; @@ -11136,12 +11136,12 @@ final: prev: YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2021-11-13"; + version = "2021-11-16"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "2badfc08d1e6c64403d6a5d5b42e4a3b78b4b43c"; - sha256 = "0vf5afg6ysd9f48ndglxr40q8smah9dwsbxq6nzqy514xg1bqxbj"; + rev = "e17fb2fc92c7c1bee6a429db0d3b432c811d0c8a"; + sha256 = "0l95wj6ghfip2l7bsdv8frhnd92wdni6a8fi1i356x1ls2fm6vvr"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; diff --git a/pkgs/os-specific/linux/ddcci/default.nix b/pkgs/os-specific/linux/ddcci/default.nix index 27de986110063..086373f1ab5ab 100644 --- a/pkgs/os-specific/linux/ddcci/default.nix +++ b/pkgs/os-specific/linux/ddcci/default.nix @@ -1,14 +1,17 @@ -{ lib, stdenv, fetchFromGitLab, kernel }: +{ lib, stdenv, fetchpatch, fetchFromGitLab, kernel }: stdenv.mkDerivation rec { pname = "ddcci-driver"; - version = "0.4.1"; + # XXX: We apply a patch for the upcoming version to the source of version 0.4.1 + # XXX: When 0.4.2 is actually released, don't forget to remove this comment, + # XXX: fix the rev in fetchFromGitLab, and remove the patch. + version = "0.4.2"; name = "${pname}-${kernel.version}-${version}"; src = fetchFromGitLab { owner = "${pname}-linux"; repo = "${pname}-linux"; - rev = "v${version}"; + rev = "v0.4.1"; sha256 = "1qhsm0ccwfmwn0r6sbc6ms4lf4a3iqfcgqmbs6afr6hhxkqll3fg"; }; @@ -25,6 +28,13 @@ stdenv.mkDerivation rec { --replace depmod \# ''; + patches = [ + (fetchpatch { + url = "https://gitlab.com/ddcci-driver-linux/ddcci-driver-linux/-/commit/bf9d79852cbd0aa5c2e288ce51b8280f74a1f5d2.patch"; + sha256 = "sha256-ShqVzkoRnlX4Y5ARY11YVYatFI1K7bAtLulP3/8/nwg="; + }) + ]; + makeFlags = kernel.makeFlags ++ [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "KVER=${kernel.modDirVersion}" @@ -38,6 +48,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ ]; platforms = platforms.linux; - broken = kernel.kernelOlder "5.1" || kernel.kernelAtLeast "5.15"; + broken = kernel.kernelOlder "5.1"; }; } diff --git a/pkgs/os-specific/linux/i7z/default.nix b/pkgs/os-specific/linux/i7z/default.nix index 2e00e9eedc3b2..7de8046483d41 100644 --- a/pkgs/os-specific/linux/i7z/default.nix +++ b/pkgs/os-specific/linux/i7z/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "i7z"; - version = "0.27.3"; + version = "0.27.4"; src = fetchFromGitHub { owner = "DimitryAndric"; repo = "i7z"; rev = "v${version}"; - sha256 = "0l8wz0ffb27nkwchc606js652spk8masy3kjmzh7ygipwsary5ds"; + sha256 = "00c4ng30ry88hcya4g1i9dngiqmz3cs31x7qh1a10nalxn1829xy"; }; buildInputs = [ ncurses ] ++ lib.optional withGui qtbase; diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index f9cab463186dd..20968e3571ae3 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -748,11 +748,18 @@ let BSD_PROCESS_ACCT_V3 = yes; + SERIAL_DEV_BUS = whenAtLeast "4.11" yes; # enables support for serial devices + SERIAL_DEV_CTRL_TTYPORT = whenAtLeast "4.11" yes; # enables support for TTY serial devices + BT_HCIBTUSB_MTK = whenAtLeast "5.3" yes; # MediaTek protocol support + BT_HCIUART_QCA = whenAtLeast "4.3" yes; # Qualcomm Atheros protocol support + BT_HCIUART_SERDEV = whenAtLeast "4.12" yes; # required by BT_HCIUART_QCA + BT_HCIUART = whenAtLeast "2.5.45" module; # required for BT devices with serial port interface (QCA6390) BT_HCIUART_BCSP = option yes; BT_HCIUART_H4 = option yes; # UART (H4) protocol support BT_HCIUART_LL = option yes; BT_RFCOMM_TTY = option yes; # RFCOMM TTY support + BT_QCA = whenAtLeast "4.3" module; # enables QCA6390 bluetooth CLEANCACHE = option yes; CRASH_DUMP = option no; diff --git a/pkgs/servers/grocy/default.nix b/pkgs/servers/grocy/default.nix index d8c73ad39b90e..b1a37c9dd2a4a 100644 --- a/pkgs/servers/grocy/default.nix +++ b/pkgs/servers/grocy/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "grocy"; - version = "3.1.2"; + version = "3.1.3"; src = fetchurl { url = "https://github.com/grocy/grocy/releases/download/v${version}/grocy_${version}.zip"; - sha256 = "sha256-Kw2UA3jJEfGPr9jMnDmJ4GW87fwM80pQpqTz9ugXzow="; + sha256 = "sha256-6vgnV9HQHwJGUHGxAMXxXXiEj2kNTWqGcHnpPHvma/Q="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/servers/heisenbridge/default.nix b/pkgs/servers/heisenbridge/default.nix index c03b0ba8846de..0d1b538ceba81 100644 --- a/pkgs/servers/heisenbridge/default.nix +++ b/pkgs/servers/heisenbridge/default.nix @@ -1,16 +1,20 @@ -{ lib, fetchurl, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonApplication rec { pname = "heisenbridge"; - version = "1.6.0"; + version = "1.7.0"; - # Use the release tarball because it has the version set correctly using the - # version.txt file. - src = fetchurl { - url = "https://github.com/hifi/heisenbridge/releases/download/v${version}/heisenbridge-${version}.tar.gz"; - sha256 = "sha256-NhHMReY48lg1FhJlCRjRiSpy+9bDLtIV+j+zX8GZcL4="; + src = fetchFromGitHub { + owner = "hifi"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-rN+qoBS9zIy5EHlFQxgAlcz9haoYJNMKJ2wlS46UOi0="; }; + postPatch = '' + echo "${version}" > heisenbridge/version.txt + ''; + propagatedBuildInputs = with python3Packages; [ aiohttp irc @@ -19,6 +23,10 @@ python3Packages.buildPythonPackage rec { pyyaml ]; + checkInputs = with python3Packages; [ + pytestCheckHook + ]; + meta = with lib; { description = "A bouncer-style Matrix-IRC bridge."; homepage = "https://github.com/hifi/heisenbridge"; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 37b078adefa19..a84ad21775fc5 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -533,7 +533,7 @@ "mold_indicator" = ps: with ps; [ ]; "monoprice" = ps: with ps; [ ]; # missing inputs: pymonoprice "moon" = ps: with ps; [ ]; - "motion_blinds" = ps: with ps; [ aiohttp-cors ifaddr ]; # missing inputs: motionblinds + "motion_blinds" = ps: with ps; [ aiohttp-cors ifaddr motionblinds ]; "motioneye" = ps: with ps; [ aiohttp-cors motioneye-client ]; "mpchc" = ps: with ps; [ ]; "mpd" = ps: with ps; [ mpd2 ]; @@ -573,7 +573,7 @@ "nextcloud" = ps: with ps; [ nextcloudmonitor ]; "nfandroidtv" = ps: with ps; [ ]; # missing inputs: notifications-android-tv "nightscout" = ps: with ps; [ ]; # missing inputs: py-nightscout - "niko_home_control" = ps: with ps; [ ]; # missing inputs: niko-home-control + "niko_home_control" = ps: with ps; [ niko-home-control ]; "nilu" = ps: with ps; [ niluclient ]; "nissan_leaf" = ps: with ps; [ pycarwings2 ]; "nmap_tracker" = ps: with ps; [ aiohttp-cors getmac ifaddr netmap ]; # missing inputs: mac-vendor-lookup diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 59d2ee364b236..688afc5baa0ac 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -520,6 +520,7 @@ in with py.pkgs; buildPythonApplication rec { "modbus" "mold_indicator" "moon" + "motion_blinds" "motioneye" "mqtt" "mqtt_eventstream" diff --git a/pkgs/servers/http/tomcat/jdbc/mysql/builder.sh b/pkgs/servers/http/tomcat/jdbc/mysql/builder.sh deleted file mode 100644 index 14829c5e85d81..0000000000000 --- a/pkgs/servers/http/tomcat/jdbc/mysql/builder.sh +++ /dev/null @@ -1,4 +0,0 @@ -source $stdenv/setup - -mkdir -p $out/lib -ln -s $mysql_jdbc/share/java/mysql-connector-java.jar $out/lib/mysql-connector-java.jar diff --git a/pkgs/servers/http/tomcat/jdbc/mysql/default.nix b/pkgs/servers/http/tomcat/jdbc/mysql/default.nix index 7585cabccd148..9e6f346a0ec4b 100644 --- a/pkgs/servers/http/tomcat/jdbc/mysql/default.nix +++ b/pkgs/servers/http/tomcat/jdbc/mysql/default.nix @@ -2,12 +2,19 @@ stdenv.mkDerivation { pname = "tomcat-mysql-jdbc"; - builder = ./builder.sh; - buildInputs = [ mysql_jdbc ]; - - inherit mysql_jdbc; version = mysql_jdbc.version; + dontUnpack = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib + ln -s $mysql_jdbc/share/java/mysql-connector-java.jar $out/lib/mysql-connector-java.jar + + runHook postInstall + ''; + meta = { platforms = lib.platforms.unix; }; diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index ffbeab36ff4f5..e2f0984bb93d8 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -1,23 +1,32 @@ -{ lib, stdenv, fetchurl, mono, makeWrapper, curl, icu60, openssl, zlib }: +{ lib +, buildDotnetModule +, fetchFromGitHub +, dotnetCorePackages +, openssl +}: -stdenv.mkDerivation rec { +buildDotnetModule rec { pname = "jackett"; - version = "0.18.925"; + version = "0.19.138"; - src = fetchurl { - url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "1md0iy6sx0agsnvrj9m7bq1lvp5z34x7zv3pvwy4zw8b46w97mnz"; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "0qaaccc95csahylzv65ndx990kcr075jffawbjpsjfkxzflfjq9n"; }; - nativeBuildInputs = [ makeWrapper ]; + projectFile = "src/Jackett.Server/Jackett.Server.csproj"; + nugetDeps = ./deps.nix; - installPhase = '' - mkdir -p $out/{bin,share/${pname}-${version}} - cp -r * $out/share/${pname}-${version} + dotnetInstallFlags = [ "-p:TargetFramework=net5.0" ]; + dotnet-runtime = dotnetCorePackages.aspnetcore_5_0; - makeWrapper "${mono}/bin/mono" $out/bin/Jackett \ - --add-flags "$out/share/${pname}-${version}/JackettConsole.exe" \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ curl icu60 openssl zlib ]} + runtimeDeps = [ openssl ]; + + postFixup = '' + # Legacy + ln -s $out/bin/jackett $out/bin/Jackett ''; meta = with lib; { @@ -27,4 +36,5 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ edwtjo nyanloutre purcell ]; platforms = platforms.all; }; + passthru.updateScript = ./updater.sh; } diff --git a/pkgs/servers/jackett/deps.nix b/pkgs/servers/jackett/deps.nix new file mode 100644 index 0000000000000..9ac744694198b --- /dev/null +++ b/pkgs/servers/jackett/deps.nix @@ -0,0 +1,250 @@ +{ fetchNuGet }: [ + (fetchNuGet { name = "AngleSharp"; version = "0.14.0"; sha256 = "1zgwhh1fp2mmaplvpgm86rpmslix3wqfxf0d3hxx1gxwfgr6wxm6"; }) + (fetchNuGet { name = "Autofac"; version = "5.2.0"; sha256 = "0yxks2nynl0mcg3m94cl94x50k3wa8xh9k3f2gmh8mxn5nrpl64r"; }) + (fetchNuGet { name = "Autofac.Extensions.DependencyInjection"; version = "6.0.0"; sha256 = "0ljgzn1jlv4k0q13l9n7gjrbw49wdfjzg8rvbwzzrg73bz77vxm3"; }) + (fetchNuGet { name = "AutoMapper"; version = "8.1.1"; sha256 = "1p2sc82lrbarhs08n2132vijfr3hv9zksb6ra12y9hfckam5lz9h"; }) + (fetchNuGet { name = "BencodeNET"; version = "3.1.4"; sha256 = "12zim3k5wnlxgkg3310djh3zy97d6g3k3xvf87qd8pk2669vb1gw"; }) + (fetchNuGet { name = "CommandLineParser"; version = "2.8.0"; sha256 = "1m32xyilv2b7k55jy8ddg08c20glbcj2yi545kxs9hj2ahanhrbb"; }) + (fetchNuGet { name = "DotNet4.SocksProxy"; version = "1.4.0.1"; sha256 = "1ig2a9ism041a6qrqkxa9xhvp19yxzcadlap5i1kz97f05a2msvb"; }) + (fetchNuGet { name = "FlareSolverrSharp"; version = "2.0.0"; sha256 = "15rs97ayh6s9g2vbn3r1bj7imazald0f22gfikw6mmyx5ghc3zrz"; }) + (fetchNuGet { name = "Microsoft.AspNetCore"; version = "2.2.0"; sha256 = "0vsv7hcsmnsgqhs67zp207n7m9ix3dbwm1p2ch3dizkcdvz235f9"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Antiforgery"; version = "2.2.0"; sha256 = "026wjdwjx0lgccqv0xi5gxylxzgz5ifgxf25p5pqakgrhkz0a59l"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Authentication"; version = "2.2.0"; sha256 = "0yqfzd0qq5ypmk6b9gnb1yscl75fxx9frq808cxs70ay7y7jqmgn"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Authentication.Abstractions"; version = "2.2.0"; sha256 = "0vj7fhpk0d95nkkxz4q0rma6pb4ym96mx6nms4603y0l19h0k5yh"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Authentication.Cookies"; version = "2.2.0"; sha256 = "0x7i7dmvq5ph8f21ajgb56fjvv31r4zn6pj8d7rsx0y6067vcp5d"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Authentication.Core"; version = "2.2.0"; sha256 = "1wgn45fmdi7dk9cl4cdhzgqc9mdxhfw7zg8zwns3j7qgrhlv6k8h"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Authorization"; version = "2.2.0"; sha256 = "1mpq8pmxlxfa625k2ghv6xcyy2wdpwv56xzya9mvmlnh50h1i8rx"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Authorization.Policy"; version = "2.2.0"; sha256 = "1d1zh65kfjf81j21ssmhr465vx08bra8424vgnrb22gdx03mhwd2"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Connections.Abstractions"; version = "2.2.0"; sha256 = "1rl94r8b0zq14f3dhfnvfjj1ivr81iw9zh5kdgs3zkdv0xc9x21j"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Cors"; version = "2.2.0"; sha256 = "0qskbz87i74kfbklxqfyqaccyba21kkx2lcdfa54kxj9r8daq7sc"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Cryptography.Internal"; version = "2.2.0"; sha256 = "01lg2fx85b47ldgdrhs6clsivj35x54xwc9r5xk3f1v8rr3gycsv"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.DataProtection"; version = "2.2.0"; sha256 = "09lzbp084xxy1xxfbxpqdff8phv2pzd1n5v30xfm03hhl7a038gx"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.DataProtection.Abstractions"; version = "2.2.0"; sha256 = "1gi4hpssmrrdf5lm6idkhvqbfy12bx14976y4gbhmx9z8lxaqcfz"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Diagnostics"; version = "2.2.0"; sha256 = "0hq5s2h0k2714352bdz2s3c3m6spkn4ckfw3pv9c4rmn6adbw9b1"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Diagnostics.Abstractions"; version = "2.2.0"; sha256 = "061cdhjh5w2f1frhimcgk68vx8p743jb9h4qik3lm1c734r0drm0"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.HostFiltering"; version = "2.2.0"; sha256 = "06wbgkbh24w9yxz6g8446l7nnjm3rdp1wklri710zqzr7zbfcx43"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Hosting"; version = "2.2.0"; sha256 = "1nk61mj7a4ri3p47xd0j520szwj05xid16r2bld85cp70xnpxjhx"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Hosting.Abstractions"; version = "2.1.0"; sha256 = "0sdzvjf6bz0krr2bm77zdyxpjcddadq2fqd3b4yybd6my3b5f7j2"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Hosting.Abstractions"; version = "2.2.0"; sha256 = "043k651vbfshh3s997x42ymj8nb32419m7q3sjw5q2c27anrhfhv"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Hosting.Server.Abstractions"; version = "2.1.0"; sha256 = "1xm8913slkx0cvk7gcbk1sf9518xmrajjjp3z8qhr5xdhdx1b879"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Hosting.Server.Abstractions"; version = "2.2.0"; sha256 = "0nz73bwrvhc1n7gd7xxm3p5ww2wx9qr9m9i43y20gh0c54adkygh"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Html.Abstractions"; version = "2.2.0"; sha256 = "1z5lkzb9h9wprvyxyjw4fj7bjypaibsw0cj4bz769hf0abjz8y1v"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Http"; version = "2.1.0"; sha256 = "1nrhbsr58fh6hpzxq75qvrimh0lk6pdwghs3cbv0f1zk90rar1cq"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Http"; version = "2.2.0"; sha256 = "1fcrafpa57sab3as18idqknzlxkx49n4sxzlzik3sj6pcji5j17q"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Http"; version = "2.2.2"; sha256 = "09mgjvpqdyylz9dbngql9arx46lfkiczjdf7aqr9asd5vjqlv2c8"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Http.Abstractions"; version = "2.1.0"; sha256 = "0jz5w1y661cxbh1sakyjh0813sqrc456mj53w3482ilb5xh5zhbf"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Http.Abstractions"; version = "2.2.0"; sha256 = "13s8cm6jdpydxmr0rgmzrmnp1v2r7i3rs7v9fhabk5spixdgfy6b"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Http.Extensions"; version = "2.2.0"; sha256 = "118gp1mfb8ymcvw87fzgjqwlc1d1b0l0sbfki291ydg414cz3dfn"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Http.Features"; version = "2.1.0"; sha256 = "1mwpvbq0z982f9r5ik6k15h18qviy735i55hld9vfk8694k9zwcj"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Http.Features"; version = "2.2.0"; sha256 = "0xrlq8i61vzhzzy25n80m7wh2kn593rfaii3aqnxdsxsg6sfgnx1"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.HttpOverrides"; version = "2.2.0"; sha256 = "1pbmmczxilgrf4qyaql88dc3av7kaixb1r36358kil68gl3irjy6"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.JsonPatch"; version = "2.2.0"; sha256 = "07cihb5sqkavg42nvircdwjp0b67mhrla97jgx285zdjphplg4h2"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.JsonPatch"; version = "5.0.0"; sha256 = "192mn6r73xjw8fvlss6vrv34iiavq7k8pg0w7advgj6khklw4dzx"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Localization"; version = "2.2.0"; sha256 = "08knc70cy7ycid5sbbbzy6my4b7ddj4j760k5xf1qnfb0njxhfh7"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Mvc"; version = "2.2.0"; sha256 = "16jrikcywkd4r4jh551p8gxxw6hj3aizdzd5i7agb06gwpgqqv9c"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Mvc.Abstractions"; version = "2.2.0"; sha256 = "09p447ipd19517vy8xx9ykvspn6b4fgbm2rskpmzyw41x9wz4k0b"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Mvc.Analyzers"; version = "2.2.0"; sha256 = "1b975z00bzgh2z5hina4bzfksvc2vgnbzmi8g3q962hspg6ylh9f"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Mvc.ApiExplorer"; version = "2.2.0"; sha256 = "1ryhd1md30fgrli74qv45mhldivbasdvydw0lllg6x6jzpyrkwpa"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Mvc.Core"; version = "2.2.0"; sha256 = "1k6lkgk9zak5sczvyjbwgqnfcwcg9ks74wznqfzck8c6hns1by0m"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Mvc.Cors"; version = "2.2.0"; sha256 = "077vjxn0k5rr4s675g50rzkns6scgijxxh5iib59k77ldwpdr14q"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Mvc.DataAnnotations"; version = "2.2.0"; sha256 = "0vdhdjarh4az7g71gkvmhq6xpvwhh8si3sbrpdwb8p60i94cdyl6"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Mvc.Formatters.Json"; version = "2.2.0"; sha256 = "0421fcf2z8a6z81ql123ili32wbr3x25zpq17xjf4s9fmsr0069a"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Mvc.Localization"; version = "2.2.0"; sha256 = "0d27xirwsr3j7jacsrz6g2r4py35hgzjyy6ak6gkd07cm707wgc6"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; version = "5.0.0"; sha256 = "1q3z35pxgvpf6l6ywh5wb6gfly055rk99a80rjqisyrbmza1msd1"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Mvc.Razor"; version = "2.2.0"; sha256 = "06fqg7rfyvfj3hdppkhy37ddjff2d6pg7khj6lccs9lwc732yr7q"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Mvc.Razor.Extensions"; version = "2.2.0"; sha256 = "04javqbzv7mkakqjl40j429giaagjj7hmwcljrgj8q1jknk0x9xc"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Mvc.RazorPages"; version = "2.2.0"; sha256 = "0zqyqfxzl3lkqfy9chd0ipani75q3109imlxrnhdfiwmxrd8xqbm"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Mvc.TagHelpers"; version = "2.2.0"; sha256 = "16aprk81sp2i0n0dmp318cm65mk03i58rhpijm4fz4xz51j7z8li"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Mvc.ViewFeatures"; version = "2.2.0"; sha256 = "1isflvb0ff5nfqnvdlyvmszkd42axbbz0xmdaf0d7sah0qkvvi7n"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Razor"; version = "2.2.0"; sha256 = "02ybprvsi59nwa0fdq99jvx7r26bs2bg3xjxkilc495clgg98zp0"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Razor.Design"; version = "2.2.0"; sha256 = "03pcdcbmyw050hag588b7caqilnq3cb6ndq5g6j0r7j7wf3plsn6"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Razor.Language"; version = "2.2.0"; sha256 = "0n58qdipwy5wymfhgm3anickwvnf4svb9ipbrby7ksrhhrkqvx4z"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Razor.Runtime"; version = "2.2.0"; sha256 = "1n9j5hjinm5gp39nwmcf26dwg1psl7sf7xkxnvfxsnl44mbcy695"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.ResponseCaching.Abstractions"; version = "2.2.0"; sha256 = "01sp2i2bgcn6blw1mcvg5nrlc97c9czyawwvgfi6ydzdvs6ang37"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.ResponseCompression"; version = "2.2.0"; sha256 = "0madnk92752alpc7cv2bazqlihhzgl3yj1s9ajhi3w09vg8n8pz4"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Rewrite"; version = "2.2.0"; sha256 = "0f21v96wkvxcxfz5a9nvhqf1dshvgg34g9075fb0nd57nsw289af"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Routing"; version = "2.2.0"; sha256 = "12kv602j2rxp43l1v3618yz3pdd7hqc3r98ya0bqz6y2ppvhbyws"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Routing.Abstractions"; version = "2.1.0"; sha256 = "1f8xixbg749nhv10vaf3jmdv9zjdw822hw7ikwa97h70767d8xz5"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Routing.Abstractions"; version = "2.2.0"; sha256 = "0d9wwz1rsh1fslbv1y72jpkvqv2v9n28rl3vslcg0x74lp2678ly"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Server.IIS"; version = "2.2.0"; sha256 = "0cgyw8xjr6kgvrj7rn072mr97sh4xj95f635vmjrx10b8rnypmkk"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Server.IISIntegration"; version = "2.2.0"; sha256 = "1dmk68cyh02g9fcg1bxp90dxl7xpqiqikdlh1835jgm44m985mpc"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Server.Kestrel"; version = "2.2.0"; sha256 = "0wh7hf09i9qxs9r0d5xdcx3qingsid9nxlwcyjg2r44pjs6cg1rf"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Server.Kestrel.Core"; version = "2.2.0"; sha256 = "075ffds8hwp8ps0zf84bsv9pgiaqry9njc403qack701aybci97r"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Server.Kestrel.Https"; version = "2.2.0"; sha256 = "08z447wrbzy3l9lmmas353nr17sg9yccwcg62l9ax9a6n1wvds8c"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions"; version = "2.2.0"; sha256 = "08bj95zy4zszyx1rsy8v2ai9kg4120ij6yi0zillwx3ndb3q7vfb"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets"; version = "2.2.0"; sha256 = "0vhicfnv12sz2c81czdgdlffcgrhnn1jzz9zwy3a9c2n4rn8k9k5"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.StaticFiles"; version = "2.2.0"; sha256 = "1bpggypnx8ai11jqlbyb6cir3x7cnw1mvqh6h88f3b0gg8wxnnpj"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.WebUtilities"; version = "2.1.0"; sha256 = "148snpiq4rhm44gzx8wn9ljfb286h7vd1axc9by4r4fxp0gix0kf"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.WebUtilities"; version = "2.2.0"; sha256 = "0cs1g4ing4alfbwyngxzgvkrv7z964isv1j9dzflafda4p0wxmsi"; }) + (fetchNuGet { name = "Microsoft.Bcl.AsyncInterfaces"; version = "1.1.0"; sha256 = "1dq5yw7cy6s42193yl4iqscfw5vzkjkgv0zyy32scr4jza6ni1a1"; }) + (fetchNuGet { name = "Microsoft.CodeAnalysis.Analyzers"; version = "1.1.0"; sha256 = "08r667hj2259wbim1p3al5qxkshydykmb7nd9ygbjlg4mmydkapc"; }) + (fetchNuGet { name = "Microsoft.CodeAnalysis.Common"; version = "2.8.0"; sha256 = "0g4h41fs0r8lqh9pk9s4mc1090kdpa6sbxq4rc866s8hnq9s1h4j"; }) + (fetchNuGet { name = "Microsoft.CodeAnalysis.CSharp"; version = "2.8.0"; sha256 = "0p1xvw1h2fmnxywv1j4x6p3rgarpc8mfwfgn0vflk5xfnc961f6w"; }) + (fetchNuGet { name = "Microsoft.CodeAnalysis.Razor"; version = "2.2.0"; sha256 = "03cm9danxxnsnmrzfz2swz6zhckkgg6hrz1ycnvnjrbpk3w4v0d6"; }) + (fetchNuGet { name = "Microsoft.CSharp"; version = "4.5.0"; sha256 = "01i28nvzccxbqmiz217fxs6hnjwmd5fafs37rd49a6qp53y6623l"; }) + (fetchNuGet { name = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) + (fetchNuGet { name = "Microsoft.DiaSymReader.Native"; version = "1.7.0"; sha256 = "0l2w3xpr7dpni20mqx41hqdzkrl0k6w9a0wqmjzdqv5f1jrwhfxn"; }) + (fetchNuGet { name = "Microsoft.DotNet.PlatformAbstractions"; version = "2.1.0"; sha256 = "1qydvyyinj3b5mraazjal3n2k7jqhn05b6n1a2f3qjkqkxi63dmy"; }) + (fetchNuGet { name = "Microsoft.Extensions.Caching.Abstractions"; version = "2.2.0"; sha256 = "0hhxc5dp52faha1bdqw0k426zicsv6x1kfqi30m9agr0b2hixj52"; }) + (fetchNuGet { name = "Microsoft.Extensions.Caching.Memory"; version = "2.2.0"; sha256 = "0bzrsn5vas86w66bd04xilnlb21nx4l6lz7d3acvy6y8ir2vb5dv"; }) + (fetchNuGet { name = "Microsoft.Extensions.Configuration"; version = "3.1.8"; sha256 = "1px3f7snw2iry7h7gfxzq0vg88cc8bf5kga22p0nkrkpgrm9hasa"; }) + (fetchNuGet { name = "Microsoft.Extensions.Configuration"; version = "5.0.0"; sha256 = "01m9vzlq0vg0lhckj2dimwq42niwny8g3lm13c9a401hlyg90z1p"; }) + (fetchNuGet { name = "Microsoft.Extensions.Configuration.Abstractions"; version = "2.1.0"; sha256 = "03gzlr3z9j1xnr1k6y91zgxpz3pj27i3zsvjwj7i8jqnlqmk7pxd"; }) + (fetchNuGet { name = "Microsoft.Extensions.Configuration.Abstractions"; version = "2.2.0"; sha256 = "1fv5277hyhfqmc0gqszyqb1ilwnijm8kc9606yia6hwr8pxyg674"; }) + (fetchNuGet { name = "Microsoft.Extensions.Configuration.Abstractions"; version = "3.1.8"; sha256 = "05mlbia6vag0a0zfflv1m3ix48230wx0yib5hp7zsc72jpcmjd7q"; }) + (fetchNuGet { name = "Microsoft.Extensions.Configuration.Abstractions"; version = "5.0.0"; sha256 = "0fqxkc9pjxkqylsdf26s9q21ciyk56h1w33pz3v1v4wcv8yv1v6k"; }) + (fetchNuGet { name = "Microsoft.Extensions.Configuration.Binder"; version = "2.1.0"; sha256 = "0x1888w5ypavvszfmpja9krgc64527prs75vm8xbf9fv3rgsplql"; }) + (fetchNuGet { name = "Microsoft.Extensions.Configuration.Binder"; version = "2.2.0"; sha256 = "10qyjdkymdmag3r807kvbnwag4j3nz65i4cwikbd77jjvz92ya3j"; }) + (fetchNuGet { name = "Microsoft.Extensions.Configuration.Binder"; version = "3.0.0"; sha256 = "1415h62v6l1yjg95zrhbarwshmdd3hyphxavdim2z10lkyhsj9vz"; }) + (fetchNuGet { name = "Microsoft.Extensions.Configuration.CommandLine"; version = "2.2.0"; sha256 = "09kc7a6g6r9lxcm7y445bmnmkhxkxxvmx6fxh99ixb8a1fkxrvfi"; }) + (fetchNuGet { name = "Microsoft.Extensions.Configuration.EnvironmentVariables"; version = "2.2.0"; sha256 = "1af6003lmw6ms53m8wsvp9rx1alr8r9pharf6azaqcw4m99vd8c5"; }) + (fetchNuGet { name = "Microsoft.Extensions.Configuration.FileExtensions"; version = "2.2.0"; sha256 = "0bwk1kh6q259nmnly90j5rbbzi9w5gigq5vyjr31c1br4j8cjmqd"; }) + (fetchNuGet { name = "Microsoft.Extensions.Configuration.Json"; version = "2.2.0"; sha256 = "18cmrvlhc71bxplldbgwfjg29qflcaf4rrg2avp4g03fqwma6vvc"; }) + (fetchNuGet { name = "Microsoft.Extensions.Configuration.UserSecrets"; version = "2.2.0"; sha256 = "15qarrjb7q463hsfkkja3yd34zf370qwjy22586w4r22rpxwirwp"; }) + (fetchNuGet { name = "Microsoft.Extensions.DependencyInjection"; version = "2.2.0"; sha256 = "0lvv45rvq1xbf47lz818rjydc776zk8mf7svpzh1dml4qwlx9zck"; }) + (fetchNuGet { name = "Microsoft.Extensions.DependencyInjection"; version = "3.0.0"; sha256 = "0cqbvy49ph16rlba2f35qhi0n7vpcf5kjybvn5fbs7dchfdzw927"; }) + (fetchNuGet { name = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.1.0"; sha256 = "0c0cx8r5xkjpxmcfp51959jnp55qjvq28d9vaslk08avvi1by12s"; }) + (fetchNuGet { name = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.2.0"; sha256 = "1jyzfdr9651h3x6pxwhpfbb9mysfh8f8z1jvy4g117h9790r9zx5"; }) + (fetchNuGet { name = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "3.0.0"; sha256 = "06s8j8v0w06f12jxw6vvsd0l5zqrmsvc3rr2gqx9z3gcq7mdnr3l"; }) + (fetchNuGet { name = "Microsoft.Extensions.DependencyModel"; version = "2.1.0"; sha256 = "0dl4qhjgifm6v3jsfzvzkvddyic77ggp9fq49ah661v45gk6ilgd"; }) + (fetchNuGet { name = "Microsoft.Extensions.FileProviders.Abstractions"; version = "2.1.0"; sha256 = "1sxls5f5cgb0wr8cwb05skqmz074683hrhmd3hhq6m5dasnzb8n3"; }) + (fetchNuGet { name = "Microsoft.Extensions.FileProviders.Abstractions"; version = "2.2.0"; sha256 = "1f83ffb4xjwljg8dgzdsa3pa0582q6b4zm0si467fgkybqzk3c54"; }) + (fetchNuGet { name = "Microsoft.Extensions.FileProviders.Composite"; version = "2.2.0"; sha256 = "0k3qfxb0pn9b63grbf9jv7xw40gk6m1djmi3c4inwys7lxcj2k18"; }) + (fetchNuGet { name = "Microsoft.Extensions.FileProviders.Physical"; version = "2.2.0"; sha256 = "0lrq4bxf67pw6n9kzwzqsnxkad2ygh2zn46hjias8j7aqljglh7x"; }) + (fetchNuGet { name = "Microsoft.Extensions.FileSystemGlobbing"; version = "2.2.0"; sha256 = "01jw7s1nb44n65qs3rk7xdzc419qwl0s5c34k031f1cc5ag3jvc2"; }) + (fetchNuGet { name = "Microsoft.Extensions.Hosting.Abstractions"; version = "2.1.0"; sha256 = "04vm9mdjjzg3lpp2rzpgkpn8h5bzdl3bwcr22lshd3kp602ws4k9"; }) + (fetchNuGet { name = "Microsoft.Extensions.Hosting.Abstractions"; version = "2.2.0"; sha256 = "1xc7xr1nq7akfahyl5in9iyxrygap2xi9nxh39rfm37sf8lk55v1"; }) + (fetchNuGet { name = "Microsoft.Extensions.Localization"; version = "2.2.0"; sha256 = "1k73kk5qmrvdyd7l8qxp19crw18f2p5dgk3cjx59g7vf3rkgmc6k"; }) + (fetchNuGet { name = "Microsoft.Extensions.Localization.Abstractions"; version = "2.2.0"; sha256 = "1yzqs5x97rj6wlg0rylj0xi3dn1bw4ps26zdqsijx621jl1r97gy"; }) + (fetchNuGet { name = "Microsoft.Extensions.Logging"; version = "2.1.0"; sha256 = "0dii8i7s6libfnspz2xb96ayagb4rwqj2kmr162vndivr9rmbm06"; }) + (fetchNuGet { name = "Microsoft.Extensions.Logging"; version = "2.2.0"; sha256 = "0bx3ljyvvcbikradq2h583rl72h8bxdz33aghk026cxzpv2mm3wm"; }) + (fetchNuGet { name = "Microsoft.Extensions.Logging"; version = "3.0.0"; sha256 = "1a9laql7pnka3n8ca26rsclkiijcdrzd57jyvbyrihgpb7bmzx0r"; }) + (fetchNuGet { name = "Microsoft.Extensions.Logging.Abstractions"; version = "2.1.0"; sha256 = "1gvgif1wcx4k6pv7gc00qv1hid945jdywy1s50s33q0hfd91hbnj"; }) + (fetchNuGet { name = "Microsoft.Extensions.Logging.Abstractions"; version = "2.2.0"; sha256 = "02w7hp6jicr7cl5p456k2cmrjvvhm6spg5kxnlncw3b72358m5wl"; }) + (fetchNuGet { name = "Microsoft.Extensions.Logging.Abstractions"; version = "3.0.0"; sha256 = "0453382r1f39hgvw631lk1hx2kas8xa1xjr6xq4wshan8d62xgd7"; }) + (fetchNuGet { name = "Microsoft.Extensions.Logging.Configuration"; version = "2.2.0"; sha256 = "1npblvkb4f251277sm6mc1xj2yww6nzag0azfz772nzkbdpj1q19"; }) + (fetchNuGet { name = "Microsoft.Extensions.Logging.Console"; version = "2.2.0"; sha256 = "1g4wcd1kac0b4l0k4blr3qxpyfaf092cs2wnsjb3paj60rhr5agf"; }) + (fetchNuGet { name = "Microsoft.Extensions.Logging.Debug"; version = "2.2.0"; sha256 = "1z5zzf43dw5xzvylkcgdi0q2mfhig6fmw2p5mxdxx916c5s007np"; }) + (fetchNuGet { name = "Microsoft.Extensions.Logging.EventSource"; version = "2.2.0"; sha256 = "18kz2bm07zfj6d4j17zkj2zai7fmbsaq4xh312nh1x4468vi088g"; }) + (fetchNuGet { name = "Microsoft.Extensions.ObjectPool"; version = "2.1.0"; sha256 = "0i0vmfc3ch7xa3awmbw3byylprfl2d6dp7lgm8k8f215kxzl1wdn"; }) + (fetchNuGet { name = "Microsoft.Extensions.ObjectPool"; version = "2.2.0"; sha256 = "0n1q9lvc24ii1shzy575xldgmz7imnk4dswwwcgmzz93klri9r1z"; }) + (fetchNuGet { name = "Microsoft.Extensions.Options"; version = "2.1.0"; sha256 = "0w9644sryd1c6r3n4lq2cgd5pn6jl3k5m38a05m7vjffa4m2spd2"; }) + (fetchNuGet { name = "Microsoft.Extensions.Options"; version = "2.2.0"; sha256 = "1b20yh03fg4nmmi3vlf6gf13vrdkmklshfzl3ijygcs4c2hly6v0"; }) + (fetchNuGet { name = "Microsoft.Extensions.Options"; version = "3.0.0"; sha256 = "1vzx8ha74y542n6w54vf60676aaz01ryklz6rm70w83v7sg2fxg3"; }) + (fetchNuGet { name = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "2.2.0"; sha256 = "0w95rpxl0fzcz7rp8zabv3c9bvkj9ma2mj1hrx9nipsc4dnqp4jd"; }) + (fetchNuGet { name = "Microsoft.Extensions.Primitives"; version = "2.1.0"; sha256 = "1r9gzwdfmb8ysnc4nzmyz5cyar1lw0qmizsvrsh252nhlyg06nmb"; }) + (fetchNuGet { name = "Microsoft.Extensions.Primitives"; version = "2.2.0"; sha256 = "0znah6arbcqari49ymigg3wiy2hgdifz8zsq8vdc3ynnf45r7h0c"; }) + (fetchNuGet { name = "Microsoft.Extensions.Primitives"; version = "3.0.0"; sha256 = "1d89yybxm7c30h5w79psybmpvy0pw7ha9r0y70f7i0kxgp8n62bk"; }) + (fetchNuGet { name = "Microsoft.Extensions.Primitives"; version = "3.1.8"; sha256 = "1p48hk3r9ikv36wdpwdrbvaccziazncf7nl60fr82i04199lfhgl"; }) + (fetchNuGet { name = "Microsoft.Extensions.Primitives"; version = "5.0.0"; sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6"; }) + (fetchNuGet { name = "Microsoft.Extensions.WebEncoders"; version = "2.2.0"; sha256 = "1mhnichccw6mjf37d38q2i1kr7qp485m7apa1b872ji0q16yy1y3"; }) + (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) + (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) + (fetchNuGet { name = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) + (fetchNuGet { name = "Microsoft.NETFramework.ReferenceAssemblies"; version = "1.0.0"; sha256 = "0na724xhvqm63vq9y18fl9jw9q2v99bdwr353378s5fsi11qzxp9"; }) + (fetchNuGet { name = "Microsoft.NETFramework.ReferenceAssemblies.net461"; version = "1.0.0"; sha256 = "00vkn4c6i0rn1l9pv912y0wgb9h6ks76qah8hvk441nari8fqbm1"; }) + (fetchNuGet { name = "Microsoft.Net.Http.Headers"; version = "2.1.0"; sha256 = "1a02bll0flsin9grd3jxbi76ycl42qamynalbp7qbqcsprabw3ai"; }) + (fetchNuGet { name = "Microsoft.Net.Http.Headers"; version = "2.2.0"; sha256 = "0w6lrk9z67bcirq2cj2ldfhnizc6id77ba6i30hjzgqjlyhh1gx5"; }) + (fetchNuGet { name = "Microsoft.Win32.Registry"; version = "4.5.0"; sha256 = "1zapbz161ji8h82xiajgriq6zgzmb1f3ar517p2h63plhsq5gh2q"; }) + (fetchNuGet { name = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) + (fetchNuGet { name = "MimeMapping"; version = "1.0.1.30"; sha256 = "03523g0kniwqzm30arnkds79j2gqjmhp5297xg4472l6iyfwwmln"; }) + (fetchNuGet { name = "Mono.Posix.NETStandard"; version = "1.0.0"; sha256 = "0xlja36hwpjm837haq15mjh2prcf68lyrmn72nvgpz8qnf9vappw"; }) + (fetchNuGet { name = "NETStandard.Library"; version = "2.0.3"; sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; }) + (fetchNuGet { name = "Newtonsoft.Json"; version = "10.0.1"; sha256 = "15ncqic3p2rzs8q8ppi0irl2miq75kilw4lh8yfgjq96id0ds3hv"; }) + (fetchNuGet { name = "Newtonsoft.Json"; version = "11.0.2"; sha256 = "1784xi44f4k8v1fr696hsccmwpy94bz7kixxqlri98zhcxn406b2"; }) + (fetchNuGet { name = "Newtonsoft.Json"; version = "12.0.2"; sha256 = "0w2fbji1smd2y7x25qqibf1qrznmv4s6s0jvrbvr6alb7mfyqvh5"; }) + (fetchNuGet { name = "Newtonsoft.Json"; version = "12.0.3"; sha256 = "17dzl305d835mzign8r15vkmav2hq8l6g7942dfjpnzr17wwl89x"; }) + (fetchNuGet { name = "Newtonsoft.Json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; }) + (fetchNuGet { name = "Newtonsoft.Json.Bson"; version = "1.0.1"; sha256 = "1r1hvj5gjl466bya2bfl5aaj8rbwyf5x1msg710wf3k2llbci1xa"; }) + (fetchNuGet { name = "Newtonsoft.Json.Bson"; version = "1.0.2"; sha256 = "0c27bhy9x3c2n26inq32kmp6drpm71n6mqnmcr19wrlcaihglj35"; }) + (fetchNuGet { name = "NLog"; version = "4.7.5"; sha256 = "0bx890dmwpx569982m532ibxlfh0n24hz1hkkxnxkpvximm4hsm5"; }) + (fetchNuGet { name = "NLog.Extensions.Logging"; version = "1.6.4"; sha256 = "0yxx1mvz2d54kq00x38dgql8lssjxv5mk1yvx73v3qff1qxi7iyz"; }) + (fetchNuGet { name = "NLog.Web.AspNetCore"; version = "4.9.3"; sha256 = "1mv5zaiyysp9j3h90i1v1rk0b6a4cv8ll6l8gj634y6ppshb8xkj"; }) + (fetchNuGet { name = "Polly"; version = "7.2.1"; sha256 = "0cjmjkr2kq2q2cch30m95hms8mq73pzcqcirzvpzcl0rirvp3map"; }) + (fetchNuGet { name = "SharpZipLib"; version = "1.2.0"; sha256 = "0ynhx1qkjm723bwjwsrdviw1d2s9azndpa12dagrjshhma3igqm5"; }) + (fetchNuGet { name = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) + (fetchNuGet { name = "System.Buffers"; version = "4.4.0"; sha256 = "183f8063w8zqn99pv0ni0nnwh7fgx46qzxamwnans55hhs2l0g19"; }) + (fetchNuGet { name = "System.Buffers"; version = "4.5.0"; sha256 = "1ywfqn4md6g3iilpxjn5dsr0f5lx6z0yvhqp4pgjcamygg73cz2c"; }) + (fetchNuGet { name = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; }) + (fetchNuGet { name = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) + (fetchNuGet { name = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) + (fetchNuGet { name = "System.Collections.Immutable"; version = "1.3.1"; sha256 = "17615br2x5riyx8ivf1dcqwj6q3ipq1bi5hqhw54yfyxmx38ddva"; }) + (fetchNuGet { name = "System.Collections.Immutable"; version = "1.5.0"; sha256 = "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06"; }) + (fetchNuGet { name = "System.ComponentModel.Annotations"; version = "4.5.0"; sha256 = "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p"; }) + (fetchNuGet { name = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; }) + (fetchNuGet { name = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) + (fetchNuGet { name = "System.Diagnostics.DiagnosticSource"; version = "4.5.0"; sha256 = "1y8m0p3127nak5yspapfnz25qc9x53gqpvwr3hdpsvrcd2r1pgyj"; }) + (fetchNuGet { name = "System.Diagnostics.EventLog"; version = "5.0.0"; sha256 = "0cii8iq25awhlc3bl8i863b9415qisnhd3fkdwf41v4bpli6i5fr"; }) + (fetchNuGet { name = "System.Diagnostics.FileVersionInfo"; version = "4.3.0"; sha256 = "094hx249lb3vb336q7dg3v257hbxvz2jnalj695l7cg5kxzqwai7"; }) + (fetchNuGet { name = "System.Diagnostics.StackTrace"; version = "4.3.0"; sha256 = "0ash4h9k0m7xsm0yl79r0ixrdz369h7y922wipp5gladmlbvpyjd"; }) + (fetchNuGet { name = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; }) + (fetchNuGet { name = "System.Dynamic.Runtime"; version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; }) + (fetchNuGet { name = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) + (fetchNuGet { name = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) + (fetchNuGet { name = "System.IO.Compression"; version = "4.3.0"; sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; }) + (fetchNuGet { name = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) + (fetchNuGet { name = "System.IO.FileSystem.AccessControl"; version = "5.0.0"; sha256 = "0ixl68plva0fsj3byv76bai7vkin86s6wyzr8vcav3szl862blvk"; }) + (fetchNuGet { name = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) + (fetchNuGet { name = "System.IO.Pipelines"; version = "4.5.2"; sha256 = "045sn3vyk5xysjjm19q4dj5c1g1rf8l98n4qsl9pl9id4fn08yq1"; }) + (fetchNuGet { name = "System.IO.Pipelines"; version = "4.6.0"; sha256 = "0r9ygjbxpyi6jgb67qnpbp42b7yvvhgmcjxnb50k3lb416claavh"; }) + (fetchNuGet { name = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) + (fetchNuGet { name = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) + (fetchNuGet { name = "System.Memory"; version = "4.5.0"; sha256 = "1layqpcx1q4l805fdnj2dfqp6ncx2z42ca06rgsr6ikq4jjgbv30"; }) + (fetchNuGet { name = "System.Memory"; version = "4.5.1"; sha256 = "0f07d7hny38lq9w69wx4lxkn4wszrqf9m9js6fh9is645csm167c"; }) + (fetchNuGet { name = "System.Memory"; version = "4.5.2"; sha256 = "1g24dwqfcmf4gpbgbhaw1j49xmpsz389l6bw2xxbsmnzvsf860ld"; }) + (fetchNuGet { name = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; }) + (fetchNuGet { name = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; }) + (fetchNuGet { name = "System.Numerics.Vectors"; version = "4.4.0"; sha256 = "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"; }) + (fetchNuGet { name = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; }) + (fetchNuGet { name = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) + (fetchNuGet { name = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) + (fetchNuGet { name = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) + (fetchNuGet { name = "System.Reflection.Metadata"; version = "1.4.2"; sha256 = "08b7b43vczlliv8k7q43jinjfrxwpljsglw7sxmc6sd7d54pd1vi"; }) + (fetchNuGet { name = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; }) + (fetchNuGet { name = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) + (fetchNuGet { name = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) + (fetchNuGet { name = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) + (fetchNuGet { name = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.0"; sha256 = "17labczwqk3jng3kkky73m0jhi8wc21vbl7cz5c0hj2p1dswin43"; }) + (fetchNuGet { name = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.1"; sha256 = "1xcrjx5fwg284qdnxyi2d0lzdm5q4frlpkp0nf6vvkx1kdz2prrf"; }) + (fetchNuGet { name = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.2"; sha256 = "1vz4275fjij8inf31np78hw50al8nqkngk04p3xv5n4fcmf1grgi"; }) + (fetchNuGet { name = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.3"; sha256 = "1afi6s2r1mh1kygbjmfba6l4f87pi5sg13p4a48idqafli94qxln"; }) + (fetchNuGet { name = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; sha256 = "119br3pd85lq8zcgh4f60jzmv1g976q1kdgi3hvqdlhfbw6siz2j"; }) + (fetchNuGet { name = "System.Runtime.CompilerServices.Unsafe"; version = "5.0.0"; sha256 = "02k25ivn50dmqx5jn8hawwmz24yf0454fjd823qk6lygj9513q4x"; }) + (fetchNuGet { name = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) + (fetchNuGet { name = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) + (fetchNuGet { name = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.0.0"; sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6"; }) + (fetchNuGet { name = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) + (fetchNuGet { name = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) + (fetchNuGet { name = "System.Security.AccessControl"; version = "4.5.0"; sha256 = "1wvwanz33fzzbnd2jalar0p0z3x0ba53vzx1kazlskp7pwyhlnq0"; }) + (fetchNuGet { name = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; }) + (fetchNuGet { name = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; }) + (fetchNuGet { name = "System.Security.Cryptography.Cng"; version = "4.5.0"; sha256 = "1pm4ykbcz48f1hdmwpia432ha6qbb9kbrxrrp7cg3m8q8xn52ngn"; }) + (fetchNuGet { name = "System.Security.Cryptography.Encoding"; version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; }) + (fetchNuGet { name = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; }) + (fetchNuGet { name = "System.Security.Cryptography.ProtectedData"; version = "5.0.0"; sha256 = "0jq1rcj5af2ydswld8ga3dyw2yi4c63wvb986b5kqsvpkwwc8x1b"; }) + (fetchNuGet { name = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; }) + (fetchNuGet { name = "System.Security.Cryptography.Xml"; version = "4.5.0"; sha256 = "1rk40x0msf9k7sxnjyizagjns1z25dh3cf22bx6hsx6vhf0sk08l"; }) + (fetchNuGet { name = "System.Security.Permissions"; version = "4.5.0"; sha256 = "192ww5rm3c9mirxgl1nzyrwd18am3izqls0hzm0fvcdjl5grvbhm"; }) + (fetchNuGet { name = "System.Security.Principal.Windows"; version = "4.5.0"; sha256 = "0rmj89wsl5yzwh0kqjgx45vzf694v9p92r4x4q6yxldk1cv1hi86"; }) + (fetchNuGet { name = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) + (fetchNuGet { name = "System.ServiceProcess.ServiceController"; version = "5.0.0"; sha256 = "1annp5kwwif6vfqn1x7vv3izwznxzb8ifvw3g9q3v0rrll26i99h"; }) + (fetchNuGet { name = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) + (fetchNuGet { name = "System.Text.Encoding.CodePages"; version = "4.5.0"; sha256 = "19x38911pawq4mrxrm04l2bnxwxxlzq8v8rj4cbxnfjj8pnd3vj3"; }) + (fetchNuGet { name = "System.Text.Encoding.CodePages"; version = "5.0.0"; sha256 = "1bn2pzaaq4wx9ixirr8151vm5hynn3lmrljcgjx9yghmm4k677k0"; }) + (fetchNuGet { name = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) + (fetchNuGet { name = "System.Text.Encodings.Web"; version = "4.5.0"; sha256 = "0srd5bva52n92i90wd88pzrqjsxnfgka3ilybwh7s6sf469y5s53"; }) + (fetchNuGet { name = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) + (fetchNuGet { name = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) + (fetchNuGet { name = "System.Threading.Tasks.Extensions"; version = "4.5.1"; sha256 = "1ikrplvw4m6pzjbq3bfbpr572n4i9mni577zvmrkaygvx85q3myw"; }) + (fetchNuGet { name = "System.Threading.Tasks.Extensions"; version = "4.5.2"; sha256 = "1sh63dz0dymqcwmprp0nadm77b83vmm7lyllpv578c397bslb8hj"; }) + (fetchNuGet { name = "System.Threading.Tasks.Parallel"; version = "4.3.0"; sha256 = "1rr3qa4hxwyj531s4nb3bwrxnxxwz617i0n9gh6x7nr7dd3ayzgh"; }) + (fetchNuGet { name = "System.Threading.Thread"; version = "4.3.0"; sha256 = "0y2xiwdfcph7znm2ysxanrhbqqss6a3shi1z3c779pj2s523mjx4"; }) + (fetchNuGet { name = "System.ValueTuple"; version = "4.3.0"; sha256 = "1227k7fxbxapq7dms4lvwwjdf3pr1jcsmhy2nzzhj6g6hs530hxn"; }) + (fetchNuGet { name = "System.ValueTuple"; version = "4.5.0"; sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy"; }) + (fetchNuGet { name = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) + (fetchNuGet { name = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) + (fetchNuGet { name = "System.Xml.XmlDocument"; version = "4.3.0"; sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; }) + (fetchNuGet { name = "System.Xml.XPath"; version = "4.3.0"; sha256 = "1cv2m0p70774a0sd1zxc8fm8jk3i5zk2bla3riqvi8gsm0r4kpci"; }) + (fetchNuGet { name = "System.Xml.XPath.XDocument"; version = "4.3.0"; sha256 = "1wxckyb7n1pi433xzz0qcwcbl1swpra64065mbwwi8dhdc4kiabn"; }) + (fetchNuGet { name = "YamlDotNet"; version = "8.1.2"; sha256 = "1lmi5mdw4067a8yk8gv9kilv1hljflkc45pr5vvz8n09af6gn78b"; }) +] diff --git a/pkgs/servers/jackett/updater.sh b/pkgs/servers/jackett/updater.sh new file mode 100755 index 0000000000000..cd0226d6b69a2 --- /dev/null +++ b/pkgs/servers/jackett/updater.sh @@ -0,0 +1,34 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl jq common-updater-scripts nuget-to-nix dotnet-sdk_5 +set -eo pipefail +cd "$(dirname "${BASH_SOURCE[0]}")" + +deps_file="$(realpath "./deps.nix")" + +new_version="$(curl -s "https://api.github.com/repos/jackett/jackett/releases?per_page=1" | jq -r '.[0].name')" +old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)" + +if [[ "$new_version" == "$old_version" ]]; then + echo "Already up to date!" + exit 0 +fi + +cd ../../.. +update-source-version jackett "${new_version//v}" +store_src="$(nix-build . -A jackett.src --no-out-link)" +src="$(mktemp -d /tmp/jackett-src.XXX)" +cp -rT "$store_src" "$src" +chmod -R +w "$src" + +pushd "$src" + +export DOTNET_NOLOGO=1 +export DOTNET_CLI_TELEMETRY_OPTOUT=1 + +mkdir ./nuget_pkgs +dotnet restore src/Jackett.Server/Jackett.Server.csproj --packages ./nuget_pkgs + +nuget-to-nix ./nuget_pkgs > "$deps_file" + +popd +rm -r "$src" diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 676abec8ecca5..b1d42c8091c7d 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -11,11 +11,11 @@ in with python3.pkgs; buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.46.0"; + version = "1.47.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-RcB+RSb/LZE8Q+UunyrYh28S7c7VsTmqg4mJIDVCX5U="; + sha256 = "sha256-SS7ETkYQ3XBihOA6TQp+6f0PNhhlUvMBR6fEYmiLT3k="; }; patches = [ diff --git a/pkgs/servers/mautrix-signal/default.nix b/pkgs/servers/mautrix-signal/default.nix index 012f54361f988..6b11b386421e6 100644 --- a/pkgs/servers/mautrix-signal/default.nix +++ b/pkgs/servers/mautrix-signal/default.nix @@ -2,13 +2,13 @@ python3.pkgs.buildPythonPackage rec { pname = "mautrix-signal"; - version = "unstable-2021-08-12"; + version = "unstable-2021-11-12"; src = fetchFromGitHub { - owner = "tulir"; - repo = "mautrix-signal"; - rev = "a592baaaa6c9ab7ec29edc84f069b9e9e2fc1b03"; - sha256 = "0rvidf4ah23x8m7k7hbkwm2xrs838wnli99gh99b5hr6fqmacbwl"; + owner = "mautrix"; + repo = "signal"; + rev = "2e57810e964c1701df2e69273c2f8cebbe021464"; + sha256 = "sha256-xgn01nbY3LR4G1Yk2MgUhq116/wEhG+5vLH6HKqZE+8="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -46,7 +46,7 @@ python3.pkgs.buildPythonPackage rec { ''; meta = with lib; { - homepage = "https://github.com/tulir/mautrix-signal"; + homepage = "https://github.com/mautrix/signal"; description = "A Matrix-Signal puppeting bridge"; license = licenses.agpl3Plus; platforms = platforms.linux; diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix index ab0564b2cf196..33b9d1d400dbf 100644 --- a/pkgs/servers/mautrix-telegram/default.nix +++ b/pkgs/servers/mautrix-telegram/default.nix @@ -12,25 +12,35 @@ let sha256 = "ebbb777cbf9312359b897bf81ba00dae0f5cb69fba2a18265dcc18a6f5ef7519"; }; }); + + tulir-telethon = self.telethon.overridePythonAttrs (oldAttrs: rec { + version = "1.24.0a2"; + pname = "tulir-telethon"; + src = oldAttrs.src.override { + inherit pname version; + sha256 = "sha256-Qbx164FwC8nhesoY2fkaKvErN8g0Ph8vGcx+Cc1AqRg="; + }; + }); }; }; # officially supported database drivers dbDrivers = with python.pkgs; [ psycopg2 + aiosqlite # sqlite driver is already shipped with python by default ]; in python.pkgs.buildPythonPackage rec { pname = "mautrix-telegram"; - version = "0.10.1"; + version = "0.10.2"; disabled = python.pythonOlder "3.7"; src = fetchFromGitHub { - owner = "tulir"; - repo = pname; + owner = "mautrix"; + repo = "telegram"; rev = "v${version}"; - sha256 = "sha256-1Dmc7WRlT2ivGkdrGDC1b44DE0ovQKfUR0gDiQE4h5c="; + sha256 = "sha256-BYsGLyxhdjBVmnZXLC5ZjwDlWcHdUGp+DsNIOXA1/Tc="; }; patches = [ ./0001-Re-add-entrypoint.patch ./0002-Don-t-depend-on-pytest-runner.patch ]; @@ -49,7 +59,7 @@ in python.pkgs.buildPythonPackage rec { CommonMark ruamel-yaml python_magic - telethon + tulir-telethon telethon-session-sqlalchemy pillow lxml @@ -87,7 +97,7 @@ in python.pkgs.buildPythonPackage rec { ]; meta = with lib; { - homepage = "https://github.com/tulir/mautrix-telegram"; + homepage = "https://github.com/mautrix/telegram"; description = "A Matrix-Telegram hybrid puppeting/relaybot bridge"; license = licenses.agpl3Plus; platforms = platforms.linux; diff --git a/pkgs/servers/mjolnir/default.nix b/pkgs/servers/mjolnir/default.nix index f6444ef386acd..8480cf4e8bf17 100644 --- a/pkgs/servers/mjolnir/default.nix +++ b/pkgs/servers/mjolnir/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "mjolnir"; - version = "1.1.20"; + version = "1.2.1"; src = fetchFromGitHub { owner = "matrix-org"; repo = "mjolnir"; rev = "v${version}"; - sha256 = "yfMBnNriSpwitR4u664iz+8uWp/3iSTymyFajMBP5xg="; + sha256 = "4c9LyQb5SZ1IoBayiP0C0ho4hwJDv49DhsuoQIv9bTs="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/mjolnir/node-deps.nix b/pkgs/servers/mjolnir/node-deps.nix index 30c8a33277e40..8a10a95cdd814 100644 --- a/pkgs/servers/mjolnir/node-deps.nix +++ b/pkgs/servers/mjolnir/node-deps.nix @@ -4,13 +4,22 @@ let sources = { - "@babel/code-frame-7.14.5" = { + "@babel/code-frame-7.12.11" = { name = "_at_babel_slash_code-frame"; packageName = "@babel/code-frame"; - version = "7.14.5"; + version = "7.12.11"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.14.5.tgz"; - sha512 = "9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw=="; + url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz"; + sha512 = "Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw=="; + }; + }; + "@babel/code-frame-7.16.0" = { + name = "_at_babel_slash_code-frame"; + packageName = "@babel/code-frame"; + version = "7.16.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.0.tgz"; + sha512 = "IF4EOMEV+bfYwOmNxGzSnjR2EmQod7f1UXOpZM3l4i4o4QNwzjtJAu/HxdjHq0aYBvdqMuQEY1eg0nqW9ZPORA=="; }; }; "@babel/helper-validator-identifier-7.15.7" = { @@ -22,31 +31,85 @@ let sha512 = "K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w=="; }; }; - "@babel/highlight-7.14.5" = { + "@babel/highlight-7.16.0" = { name = "_at_babel_slash_highlight"; packageName = "@babel/highlight"; - version = "7.14.5"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz"; - sha512 = "qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg=="; + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.0.tgz"; + sha512 = "t8MH41kUQylBtu2+4IQA3atqevA2lRgqA2wyVB/YiWmsDSuylZZuXOUy9ric30hfzauEFfdsuk/eXTRrGrfd0g=="; }; }; - "@jest/types-27.1.1" = { + "@eslint/eslintrc-0.4.3" = { + name = "_at_eslint_slash_eslintrc"; + packageName = "@eslint/eslintrc"; + version = "0.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz"; + sha512 = "J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw=="; + }; + }; + "@humanwhocodes/config-array-0.5.0" = { + name = "_at_humanwhocodes_slash_config-array"; + packageName = "@humanwhocodes/config-array"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz"; + sha512 = "FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg=="; + }; + }; + "@humanwhocodes/object-schema-1.2.1" = { + name = "_at_humanwhocodes_slash_object-schema"; + packageName = "@humanwhocodes/object-schema"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz"; + sha512 = "ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA=="; + }; + }; + "@jest/types-27.2.5" = { name = "_at_jest_slash_types"; packageName = "@jest/types"; - version = "27.1.1"; + version = "27.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@jest/types/-/types-27.2.5.tgz"; + sha512 = "nmuM4VuDtCZcY+eTpw+0nvstwReMsjPoj7ZR80/BbixulhLaiX+fbv8oeLW8WZlJMcsGQsTmMKT/iTZu1Uy/lQ=="; + }; + }; + "@selderee/plugin-htmlparser2-0.6.0" = { + name = "_at_selderee_slash_plugin-htmlparser2"; + packageName = "@selderee/plugin-htmlparser2"; + version = "0.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/types/-/types-27.1.1.tgz"; - sha512 = "yqJPDDseb0mXgKqmNqypCsb85C22K1aY5+LUxh7syIM9n/b0AsaltxNy+o6tt29VcfGDpYEve175bm3uOhcehA=="; + url = "https://registry.npmjs.org/@selderee/plugin-htmlparser2/-/plugin-htmlparser2-0.6.0.tgz"; + sha512 = "J3jpy002TyBjd4N/p6s+s90eX42H2eRhK3SbsZuvTDv977/E8p2U3zikdiehyJja66do7FlxLomZLPlvl2/xaA=="; }; }; - "@types/body-parser-1.19.1" = { + "@tootallnate/once-1.1.2" = { + name = "_at_tootallnate_slash_once"; + packageName = "@tootallnate/once"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz"; + sha512 = "RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw=="; + }; + }; + "@types/axios-0.14.0" = { + name = "_at_types_slash_axios"; + packageName = "@types/axios"; + version = "0.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/axios/-/axios-0.14.0.tgz"; + sha1 = "ec2300fbe7d7dddd7eb9d3abf87999964cafce46"; + }; + }; + "@types/body-parser-1.19.2" = { name = "_at_types_slash_body-parser"; packageName = "@types/body-parser"; - version = "1.19.1"; + version = "1.19.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.1.tgz"; - sha512 = "a6bTJ21vFOGIkwM0kzh9Yr89ziVxq4vYH2fQ6N8AeipEzai/cFK6aGMArIkUeIdRIgpwQa+2bXiLuUJCpSf2Cg=="; + url = "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz"; + sha512 = "ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g=="; }; }; "@types/connect-3.4.35" = { @@ -58,6 +121,15 @@ let sha512 = "cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ=="; }; }; + "@types/crypto-js-4.0.2" = { + name = "_at_types_slash_crypto-js"; + packageName = "@types/crypto-js"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/crypto-js/-/crypto-js-4.0.2.tgz"; + sha512 = "sCVniU+h3GcGqxOmng11BRvf9TfN9yIs8KKjB8C8d75W69cpTfZG80gau9yTx5SxF3gvHGbJhdESzzvnjtf3Og=="; + }; + }; "@types/express-4.17.13" = { name = "_at_types_slash_express"; packageName = "@types/express"; @@ -67,13 +139,13 @@ let sha512 = "6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA=="; }; }; - "@types/express-serve-static-core-4.17.24" = { + "@types/express-serve-static-core-4.17.25" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; - version = "4.17.24"; + version = "4.17.25"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.24.tgz"; - sha512 = "3UJuW+Qxhzwjq3xhwXm2onQcFHn76frIYVbTu+kn24LFxI+dEhdfISDFovPB8VpEgW8oQCTpRuCe+0zJxB7NEA=="; + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.25.tgz"; + sha512 = "OUJIVfRMFijZukGGwTpKNFprqCCXk5WjNGvUgB/CxxBR40QWSjsNK86+yvGKlCOGc7sbwfHLaXhkG+NsytwBaQ=="; }; }; "@types/istanbul-lib-coverage-2.0.3" = { @@ -103,6 +175,15 @@ let sha512 = "c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw=="; }; }; + "@types/jsdom-16.2.13" = { + name = "_at_types_slash_jsdom"; + packageName = "@types/jsdom"; + version = "16.2.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/jsdom/-/jsdom-16.2.13.tgz"; + sha512 = "8JQCjdeAidptSsOcRWk2iTm9wCcwn9l+kRG6k5bzUacrnm1ezV4forq0kWjUih/tumAeoG+OspOvQEbbRucBTw=="; + }; + }; "@types/json5-0.0.29" = { name = "_at_types_slash_json5"; packageName = "@types/json5"; @@ -130,13 +211,22 @@ let sha512 = "scN0hAWyLVAvLR9AyW7HoFF5sJZglyBsbPuHO4fv7JRvfmPBMfp1ozWqOf/e4wwPNxezBZXRfWzMb6iFLgEVRA=="; }; }; - "@types/node-11.15.54" = { + "@types/node-16.11.7" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "11.15.54"; + version = "16.11.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-11.15.54.tgz"; - sha512 = "1RWYiq+5UfozGsU6MwJyFX6BtktcT10XRjvcAQmskCtMcW3tPske88lM/nHv7BQG1w9KBXI1zPGuu5PnNCX14g=="; + url = "https://registry.npmjs.org/@types/node/-/node-16.11.7.tgz"; + sha512 = "QB5D2sqfSjCmTuWcBWyJ+/44bcjO7VbjSbOE0ucoVbAsSNQc4Lt6QkgkVXkTDwkL4z/beecZNDvVX15D4P8Jbw=="; + }; + }; + "@types/parse5-6.0.2" = { + name = "_at_types_slash_parse5"; + packageName = "@types/parse5"; + version = "6.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/parse5/-/parse5-6.0.2.tgz"; + sha512 = "+hQX+WyJAOne7Fh3zF5CxPemILIbuhNcqHHodzK9caYOLnC8pD5efmPleRnw0z++LfKUC/sVNMwk0Gap+B0baA=="; }; }; "@types/qs-6.9.7" = { @@ -175,6 +265,15 @@ let sha512 = "Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw=="; }; }; + "@types/tough-cookie-4.0.1" = { + name = "_at_types_slash_tough-cookie"; + packageName = "@types/tough-cookie"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.1.tgz"; + sha512 = "Y0K95ThC3esLEYD6ZuqNek29lNX2EM1qxV8y2FTLUB0ff5wWrk7az+mLrnNFUnaXcgKye22+sFBRXOgpPILZNg=="; + }; + }; "@types/yargs-16.0.4" = { name = "_at_types_slash_yargs"; packageName = "@types/yargs"; @@ -202,6 +301,15 @@ let sha512 = "sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q=="; }; }; + "abab-2.0.5" = { + name = "abab"; + packageName = "abab"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz"; + sha512 = "9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q=="; + }; + }; "accepts-1.3.7" = { name = "accepts"; packageName = "accepts"; @@ -211,6 +319,60 @@ let sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA=="; }; }; + "acorn-7.4.1" = { + name = "acorn"; + packageName = "acorn"; + version = "7.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz"; + sha512 = "nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="; + }; + }; + "acorn-8.6.0" = { + name = "acorn"; + packageName = "acorn"; + version = "8.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn/-/acorn-8.6.0.tgz"; + sha512 = "U1riIR+lBSNi3IbxtaHOIKdH8sLFv3NYfNv8sg7ZsNhcfl4HF2++BfqqrNAxoCLQW1iiylOj76ecnaUxz+z9yw=="; + }; + }; + "acorn-globals-6.0.0" = { + name = "acorn-globals"; + packageName = "acorn-globals"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz"; + sha512 = "ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg=="; + }; + }; + "acorn-jsx-5.3.2" = { + name = "acorn-jsx"; + packageName = "acorn-jsx"; + version = "5.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz"; + sha512 = "rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ=="; + }; + }; + "acorn-walk-7.2.0" = { + name = "acorn-walk"; + packageName = "acorn-walk"; + version = "7.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz"; + sha512 = "OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA=="; + }; + }; + "agent-base-6.0.2" = { + name = "agent-base"; + packageName = "agent-base"; + version = "6.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz"; + sha512 = "RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ=="; + }; + }; "ajv-6.12.6" = { name = "ajv"; packageName = "ajv"; @@ -220,6 +382,15 @@ let sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="; }; }; + "ajv-8.8.1" = { + name = "ajv"; + packageName = "ajv"; + version = "8.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv/-/ajv-8.8.1.tgz"; + sha512 = "6CiMNDrzv0ZR916u2T+iRunnD60uWmNn8SkdB44/6stVORUg0aAkWO7PkOhpCmjmW8f2I/G/xnowD66fxGyQJg=="; + }; + }; "ansi-colors-4.1.1" = { name = "ansi-colors"; packageName = "ansi-colors"; @@ -229,15 +400,6 @@ let sha512 = "JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA=="; }; }; - "ansi-regex-3.0.0" = { - name = "ansi-regex"; - packageName = "ansi-regex"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz"; - sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; - }; - }; "ansi-regex-5.0.1" = { name = "ansi-regex"; packageName = "ansi-regex"; @@ -319,13 +481,13 @@ let sha1 = "898508da2226f380df904728456849c1501a4b0d"; }; }; - "asn1-0.2.4" = { + "asn1-0.2.6" = { name = "asn1"; packageName = "asn1"; - version = "0.2.4"; + version = "0.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz"; - sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg=="; + url = "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz"; + sha512 = "ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ=="; }; }; "assert-plus-1.0.0" = { @@ -337,6 +499,15 @@ let sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; }; }; + "astral-regex-2.0.0" = { + name = "astral-regex"; + packageName = "astral-regex"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz"; + sha512 = "Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ=="; + }; + }; "asynckit-0.4.0" = { name = "asynckit"; packageName = "asynckit"; @@ -364,6 +535,15 @@ let sha512 = "xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="; }; }; + "axios-0.21.4" = { + name = "axios"; + packageName = "axios"; + version = "0.21.4"; + src = fetchurl { + url = "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz"; + sha512 = "ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg=="; + }; + }; "balanced-match-1.0.2" = { name = "balanced-match"; packageName = "balanced-match"; @@ -436,6 +616,15 @@ let sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A=="; }; }; + "browser-process-hrtime-1.0.0" = { + name = "browser-process-hrtime"; + packageName = "browser-process-hrtime"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz"; + sha512 = "9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow=="; + }; + }; "browser-stdout-1.3.1" = { name = "browser-stdout"; packageName = "browser-stdout"; @@ -472,13 +661,22 @@ let sha512 = "zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="; }; }; - "camelcase-6.2.0" = { + "callsites-3.1.0" = { + name = "callsites"; + packageName = "callsites"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz"; + sha512 = "P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="; + }; + }; + "camelcase-6.2.1" = { name = "camelcase"; packageName = "camelcase"; - version = "6.2.0"; + version = "6.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz"; - sha512 = "c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg=="; + url = "https://registry.npmjs.org/camelcase/-/camelcase-6.2.1.tgz"; + sha512 = "tVI4q5jjFV5CavAU8DXfza/TJcZutVKo/5Foskmsqcm0MsL91moHvwiGNnqaa2o6PF/7yT5ikDRcVcl8Rj6LCA=="; }; }; "caseless-0.12.0" = { @@ -562,15 +760,6 @@ let sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="; }; }; - "colorette-1.4.0" = { - name = "colorette"; - packageName = "colorette"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/colorette/-/colorette-1.4.0.tgz"; - sha512 = "Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g=="; - }; - }; "combined-stream-1.0.8" = { name = "combined-stream"; packageName = "combined-stream"; @@ -589,6 +778,15 @@ let sha512 = "GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="; }; }; + "commandpost-1.4.0" = { + name = "commandpost"; + packageName = "commandpost"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commandpost/-/commandpost-1.4.0.tgz"; + sha512 = "aE2Y4MTFJ870NuB/+2z1cXBhSBBzRydVVjzhFC4gtenEhpnj15yu0qptWGJsO9YGrcPZ3ezX8AWb1VA391MKpQ=="; + }; + }; "concat-map-0.0.1" = { name = "concat-map"; packageName = "concat-map"; @@ -652,6 +850,51 @@ let sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; }; }; + "cross-spawn-7.0.3" = { + name = "cross-spawn"; + packageName = "cross-spawn"; + version = "7.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz"; + sha512 = "iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w=="; + }; + }; + "crypto-js-4.1.1" = { + name = "crypto-js"; + packageName = "crypto-js"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/crypto-js/-/crypto-js-4.1.1.tgz"; + sha512 = "o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw=="; + }; + }; + "cssom-0.3.8" = { + name = "cssom"; + packageName = "cssom"; + version = "0.3.8"; + src = fetchurl { + url = "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz"; + sha512 = "b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg=="; + }; + }; + "cssom-0.4.4" = { + name = "cssom"; + packageName = "cssom"; + version = "0.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz"; + sha512 = "p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw=="; + }; + }; + "cssstyle-2.3.0" = { + name = "cssstyle"; + packageName = "cssstyle"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz"; + sha512 = "AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A=="; + }; + }; "dashdash-1.14.1" = { name = "dashdash"; packageName = "dashdash"; @@ -661,6 +904,15 @@ let sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; }; }; + "data-urls-2.0.0" = { + name = "data-urls"; + packageName = "data-urls"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz"; + sha512 = "X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ=="; + }; + }; "debug-2.6.9" = { name = "debug"; packageName = "debug"; @@ -670,13 +922,13 @@ let sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; }; }; - "debug-4.3.1" = { + "debug-4.3.2" = { name = "debug"; packageName = "debug"; - version = "4.3.1"; + version = "4.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz"; - sha512 = "doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ=="; + url = "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz"; + sha512 = "mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw=="; }; }; "decamelize-4.0.0" = { @@ -688,6 +940,24 @@ let sha512 = "9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ=="; }; }; + "decimal.js-10.3.1" = { + name = "decimal.js"; + packageName = "decimal.js"; + version = "10.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/decimal.js/-/decimal.js-10.3.1.tgz"; + sha512 = "V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ=="; + }; + }; + "deep-is-0.1.4" = { + name = "deep-is"; + packageName = "deep-is"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz"; + sha512 = "oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="; + }; + }; "deepmerge-4.2.2" = { name = "deepmerge"; packageName = "deepmerge"; @@ -769,6 +1039,24 @@ let sha512 = "ag6wfpBFyNXZ0p8pcuIDS//D8H062ZQJ3fzYxjpmeKjnz8W4pekL3AI8VohmyZmsWW2PWaHgjsmqR6L13101VQ=="; }; }; + "discontinuous-range-1.0.0" = { + name = "discontinuous-range"; + packageName = "discontinuous-range"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/discontinuous-range/-/discontinuous-range-1.0.0.tgz"; + sha1 = "e38331f0844bba49b9a9cb71c771585aab1bc65a"; + }; + }; + "doctrine-3.0.0" = { + name = "doctrine"; + packageName = "doctrine"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz"; + sha512 = "yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w=="; + }; + }; "dom-serializer-1.3.2" = { name = "dom-serializer"; packageName = "dom-serializer"; @@ -787,6 +1075,15 @@ let sha512 = "DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A=="; }; }; + "domexception-2.0.1" = { + name = "domexception"; + packageName = "domexception"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz"; + sha512 = "yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg=="; + }; + }; "domhandler-3.3.0" = { name = "domhandler"; packageName = "domhandler"; @@ -823,6 +1120,15 @@ let sha1 = "3a83a904e54353287874c564b7549386849a98c9"; }; }; + "editorconfig-0.15.3" = { + name = "editorconfig"; + packageName = "editorconfig"; + version = "0.15.3"; + src = fetchurl { + url = "https://registry.npmjs.org/editorconfig/-/editorconfig-0.15.3.tgz"; + sha512 = "M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g=="; + }; + }; "ee-first-1.1.1" = { name = "ee-first"; packageName = "ee-first"; @@ -850,6 +1156,15 @@ let sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; }; }; + "enquirer-2.3.6" = { + name = "enquirer"; + packageName = "enquirer"; + version = "2.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz"; + sha512 = "yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg=="; + }; + }; "entities-2.2.0" = { name = "entities"; packageName = "entities"; @@ -904,6 +1219,69 @@ let sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="; }; }; + "escodegen-2.0.0" = { + name = "escodegen"; + packageName = "escodegen"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz"; + sha512 = "mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw=="; + }; + }; + "eslint-7.32.0" = { + name = "eslint"; + packageName = "eslint"; + version = "7.32.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz"; + sha512 = "VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA=="; + }; + }; + "eslint-scope-5.1.1" = { + name = "eslint-scope"; + packageName = "eslint-scope"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz"; + sha512 = "2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw=="; + }; + }; + "eslint-utils-2.1.0" = { + name = "eslint-utils"; + packageName = "eslint-utils"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz"; + sha512 = "w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg=="; + }; + }; + "eslint-visitor-keys-1.3.0" = { + name = "eslint-visitor-keys"; + packageName = "eslint-visitor-keys"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz"; + sha512 = "6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ=="; + }; + }; + "eslint-visitor-keys-2.1.0" = { + name = "eslint-visitor-keys"; + packageName = "eslint-visitor-keys"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz"; + sha512 = "0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw=="; + }; + }; + "espree-7.3.1" = { + name = "espree"; + packageName = "espree"; + version = "7.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz"; + sha512 = "v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g=="; + }; + }; "esprima-4.0.1" = { name = "esprima"; packageName = "esprima"; @@ -913,6 +1291,51 @@ let sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="; }; }; + "esquery-1.4.0" = { + name = "esquery"; + packageName = "esquery"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz"; + sha512 = "cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w=="; + }; + }; + "esrecurse-4.3.0" = { + name = "esrecurse"; + packageName = "esrecurse"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz"; + sha512 = "KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag=="; + }; + }; + "estraverse-4.3.0" = { + name = "estraverse"; + packageName = "estraverse"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz"; + sha512 = "39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="; + }; + }; + "estraverse-5.3.0" = { + name = "estraverse"; + packageName = "estraverse"; + version = "5.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz"; + sha512 = "MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="; + }; + }; + "esutils-2.0.3" = { + name = "esutils"; + packageName = "esutils"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz"; + sha512 = "kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="; + }; + }; "etag-1.8.1" = { name = "etag"; packageName = "etag"; @@ -922,13 +1345,13 @@ let sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887"; }; }; - "expect-27.2.1" = { + "expect-27.3.1" = { name = "expect"; packageName = "expect"; - version = "27.2.1"; + version = "27.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/expect/-/expect-27.2.1.tgz"; - sha512 = "ekOA2mBtT2phxcoPVHCXIzbJxCvRXhx2fr7m28IgGdZxUOh8UvxvoRz1FcPlfgZMpE92biHB6woIcAKXqR28hA=="; + url = "https://registry.npmjs.org/expect/-/expect-27.3.1.tgz"; + sha512 = "MrNXV2sL9iDRebWPGOGFdPQRl2eDQNu/uhxIMShjjx74T6kC6jFIkmQ6OqXDtevjGUkyB2IT56RzDBqXf/QPCg=="; }; }; "express-4.17.1" = { @@ -976,6 +1399,24 @@ let sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="; }; }; + "fast-levenshtein-2.0.6" = { + name = "fast-levenshtein"; + packageName = "fast-levenshtein"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"; + sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; + }; + }; + "file-entry-cache-6.0.1" = { + name = "file-entry-cache"; + packageName = "file-entry-cache"; + version = "6.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz"; + sha512 = "7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg=="; + }; + }; "fill-range-7.0.1" = { name = "fill-range"; packageName = "fill-range"; @@ -1012,6 +1453,33 @@ let sha512 = "b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ=="; }; }; + "flat-cache-3.0.4" = { + name = "flat-cache"; + packageName = "flat-cache"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz"; + sha512 = "dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg=="; + }; + }; + "flatted-3.2.4" = { + name = "flatted"; + packageName = "flatted"; + version = "3.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/flatted/-/flatted-3.2.4.tgz"; + sha512 = "8/sOawo8tJ4QOBX8YlQBMxL8+RLZfxMQOif9o0KUKTNTjMYElWPE0r/m5VNFxTRd0NSw8qSy8dajrwX4RYI1Hw=="; + }; + }; + "follow-redirects-1.14.5" = { + name = "follow-redirects"; + packageName = "follow-redirects"; + version = "1.14.5"; + src = fetchurl { + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.5.tgz"; + sha512 = "wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA=="; + }; + }; "forever-agent-0.6.1" = { name = "forever-agent"; packageName = "forever-agent"; @@ -1030,6 +1498,15 @@ let sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ=="; }; }; + "form-data-3.0.1" = { + name = "form-data"; + packageName = "form-data"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz"; + sha512 = "RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg=="; + }; + }; "forwarded-0.2.0" = { name = "forwarded"; packageName = "forwarded"; @@ -1075,6 +1552,15 @@ let sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="; }; }; + "functional-red-black-tree-1.0.1" = { + name = "functional-red-black-tree"; + packageName = "functional-red-black-tree"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz"; + sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"; + }; + }; "get-caller-file-2.0.5" = { name = "get-caller-file"; packageName = "get-caller-file"; @@ -1102,6 +1588,15 @@ let sha512 = "OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ=="; }; }; + "glob-7.2.0" = { + name = "glob"; + packageName = "glob"; + version = "7.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz"; + sha512 = "lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q=="; + }; + }; "glob-parent-5.1.2" = { name = "glob-parent"; packageName = "glob-parent"; @@ -1120,6 +1615,15 @@ let sha512 = "lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw=="; }; }; + "globals-13.12.0" = { + name = "globals"; + packageName = "globals"; + version = "13.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/globals/-/globals-13.12.0.tgz"; + sha512 = "uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg=="; + }; + }; "graceful-fs-4.2.8" = { name = "graceful-fs"; packageName = "graceful-fs"; @@ -1201,6 +1705,15 @@ let sha512 = "F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="; }; }; + "html-encoding-sniffer-2.0.1" = { + name = "html-encoding-sniffer"; + packageName = "html-encoding-sniffer"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz"; + sha512 = "D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ=="; + }; + }; "html-to-text-6.0.0" = { name = "html-to-text"; packageName = "html-to-text"; @@ -1210,6 +1723,15 @@ let sha512 = "r0KNC5aqCAItsjlgtirW6RW25c92Ee3ybQj8z//4Sl4suE3HIPqM4deGpYCUJULLjtVPEP1+Ma+1ZeX1iMsCiA=="; }; }; + "html-to-text-8.1.0" = { + name = "html-to-text"; + packageName = "html-to-text"; + version = "8.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/html-to-text/-/html-to-text-8.1.0.tgz"; + sha512 = "Z9iYAqYK2c18GswSbnxJSeMs7lyJgwR2oIkDOyOHGBbYsPsG4HvT379jj3Lcbfko8A5ceyyMHAfkmp/BiXA9/Q=="; + }; + }; "htmlencode-0.0.4" = { name = "htmlencode"; packageName = "htmlencode"; @@ -1246,6 +1768,15 @@ let sha512 = "uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg=="; }; }; + "http-proxy-agent-4.0.1" = { + name = "http-proxy-agent"; + packageName = "http-proxy-agent"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz"; + sha512 = "k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg=="; + }; + }; "http-signature-1.2.0" = { name = "http-signature"; packageName = "http-signature"; @@ -1255,6 +1786,15 @@ let sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; }; }; + "https-proxy-agent-5.0.0" = { + name = "https-proxy-agent"; + packageName = "https-proxy-agent"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz"; + sha512 = "EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA=="; + }; + }; "iconv-lite-0.4.24" = { name = "iconv-lite"; packageName = "iconv-lite"; @@ -1264,6 +1804,33 @@ let sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; }; }; + "ignore-4.0.6" = { + name = "ignore"; + packageName = "ignore"; + version = "4.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz"; + sha512 = "cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg=="; + }; + }; + "import-fresh-3.3.0" = { + name = "import-fresh"; + packageName = "import-fresh"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz"; + sha512 = "veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw=="; + }; + }; + "imurmurhash-0.1.4" = { + name = "imurmurhash"; + packageName = "imurmurhash"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"; + sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; + }; + }; "inflight-1.0.6" = { name = "inflight"; packageName = "inflight"; @@ -1300,13 +1867,13 @@ let sha512 = "ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw=="; }; }; - "is-core-module-2.6.0" = { + "is-core-module-2.8.0" = { name = "is-core-module"; packageName = "is-core-module"; - version = "2.6.0"; + version = "2.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.6.0.tgz"; - sha512 = "wShG8vs60jKfPWpF2KZRaAtvt3a20OAn7+IJ6hLPECpSABLcKtFKTTI4ZtH5QcBruBHlq+WsdHWyz0BCZW7svQ=="; + url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.0.tgz"; + sha512 = "vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw=="; }; }; "is-extglob-2.1.1" = { @@ -1318,15 +1885,6 @@ let sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; }; }; - "is-fullwidth-code-point-2.0.0" = { - name = "is-fullwidth-code-point"; - packageName = "is-fullwidth-code-point"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"; - sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; - }; - }; "is-fullwidth-code-point-3.0.0" = { name = "is-fullwidth-code-point"; packageName = "is-fullwidth-code-point"; @@ -1336,13 +1894,13 @@ let sha512 = "zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="; }; }; - "is-glob-4.0.1" = { + "is-glob-4.0.3" = { name = "is-glob"; packageName = "is-glob"; - version = "4.0.1"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz"; - sha512 = "5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg=="; + url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz"; + sha512 = "xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg=="; }; }; "is-number-7.0.0" = { @@ -1372,6 +1930,15 @@ let sha512 = "VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q=="; }; }; + "is-potential-custom-element-name-1.0.1" = { + name = "is-potential-custom-element-name"; + packageName = "is-potential-custom-element-name"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz"; + sha512 = "bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ=="; + }; + }; "is-promise-2.2.2" = { name = "is-promise"; packageName = "is-promise"; @@ -1417,40 +1984,40 @@ let sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; }; }; - "jest-diff-27.2.0" = { + "jest-diff-27.3.1" = { name = "jest-diff"; packageName = "jest-diff"; - version = "27.2.0"; + version = "27.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/jest-diff/-/jest-diff-27.2.0.tgz"; - sha512 = "QSO9WC6btFYWtRJ3Hac0sRrkspf7B01mGrrQEiCW6TobtViJ9RWL0EmOs/WnBsZDsI/Y2IoSHZA2x6offu0sYw=="; + url = "https://registry.npmjs.org/jest-diff/-/jest-diff-27.3.1.tgz"; + sha512 = "PCeuAH4AWUo2O5+ksW4pL9v5xJAcIKPUPfIhZBcG1RKv/0+dvaWTQK1Nrau8d67dp65fOqbeMdoil+6PedyEPQ=="; }; }; - "jest-get-type-27.0.6" = { + "jest-get-type-27.3.1" = { name = "jest-get-type"; packageName = "jest-get-type"; - version = "27.0.6"; + version = "27.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.0.6.tgz"; - sha512 = "XTkK5exIeUbbveehcSR8w0bhH+c0yloW/Wpl+9vZrjzztCPWrxhHwkIFpZzCt71oRBsgxmuUfxEqOYoZI2macg=="; + url = "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.3.1.tgz"; + sha512 = "+Ilqi8hgHSAdhlQ3s12CAVNd8H96ZkQBfYoXmArzZnOfAtVAJEiPDBirjByEblvG/4LPJmkL+nBqPO3A1YJAEg=="; }; }; - "jest-matcher-utils-27.2.0" = { + "jest-matcher-utils-27.3.1" = { name = "jest-matcher-utils"; packageName = "jest-matcher-utils"; - version = "27.2.0"; + version = "27.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.2.0.tgz"; - sha512 = "F+LG3iTwJ0gPjxBX6HCyrARFXq6jjiqhwBQeskkJQgSLeF1j6ui1RTV08SR7O51XTUhtc8zqpDj8iCG4RGmdKw=="; + url = "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.3.1.tgz"; + sha512 = "hX8N7zXS4k+8bC1Aj0OWpGb7D3gIXxYvPNK1inP5xvE4ztbz3rc4AkI6jGVaerepBnfWB17FL5lWFJT3s7qo8w=="; }; }; - "jest-message-util-27.2.0" = { + "jest-message-util-27.3.1" = { name = "jest-message-util"; packageName = "jest-message-util"; - version = "27.2.0"; + version = "27.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.2.0.tgz"; - sha512 = "y+sfT/94CiP8rKXgwCOzO1mUazIEdEhrLjuiu+RKmCP+8O/TJTSne9dqQRbFIHBtlR2+q7cddJlWGir8UATu5w=="; + url = "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.3.1.tgz"; + sha512 = "bh3JEmxsTZ/9rTm0jQrPElbY2+y48Rw2t47uMfByNyUVR+OfPh4anuyKsGqsNkXk/TI4JbLRZx+7p7Hdt6q1yg=="; }; }; "jest-regex-util-27.0.6" = { @@ -1498,6 +2065,15 @@ let sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; }; }; + "jsdom-16.7.0" = { + name = "jsdom"; + packageName = "jsdom"; + version = "16.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz"; + sha512 = "u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw=="; + }; + }; "json-schema-0.2.3" = { name = "json-schema"; packageName = "json-schema"; @@ -1516,6 +2092,24 @@ let sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="; }; }; + "json-schema-traverse-1.0.0" = { + name = "json-schema-traverse"; + packageName = "json-schema-traverse"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz"; + sha512 = "NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="; + }; + }; + "json-stable-stringify-without-jsonify-1.0.1" = { + name = "json-stable-stringify-without-jsonify"; + packageName = "json-stable-stringify-without-jsonify"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"; + sha1 = "9db7b59496ad3f3cfef30a75142d2d930ad72651"; + }; + }; "json-stringify-safe-5.0.1" = { name = "json-stringify-safe"; packageName = "json-stringify-safe"; @@ -1552,13 +2146,22 @@ let sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; }; }; - "klona-2.0.4" = { - name = "klona"; - packageName = "klona"; - version = "2.0.4"; + "levn-0.3.0" = { + name = "levn"; + packageName = "levn"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz"; + sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee"; + }; + }; + "levn-0.4.1" = { + name = "levn"; + packageName = "levn"; + version = "0.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/klona/-/klona-2.0.4.tgz"; - sha512 = "ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA=="; + url = "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz"; + sha512 = "+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ=="; }; }; "locate-path-6.0.0" = { @@ -1579,6 +2182,24 @@ let sha512 = "v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="; }; }; + "lodash.merge-4.6.2" = { + name = "lodash.merge"; + packageName = "lodash.merge"; + version = "4.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz"; + sha512 = "0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="; + }; + }; + "lodash.truncate-4.4.2" = { + name = "lodash.truncate"; + packageName = "lodash.truncate"; + version = "4.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz"; + sha1 = "5a350da0b1113b837ecfffd5812cbe58d6eae193"; + }; + }; "log-symbols-4.1.0" = { name = "log-symbols"; packageName = "log-symbols"; @@ -1597,6 +2218,15 @@ let sha512 = "2+x8esE/Wb9SQ1F9IHaYWfsC9FIecLOPrK4g17FGEayjUWH172H6nwicRovGvSE2CPZouc2MCIqCI7h9d+GftQ=="; }; }; + "lru-cache-4.1.5" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "4.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz"; + sha512 = "sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g=="; + }; + }; "lru-cache-6.0.0" = { name = "lru-cache"; packageName = "lru-cache"; @@ -1669,22 +2299,22 @@ let sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; }; }; - "mime-db-1.49.0" = { + "mime-db-1.51.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.49.0"; + version = "1.51.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.49.0.tgz"; - sha512 = "CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA=="; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz"; + sha512 = "5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g=="; }; }; - "mime-types-2.1.32" = { + "mime-types-2.1.34" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.32"; + version = "2.1.34"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.32.tgz"; - sha512 = "hJGaVS4G4c9TSMYh2n6SQAGrC4RnfU+daP8G7cSCmaqNjiOoUY0VHCMS42pxnQmVF1GWwFhbHWn3RIxCqTmZ9A=="; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz"; + sha512 = "6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A=="; }; }; "minimalistic-assert-1.0.1" = { @@ -1732,13 +2362,22 @@ let sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="; }; }; - "mocha-9.1.1" = { + "mocha-9.1.3" = { name = "mocha"; packageName = "mocha"; - version = "9.1.1"; + version = "9.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-9.1.1.tgz"; - sha512 = "0wE74YMgOkCgBUj8VyIDwmLUjTsS13WV1Pg7l0SHea2qzZzlq7MDnfbPsHKcELBRk3+izEVkRofjmClpycudCA=="; + url = "https://registry.npmjs.org/mocha/-/mocha-9.1.3.tgz"; + sha512 = "Xcpl9FqXOAYqI3j79pEtHBBnQgVXIhpULjGQa7DVb0Po+VzmSIK9kanAiWLHoRR/dbZ2qpdPshuXr8l1VaHCzw=="; + }; + }; + "moo-0.5.1" = { + name = "moo"; + packageName = "moo"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/moo/-/moo-0.5.1.tgz"; + sha512 = "I1mnb5xn4fO80BH9BLcF0yLypy2UKl+Cb01Fu0hJRkJjlCRtxZMWkTdAtDd5ZqCOxtCkhmRwyI57vWT+1iZ67w=="; }; }; "morgan-1.10.0" = { @@ -1786,22 +2425,40 @@ let sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="; }; }; - "nanoid-3.1.23" = { + "nanoid-3.1.25" = { name = "nanoid"; packageName = "nanoid"; - version = "3.1.23"; + version = "3.1.25"; src = fetchurl { - url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.23.tgz"; - sha512 = "FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw=="; + url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.25.tgz"; + sha512 = "rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q=="; }; }; - "nanoid-3.1.25" = { + "nanoid-3.1.30" = { name = "nanoid"; packageName = "nanoid"; - version = "3.1.25"; + version = "3.1.30"; src = fetchurl { - url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.25.tgz"; - sha512 = "rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q=="; + url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.30.tgz"; + sha512 = "zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ=="; + }; + }; + "natural-compare-1.4.0" = { + name = "natural-compare"; + packageName = "natural-compare"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz"; + sha1 = "4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"; + }; + }; + "nearley-2.20.1" = { + name = "nearley"; + packageName = "nearley"; + version = "2.20.1"; + src = fetchurl { + url = "https://registry.npmjs.org/nearley/-/nearley-2.20.1.tgz"; + sha512 = "+Mc8UaAebFzgV+KpI5n7DasuuQCHA89dmwm7JXw3TV43ukfNQ9DnBH3Mdb2g/I4Fdxc26pwimBWvjIw0UAILSQ=="; }; }; "negotiator-0.6.2" = { @@ -1822,6 +2479,15 @@ let sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="; }; }; + "nwsapi-2.2.0" = { + name = "nwsapi"; + packageName = "nwsapi"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz"; + sha512 = "h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ=="; + }; + }; "oauth-sign-0.9.0" = { name = "oauth-sign"; packageName = "oauth-sign"; @@ -1858,6 +2524,24 @@ let sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; }; }; + "optionator-0.8.3" = { + name = "optionator"; + packageName = "optionator"; + version = "0.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz"; + sha512 = "+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA=="; + }; + }; + "optionator-0.9.1" = { + name = "optionator"; + packageName = "optionator"; + version = "0.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz"; + sha512 = "74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw=="; + }; + }; "p-limit-3.1.0" = { name = "p-limit"; packageName = "p-limit"; @@ -1876,6 +2560,15 @@ let sha512 = "LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw=="; }; }; + "parent-module-1.0.1" = { + name = "parent-module"; + packageName = "parent-module"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz"; + sha512 = "GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g=="; + }; + }; "parse-srcset-1.0.2" = { name = "parse-srcset"; packageName = "parse-srcset"; @@ -1885,6 +2578,24 @@ let sha1 = "f2bd221f6cc970a938d88556abc589caaaa2bde1"; }; }; + "parse5-6.0.1" = { + name = "parse5"; + packageName = "parse5"; + version = "6.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz"; + sha512 = "Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw=="; + }; + }; + "parseley-0.7.0" = { + name = "parseley"; + packageName = "parseley"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parseley/-/parseley-0.7.0.tgz"; + sha512 = "xyOytsdDu077M3/46Am+2cGXEKM9U9QclBDv7fimY7e+BBlxh2JcBp2mgNsmkyA9uvgyTjVzDi7cP1v4hcFxbw=="; + }; + }; "parseurl-1.3.3" = { name = "parseurl"; packageName = "parseurl"; @@ -1912,6 +2623,15 @@ let sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; }; }; + "path-key-3.1.1" = { + name = "path-key"; + packageName = "path-key"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz"; + sha512 = "ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="; + }; + }; "path-parse-1.0.7" = { name = "path-parse"; packageName = "path-parse"; @@ -1939,6 +2659,15 @@ let sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; }; }; + "picocolors-1.0.0" = { + name = "picocolors"; + packageName = "picocolors"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz"; + sha512 = "1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="; + }; + }; "picomatch-2.3.0" = { name = "picomatch"; packageName = "picomatch"; @@ -1957,22 +2686,49 @@ let sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"; }; }; - "postcss-8.3.6" = { + "postcss-8.3.11" = { name = "postcss"; packageName = "postcss"; - version = "8.3.6"; + version = "8.3.11"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss/-/postcss-8.3.11.tgz"; + sha512 = "hCmlUAIlUiav8Xdqw3Io4LcpA1DOt7h3LSTAC4G6JGHFFaWzI6qvFt9oilvl8BmkbBRX1IhM90ZAmpk68zccQA=="; + }; + }; + "prelude-ls-1.1.2" = { + name = "prelude-ls"; + packageName = "prelude-ls"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.3.6.tgz"; - sha512 = "wG1cc/JhRgdqB6WHEuyLTedf3KIRuD0hG6ldkFEZNCjRxiC+3i6kkWUUbiJQayP28iwG35cEmAbe98585BYV0A=="; + url = "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz"; + sha1 = "21932a549f5e52ffd9a827f570e04be62a97da54"; }; }; - "pretty-format-27.2.0" = { + "prelude-ls-1.2.1" = { + name = "prelude-ls"; + packageName = "prelude-ls"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz"; + sha512 = "vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="; + }; + }; + "pretty-format-27.3.1" = { name = "pretty-format"; packageName = "pretty-format"; - version = "27.2.0"; + version = "27.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/pretty-format/-/pretty-format-27.2.0.tgz"; - sha512 = "KyJdmgBkMscLqo8A7K77omgLx5PWPiXJswtTtFV7XgVZv2+qPk6UivpXXO+5k6ZEbWIbLoKdx1pZ6ldINzbwTA=="; + url = "https://registry.npmjs.org/pretty-format/-/pretty-format-27.3.1.tgz"; + sha512 = "DR/c+pvFc52nLimLROYjnXPtolawm+uWDxr4FjuLDLUn+ktWnSN851KoHwHzzqq6rfCOjkzN8FLgDrSub6UDuA=="; + }; + }; + "progress-2.0.3" = { + name = "progress"; + packageName = "progress"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz"; + sha512 = "7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="; }; }; "proxy-addr-2.0.7" = { @@ -1984,6 +2740,15 @@ let sha512 = "llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg=="; }; }; + "pseudomap-1.0.2" = { + name = "pseudomap"; + packageName = "pseudomap"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz"; + sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3"; + }; + }; "psl-1.8.0" = { name = "psl"; packageName = "psl"; @@ -2020,6 +2785,24 @@ let sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="; }; }; + "railroad-diagrams-1.0.0" = { + name = "railroad-diagrams"; + packageName = "railroad-diagrams"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz"; + sha1 = "eb7e6267548ddedfb899c1b90e57374559cddb7e"; + }; + }; + "randexp-0.4.6" = { + name = "randexp"; + packageName = "randexp"; + version = "0.4.6"; + src = fetchurl { + url = "https://registry.npmjs.org/randexp/-/randexp-0.4.6.tgz"; + sha512 = "80WNmd9DA0tmZrw9qQa62GPPWfuXJknrmVmLcxvq4uZBdYqb1wYoKTmnlGUchvVWe0XiLupYkBoXVOxz3C8DYQ=="; + }; + }; "randombytes-2.1.0" = { name = "randombytes"; packageName = "randombytes"; @@ -2065,6 +2848,15 @@ let sha512 = "hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA=="; }; }; + "regexpp-3.2.0" = { + name = "regexpp"; + packageName = "regexpp"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz"; + sha512 = "pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg=="; + }; + }; "request-2.88.2" = { name = "request"; packageName = "request"; @@ -2101,6 +2893,15 @@ let sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; }; }; + "require-from-string-2.0.2" = { + name = "require-from-string"; + packageName = "require-from-string"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz"; + sha512 = "Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw=="; + }; + }; "resolve-1.20.0" = { name = "resolve"; packageName = "resolve"; @@ -2110,6 +2911,33 @@ let sha512 = "wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A=="; }; }; + "resolve-from-4.0.0" = { + name = "resolve-from"; + packageName = "resolve-from"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz"; + sha512 = "pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="; + }; + }; + "ret-0.1.15" = { + name = "ret"; + packageName = "ret"; + version = "0.1.15"; + src = fetchurl { + url = "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz"; + sha512 = "TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="; + }; + }; + "rimraf-3.0.2" = { + name = "rimraf"; + packageName = "rimraf"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz"; + sha512 = "JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA=="; + }; + }; "safe-buffer-5.1.2" = { name = "safe-buffer"; packageName = "safe-buffer"; @@ -2128,13 +2956,31 @@ let sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; - "sanitize-html-2.5.1" = { + "sanitize-html-2.5.3" = { name = "sanitize-html"; packageName = "sanitize-html"; - version = "2.5.1"; + version = "2.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-2.5.3.tgz"; + sha512 = "DGATXd1fs/Rm287/i5FBKVYSBBUL0iAaztOA1/RFhEs4yqo39/X52i/q/CwsfCUG5cilmXSBmnQmyWfnKhBlOg=="; + }; + }; + "saxes-5.0.1" = { + name = "saxes"; + packageName = "saxes"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz"; + sha512 = "5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw=="; + }; + }; + "selderee-0.6.0" = { + name = "selderee"; + packageName = "selderee"; + version = "0.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-2.5.1.tgz"; - sha512 = "hUITPitQk+eFNLtr4dEkaaiAJndG2YE87IOpcfBSL1XdklWgwcNDJdr9Ppe8QKL/C3jFt1xH/Mbj20e0GZQOfg=="; + url = "https://registry.npmjs.org/selderee/-/selderee-0.6.0.tgz"; + sha512 = "ibqWGV5aChDvfVdqNYuaJP/HnVBhlRGSRrlbttmlMpHcLuTqqbMH36QkSs9GEgj5M88JDYLI8eyP94JaQ8xRlg=="; }; }; "semver-5.7.1" = { @@ -2146,6 +2992,15 @@ let sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="; }; }; + "semver-7.3.5" = { + name = "semver"; + packageName = "semver"; + version = "7.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz"; + sha512 = "PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ=="; + }; + }; "send-0.17.1" = { name = "send"; packageName = "send"; @@ -2182,6 +3037,33 @@ let sha512 = "JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="; }; }; + "shebang-command-2.0.0" = { + name = "shebang-command"; + packageName = "shebang-command"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz"; + sha512 = "kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA=="; + }; + }; + "shebang-regex-3.0.0" = { + name = "shebang-regex"; + packageName = "shebang-regex"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz"; + sha512 = "7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="; + }; + }; + "sigmund-1.0.1" = { + name = "sigmund"; + packageName = "sigmund"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"; + sha1 = "3ff21f198cad2175f9f3b781853fd94d0d19b590"; + }; + }; "slash-3.0.0" = { name = "slash"; packageName = "slash"; @@ -2191,6 +3073,15 @@ let sha512 = "g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="; }; }; + "slice-ansi-4.0.0" = { + name = "slice-ansi"; + packageName = "slice-ansi"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz"; + sha512 = "qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ=="; + }; + }; "source-map-0.6.1" = { name = "source-map"; packageName = "source-map"; @@ -2272,40 +3163,22 @@ let sha1 = "071105bdfc286e6615c0403c27e9d7b5dcb855cb"; }; }; - "string-width-2.1.1" = { - name = "string-width"; - packageName = "string-width"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz"; - sha512 = "nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw=="; - }; - }; - "string-width-4.2.2" = { + "string-width-4.2.3" = { name = "string-width"; packageName = "string-width"; - version = "4.2.2"; + version = "4.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz"; - sha512 = "XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA=="; + url = "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"; + sha512 = "wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="; }; }; - "strip-ansi-4.0.0" = { + "strip-ansi-6.0.1" = { name = "strip-ansi"; packageName = "strip-ansi"; - version = "4.0.0"; + version = "6.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz"; - sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; - }; - }; - "strip-ansi-6.0.0" = { - name = "strip-ansi"; - packageName = "strip-ansi"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz"; - sha512 = "AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w=="; + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"; + sha512 = "Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="; }; }; "strip-bom-3.0.0" = { @@ -2353,6 +3226,33 @@ let sha512 = "MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q=="; }; }; + "symbol-tree-3.2.4" = { + name = "symbol-tree"; + packageName = "symbol-tree"; + version = "3.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz"; + sha512 = "9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="; + }; + }; + "table-6.7.3" = { + name = "table"; + packageName = "table"; + version = "6.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/table/-/table-6.7.3.tgz"; + sha512 = "5DkIxeA7XERBqMwJq0aHZOdMadBx4e6eDoFRuyT5VR82J0Ycg2DwM6GfA/EQAhJ+toRTaS1lIdSQCqgrmhPnlw=="; + }; + }; + "text-table-0.2.0" = { + name = "text-table"; + packageName = "text-table"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz"; + sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4"; + }; + }; "to-regex-range-5.0.1" = { name = "to-regex-range"; packageName = "to-regex-range"; @@ -2380,6 +3280,24 @@ let sha512 = "nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g=="; }; }; + "tough-cookie-4.0.0" = { + name = "tough-cookie"; + packageName = "tough-cookie"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz"; + sha512 = "tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg=="; + }; + }; + "tr46-2.1.0" = { + name = "tr46"; + packageName = "tr46"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz"; + sha512 = "15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw=="; + }; + }; "ts-mocha-8.0.0" = { name = "ts-mocha"; packageName = "ts-mocha"; @@ -2452,6 +3370,33 @@ let sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; }; }; + "type-check-0.3.2" = { + name = "type-check"; + packageName = "type-check"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz"; + sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72"; + }; + }; + "type-check-0.4.0" = { + name = "type-check"; + packageName = "type-check"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz"; + sha512 = "XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew=="; + }; + }; + "type-fest-0.20.2" = { + name = "type-fest"; + packageName = "type-fest"; + version = "0.20.2"; + src = fetchurl { + url = "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz"; + sha512 = "Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ=="; + }; + }; "type-is-1.6.18" = { name = "type-is"; packageName = "type-is"; @@ -2461,13 +3406,31 @@ let sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="; }; }; - "typescript-4.4.3" = { + "typescript-4.5.2" = { name = "typescript"; packageName = "typescript"; - version = "4.4.3"; + version = "4.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/typescript/-/typescript-4.5.2.tgz"; + sha512 = "5BlMof9H1yGt0P8/WF+wPNw6GfctgGjXp5hkblpyT+8rkASSmkUKMXrxR0Xg8ThVCi/JnHQiKXeBaEwCeQwMFw=="; + }; + }; + "typescript-formatter-7.2.2" = { + name = "typescript-formatter"; + packageName = "typescript-formatter"; + version = "7.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/typescript-formatter/-/typescript-formatter-7.2.2.tgz"; + sha512 = "V7vfI9XArVhriOTYHPzMU2WUnm5IMdu9X/CPxs8mIMGxmTBFpDABlbkBka64PZJ9/xgQeRpK8KzzAG4MPzxBDQ=="; + }; + }; + "universalify-0.1.2" = { + name = "universalify"; + packageName = "universalify"; + version = "0.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.4.3.tgz"; - sha512 = "4xfscpisVgqqDfPaJo5vkd+Qd/ItkoagnHpufr+i2QCHBsNYp+G7UAoyFl8aPtx879u38wPV65rZ8qbGZijalA=="; + url = "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz"; + sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="; }; }; "unpipe-1.0.0" = { @@ -2506,6 +3469,15 @@ let sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="; }; }; + "v8-compile-cache-2.3.0" = { + name = "v8-compile-cache"; + packageName = "v8-compile-cache"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz"; + sha512 = "l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA=="; + }; + }; "vary-1.1.2" = { name = "vary"; packageName = "vary"; @@ -2524,6 +3496,69 @@ let sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; }; }; + "w3c-hr-time-1.0.2" = { + name = "w3c-hr-time"; + packageName = "w3c-hr-time"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz"; + sha512 = "z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ=="; + }; + }; + "w3c-xmlserializer-2.0.0" = { + name = "w3c-xmlserializer"; + packageName = "w3c-xmlserializer"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz"; + sha512 = "4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA=="; + }; + }; + "webidl-conversions-5.0.0" = { + name = "webidl-conversions"; + packageName = "webidl-conversions"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz"; + sha512 = "VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA=="; + }; + }; + "webidl-conversions-6.1.0" = { + name = "webidl-conversions"; + packageName = "webidl-conversions"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz"; + sha512 = "qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w=="; + }; + }; + "whatwg-encoding-1.0.5" = { + name = "whatwg-encoding"; + packageName = "whatwg-encoding"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz"; + sha512 = "b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw=="; + }; + }; + "whatwg-mimetype-2.3.0" = { + name = "whatwg-mimetype"; + packageName = "whatwg-mimetype"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz"; + sha512 = "M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g=="; + }; + }; + "whatwg-url-8.7.0" = { + name = "whatwg-url"; + packageName = "whatwg-url"; + version = "8.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz"; + sha512 = "gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg=="; + }; + }; "which-2.0.2" = { name = "which"; packageName = "which"; @@ -2533,13 +3568,13 @@ let sha512 = "BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="; }; }; - "wide-align-1.1.3" = { - name = "wide-align"; - packageName = "wide-align"; - version = "1.1.3"; + "word-wrap-1.2.3" = { + name = "word-wrap"; + packageName = "word-wrap"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz"; - sha512 = "QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA=="; + url = "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz"; + sha512 = "Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="; }; }; "workerpool-6.1.5" = { @@ -2569,6 +3604,33 @@ let sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; }; }; + "ws-7.5.5" = { + name = "ws"; + packageName = "ws"; + version = "7.5.5"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-7.5.5.tgz"; + sha512 = "BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w=="; + }; + }; + "xml-name-validator-3.0.0" = { + name = "xml-name-validator"; + packageName = "xml-name-validator"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz"; + sha512 = "A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw=="; + }; + }; + "xmlchars-2.2.0" = { + name = "xmlchars"; + packageName = "xmlchars"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz"; + sha512 = "JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw=="; + }; + }; "y18n-5.0.8" = { name = "y18n"; packageName = "y18n"; @@ -2578,6 +3640,15 @@ let sha512 = "0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="; }; }; + "yallist-2.1.2" = { + name = "yallist"; + packageName = "yallist"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz"; + sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52"; + }; + }; "yallist-4.0.0" = { name = "yallist"; packageName = "yallist"; @@ -2636,12 +3707,12 @@ let args = { name = "mjolnir"; packageName = "mjolnir"; - version = "1.1.20"; - src = ../../../../../../../nix/store/hc66j9i16g2n08v0laiyydqch4szfygn-source; + version = "1.2.1"; + src = ../../../../../../../nix/store/8x9ib7ymf5yj075632mz4qap4m0nzd52-source; dependencies = [ - sources."@babel/code-frame-7.14.5" + sources."@babel/code-frame-7.12.11" sources."@babel/helper-validator-identifier-7.15.7" - (sources."@babel/highlight-7.14.5" // { + (sources."@babel/highlight-7.16.0" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -2652,26 +3723,63 @@ let sources."supports-color-5.5.0" ]; }) - sources."@jest/types-27.1.1" - sources."@types/body-parser-1.19.1" + (sources."@eslint/eslintrc-0.4.3" // { + dependencies = [ + sources."argparse-1.0.10" + sources."debug-4.3.2" + sources."js-yaml-3.14.1" + sources."ms-2.1.2" + ]; + }) + (sources."@humanwhocodes/config-array-0.5.0" // { + dependencies = [ + sources."debug-4.3.2" + sources."ms-2.1.2" + ]; + }) + sources."@humanwhocodes/object-schema-1.2.1" + sources."@jest/types-27.2.5" + sources."@selderee/plugin-htmlparser2-0.6.0" + sources."@tootallnate/once-1.1.2" + sources."@types/axios-0.14.0" + sources."@types/body-parser-1.19.2" sources."@types/connect-3.4.35" + sources."@types/crypto-js-4.0.2" sources."@types/express-4.17.13" - sources."@types/express-serve-static-core-4.17.24" + sources."@types/express-serve-static-core-4.17.25" sources."@types/istanbul-lib-coverage-2.0.3" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-3.0.1" + sources."@types/jsdom-16.2.13" sources."@types/json5-0.0.29" sources."@types/mime-1.3.2" sources."@types/mocha-9.0.0" - sources."@types/node-11.15.54" + sources."@types/node-16.11.7" + sources."@types/parse5-6.0.2" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" sources."@types/serve-static-1.13.10" sources."@types/stack-utils-2.0.1" + sources."@types/tough-cookie-4.0.1" sources."@types/yargs-16.0.4" sources."@types/yargs-parser-20.2.1" sources."@ungap/promise-all-settled-1.1.2" + sources."abab-2.0.5" sources."accepts-1.3.7" + sources."acorn-8.6.0" + (sources."acorn-globals-6.0.0" // { + dependencies = [ + sources."acorn-7.4.1" + ]; + }) + sources."acorn-jsx-5.3.2" + sources."acorn-walk-7.2.0" + (sources."agent-base-6.0.2" // { + dependencies = [ + sources."debug-4.3.2" + sources."ms-2.1.2" + ]; + }) sources."ajv-6.12.6" sources."ansi-colors-4.1.1" sources."ansi-regex-5.0.1" @@ -2680,11 +3788,13 @@ let sources."argparse-2.0.1" sources."array-flatten-1.1.1" sources."arrify-1.0.1" - sources."asn1-0.2.4" + sources."asn1-0.2.6" sources."assert-plus-1.0.0" + sources."astral-regex-2.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" + sources."axios-0.21.4" sources."balanced-match-1.0.2" sources."basic-auth-2.0.1" sources."bcrypt-pbkdf-1.0.2" @@ -2693,26 +3803,22 @@ let sources."body-parser-1.19.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" + sources."browser-process-hrtime-1.0.0" sources."browser-stdout-1.3.1" sources."buffer-from-1.1.2" sources."builtin-modules-1.1.1" sources."bytes-3.1.0" - sources."camelcase-6.2.0" + sources."callsites-3.1.0" + sources."camelcase-6.2.1" sources."caseless-0.12.0" sources."chalk-4.1.2" sources."chokidar-3.5.2" - (sources."cliui-7.0.4" // { - dependencies = [ - sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" - ]; - }) + sources."cliui-7.0.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."colorette-1.4.0" sources."combined-stream-1.0.8" sources."commander-2.20.3" + sources."commandpost-1.4.0" sources."concat-map-0.0.1" sources."config-3.3.6" sources."content-disposition-0.5.3" @@ -2720,38 +3826,90 @@ let sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."core-util-is-1.0.2" + sources."cross-spawn-7.0.3" + sources."crypto-js-4.1.1" + sources."cssom-0.4.4" + (sources."cssstyle-2.3.0" // { + dependencies = [ + sources."cssom-0.3.8" + ]; + }) sources."dashdash-1.14.1" + sources."data-urls-2.0.0" sources."debug-2.6.9" sources."decamelize-4.0.0" + sources."decimal.js-10.3.1" + sources."deep-is-0.1.4" sources."deepmerge-4.2.2" sources."delayed-stream-1.0.0" sources."depd-1.1.2" sources."destroy-1.0.4" sources."diff-5.0.0" sources."diff-sequences-27.0.6" - (sources."dom-serializer-1.3.2" // { + sources."discontinuous-range-1.0.0" + sources."doctrine-3.0.0" + sources."dom-serializer-1.3.2" + sources."domelementtype-2.2.0" + (sources."domexception-2.0.1" // { dependencies = [ - sources."domhandler-4.2.2" + sources."webidl-conversions-5.0.0" ]; }) - sources."domelementtype-2.2.0" - sources."domhandler-3.3.0" - (sources."domutils-2.8.0" // { + sources."domhandler-4.2.2" + sources."domutils-2.8.0" + sources."ecc-jsbn-0.1.2" + (sources."editorconfig-0.15.3" // { dependencies = [ - sources."domhandler-4.2.2" + sources."lru-cache-4.1.5" + sources."semver-5.7.1" + sources."yallist-2.1.2" ]; }) - sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" + sources."enquirer-2.3.6" sources."entities-2.2.0" sources."escalade-3.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-4.0.0" + sources."escodegen-2.0.0" + (sources."eslint-7.32.0" // { + dependencies = [ + sources."argparse-1.0.10" + sources."debug-4.3.2" + sources."js-yaml-3.14.1" + sources."levn-0.4.1" + sources."ms-2.1.2" + sources."optionator-0.9.1" + sources."prelude-ls-1.2.1" + sources."type-check-0.4.0" + ]; + }) + (sources."eslint-scope-5.1.1" // { + dependencies = [ + sources."estraverse-4.3.0" + ]; + }) + (sources."eslint-utils-2.1.0" // { + dependencies = [ + sources."eslint-visitor-keys-1.3.0" + ]; + }) + sources."eslint-visitor-keys-2.1.0" + (sources."espree-7.3.1" // { + dependencies = [ + sources."acorn-7.4.1" + sources."eslint-visitor-keys-1.3.0" + ]; + }) sources."esprima-4.0.1" + sources."esquery-1.4.0" + sources."esrecurse-4.3.0" + sources."estraverse-5.3.0" + sources."esutils-2.0.3" sources."etag-1.8.1" - (sources."expect-27.2.1" // { + (sources."expect-27.3.1" // { dependencies = [ sources."ansi-styles-5.2.0" ]; @@ -2761,22 +3919,29 @@ let sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" + sources."fast-levenshtein-2.0.6" + sources."file-entry-cache-6.0.1" sources."fill-range-7.0.1" sources."finalhandler-1.1.2" sources."find-up-5.0.0" sources."flat-5.0.2" + sources."flat-cache-3.0.4" + sources."flatted-3.2.4" + sources."follow-redirects-1.14.5" sources."forever-agent-0.6.1" - sources."form-data-2.3.3" + sources."form-data-3.0.1" sources."forwarded-0.2.0" sources."fresh-0.5.2" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."function-bind-1.1.1" + sources."functional-red-black-tree-1.0.1" sources."get-caller-file-2.0.5" sources."getpass-0.1.7" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."glob-parent-5.1.2" sources."glob-to-regexp-0.4.1" + sources."globals-13.12.0" sources."graceful-fs-4.2.8" sources."growl-1.10.5" sources."har-schema-2.0.0" @@ -2785,129 +3950,184 @@ let sources."has-flag-4.0.0" sources."hash.js-1.1.7" sources."he-1.2.0" - sources."html-to-text-6.0.0" + sources."html-encoding-sniffer-2.0.1" + sources."html-to-text-8.1.0" sources."htmlencode-0.0.4" - sources."htmlparser2-4.1.0" + sources."htmlparser2-6.1.0" sources."http-errors-1.7.2" + (sources."http-proxy-agent-4.0.1" // { + dependencies = [ + sources."debug-4.3.2" + sources."ms-2.1.2" + ]; + }) sources."http-signature-1.2.0" + (sources."https-proxy-agent-5.0.0" // { + dependencies = [ + sources."debug-4.3.2" + sources."ms-2.1.2" + ]; + }) sources."iconv-lite-0.4.24" + sources."ignore-4.0.6" + sources."import-fresh-3.3.0" + sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ipaddr.js-1.9.1" sources."is-binary-path-2.1.0" - sources."is-core-module-2.6.0" + sources."is-core-module-2.8.0" sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-2.0.0" - sources."is-glob-4.0.1" + sources."is-fullwidth-code-point-3.0.0" + sources."is-glob-4.0.3" sources."is-number-7.0.0" sources."is-plain-obj-2.1.0" sources."is-plain-object-5.0.0" + sources."is-potential-custom-element-name-1.0.1" sources."is-promise-2.2.2" sources."is-typedarray-1.0.0" sources."is-unicode-supported-0.1.0" sources."isexe-2.0.0" sources."isstream-0.1.2" - sources."jest-diff-27.2.0" - sources."jest-get-type-27.0.6" - sources."jest-matcher-utils-27.2.0" - sources."jest-message-util-27.2.0" + sources."jest-diff-27.3.1" + sources."jest-get-type-27.3.1" + sources."jest-matcher-utils-27.3.1" + (sources."jest-message-util-27.3.1" // { + dependencies = [ + sources."@babel/code-frame-7.16.0" + ]; + }) sources."jest-regex-util-27.0.6" sources."js-tokens-4.0.0" sources."js-yaml-4.1.0" sources."jsbn-0.1.1" + sources."jsdom-16.7.0" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" + sources."json-stable-stringify-without-jsonify-1.0.1" sources."json-stringify-safe-5.0.1" sources."json5-2.2.0" sources."jsprim-1.4.1" - sources."klona-2.0.4" + sources."levn-0.3.0" sources."locate-path-6.0.0" sources."lodash-4.17.21" + sources."lodash.merge-4.6.2" + sources."lodash.truncate-4.4.2" sources."log-symbols-4.1.0" sources."lowdb-1.0.0" sources."lru-cache-6.0.0" sources."make-error-1.3.6" - sources."matrix-bot-sdk-0.5.19" + (sources."matrix-bot-sdk-0.5.19" // { + dependencies = [ + sources."domhandler-3.3.0" + sources."html-to-text-6.0.0" + sources."htmlparser2-4.1.0" + ]; + }) sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."micromatch-4.0.4" sources."mime-1.6.0" - sources."mime-db-1.49.0" - sources."mime-types-2.1.32" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."minimalistic-assert-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-1.0.4" - (sources."mocha-9.1.1" // { + (sources."mocha-9.1.3" // { dependencies = [ - (sources."debug-4.3.1" // { + (sources."debug-4.3.2" // { dependencies = [ sources."ms-2.1.2" ]; }) + sources."glob-7.1.7" sources."ms-2.1.3" - sources."nanoid-3.1.23" + sources."nanoid-3.1.25" sources."supports-color-8.1.1" ]; }) + sources."moo-0.5.1" (sources."morgan-1.10.0" // { dependencies = [ sources."depd-2.0.0" ]; }) sources."ms-2.0.0" - sources."nanoid-3.1.25" + sources."nanoid-3.1.30" + sources."natural-compare-1.4.0" + sources."nearley-2.20.1" sources."negotiator-0.6.2" sources."normalize-path-3.0.0" + sources."nwsapi-2.2.0" sources."oauth-sign-0.9.0" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" + sources."optionator-0.8.3" sources."p-limit-3.1.0" sources."p-locate-5.0.0" + sources."parent-module-1.0.1" sources."parse-srcset-1.0.2" + sources."parse5-6.0.1" + sources."parseley-0.7.0" sources."parseurl-1.3.3" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" + sources."path-key-3.1.1" sources."path-parse-1.0.7" sources."path-to-regexp-0.1.7" sources."performance-now-2.1.0" + sources."picocolors-1.0.0" sources."picomatch-2.3.0" sources."pify-3.0.0" - sources."postcss-8.3.6" - (sources."pretty-format-27.2.0" // { + sources."postcss-8.3.11" + sources."prelude-ls-1.1.2" + (sources."pretty-format-27.3.1" // { dependencies = [ sources."ansi-styles-5.2.0" ]; }) + sources."progress-2.0.3" sources."proxy-addr-2.0.7" + sources."pseudomap-1.0.2" sources."psl-1.8.0" sources."punycode-2.1.1" sources."qs-6.7.0" + sources."railroad-diagrams-1.0.0" + sources."randexp-0.4.6" sources."randombytes-2.1.0" sources."range-parser-1.2.1" sources."raw-body-2.4.0" sources."react-is-17.0.2" sources."readdirp-3.6.0" + sources."regexpp-3.2.0" (sources."request-2.88.2" // { dependencies = [ + sources."form-data-2.3.3" sources."qs-6.5.2" + sources."tough-cookie-2.5.0" + ]; + }) + (sources."request-promise-4.2.6" // { + dependencies = [ + sources."tough-cookie-2.5.0" ]; }) - sources."request-promise-4.2.6" sources."request-promise-core-1.1.4" sources."require-directory-2.1.1" + sources."require-from-string-2.0.2" sources."resolve-1.20.0" + sources."resolve-from-4.0.0" + sources."ret-0.1.15" + sources."rimraf-3.0.2" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - (sources."sanitize-html-2.5.1" // { - dependencies = [ - sources."domhandler-4.2.2" - sources."htmlparser2-6.1.0" - ]; - }) - sources."semver-5.7.1" + sources."sanitize-html-2.5.3" + sources."saxes-5.0.1" + sources."selderee-0.6.0" + sources."semver-7.3.5" (sources."send-0.17.1" // { dependencies = [ sources."ms-2.1.1" @@ -2916,7 +4136,11 @@ let sources."serialize-javascript-6.0.0" sources."serve-static-1.14.1" sources."setprototypeof-1.1.1" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."sigmund-1.0.1" sources."slash-3.0.0" + sources."slice-ansi-4.0.0" sources."source-map-0.6.1" sources."source-map-js-0.6.2" sources."source-map-support-0.5.20" @@ -2930,18 +4154,23 @@ let sources."statuses-1.5.0" sources."stealthy-require-1.1.1" sources."steno-0.4.4" - sources."string-width-2.1.1" - (sources."strip-ansi-4.0.0" // { - dependencies = [ - sources."ansi-regex-3.0.0" - ]; - }) + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" sources."strip-bom-3.0.0" sources."strip-json-comments-3.1.1" sources."supports-color-7.2.0" + sources."symbol-tree-3.2.4" + (sources."table-6.7.3" // { + dependencies = [ + sources."ajv-8.8.1" + sources."json-schema-traverse-1.0.0" + ]; + }) + sources."text-table-0.2.0" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" - sources."tough-cookie-2.5.0" + sources."tough-cookie-4.0.0" + sources."tr46-2.1.0" sources."ts-mocha-8.0.0" (sources."ts-node-7.0.1" // { dependencies = [ @@ -2967,40 +4196,43 @@ let sources."has-flag-3.0.0" sources."js-yaml-3.14.1" sources."mkdirp-0.5.5" + sources."semver-5.7.1" sources."supports-color-5.5.0" ]; }) sources."tsutils-2.29.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" + sources."type-check-0.3.2" + sources."type-fest-0.20.2" sources."type-is-1.6.18" - sources."typescript-4.4.3" + sources."typescript-4.5.2" + sources."typescript-formatter-7.2.2" + sources."universalify-0.1.2" sources."unpipe-1.0.0" sources."uri-js-4.4.1" sources."utils-merge-1.0.1" sources."uuid-3.4.0" + sources."v8-compile-cache-2.3.0" sources."vary-1.1.2" sources."verror-1.10.0" + sources."w3c-hr-time-1.0.2" + sources."w3c-xmlserializer-2.0.0" + sources."webidl-conversions-6.1.0" + sources."whatwg-encoding-1.0.5" + sources."whatwg-mimetype-2.3.0" + sources."whatwg-url-8.7.0" sources."which-2.0.2" - sources."wide-align-1.1.3" + sources."word-wrap-1.2.3" sources."workerpool-6.1.5" - (sources."wrap-ansi-7.0.0" // { - dependencies = [ - sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" - ]; - }) + sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" + sources."ws-7.5.5" + sources."xml-name-validator-3.0.0" + sources."xmlchars-2.2.0" sources."y18n-5.0.8" sources."yallist-4.0.0" - (sources."yargs-16.2.0" // { - dependencies = [ - sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" - ]; - }) + sources."yargs-16.2.0" sources."yargs-parser-20.2.4" sources."yargs-unparser-2.0.0" sources."yn-2.0.0" diff --git a/pkgs/servers/monitoring/icinga2/default.nix b/pkgs/servers/monitoring/icinga2/default.nix index 7079ae4ff8dbc..b85cccf183860 100644 --- a/pkgs/servers/monitoring/icinga2/default.nix +++ b/pkgs/servers/monitoring/icinga2/default.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, fetchFromGitHub, cmake, flex, bison, systemd -, boost, openssl, patchelf, mariadb-connector-c, postgresql, zlib +{ stdenv, runCommand, lib, fetchFromGitHub, fetchpatch, cmake, flex, bison, systemd +, boost, openssl, patchelf, mariadb-connector-c, postgresql, zlib, tzdata # Databases , withMysql ? true, withPostgresql ? false # Features @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "icinga2${nameSuffix}"; - version = "2.13.1"; + version = "2.13.2"; src = fetchFromGitHub { owner = "icinga"; repo = "icinga2"; rev = "v${version}"; - sha256 = "sha256-cGVUNO3p00bkPd4tPbipevuixHz8ptk6W8y1rl3dge8="; + sha256 = "sha256:1ijvav2ymgq1i8jycrqbp2y4r54y0dkwjnwxc20bmcixxh877zdn"; }; patches = [ @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { "-DMYSQL_INCLUDE_DIR=${mariadb-connector-c.dev}/include/mariadb" "-DMYSQL_LIB=${mariadb-connector-c.out}/lib/mariadb/libmysqlclient.a" "-DICINGA2_PLUGINDIR=bin" - "-DICINGA2_UNITY_BUILD=no" + "-DICINGA2_LTO_BUILD=yes" # Features (mkFeatureFlag "MYSQL" withMysql) (mkFeatureFlag "PGSQL" withPostgresql) @@ -49,23 +49,28 @@ stdenv.mkDerivation rec { "-DICINGA2_USER=icinga2" "-DICINGA2_GROUP=icinga2" "-DICINGA2_GIT_VERSION_INFO=OFF" - "-DICINGA2_WITH_TESTS=OFF" "-DUSE_SYSTEMD=ON" ]; + outputs = [ "out" "doc" ]; + buildInputs = [ boost openssl systemd ] ++ lib.optional withPostgresql postgresql; nativeBuildInputs = [ cmake flex bison patchelf ]; + doCheck = true; + checkInputs = [ tzdata ]; # legacytimeperiod/dst needs this + postFixup = '' rm -r $out/etc/logrotate.d $out/etc/sysconfig $out/lib/icinga2/prepare-dirs # Fix hardcoded paths sed -i 's:/usr/bin/::g' $out/etc/icinga2/scripts/* - # Cleanup sbin + # Get rid of sbin sed -i 's/sbin/bin/g' $out/lib/icinga2/safe-reload + sed -i 's/sbin/bin/g' $out/bin/icinga2 rm $out/sbin ${lib.optionalString withMysql '' @@ -78,18 +83,10 @@ stdenv.mkDerivation rec { ''} ''; - vim = stdenv.mkDerivation { - pname = "vim-icinga2"; - inherit version src; - - dontConfigure = true; - dontBuild = true; - - installPhase = '' - mkdir -p $out/share/vim-plugins - cp -r tools/syntax/vim $out/share/vim-plugins/icinga2 - ''; - }; + vim = runCommand "vim-icinga2-${version}" {} '' + mkdir -p $out/share/vim-plugins + cp -r "${src}/tools/syntax/vim" $out/share/vim-plugins/icinga2 + ''; meta = { description = "Open source monitoring system"; diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 95ac59cec2ba4..8f1a407bf56d7 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -98,7 +98,7 @@ let # using libmad to decode mp3 files on darwin is causing a segfault -- there # is probably a solution, but I'm disabling it for now platformMask = lib.optionals stdenv.isDarwin [ "mad" "pulse" "jack" "nfs" "smbclient" ] - ++ lib.optionals (!stdenv.isLinux) [ "alsa" "io_uring" "systemd" "syslog" ]; + ++ lib.optionals (!stdenv.isLinux) [ "alsa" "pipewire" "io_uring" "systemd" "syslog" ]; knownFeatures = builtins.attrNames featureDependencies ++ builtins.attrNames nativeFeatureDependencies; platformFeatures = lib.subtractLists platformMask knownFeatures; @@ -117,13 +117,13 @@ let in stdenv.mkDerivation rec { pname = "mpd"; - version = "0.23.2"; + version = "0.23.4"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "MPD"; rev = "v${version}"; - sha256 = "sha256-gn06t8S0hh5xe5V1vnXVHSb0FwxY40onUV+Bt7oL9ic="; + sha256 = "sha256-siMFLV1fKdRt8To6AhLXmAAsgqZCA/bbvmlhbb6hLic="; }; buildInputs = [ diff --git a/pkgs/servers/mumsi/default.nix b/pkgs/servers/mumsi/default.nix deleted file mode 100644 index c6fd2332c90c5..0000000000000 --- a/pkgs/servers/mumsi/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, boost -, log4cpp, pjsip, openssl, alsa-lib, mumlib }: -with lib; stdenv.mkDerivation { - pname = "mumsi"; - version = "unstable-2018-12-12"; - - src = fetchFromGitHub { - owner = "slomkowski"; - repo = "mumsi"; - rev = "961b75792f8da22fb5502e39edb286e32172d0b0"; - sha256 = "0vrivl1fiiwjsz4v26nrn8ra3k9v0mcz7zjm2z319fw8hv6n1nrk"; - }; - - buildInputs = [ boost log4cpp pkg-config pjsip mumlib openssl alsa-lib ]; - nativeBuildInputs = [ cmake pkg-config ]; - installPhase = '' - install -Dm555 mumsi $out/bin/mumsi - ''; - - meta = { - description = "SIP to Mumble gateway/bridge using PJSUA stack"; - homepage = "https://github.com/slomkowski/mumsi"; - maintainers = with maintainers; [ das_j ]; - license = licenses.asl20; - platforms = platforms.linux; - }; -} diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 9c6e3a22122a2..0b7fb6f50fe77 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -51,8 +51,8 @@ in { }; nextcloud22 = generic { - version = "22.2.2"; - sha256 = "sha256-lDvn29N19Lhm3P2YIVM/85vr/U07qR+M8TkF/D/GTfA="; + version = "22.2.3"; + sha256 = "sha256-ZqKaakkHOMCr7bZ3y2jHyR+rqz5kGaPJnYtAaJnrlCo="; }; # tip: get she sha with: # curl 'https://download.nextcloud.com/server/releases/nextcloud-${version}.tar.bz2.sha256' diff --git a/pkgs/servers/web-apps/sogo/default.nix b/pkgs/servers/web-apps/sogo/default.nix index fc7af3bcf2dce..e4dd796317a86 100644 --- a/pkgs/servers/web-apps/sogo/default.nix +++ b/pkgs/servers/web-apps/sogo/default.nix @@ -2,13 +2,13 @@ , openssl, openldap, sope, libmemcached, curl, libsodium, libytnef, libzip, pkg-config, nixosTests }: gnustep.stdenv.mkDerivation rec { pname = "SOGo"; - version = "5.2.0"; + version = "5.3.0"; src = fetchFromGitHub { owner = "inverse-inc"; repo = pname; rev = "SOGo-${version}"; - sha256 = "0y9im5y6ffdc7sy2qphq0xai4ig1ks7vj10vy4mn1psdlc5kd516"; + sha256 = "0f09b2ga43xdd8w14llclrsdxc1y8xb3g1h15lahxq82xkvixjjl"; }; nativeBuildInputs = [ gnustep.make makeWrapper python3 ]; diff --git a/pkgs/servers/zoneminder/default.nix b/pkgs/servers/zoneminder/default.nix index 3aed72eb8b8d5..b0828de006f75 100644 --- a/pkgs/servers/zoneminder/default.nix +++ b/pkgs/servers/zoneminder/default.nix @@ -78,13 +78,13 @@ let in stdenv.mkDerivation rec { pname = "zoneminder"; - version = "1.36.8"; + version = "1.36.10"; src = fetchFromGitHub { owner = "ZoneMinder"; repo = "zoneminder"; rev = version; - sha256 = "sha256-UUpq4CCZq+EwVNGsLCQuVWdY3yoGw977AaMk1iJ6a5U="; + sha256 = "sha256-MmBnbVDitKOctPe2dNe1sMNNs/qEYGVq3UMJxAkLlCc="; fetchSubmodules = true; }; diff --git a/pkgs/tools/admin/aliyun-cli/default.nix b/pkgs/tools/admin/aliyun-cli/default.nix new file mode 100644 index 0000000000000..3ff8ae3caa23d --- /dev/null +++ b/pkgs/tools/admin/aliyun-cli/default.nix @@ -0,0 +1,30 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "aliyun-cli"; + version = "3.0.94"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "aliyun"; + repo = pname; + fetchSubmodules = true; + sha256 = "sha256:1l9rzdp9kxxicvp45pa7288zxa07xp7w6aj7d9k9xlzv8l96k6j3"; + }; + vendorSha256 = "sha256:0dklq78bqfidcda8pwd6qwaycah3gndmq9s90h1pqx1isw4frckk"; + + subPackages = ["aliyun-openapi-meta" "main"]; + + ldFlags = "-X 'github.com/aliyun/${pname}/cli.Version=${version}'"; + + postInstall = '' + mv $out/bin/main $out/bin/aliyun + ''; + + meta = with lib; { + description = "Tool to manage and use Alibaba Cloud resources through a command line interface."; + homepage = "https://github.com/aliyun/aliyun-cli"; + license = licenses.asl20; + maintainers = with maintainers; [ ornxka ]; + }; +} diff --git a/pkgs/tools/archivers/pax/default.nix b/pkgs/tools/archivers/pax/default.nix index d554ea4dade37..cfba3754c8196 100644 --- a/pkgs/tools/archivers/pax/default.nix +++ b/pkgs/tools/archivers/pax/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, utmp }: stdenv.mkDerivation rec { pname = "pax"; @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1p18nxijh323f4i1s2pg7pcr0557xljl5avv8ll5s9nfr34r5j0w"; }; + buildInputs = lib.optional stdenv.isDarwin utmp; + buildPhase = '' sh Build.sh -r -tpax ''; diff --git a/pkgs/tools/filesystems/kio-fuse/default.nix b/pkgs/tools/filesystems/kio-fuse/default.nix new file mode 100644 index 0000000000000..a68165956eb31 --- /dev/null +++ b/pkgs/tools/filesystems/kio-fuse/default.nix @@ -0,0 +1,31 @@ +{ lib +, mkDerivation +, fetchgit +, cmake +, extra-cmake-modules +, kio +, fuse3 +}: + +mkDerivation rec { + pname = "kio-fuse"; + version = "5.0.1"; + + src = fetchgit { + url = "https://invent.kde.org/system/kio-fuse.git"; + sha256 = "sha256-LSFbFCaEPkQTk1Rg9xpueBOQpkbr/tgYxLD31F6i/qE="; + rev = "v${version}"; + }; + + nativeBuildInputs = [ cmake extra-cmake-modules ]; + + buildInputs = [ kio fuse3 ]; + + meta = with lib; { + description = "FUSE Interface for KIO"; + homepage = "https://invent.kde.org/system/kio-fuse"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ _1000teslas ]; + }; +} diff --git a/pkgs/tools/graphics/svgcleaner/Cargo.lock b/pkgs/tools/graphics/svgcleaner/Cargo.lock deleted file mode 100644 index 8daf4c4f83b5a..0000000000000 --- a/pkgs/tools/graphics/svgcleaner/Cargo.lock +++ /dev/null @@ -1,256 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "autocfg" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "chrono" -version = "0.4.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" -dependencies = [ - "libc", - "num-integer", - "num-traits", - "time", - "winapi", -] - -[[package]] -name = "clap" -version = "2.33.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" -dependencies = [ - "bitflags", - "textwrap", - "unicode-width", -] - -[[package]] -name = "error-chain" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff511d5dc435d703f4971bc399647c9bc38e20cb41452e3b9feb4765419ed3f3" - -[[package]] -name = "fern" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e69ab0d5aca163e388c3a49d284fed6c3d0810700e77c5ae2756a50ec1a4daaa" -dependencies = [ - "chrono", - "log", -] - -[[package]] -name = "float-cmp" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2be876712b52d3970d361df27210574630d8d44d6461f0b55745d56e88ac10b0" -dependencies = [ - "num", -] - -[[package]] -name = "libc" -version = "0.2.103" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8f7255a17a627354f321ef0055d63b898c6fb27eff628af4d1b66b7331edf6" - -[[package]] -name = "log" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "num" -version = "0.1.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4703ad64153382334aa8db57c637364c322d3372e097840c72000dabdcf6156e" -dependencies = [ - "num-integer", - "num-iter", - "num-traits", -] - -[[package]] -name = "num-integer" -version = "0.1.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-iter" -version = "0.1.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2021c8337a54d21aca0d59a92577a029af9431cb59b909b03252b9c164fad59" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" -dependencies = [ - "autocfg", -] - -[[package]] -name = "phf" -version = "0.7.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18" -dependencies = [ - "phf_shared", -] - -[[package]] -name = "phf_shared" -version = "0.7.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0" -dependencies = [ - "siphasher", -] - -[[package]] -name = "simplecss" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "135685097a85a64067df36e28a243e94a94f76d829087ce0be34eeb014260c0e" - -[[package]] -name = "siphasher" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" - -[[package]] -name = "svgcleaner" -version = "0.9.5" -dependencies = [ - "clap", - "error-chain", - "fern", - "log", - "svgdom", -] - -[[package]] -name = "svgdom" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dac5d235d251b4266fb95bdf737fe0c546b26327a127e35ad33effdd78cb2e83" -dependencies = [ - "error-chain", - "float-cmp", - "log", - "simplecss", - "svgparser", -] - -[[package]] -name = "svgparser" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90b2a4d5f7d25526c750e436fb5a224e06579f32581515bf511b37210007a3cb" -dependencies = [ - "error-chain", - "log", - "phf", - "xmlparser", -] - -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "time" -version = "0.1.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" -dependencies = [ - "libc", - "wasi", - "winapi", -] - -[[package]] -name = "unicode-width" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" - -[[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "xmlparser" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4fb8cb7e78fcf5055e751eae348c81bba17b6c84c8ed9fc5f6cf60e3e15d4aa" -dependencies = [ - "error-chain", - "log", -] diff --git a/pkgs/tools/graphics/svgcleaner/default.nix b/pkgs/tools/graphics/svgcleaner/default.nix deleted file mode 100644 index 48902f322e2fb..0000000000000 --- a/pkgs/tools/graphics/svgcleaner/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, rustPlatform, fetchFromGitHub }: - -rustPlatform.buildRustPackage rec { - pname = "svgcleaner"; - version = "0.9.5"; - - src = fetchFromGitHub { - owner = "RazrFalcon"; - repo = "svgcleaner"; - rev = "v${version}"; - sha256 = "sha256-nc+lKL6CJZid0WidcBwILhn81VgmmFrutfKT5UffdHA="; - }; - - cargoLock.lockFile = ./Cargo.lock; - - postPatch = '' - cp ${./Cargo.lock} Cargo.lock; - ''; - - meta = with lib; { - description = "A tool for tidying and optimizing SVGs"; - homepage = "https://github.com/RazrFalcon/svgcleaner"; - changelog = "https://github.com/RazrFalcon/svgcleaner/blob/v${version}/CHANGELOG.md"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ mehandes ]; - }; -} diff --git a/pkgs/tools/misc/convbin/default.nix b/pkgs/tools/misc/convbin/default.nix index e350092a0e366..90b403adeb603 100644 --- a/pkgs/tools/misc/convbin/default.nix +++ b/pkgs/tools/misc/convbin/default.nix @@ -13,6 +13,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-zCRM62xwaPaN8+cg+CeaqK/9hKpZmSBBeUOQqAvQGYw="; }; + postPatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace Makefile --replace "-flto" "" + ''; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; checkPhase = '' diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index b1390fefb33cd..f6f799a9b0c0a 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -9,11 +9,11 @@ # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python3Packages.buildPythonApplication rec { pname = "diffoscope"; - version = "190"; + version = "192"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "sha256-iZ9OJESNlGgsYTO9jbzEX5sCz8Rrhs7cecJEy7j4U+c="; + sha256 = "sha256-ZaSE1yYznZIQV7yKyeBlqQzkgUn3CoadZY2fDA1/SnE="; }; outputs = [ "out" "man" ]; @@ -79,6 +79,7 @@ python3Packages.buildPythonApplication rec { # Disable flaky tests on Darwin "test_non_unicode_filename" "test_listing" + "test_symlink_root" ]; # flaky tests on Darwin diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index 08e4641fb4c1d..a002d190984f8 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchurl, intltool, gettext, coreutils, gnused, gnome , gnugrep, parted, glib, libuuid, pkg-config, gtkmm3, libxml2 , gpart, hdparm, procps, util-linux, polkit, wrapGAppsHook, substituteAll +, mtools, dosfstools }: stdenv.mkDerivation rec { @@ -29,7 +30,7 @@ stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( - --prefix PATH : "${lib.makeBinPath [ gpart hdparm util-linux procps coreutils gnused gnugrep ]}" + --prefix PATH : "${lib.makeBinPath [ gpart hdparm util-linux procps coreutils gnused gnugrep mtools dosfstools ]}" ) ''; diff --git a/pkgs/tools/misc/ibus-theme-tools/default.nix b/pkgs/tools/misc/ibus-theme-tools/default.nix new file mode 100644 index 0000000000000..ee8a8719d1397 --- /dev/null +++ b/pkgs/tools/misc/ibus-theme-tools/default.nix @@ -0,0 +1,29 @@ +{ lib, python3Packages, fetchFromGitHub, gettext }: + +python3Packages.buildPythonApplication rec { + pname = "ibus-theme-tools"; + version = "4.2.0"; + + src = fetchFromGitHub { + owner = "openSUSE"; + repo = "IBus-Theme-Tools"; + rev = "v${version}"; + sha256 = "0i8vwnikwd1bfpv4xlgzc51gn6s18q58nqhvcdiyjzcmy3z344c2"; + }; + + buildInputs = [ gettext ]; + + propagatedBuildInputs = with python3Packages; [ tinycss2 pygobject3 ]; + + # No test. + doCheck = false; + + pythonImportsCheck = [ "ibus_theme_tools" ]; + + meta = with lib; { + description = "Generate the IBus GTK or GNOME Shell theme from existing themes"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ hollowman6 ]; + homepage = "https://github.com/openSUSE/IBus-Theme-Tools"; + }; +} diff --git a/pkgs/tools/misc/rates/default.nix b/pkgs/tools/misc/rates/default.nix index 989a9e6734aca..8ead57a07eb98 100644 --- a/pkgs/tools/misc/rates/default.nix +++ b/pkgs/tools/misc/rates/default.nix @@ -1,6 +1,8 @@ { lib +, stdenv , fetchFromGitHub , rustPlatform +, Security }: rustPlatform.buildRustPackage rec { @@ -16,6 +18,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "041sskiq152iywwqd8p7aqsqzbj359zl7ilnp8ahzdqprz3slk1w"; + buildInputs = lib.optional stdenv.isDarwin Security; + meta = with lib; { description = "CLI tool that brings currency exchange rates right into your terminal"; homepage = "https://github.com/lunush/rates"; diff --git a/pkgs/tools/misc/topicctl/default.nix b/pkgs/tools/misc/topicctl/default.nix index 9ecbbcba37af4..0a51eda485707 100644 --- a/pkgs/tools/misc/topicctl/default.nix +++ b/pkgs/tools/misc/topicctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "topicctl"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "segmentio"; repo = "topicctl"; rev = "v${version}"; - sha256 = "sha256-LsMt2BHfO0I5N2C247fmoOgQ5EXMgk/3Kj/lI+vTRV0="; + sha256 = "sha256-bCTlKhYmMe89dYuLiZ58CPpYZiXSGqbddxugsZS5/Cs="; }; - vendorSha256 = "sha256-ur7qMm7l1CocQwX58fTL1PpdgIEJyRAzSlNJM1WTvM0="; + vendorSha256 = "sha256-1VRK8tmsbOuP5t5uJ1h+KPcS4K9D+y6UQKeUP2HPXrQ="; ldflags = [ "-X main.BuildVersion=${version}" diff --git a/pkgs/tools/networking/lychee/default.nix b/pkgs/tools/networking/lychee/default.nix index 72f5b6f57fd20..657fd108b9a01 100644 --- a/pkgs/tools/networking/lychee/default.nix +++ b/pkgs/tools/networking/lychee/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "lychee"; - version = "0.7.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "lycheeverse"; repo = pname; - rev = version; - sha256 = "0kpwpbv0dqb0p4bxjlcjas6x1n91rdsvy2psrc1nyr1sh6gb1q5j"; + rev = "v${version}"; + sha256 = "sha256-TjjSysG4UCXVi5ytWaJVL31TFLHC3Ro5OEB56pzbn7s="; }; - cargoSha256 = "1b915zkg41n3azk4hhg6fgc83n7iq8p7drvdyil2m2a4qdjvp9r3"; + cargoSha256 = "sha256-apRXxd7RBnNjhZb0xAUr5hSTafyMbg0k1wgHT93Z66g="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/networking/ookla-speedtest/default.nix b/pkgs/tools/networking/ookla-speedtest/default.nix index 200b488cf7146..6f377a0a4bf7c 100644 --- a/pkgs/tools/networking/ookla-speedtest/default.nix +++ b/pkgs/tools/networking/ookla-speedtest/default.nix @@ -2,16 +2,16 @@ let pname = "ookla-speedtest"; - version = "1.0.0"; + version = "1.1.0"; srcs = { x86_64-linux = fetchurl { url = "https://install.speedtest.net/app/cli/${pname}-${version}-x86_64-linux.tgz"; - sha256 = "sha256-X+ICjw1EJ+T0Ix2fnPcOZpG7iQpwY211Iy/k2XBjMWg="; + sha256 = "sha256-/NWN8G6uqokjchSnNcC3FU1qDsOjt4Jh2kCnZc5B9H8="; }; aarch64-linux = fetchurl { url = "https://install.speedtest.net/app/cli/${pname}-${version}-aarch64-linux.tgz"; - sha256 = "sha256-BzaE3DSQUIygGwTFhV4Ez9eX/tM/bqam7cJt+8b2qp4="; + sha256 = "sha256-kyOrChC3S8kn4ArO5IylFIstS/N3pXxBVx4ZWI600oU="; }; }; in diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index f35eecca05a98..d5d37cd70a0f8 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2021-11-16"; + version = "2021-11-18"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-xsTmZdEee/lrRYPemny7lUy13xXVVDrb7w1NBnkzmJM="; + sha256 = "sha256-GSqJIM/wAgSKn9BWOSEwmrVTwI6ZOTZGNHRcepDT7MI="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/gau/default.nix b/pkgs/tools/security/gau/default.nix index fec4e4e013b56..95d5f228c8037 100644 --- a/pkgs/tools/security/gau/default.nix +++ b/pkgs/tools/security/gau/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gau"; - version = "1.2.0"; + version = "2.0.6"; src = fetchFromGitHub { owner = "lc"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hUIUDDP9NtMmJXj5GCD/ISUUcx5prKCVVFztff9txoU="; + sha256 = "sha256-d9Cfd2KD+ymGnzOjlVQkSm3XBamoJIUKQLnRZzSDBtk="; }; - vendorSha256 = "sha256-WMoFbqtBMcjTWX51mEMzpgDEAndCElldNqjG27yXd2w="; + vendorSha256 = "sha256-u5ketxHPwZN2mV0uTgwJbY+ImusGZ9GTTmFAGvdH5yA="; meta = with lib; { description = "Tool to fetch known URLs"; diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index d1e114e32450c..c4e5370fb5ecf 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.14" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.15" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index 27690111611cc..3ec1ed8963b55 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: 2c47df62b425e4083f4816d71405fed1c0e8b35b - ref: refs/tags/6.1.14 + revision: 1dd828ca9f705d3f05d273b535ff666b5941ddd6 + ref: refs/tags/6.1.15 specs: - metasploit-framework (6.1.14) + metasploit-framework (6.1.15) actionpack (~> 6.0) activerecord (~> 6.0) activesupport (~> 6.0) @@ -128,13 +128,13 @@ GEM arel-helpers (2.12.1) activerecord (>= 3.1.0, < 7) aws-eventstream (1.2.0) - aws-partitions (1.528.0) + aws-partitions (1.533.0) aws-sdk-core (3.122.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-ec2 (1.279.0) + aws-sdk-ec2 (1.281.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) aws-sdk-iam (1.63.0) @@ -143,7 +143,7 @@ GEM aws-sdk-kms (1.51.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.105.1) + aws-sdk-s3 (1.106.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) @@ -288,7 +288,7 @@ GEM pcaprub patch_finder (1.0.2) pcaprub (0.12.4) - pdf-reader (2.5.0) + pdf-reader (2.6.0) Ascii85 (~> 1.0) afm (~> 0.2.1) hashery (~> 2.0) @@ -330,7 +330,7 @@ GEM rex-core rex-struct2 rex-text - rex-core (0.1.18) + rex-core (0.1.20) rex-encoder (0.1.6) metasm rex-arch diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 674418693c75d..4a691122cf419 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.1.14"; + version = "6.1.15"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-ySQOc/k+kvdSj5g88ujm4e2apvPVbiaspzSbCdEQ4ZA="; + sha256 = "sha256-Wz5FeM7AvRS4mV3BJcWOdp1GgAzTOqRnjBAQp4/Oj5E="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index 7c1947ddb4d93..ff8d0da3f3a87 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -104,10 +104,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1awcpdvfk6dlb9n5wiksq8vhqwdpmkybv4ga8drmlx6x9li3my5k"; + sha256 = "052y91z5xqysfmnclcp0k9cy7dgjk28xv6dskwww42ljdgjxcmxi"; type = "gem"; }; - version = "1.528.0"; + version = "1.533.0"; }; aws-sdk-core = { groups = ["default"]; @@ -124,10 +124,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cvf70lj99r59wn35pqxg5c6c2qkgnir0b8fqgi8h757xz6b9m72"; + sha256 = "01ywgc5mh1h19ac10l1ck911qgkxqavwbanp4i6h9ddlcd9jmhm1"; type = "gem"; }; - version = "1.279.0"; + version = "1.281.0"; }; aws-sdk-iam = { groups = ["default"]; @@ -154,10 +154,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12j7i6l52b6hsnj59grn0m1s9pn6l38zmra6ad8i12vdsvd185w7"; + sha256 = "06ix8lw1r0mw77hnc7ns0fqrsl616g35xw8qcsihzwzgvwb2z0mb"; type = "gem"; }; - version = "1.105.1"; + version = "1.106.0"; }; aws-sigv4 = { groups = ["default"]; @@ -664,12 +664,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "2c47df62b425e4083f4816d71405fed1c0e8b35b"; - sha256 = "1471238hk6rllyn2cvnmyfk9mvg1wvlg4g4qix9gg4iyz5rhw969"; + rev = "1dd828ca9f705d3f05d273b535ff666b5941ddd6"; + sha256 = "14cgrs7sf40hiiks8fnk1j04d7bniv2jbhaxk6w19gf0rrw4agjv"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.1.14"; + version = "6.1.15"; }; metasploit-model = { groups = ["default"]; @@ -947,10 +947,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14cxj3ra9nnn334qpm2vsx9s0zk3095s8ih6cwcp47h3hv03c73y"; + sha256 = "0zgv9pp9cqd1cf8bwk7pb5lkm81gn7znnan0a7s42wd0qavs4nnz"; type = "gem"; }; - version = "2.5.0"; + version = "2.6.0"; }; pg = { groups = ["default"]; @@ -1127,10 +1127,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i3rn2ndf9ijgjfn3c8rpblw8lnqynm2flmfmm6dbfhjyhhawnaz"; + sha256 = "0hy7xrd3pwyfk2199zkgfa6kz1fsx7ngf6s512gpk8gadjc8hq6j"; type = "gem"; }; - version = "0.1.18"; + version = "0.1.20"; }; rex-encoder = { groups = ["default"]; diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index 353590ed87c81..57f49988e75b0 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -12,11 +12,11 @@ let in python3Packages.buildPythonApplication rec { pname = "truffleHog"; - version = "2.1.11"; + version = "2.2.1"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "53619f0c5be082abd377f987291ace80bc3b88f864972b1a30494780980f769e"; + sha256 = "sha256-fw0JyM2iqQrkL4FAXllEozJdkKWELS3eAURx5NZcceQ="; }; # Relax overly restricted version constraint diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix index 7e4ce71ec547d..6b22dd5fe5ce5 100644 --- a/pkgs/tools/system/plan9port/default.nix +++ b/pkgs/tools/system/plan9port/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { pname = "plan9port"; - version = "0.pre+date=2021-10-19"; + version = "2021-10-19"; src = fetchFromGitHub { owner = "9fans"; @@ -101,6 +101,7 @@ stdenv.mkDerivation { kovirobi ]; platforms = platforms.unix; + broken = stdenv.isDarwin; }; } # TODO: investigate the mouse chording support patch diff --git a/pkgs/tools/text/tidy-viewer/default.nix b/pkgs/tools/text/tidy-viewer/default.nix index 29d243a650425..43b38d06b928d 100644 --- a/pkgs/tools/text/tidy-viewer/default.nix +++ b/pkgs/tools/text/tidy-viewer/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "tidy-viewer"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "alexhallam"; repo = "tv"; rev = version; - sha256 = "sha256-YXYz+SvL6YRwnZ7frmmx4NevNTh0rJcW7e4jSuX3TNs="; + sha256 = "sha256-onLu4XNe3sLfZ273Hq9IvgZEV9ir8oEXX7tQG75K2Hw="; }; - cargoSha256 = "sha256-KwnnoVacTMw7kHLQynv9557zUq8aFZfzBD+Zc9Q6XBs="; + cargoSha256 = "sha256-CYiRi6ny0wzTddpjdnnMHGqcWRM9wVjF34RmETgLH5A="; # this test parses command line arguments # error: Found argument '--test-threads' which wasn't expected, or isn't valid in this context diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6fac1340ff04e..2453aa9220867 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -575,6 +575,7 @@ mapAliases ({ mssys = ms-sys; # added 2015-12-13 mpv-with-scripts = self.wrapMpv self.mpv-unwrapped { }; # added 2020-05-22 multipath_tools = multipath-tools; # added 2016-01-21 + mumsi = throw "mumsi has been removed from nixpkgs, as it's unmaintained and does not build anymore"; # added 2021-11-18 mupen64plus1_5 = mupen64plus; # added 2016-02-12 mx = throw "graalvm8 and its tools were deprecated in favor of graalvm8-ce"; # added 2021-10-15 mxisd = throw "mxisd has been removed from nixpkgs as it has reached end of life, see https://github.com/kamax-matrix/mxisd/blob/535e0a5b96ab63cb0ddef90f6f42c5866407df95/EOL.md#end-of-life-notice . ma1sd may be a suitable alternative."; # added 2021-04-15 @@ -892,6 +893,7 @@ mapAliases ({ stanchion = throw "Stanchion was part of riak-cs which is not maintained anymore"; # added 2020-10-14 stumpwm-git = throw "stumpwm-git has been broken for a long time and lispPackages.stumpwm follows Quicklisp that is close to git version"; # added 2021-05-09 surf-webkit2 = surf; # added 2017-04-02 + svgcleaner = throw "svgcleaner has been removed."; # added 2021-11-17 swec = throw "swec has been removed; broken and abandoned upstream."; # added 2021-10-14 swfdec = throw "swfdec has been removed as broken and unmaintained."; # added 2020-08-23 swtpm-tpm2 = swtpm; # added 2021-02-26 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bb92dc9a69b1f..41337a999a83c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -259,7 +259,9 @@ with pkgs; clj-kondo = callPackage ../development/tools/clj-kondo { }; - cloak = callPackage ../applications/misc/cloak { }; + cloak = callPackage ../applications/misc/cloak { + inherit (darwin.apple_sdk.frameworks) Security; + }; cmark = callPackage ../development/libraries/cmark { }; @@ -1044,6 +1046,8 @@ with pkgs; hyper = callPackage ../applications/terminal-emulators/hyper { }; + iqueue = callPackage ../development/libraries/iqueue {}; + iterm2 = callPackage ../applications/terminal-emulators/iterm2 {}; kitty = callPackage ../applications/terminal-emulators/kitty { @@ -1335,6 +1339,8 @@ with pkgs; avfs = callPackage ../tools/filesystems/avfs { }; + aliyun-cli = callPackage ../tools/admin/aliyun-cli { }; + aws-iam-authenticator = callPackage ../tools/security/aws-iam-authenticator {}; awscli = callPackage ../tools/admin/awscli { }; @@ -1733,6 +1739,8 @@ with pkgs; gitless = callPackage ../applications/version-management/gitless { python = python3; }; + gistyc = with python3Packages; toPythonApplication gistyc; + gitlint = python3Packages.callPackage ../tools/misc/gitlint { }; gitter = callPackage ../applications/networking/instant-messengers/gitter { }; @@ -3220,6 +3228,10 @@ with pkgs; lite = callPackage ../applications/editors/lite { }; + lite-xl = callPackage ../applications/editors/lite-xl { + inherit (darwin.apple_sdk.frameworks) Foundation; + }; + loadwatch = callPackage ../tools/system/loadwatch { }; loccount = callPackage ../development/tools/misc/loccount { }; @@ -4157,6 +4169,8 @@ with pkgs; ibus-with-plugins = callPackage ../tools/inputmethods/ibus/wrapper.nix { }; + ibus-theme-tools = callPackage ../tools/misc/ibus-theme-tools { }; + interception-tools = callPackage ../tools/inputmethods/interception-tools { }; interception-tools-plugins = { caps2esc = callPackage ../tools/inputmethods/interception-tools/caps2esc.nix { }; @@ -4745,7 +4759,9 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - pax = callPackage ../tools/archivers/pax { }; + pax = callPackage ../tools/archivers/pax { + inherit (pkgs.darwin.apple_sdk.libs) utmp; + }; rage = callPackage ../tools/security/rage { inherit (darwin.apple_sdk.frameworks) Foundation Security; @@ -6739,6 +6755,8 @@ with pkgs; kibi = callPackage ../applications/editors/kibi { }; + kio-fuse = libsForQt5.callPackage ../tools/filesystems/kio-fuse { }; + kismet = callPackage ../applications/networking/sniffers/kismet { }; kiterunner = callPackage ../tools/security/kiterunner { }; @@ -7662,7 +7680,9 @@ with pkgs; metasploit = callPackage ../tools/security/metasploit { }; - mhost = callPackage ../applications/networking/mhost { }; + mhost = callPackage ../applications/networking/mhost { + inherit (darwin.apple_sdk.frameworks) Security; + }; ms-sys = callPackage ../tools/misc/ms-sys { }; @@ -9692,8 +9712,6 @@ with pkgs; svgbob = callPackage ../tools/graphics/svgbob { }; - svgcleaner = callPackage ../tools/graphics/svgcleaner { }; - ssb = callPackage ../tools/security/ssb { }; ssb-patchwork = callPackage ../applications/networking/ssb-patchwork { }; @@ -12896,7 +12914,9 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - devserver = callPackage ../development/tools/rust/devserver { }; + devserver = callPackage ../development/tools/rust/devserver { + inherit (darwin.apple_sdk.frameworks) CoreServices; + }; maturin = callPackage ../development/tools/rust/maturin { inherit (darwin.apple_sdk.frameworks) Security; @@ -13910,7 +13930,8 @@ with pkgs; electron_12 electron_13 electron_14 - electron_15; + electron_15 + electron_16; autobuild = callPackage ../development/tools/misc/autobuild { }; @@ -18657,8 +18678,6 @@ with pkgs; mueval = callPackage ../development/tools/haskell/mueval { }; - mumlib = callPackage ../development/libraries/mumlib { }; - muparser = callPackage ../development/libraries/muparser { inherit (darwin.stubs) setfile; }; @@ -19664,7 +19683,7 @@ with pkgs; StormLib = callPackage ../development/libraries/StormLib { }; - stxxl = callPackage ../development/libraries/stxxl { parallel = true; }; + stxxl = callPackage ../development/libraries/stxxl { }; sqlite = lowPrio (callPackage ../development/libraries/sqlite { }); @@ -20911,8 +20930,6 @@ with pkgs; mullvad-vpn = callPackage ../applications/networking/mullvad-vpn { }; - mumsi = callPackage ../servers/mumsi { }; - mycorrhiza = callPackage ../servers/mycorrhiza { }; myserver = callPackage ../servers/http/myserver { }; @@ -23130,6 +23147,16 @@ with pkgs; gruvbox-dark-gtk = callPackage ../data/themes/gruvbox-dark-gtk { }; + palenight-theme = callPackage ../data/themes/gtk-theme-framework { theme = "palenight"; }; + + amarena-theme = callPackage ../data/themes/gtk-theme-framework { theme = "amarena"; }; + + gruvterial-theme = callPackage ../data/themes/gtk-theme-framework { theme = "gruvterial"; }; + + oceanic-theme = callPackage ../data/themes/gtk-theme-framework { theme = "oceanic"; }; + + spacx-gtk-theme = callPackage ../data/themes/gtk-theme-framework { theme = "spacx"; }; + gruvbox-dark-icons-gtk = callPackage ../data/icons/gruvbox-dark-icons-gtk { inherit (plasma5Packages) breeze-icons; }; @@ -23219,6 +23246,11 @@ with pkgs; kreative-square-fonts = callPackage ../data/fonts/kreative-square-fonts { }; + la-capitaine-icon-theme = callPackage ../data/icons/la-capitaine-icon-theme { + inherit (plasma5Packages) breeze-icons; + inherit (pantheon) elementary-icon-theme; + }; + layan-gtk-theme = callPackage ../data/themes/layan-gtk-theme { }; lato = callPackage ../data/fonts/lato {}; @@ -27100,6 +27132,8 @@ with pkgs; mlt-qt5 = libsForQt514.mlt; }; + synology-drive = libsForQt5.callPackage ../applications/networking/synology-drive { }; + taxi = callPackage ../applications/networking/ftp/taxi { }; librep = callPackage ../development/libraries/librep { }; @@ -27500,6 +27534,8 @@ with pkgs; purple-discord = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-discord { }; + purple-googlechat = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-googlechat { }; + purple-hangouts = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-hangouts { }; purple-lurch = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-lurch { }; @@ -32782,7 +32818,9 @@ with pkgs; qdl = callPackage ../tools/misc/qdl { }; - rates = callPackage ../tools/misc/rates { }; + rates = callPackage ../tools/misc/rates { + inherit (darwin.apple_sdk.frameworks) Security; + }; rargs = callPackage ../tools/misc/rargs { }; @@ -33019,6 +33057,8 @@ with pkgs; tfswitch = callPackage ../applications/networking/cluster/tfswitch {}; + tgswitch = callPackage ../applications/networking/cluster/tgswitch {}; + tilt = callPackage ../applications/networking/cluster/tilt {}; timeular = callPackage ../applications/office/timeular {}; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b4cd4106113da..bf340c10cb3b4 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -128,7 +128,7 @@ in { llvmPackages = pkgs.llvmPackages_10; }; ghcHEAD = callPackage ../development/compilers/ghc/head.nix { - bootPkgs = packages.ghc901; # no binary yet + bootPkgs = packages.ghc8107Binary; inherit (buildPackages.python3Packages) sphinx; # Need to use apple's patched xattr until # https://github.com/xattr/xattr/issues/44 and diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 7c7c0133ee9d4..5ba2d5b0643eb 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -82,6 +82,7 @@ mapAliases ({ pytest_xdist = pytest-xdist; # added 2021-01-04 python_simple_hipchat = python-simple-hipchat; # added 2021-07-21 qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09 + rdflib-jsonld = throw "rdflib-jsonld is not compatible with rdflib 6"; # added 2021-11-05 requests_toolbelt = requests-toolbelt; # added 2017-09-26 rotate-backups = throw "rotate-backups was removed in favor of the top-level rotate-backups"; # added 2021-07-01 ruamel_base = ruamel-base; # added 2021-11-01 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a6abc29d13574..87b06b9eb1486 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2259,6 +2259,8 @@ in { dnspython = callPackage ../development/python-modules/dnspython { }; + dnspythonchia = callPackage ../development/python-modules/dnspythonchia { }; + doc8 = callPackage ../development/python-modules/doc8 { }; docker = callPackage ../development/python-modules/docker { }; @@ -3098,6 +3100,8 @@ in { gipc = callPackage ../development/python-modules/gipc { }; + gistyc = callPackage ../development/python-modules/gistyc { }; + git-annex-adapter = callPackage ../development/python-modules/git-annex-adapter { }; @@ -4874,6 +4878,8 @@ in { mortgage = callPackage ../development/python-modules/mortgage { }; + motionblinds = callPackage ../development/python-modules/motionblinds { }; + motioneye-client = callPackage ../development/python-modules/motioneye-client { }; moto = callPackage ../development/python-modules/moto { }; @@ -5102,6 +5108,8 @@ in { Nikola = callPackage ../development/python-modules/Nikola { }; + niko-home-control = callPackage ../development/python-modules/niko-home-control { }; + nilearn = callPackage ../development/python-modules/nilearn { }; niluclient = callPackage ../development/python-modules/niluclient { }; @@ -5297,6 +5305,8 @@ in { onnx = callPackage ../development/python-modules/onnx { }; + oocsi = callPackage ../development/python-modules/oocsi { }; + open-garage = callPackage ../development/python-modules/open-garage { }; openant = callPackage ../development/python-modules/openant { }; @@ -6358,6 +6368,8 @@ in { pydy = callPackage ../development/python-modules/pydy { }; + pydyf = callPackage ../development/python-modules/pydyf { }; + pyechonest = callPackage ../development/python-modules/pyechonest { }; pyeclib = callPackage ../development/python-modules/pyeclib { }; @@ -6390,6 +6402,8 @@ in { pyevmasm = callPackage ../development/python-modules/pyevmasm { }; + pyevilgenius = callPackage ../development/python-modules/pyevilgenius { }; + pyexcel = callPackage ../development/python-modules/pyexcel { }; pyexcel-io = callPackage ../development/python-modules/pyexcel-io { }; @@ -8034,8 +8048,6 @@ in { rdflib = callPackage ../development/python-modules/rdflib { }; - rdflib-jsonld = callPackage ../development/python-modules/rdflib-jsonld { }; - rdkit = callPackage ../development/python-modules/rdkit { }; re-assert = callPackage ../development/python-modules/re-assert { }; @@ -8426,7 +8438,7 @@ in { scikit-survival = callPackage ../development/python-modules/scikit-survival { }; - scs = callPackage ../development/python-modules/scs { scs = pkgs.scs; }; + scs = callPackage ../development/python-modules/scs { }; sdnotify = callPackage ../development/python-modules/sdnotify { }; @@ -8931,6 +8943,8 @@ in { stack-data = callPackage ../development/python-modules/stack-data { }; + stanza = callPackage ../development/python-modules/stanza { }; + starlette = callPackage ../development/python-modules/starlette { inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices; }; @@ -9644,6 +9658,8 @@ in { uptime = callPackage ../development/python-modules/uptime { }; + uptime-kuma-monitor = callPackage ../development/python-modules/uptime-kuma-monitor { }; + uranium = callPackage ../development/python-modules/uranium { }; uritemplate = callPackage ../development/python-modules/uritemplate { }; |