Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
33248a2caf
84 changed files with 1907 additions and 1386 deletions
|
|
@ -16500,12 +16500,6 @@
|
|||
githubId = 158321;
|
||||
name = "Stewart Mackenzie";
|
||||
};
|
||||
skeidel = {
|
||||
email = "svenkeidel@gmail.com";
|
||||
github = "svenkeidel";
|
||||
githubId = 266500;
|
||||
name = "Sven Keidel";
|
||||
};
|
||||
skykanin = {
|
||||
github = "skykanin";
|
||||
githubId = 3789764;
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ let
|
|||
|| head srvMatch == srv # Include sections for the service being configured
|
||||
then v
|
||||
# Enable Web links and integrations between services.
|
||||
else if tail srvMatch == [ null ] && elem (head srvMatch) cfg.services
|
||||
else if tail srvMatch == [ null ] && cfg.${head srvMatch}.enable
|
||||
then {
|
||||
inherit (v) origin;
|
||||
# mansrht crashes without it
|
||||
|
|
@ -38,9 +38,9 @@ let
|
|||
# for services needing access to them.
|
||||
"builds.sr.ht::worker".buildlogs = "/var/log/sourcehut/buildsrht-worker";
|
||||
"git.sr.ht".post-update-script = "/usr/bin/gitsrht-update-hook";
|
||||
"git.sr.ht".repos = "/var/lib/sourcehut/gitsrht/repos";
|
||||
"git.sr.ht".repos = cfg.settings."git.sr.ht".repos;
|
||||
"hg.sr.ht".changegroup-script = "/usr/bin/hgsrht-hook-changegroup";
|
||||
"hg.sr.ht".repos = "/var/lib/sourcehut/hgsrht/repos";
|
||||
"hg.sr.ht".repos = cfg.settings."hg.sr.ht".repos;
|
||||
# Making this a per service option despite being in a global section,
|
||||
# so that it uses the redis-server used by the service.
|
||||
"sr.ht".redis-host = cfg.${srv}.redis.host;
|
||||
|
|
@ -77,6 +77,14 @@ let
|
|||
type = types.path;
|
||||
apply = s: "<" + toString s;
|
||||
};
|
||||
api-origin = mkOption {
|
||||
description = lib.mdDoc "Origin URL for the API";
|
||||
type = types.str;
|
||||
default = "http://${cfg.listenAddress}:${toString (cfg.${srv}.port + 100)}";
|
||||
defaultText = lib.literalMD ''
|
||||
`"http://''${`[](#opt-services.sourcehut.listenAddress)`}:''${toString (`[](#opt-services.sourcehut.${srv}.port)` + 100)}"`
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
# Specialized python containing all the modules
|
||||
|
|
@ -112,15 +120,6 @@ in
|
|||
and account management services
|
||||
'');
|
||||
|
||||
services = mkOption {
|
||||
type = with types; listOf (enum
|
||||
[ "builds" "git" "hg" "hub" "lists" "man" "meta" "pages" "paste" "todo" ]);
|
||||
defaultText = "locally enabled services";
|
||||
description = lib.mdDoc ''
|
||||
Services that may be displayed as links in the title bar of the Web interface.
|
||||
'';
|
||||
};
|
||||
|
||||
listenAddress = mkOption {
|
||||
type = types.str;
|
||||
default = "localhost";
|
||||
|
|
@ -400,8 +399,8 @@ in
|
|||
This setting is propagated to newer and existing repositories.
|
||||
'';
|
||||
type = types.str;
|
||||
default = "${cfg.python}/bin/hgsrht-hook-changegroup";
|
||||
defaultText = "\${cfg.python}/bin/hgsrht-hook-changegroup";
|
||||
default = "${pkgs.sourcehut.hgsrht}/bin/hgsrht-hook-changegroup";
|
||||
defaultText = "\${pkgs.sourcehut.hgsrht}/bin/hgsrht-hook-changegroup";
|
||||
};
|
||||
repos = mkOption {
|
||||
description = lib.mdDoc ''
|
||||
|
|
@ -501,12 +500,6 @@ in
|
|||
options."meta.sr.ht" =
|
||||
removeAttrs (commonServiceSettings "meta")
|
||||
["oauth-client-id" "oauth-client-secret"] // {
|
||||
api-origin = mkOption {
|
||||
description = lib.mdDoc "Origin URL for API, 100 more than web.";
|
||||
type = types.str;
|
||||
default = "http://${cfg.listenAddress}:${toString (cfg.meta.port + 100)}";
|
||||
defaultText = lib.literalMD ''`"http://''${`[](#opt-services.sourcehut.listenAddress)`}:''${toString (`[](#opt-services.sourcehut.meta.port)` + 100)}"`'';
|
||||
};
|
||||
webhooks = mkOption {
|
||||
description = lib.mdDoc "The Redis connection used for the webhooks worker.";
|
||||
type = types.str;
|
||||
|
|
@ -784,6 +777,7 @@ in
|
|||
extraConfig = ''
|
||||
PermitUserEnvironment SRHT_*
|
||||
'';
|
||||
startWhenNeeded = false;
|
||||
};
|
||||
environment.etc."ssh/sourcehut/config.ini".source =
|
||||
settingsFormat.generate "sourcehut-dispatch-config.ini"
|
||||
|
|
@ -792,15 +786,28 @@ in
|
|||
environment.etc."ssh/sourcehut/subdir/srht-dispatch" = {
|
||||
# sshd_config(5): The program must be owned by root, not writable by group or others
|
||||
mode = "0755";
|
||||
source = pkgs.writeShellScript "srht-dispatch" ''
|
||||
source = pkgs.writeShellScript "srht-dispatch-wrapper" ''
|
||||
set -e
|
||||
set -x
|
||||
cd /etc/ssh/sourcehut/subdir
|
||||
${cfg.python}/bin/gitsrht-dispatch "$@"
|
||||
${pkgs.sourcehut.gitsrht}/bin/gitsrht-dispatch "$@"
|
||||
'';
|
||||
};
|
||||
systemd.tmpfiles.settings."10-sourcehut-gitsrht" = mkIf cfg.git.enable (
|
||||
builtins.listToAttrs (map (name: {
|
||||
name = "/var/log/sourcehut/gitsrht-${name}";
|
||||
value.f = {
|
||||
inherit (cfg.git) user group;
|
||||
mode = "0644";
|
||||
};
|
||||
}) [ "keys" "shell" "update-hook" ])
|
||||
);
|
||||
systemd.services.sshd = {
|
||||
#path = optional cfg.git.enable [ cfg.git.package ];
|
||||
preStart = mkIf cfg.hg.enable ''
|
||||
chown ${cfg.hg.user}:${cfg.hg.group} /var/log/sourcehut/hgsrht-keys
|
||||
'';
|
||||
serviceConfig = {
|
||||
LogsDirectory = "sourcehut";
|
||||
BindReadOnlyPaths =
|
||||
# Note that those /usr/bin/* paths are hardcoded in multiple places in *.sr.ht,
|
||||
# for instance to get the user from the [git.sr.ht::dispatch] settings.
|
||||
|
|
@ -813,7 +820,6 @@ in
|
|||
"${pkgs.writeShellScript "buildsrht-keys-wrapper" ''
|
||||
set -e
|
||||
cd /run/sourcehut/buildsrht/subdir
|
||||
set -x
|
||||
exec -a "$0" ${pkgs.sourcehut.buildsrht}/bin/buildsrht-keys "$@"
|
||||
''}:/usr/bin/buildsrht-keys"
|
||||
"${pkgs.sourcehut.buildsrht}/bin/master-shell:/usr/bin/master-shell"
|
||||
|
|
@ -825,31 +831,26 @@ in
|
|||
"${pkgs.writeShellScript "gitsrht-keys-wrapper" ''
|
||||
set -e
|
||||
cd /run/sourcehut/gitsrht/subdir
|
||||
set -x
|
||||
exec -a "$0" ${pkgs.sourcehut.gitsrht}/bin/gitsrht-keys "$@"
|
||||
''}:/usr/bin/gitsrht-keys"
|
||||
"${pkgs.writeShellScript "gitsrht-shell-wrapper" ''
|
||||
set -e
|
||||
cd /run/sourcehut/gitsrht/subdir
|
||||
set -x
|
||||
export PATH="${cfg.git.package}/bin:$PATH"
|
||||
export SRHT_CONFIG=/run/sourcehut/gitsrht/config.ini
|
||||
exec -a "$0" ${pkgs.sourcehut.gitsrht}/bin/gitsrht-shell "$@"
|
||||
''}:/usr/bin/gitsrht-shell"
|
||||
"${pkgs.writeShellScript "gitsrht-update-hook" ''
|
||||
set -e
|
||||
test -e "''${PWD%/*}"/config.ini ||
|
||||
# Git hooks are run relative to their repository's directory,
|
||||
# but gitsrht-update-hook looks up ../config.ini
|
||||
ln -s /run/sourcehut/gitsrht/config.ini "''${PWD%/*}"/config.ini
|
||||
export SRHT_CONFIG=/run/sourcehut/gitsrht/config.ini
|
||||
# hooks/post-update calls /usr/bin/gitsrht-update-hook as hooks/stage-3
|
||||
# but this wrapper being a bash script, it overrides $0 with /usr/bin/gitsrht-update-hook
|
||||
# hence this hack to put hooks/stage-3 back into gitsrht-update-hook's $0
|
||||
if test "''${STAGE3:+set}"
|
||||
then
|
||||
set -x
|
||||
exec -a hooks/stage-3 ${pkgs.sourcehut.gitsrht}/bin/gitsrht-update-hook "$@"
|
||||
else
|
||||
export STAGE3=set
|
||||
set -x
|
||||
exec -a "$0" ${pkgs.sourcehut.gitsrht}/bin/gitsrht-update-hook "$@"
|
||||
fi
|
||||
''}:/usr/bin/gitsrht-update-hook"
|
||||
|
|
@ -860,13 +861,11 @@ in
|
|||
"${pkgs.writeShellScript "hgsrht-keys-wrapper" ''
|
||||
set -e
|
||||
cd /run/sourcehut/hgsrht/subdir
|
||||
set -x
|
||||
exec -a "$0" ${pkgs.sourcehut.hgsrht}/bin/hgsrht-keys "$@"
|
||||
''}:/usr/bin/hgsrht-keys"
|
||||
"${pkgs.writeShellScript "hgsrht-shell-wrapper" ''
|
||||
set -e
|
||||
cd /run/sourcehut/hgsrht/subdir
|
||||
set -x
|
||||
exec -a "$0" ${pkgs.sourcehut.hgsrht}/bin/hgsrht-shell "$@"
|
||||
''}:/usr/bin/hgsrht-shell"
|
||||
# Mercurial's changegroup hooks are run relative to their repository's directory,
|
||||
|
|
@ -875,8 +874,7 @@ in
|
|||
set -e
|
||||
test -e "''$PWD"/config.ini ||
|
||||
ln -s /run/sourcehut/hgsrht/config.ini "''$PWD"/config.ini
|
||||
set -x
|
||||
exec -a "$0" ${cfg.python}/bin/hgsrht-hook-changegroup "$@"
|
||||
exec -a "$0" ${pkgs.sourcehut.hgsrht}/bin/hgsrht-hook-changegroup "$@"
|
||||
''}:/usr/bin/hgsrht-hook-changegroup"
|
||||
];
|
||||
};
|
||||
|
|
@ -1066,10 +1064,11 @@ in
|
|||
};
|
||||
})
|
||||
];
|
||||
extraServices.gitsrht-api = {
|
||||
serviceConfig.Restart = "always";
|
||||
serviceConfig.RestartSec = "5s";
|
||||
serviceConfig.ExecStart = "${pkgs.sourcehut.gitsrht}/bin/gitsrht-api -b ${cfg.listenAddress}:${toString (cfg.git.port + 100)}";
|
||||
extraServices.gitsrht-api.serviceConfig = {
|
||||
Restart = "always";
|
||||
RestartSec = "5s";
|
||||
ExecStart = "${pkgs.sourcehut.gitsrht}/bin/gitsrht-api -b ${cfg.listenAddress}:${toString (cfg.git.port + 100)}";
|
||||
BindPaths = [ "${cfg.settings."git.sr.ht".repos}:/var/lib/sourcehut/gitsrht/repos" ];
|
||||
};
|
||||
extraServices.gitsrht-fcgiwrap = mkIf cfg.nginx.enable {
|
||||
serviceConfig = {
|
||||
|
|
@ -1188,7 +1187,7 @@ in
|
|||
extraServices.listssrht-lmtp = {
|
||||
wants = [ "postfix.service" ];
|
||||
unitConfig.JoinsNamespaceOf = optional cfg.postfix.enable "postfix.service";
|
||||
serviceConfig.ExecStart = "${cfg.python}/bin/listssrht-lmtp";
|
||||
serviceConfig.ExecStart = "${pkgs.sourcehut.listssrht}/bin/listssrht-lmtp";
|
||||
# Avoid crashing: os.chown(sock, os.getuid(), sock_gid)
|
||||
serviceConfig.PrivateUsers = mkForce false;
|
||||
};
|
||||
|
|
@ -1252,55 +1251,30 @@ in
|
|||
) cfg.settings));
|
||||
serviceConfig.ExecStart = "${pkgs.sourcehut.metasrht}/bin/metasrht-api -b ${cfg.listenAddress}:${toString (cfg.meta.port + 100)}";
|
||||
};
|
||||
extraConfig = mkMerge [
|
||||
{
|
||||
assertions = [
|
||||
{ assertion = let s = cfg.settings."meta.sr.ht::billing"; in
|
||||
s.enabled == "yes" -> (s.stripe-public-key != null && s.stripe-secret-key != null);
|
||||
message = "If meta.sr.ht::billing is enabled, the keys must be defined.";
|
||||
}
|
||||
];
|
||||
environment.systemPackages = optional cfg.meta.enable
|
||||
(pkgs.writeShellScriptBin "metasrht-manageuser" ''
|
||||
set -eux
|
||||
if test "$(${pkgs.coreutils}/bin/id -n -u)" != '${cfg.meta.user}'
|
||||
then exec sudo -u '${cfg.meta.user}' "$0" "$@"
|
||||
else
|
||||
# In order to load config.ini
|
||||
if cd /run/sourcehut/metasrht
|
||||
then exec ${cfg.python}/bin/metasrht-manageuser "$@"
|
||||
else cat <<EOF
|
||||
Please run: sudo systemctl start metasrht
|
||||
EOF
|
||||
exit 1
|
||||
fi
|
||||
extraConfig = {
|
||||
assertions = [
|
||||
{ assertion = let s = cfg.settings."meta.sr.ht::billing"; in
|
||||
s.enabled == "yes" -> (s.stripe-public-key != null && s.stripe-secret-key != null);
|
||||
message = "If meta.sr.ht::billing is enabled, the keys must be defined.";
|
||||
}
|
||||
];
|
||||
environment.systemPackages = optional cfg.meta.enable
|
||||
(pkgs.writeShellScriptBin "metasrht-manageuser" ''
|
||||
set -eux
|
||||
if test "$(${pkgs.coreutils}/bin/id -n -u)" != '${cfg.meta.user}'
|
||||
then exec sudo -u '${cfg.meta.user}' "$0" "$@"
|
||||
else
|
||||
# In order to load config.ini
|
||||
if cd /run/sourcehut/metasrht
|
||||
then exec ${pkgs.sourcehut.metasrht}/bin/metasrht-manageuser "$@"
|
||||
else cat <<EOF
|
||||
Please run: sudo systemctl start metasrht
|
||||
EOF
|
||||
exit 1
|
||||
fi
|
||||
'');
|
||||
}
|
||||
(mkIf cfg.nginx.enable {
|
||||
services.nginx.virtualHosts."meta.${domain}" = {
|
||||
locations."/query" = {
|
||||
proxyPass = cfg.settings."meta.sr.ht".api-origin;
|
||||
extraConfig = ''
|
||||
if ($request_method = 'OPTIONS') {
|
||||
add_header 'Access-Control-Allow-Origin' '*';
|
||||
add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
|
||||
add_header 'Access-Control-Allow-Headers' 'User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range';
|
||||
add_header 'Access-Control-Max-Age' 1728000;
|
||||
add_header 'Content-Type' 'text/plain; charset=utf-8';
|
||||
add_header 'Content-Length' 0;
|
||||
return 204;
|
||||
}
|
||||
|
||||
add_header 'Access-Control-Allow-Origin' '*';
|
||||
add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
|
||||
add_header 'Access-Control-Allow-Headers' 'User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range';
|
||||
add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range';
|
||||
'';
|
||||
};
|
||||
};
|
||||
})
|
||||
];
|
||||
fi
|
||||
'');
|
||||
};
|
||||
})
|
||||
|
||||
(import ./service.nix "pages" {
|
||||
|
|
@ -1356,7 +1330,7 @@ in
|
|||
extraServices.todosrht-lmtp = {
|
||||
wants = [ "postfix.service" ];
|
||||
unitConfig.JoinsNamespaceOf = optional cfg.postfix.enable "postfix.service";
|
||||
serviceConfig.ExecStart = "${cfg.python}/bin/todosrht-lmtp";
|
||||
serviceConfig.ExecStart = "${pkgs.sourcehut.todosrht}/bin/todosrht-lmtp";
|
||||
# Avoid crashing: os.chown(sock, os.getuid(), sock_gid)
|
||||
serviceConfig.PrivateUsers = mkForce false;
|
||||
};
|
||||
|
|
@ -1388,6 +1362,10 @@ in
|
|||
dispatch is deprecated. See https://sourcehut.org/blog/2022-08-01-dispatch-deprecation-plans/
|
||||
for more information.
|
||||
'')
|
||||
|
||||
(mkRemovedOptionModule [ "services" "sourcehut" "services"] ''
|
||||
This option was removed in favor of individual <service>.enable flags.
|
||||
'')
|
||||
];
|
||||
|
||||
meta.doc = ./default.md;
|
||||
|
|
|
|||
|
|
@ -108,7 +108,7 @@ let
|
|||
#SocketBindDeny = "any";
|
||||
SystemCallFilter = [
|
||||
"@system-service"
|
||||
"~@aio" "~@keyring" "~@memlock" "~@privileged" "~@resources" "~@timer"
|
||||
"~@aio" "~@keyring" "~@memlock" "~@privileged" "~@timer"
|
||||
"@chown" "@setuid"
|
||||
];
|
||||
SystemCallArchitectures = "native";
|
||||
|
|
@ -222,6 +222,23 @@ in
|
|||
expires 30d;
|
||||
'';
|
||||
};
|
||||
locations."/query" = mkIf (cfg.settings.${iniKey} ? api-origin) {
|
||||
proxyPass = cfg.settings.${iniKey}.api-origin;
|
||||
extraConfig = ''
|
||||
add_header 'Access-Control-Allow-Origin' '*';
|
||||
add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
|
||||
add_header 'Access-Control-Allow-Headers' 'User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range';
|
||||
|
||||
if ($request_method = 'OPTIONS') {
|
||||
add_header 'Access-Control-Max-Age' 1728000;
|
||||
add_header 'Content-Type' 'text/plain; charset=utf-8';
|
||||
add_header 'Content-Length' 0;
|
||||
return 204;
|
||||
}
|
||||
|
||||
add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range';
|
||||
'';
|
||||
};
|
||||
} cfg.nginx.virtualHost ];
|
||||
};
|
||||
|
||||
|
|
@ -236,9 +253,6 @@ in
|
|||
}) [srvCfg.user];
|
||||
};
|
||||
|
||||
services.sourcehut.services = mkDefault (filter (s: cfg.${s}.enable)
|
||||
[ "builds" "dispatch" "git" "hg" "hub" "lists" "man" "meta" "pages" "paste" "todo" ]);
|
||||
|
||||
services.sourcehut.settings = mkMerge [
|
||||
{
|
||||
"${srv}.sr.ht".origin = mkDefault "https://${srv}.${cfg.settings."sr.ht".global-domain}";
|
||||
|
|
@ -363,6 +377,20 @@ in
|
|||
}
|
||||
extraService
|
||||
])) extraServices)
|
||||
|
||||
# Work around 'pq: permission denied for schema public' with postgres v15, until a
|
||||
# solution for `services.postgresql.ensureUsers` is found.
|
||||
# See https://github.com/NixOS/nixpkgs/issues/216989
|
||||
# Workaround taken from nixos/forgejo: https://github.com/NixOS/nixpkgs/pull/262741
|
||||
(lib.mkIf (
|
||||
cfg.postgresql.enable
|
||||
&& lib.strings.versionAtLeast config.services.postgresql.package.version "15.0"
|
||||
) {
|
||||
postgresql.postStart = (lib.mkAfter ''
|
||||
$PSQL -tAc 'ALTER DATABASE "${srvCfg.postgresql.database}" OWNER TO "${srvCfg.user}";'
|
||||
'');
|
||||
}
|
||||
)
|
||||
];
|
||||
|
||||
systemd.timers = mapAttrs (timerName: timer:
|
||||
|
|
|
|||
|
|
@ -126,6 +126,7 @@ in
|
|||
virtualisation.diskSize = 4 * 1024;
|
||||
virtualisation.memorySize = 2 * 1024;
|
||||
networking.domain = domain;
|
||||
networking.enableIPv6 = false;
|
||||
networking.extraHosts = ''
|
||||
${config.networking.primaryIPAddress} builds.${domain}
|
||||
${config.networking.primaryIPAddress} git.${domain}
|
||||
|
|
@ -134,11 +135,6 @@ in
|
|||
|
||||
services.sourcehut = {
|
||||
enable = true;
|
||||
services = [
|
||||
"builds"
|
||||
"git"
|
||||
"meta"
|
||||
];
|
||||
nginx.enable = true;
|
||||
nginx.virtualHost = {
|
||||
forceSSL = true;
|
||||
|
|
|
|||
|
|
@ -3,33 +3,8 @@ import ./make-test-python.nix ({ lib, ... }: {
|
|||
meta.maintainers = with lib.maintainers; [ ambroisie ];
|
||||
|
||||
nodes.machine = { pkgs, ... }: {
|
||||
# Setup using Postgres
|
||||
services.tandoor-recipes = {
|
||||
enable = true;
|
||||
|
||||
extraConfig = {
|
||||
DB_ENGINE = "django.db.backends.postgresql";
|
||||
POSTGRES_HOST = "/run/postgresql";
|
||||
POSTGRES_USER = "tandoor_recipes";
|
||||
POSTGRES_DB = "tandoor_recipes";
|
||||
};
|
||||
};
|
||||
|
||||
services.postgresql = {
|
||||
enable = true;
|
||||
ensureDatabases = [ "tandoor_recipes" ];
|
||||
ensureUsers = [
|
||||
{
|
||||
name = "tandoor_recipes";
|
||||
ensurePermissions."DATABASE tandoor_recipes" = "ALL PRIVILEGES";
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
systemd.services = {
|
||||
tandoor-recipes = {
|
||||
after = [ "postgresql.service" ];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -95,6 +95,6 @@ python3Packages.buildPythonApplication rec {
|
|||
homepage = "http://gpodder.org/";
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
maintainers = with maintainers; [ skeidel mic92 ];
|
||||
maintainers = with maintainers; [ mic92 ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -35,6 +35,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://sourceforge.net/projects/gtkpod/";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.skeidel ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -297,10 +297,10 @@
|
|||
elpaBuild {
|
||||
pname = "async";
|
||||
ename = "async";
|
||||
version = "1.9.7.0.20230802.104021";
|
||||
version = "1.9.7.0.20231105.171300";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/devel/async-1.9.7.0.20230802.104021.tar";
|
||||
sha256 = "1w300q3fgnpibsbgkmxpicxv5ba8xj7cv9i28j7854b49d6xvjb6";
|
||||
url = "https://elpa.gnu.org/devel/async-1.9.7.0.20231105.171300.tar";
|
||||
sha256 = "1f3z679jlhv8xyc1kssmcgq9alwa06r64cpclf477fs6581nda2w";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -582,10 +582,10 @@
|
|||
elpaBuild {
|
||||
pname = "breadcrumb";
|
||||
ename = "breadcrumb";
|
||||
version = "1.0.1.0.20230913.180643";
|
||||
version = "1.0.1.0.20231107.53204";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/devel/breadcrumb-1.0.1.0.20230913.180643.tar";
|
||||
sha256 = "1f2kgjmdn8m9sgwx42yv7ldn41s0az53kn6vzlshx5h77y2g1bsn";
|
||||
url = "https://elpa.gnu.org/devel/breadcrumb-1.0.1.0.20231107.53204.tar";
|
||||
sha256 = "0ai8vw9mnlbsc6qmvapdw8mnkssxj1g3hg83acjc4vlcrdxr40vg";
|
||||
};
|
||||
packageRequires = [ emacs project ];
|
||||
meta = {
|
||||
|
|
@ -620,10 +620,10 @@
|
|||
elpaBuild {
|
||||
pname = "buffer-env";
|
||||
ename = "buffer-env";
|
||||
version = "0.5.0.20231008.102838";
|
||||
version = "0.5.0.20231028.161716";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/devel/buffer-env-0.5.0.20231008.102838.tar";
|
||||
sha256 = "0isxis03qgiq73zrizsv4xmmbdzqpcwh4kiva4kfiggz43xsk2g7";
|
||||
url = "https://elpa.gnu.org/devel/buffer-env-0.5.0.20231028.161716.tar";
|
||||
sha256 = "1gi7092mfzsqfj8l000arxdwmg73xzbgzfliazzk0s617480ccbw";
|
||||
};
|
||||
packageRequires = [ compat emacs ];
|
||||
meta = {
|
||||
|
|
@ -650,6 +650,21 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
bufferlo = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "bufferlo";
|
||||
ename = "bufferlo";
|
||||
version = "0.2.0.20231106.215852";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/devel/bufferlo-0.2.0.20231106.215852.tar";
|
||||
sha256 = "17qjjifdl3y8p4ldzami9b3ns9mzzqdacvkzsryv5885hzas67zz";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/bufferlo.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
bug-hunter = callPackage ({ cl-lib ? null
|
||||
, elpaBuild
|
||||
, fetchurl
|
||||
|
|
@ -710,10 +725,10 @@
|
|||
elpaBuild {
|
||||
pname = "cape";
|
||||
ename = "cape";
|
||||
version = "0.17.0.20231022.115714";
|
||||
version = "0.17.0.20231029.100801";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/devel/cape-0.17.0.20231022.115714.tar";
|
||||
sha256 = "0bvmrxjd054f14qap6w5052900k4pn33vb7cbc87rvrgdyhh5ixa";
|
||||
url = "https://elpa.gnu.org/devel/cape-0.17.0.20231029.100801.tar";
|
||||
sha256 = "14898pkxh61sxhmapb87zafl5wjz5w2na0mqpj8c36hvr5h33jnj";
|
||||
};
|
||||
packageRequires = [ compat emacs ];
|
||||
meta = {
|
||||
|
|
@ -905,17 +920,14 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
company = callPackage ({ elpaBuild
|
||||
, emacs
|
||||
, fetchurl
|
||||
, lib }:
|
||||
company = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "company";
|
||||
ename = "company";
|
||||
version = "0.10.2.0.20231023.103313";
|
||||
version = "0.10.2.0.20231110.5234";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/devel/company-0.10.2.0.20231023.103313.tar";
|
||||
sha256 = "1zcap5mv6cn9a2j8axg4yw4iprxkwwyjmw7qahijlk02ycwmwwfn";
|
||||
url = "https://elpa.gnu.org/devel/company-0.10.2.0.20231110.5234.tar";
|
||||
sha256 = "18533dlk7k77if51kjhwlf2yb872ixjf1cffg197bnfy29sdrm11";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -988,10 +1000,10 @@
|
|||
elpaBuild {
|
||||
pname = "compat";
|
||||
ename = "compat";
|
||||
version = "29.1.4.2.0.20230927.210420";
|
||||
version = "29.1.4.3.0.20231107.184238";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/devel/compat-29.1.4.2.0.20230927.210420.tar";
|
||||
sha256 = "16apiq2aj82gmlg1xaqrrv6riikdb2m4iyg3b4abp472q8hwwfk5";
|
||||
url = "https://elpa.gnu.org/devel/compat-29.1.4.3.0.20231107.184238.tar";
|
||||
sha256 = "1mcfx5my48zr14syzmpidgr1kjji2v63sqmx3zh7spxxd274yviq";
|
||||
};
|
||||
packageRequires = [ emacs seq ];
|
||||
meta = {
|
||||
|
|
@ -1003,10 +1015,10 @@
|
|||
elpaBuild {
|
||||
pname = "consult";
|
||||
ename = "consult";
|
||||
version = "0.35.0.20231023.154305";
|
||||
version = "0.35.0.20231107.212252";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/devel/consult-0.35.0.20231023.154305.tar";
|
||||
sha256 = "1cx8m0llk76z1kawkqg9dq7aws2i2bsgnhr3xvw7chdwvjywghs6";
|
||||
url = "https://elpa.gnu.org/devel/consult-0.35.0.20231107.212252.tar";
|
||||
sha256 = "1p9l79sxxa06cxky5z08mccf34hbbp742iza57riknf0zmrglkpc";
|
||||
};
|
||||
packageRequires = [ compat emacs ];
|
||||
meta = {
|
||||
|
|
@ -1055,10 +1067,10 @@
|
|||
elpaBuild {
|
||||
pname = "corfu";
|
||||
ename = "corfu";
|
||||
version = "0.38.0.20231013.185720";
|
||||
version = "0.38.0.20231108.174629";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/devel/corfu-0.38.0.20231013.185720.tar";
|
||||
sha256 = "0573w5zgkchk5kkj2wb7sl1qrp88k99v44jv0cddrrn35r77hrpx";
|
||||
url = "https://elpa.gnu.org/devel/corfu-0.38.0.20231108.174629.tar";
|
||||
sha256 = "1ynkyw7mkl8y66kxwy51gwdj60b4nadk9qbwsjljbfdnc80y6ws5";
|
||||
};
|
||||
packageRequires = [ compat emacs ];
|
||||
meta = {
|
||||
|
|
@ -1290,10 +1302,10 @@
|
|||
elpaBuild {
|
||||
pname = "debbugs";
|
||||
ename = "debbugs";
|
||||
version = "0.37.0.20231020.114541";
|
||||
version = "0.37.0.20231029.152335";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/devel/debbugs-0.37.0.20231020.114541.tar";
|
||||
sha256 = "1bzphx74h67jyfdz66p6d78knqddfgvzwk8w848r1lfw2jh2h6dc";
|
||||
url = "https://elpa.gnu.org/devel/debbugs-0.37.0.20231029.152335.tar";
|
||||
sha256 = "0i2jbns27cfrlkyq3rszqkg6vqbw9r2pq2w9yxcyj60v0hq0ww53";
|
||||
};
|
||||
packageRequires = [ emacs soap-client ];
|
||||
meta = {
|
||||
|
|
@ -1320,10 +1332,10 @@
|
|||
elpaBuild {
|
||||
pname = "denote";
|
||||
ename = "denote";
|
||||
version = "2.0.0.0.20231027.53913";
|
||||
version = "2.0.0.0.20231107.64253";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/devel/denote-2.0.0.0.20231027.53913.tar";
|
||||
sha256 = "044r77y0b7b3svwjin926xkp8xcwkxjpixi0x8nrfzh2krzkkakx";
|
||||
url = "https://elpa.gnu.org/devel/denote-2.0.0.0.20231107.64253.tar";
|
||||
sha256 = "143pgnsfi3mf42n1yrwjr79b32k0081i19zdkwg97xhvfbqhiddw";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -1472,6 +1484,24 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
dired-duplicates = callPackage ({ elpaBuild
|
||||
, emacs
|
||||
, fetchurl
|
||||
, lib }:
|
||||
elpaBuild {
|
||||
pname = "dired-duplicates";
|
||||
ename = "dired-duplicates";
|
||||
version = "0.2.0.20231109.135341";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/devel/dired-duplicates-0.2.0.20231109.135341.tar";
|
||||
sha256 = "07ridbcy3n0v3dax7kj3d7nk2k0w57dnapd4kki4xhkm4fklx6w6";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/dired-duplicates.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
dired-git-info = callPackage ({ elpaBuild
|
||||
, emacs
|
||||
, fetchurl
|
||||
|
|
@ -1727,10 +1757,10 @@
|
|||
elpaBuild {
|
||||
pname = "eev";
|
||||
ename = "eev";
|
||||
version = "20230127.0.20230521.54745";
|
||||
version = "20230127.0.20231106.221153";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/devel/eev-20230127.0.20230521.54745.tar";
|
||||
sha256 = "09s6r6xjyfhdiy7j3wnw53gyjbjr8347ikzhi6xxzkna3r5fc1mx";
|
||||
url = "https://elpa.gnu.org/devel/eev-20230127.0.20231106.221153.tar";
|
||||
sha256 = "0labf7shjyv5v5rakkgra8338k9y5ads82ziqracklgj5p39gakf";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -1745,10 +1775,10 @@
|
|||
elpaBuild {
|
||||
pname = "ef-themes";
|
||||
ename = "ef-themes";
|
||||
version = "1.4.0.0.20231026.80318";
|
||||
version = "1.4.0.0.20231031.71401";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/devel/ef-themes-1.4.0.0.20231026.80318.tar";
|
||||
sha256 = "02nx6p5m54gyyw2rjb0msvh3cijnqpm0p5i9l71gykg54rbabwnr";
|
||||
url = "https://elpa.gnu.org/devel/ef-themes-1.4.0.0.20231031.71401.tar";
|
||||
sha256 = "02yrb6cv0l6k30xyd8wz0jjr4cy66p9limcrmkm52q1k7l0dq3za";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -1770,10 +1800,10 @@
|
|||
elpaBuild {
|
||||
pname = "eglot";
|
||||
ename = "eglot";
|
||||
version = "1.15.0.20231021.100531";
|
||||
version = "1.15.0.20231107.90944";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/devel/eglot-1.15.0.20231021.100531.tar";
|
||||
sha256 = "0rgf0s76sbmabmv1wvghs2qapl3g23j58ka4ks9dd95nc004b8i6";
|
||||
url = "https://elpa.gnu.org/devel/eglot-1.15.0.20231107.90944.tar";
|
||||
sha256 = "135a3zyzjpv2n0c988b9g9mh93y7p1dp9nvmchm4i26mdmzn6jbz";
|
||||
};
|
||||
packageRequires = [
|
||||
eldoc
|
||||
|
|
@ -1881,10 +1911,10 @@
|
|||
elpaBuild {
|
||||
pname = "embark";
|
||||
ename = "embark";
|
||||
version = "0.23.0.20231026.124244";
|
||||
version = "0.23.0.20231104.193345";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/devel/embark-0.23.0.20231026.124244.tar";
|
||||
sha256 = "0d73fpxqv243pbj36299nfb4j6w2aqabpn4l3z1gvcpx2x2abbrd";
|
||||
url = "https://elpa.gnu.org/devel/embark-0.23.0.20231104.193345.tar";
|
||||
sha256 = "10qny8wp74np12sczz08gfrxspvapwvz2zkdig76wcrpd4kdpjk4";
|
||||
};
|
||||
packageRequires = [ compat emacs ];
|
||||
meta = {
|
||||
|
|
@ -1901,10 +1931,10 @@
|
|||
elpaBuild {
|
||||
pname = "embark-consult";
|
||||
ename = "embark-consult";
|
||||
version = "0.8.0.20231026.124244";
|
||||
version = "0.8.0.20231104.193345";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/devel/embark-consult-0.8.0.20231026.124244.tar";
|
||||
sha256 = "0wd3pdkh0y5x2bd8q6q7bc543s5ks7d8zlxrflk5ywlqaz8xi9g4";
|
||||
url = "https://elpa.gnu.org/devel/embark-consult-0.8.0.20231104.193345.tar";
|
||||
sha256 = "15syrabv26yq69g2lz2dqs8w4drw1v3whr0h2vzmc1p0pv9jpks2";
|
||||
};
|
||||
packageRequires = [ consult emacs embark ];
|
||||
meta = {
|
||||
|
|
@ -1926,10 +1956,10 @@
|
|||
elpaBuild {
|
||||
pname = "ement";
|
||||
ename = "ement";
|
||||
version = "0.14pre0.20231007.60132";
|
||||
version = "0.14pre0.20231029.40923";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/devel/ement-0.14pre0.20231007.60132.tar";
|
||||
sha256 = "0ndvlrmmwlpn08pf45vg8qa9z8xjg41i03bw9x7lknlj27lk77c7";
|
||||
url = "https://elpa.gnu.org/devel/ement-0.14pre0.20231029.40923.tar";
|
||||
sha256 = "06r0s8dxlxr63a1zgdk0qxzd6x27r6mlymi6hxp8923yvwqddkdf";
|
||||
};
|
||||
packageRequires = [
|
||||
emacs
|
||||
|
|
@ -1955,10 +1985,10 @@
|
|||
elpaBuild {
|
||||
pname = "emms";
|
||||
ename = "emms";
|
||||
version = "16.0.20231017.153742";
|
||||
version = "16.0.20231106.173540";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/devel/emms-16.0.20231017.153742.tar";
|
||||
sha256 = "02lvppyraqc66hb4q4smlcpccq3ggvhg6qj3ld66vmjl7gfasw1a";
|
||||
url = "https://elpa.gnu.org/devel/emms-16.0.20231106.173540.tar";
|
||||
sha256 = "08l7nzz596jwqr4wcjcvsihdhai4faqihavrshvja2nhrdxxm79x";
|
||||
};
|
||||
packageRequires = [ cl-lib nadvice seq ];
|
||||
meta = {
|
||||
|
|
@ -2024,10 +2054,10 @@
|
|||
elpaBuild {
|
||||
pname = "erc";
|
||||
ename = "erc";
|
||||
version = "5.6snapshot0.20231027.130929";
|
||||
version = "5.6snapshot0.20231104.154155";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/devel/erc-5.6snapshot0.20231027.130929.tar";
|
||||
sha256 = "1v1r86cpl4jnnds9ljwr71g3xc96b2gvjbcpcvkhjfbf8g58ky40";
|
||||
url = "https://elpa.gnu.org/devel/erc-5.6snapshot0.20231104.154155.tar";
|
||||
sha256 = "0z22cw6hgn4lsc1bp4ci75v03mvlra1nyfj8g7xkfdv75nbv2yga";
|
||||
};
|
||||
packageRequires = [ compat emacs ];
|
||||
meta = {
|
||||
|
|
@ -2277,6 +2307,25 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
flymake-codespell = callPackage ({ compat
|
||||
, elpaBuild
|
||||
, emacs
|
||||
, fetchurl
|
||||
, lib }:
|
||||
elpaBuild {
|
||||
pname = "flymake-codespell";
|
||||
ename = "flymake-codespell";
|
||||
version = "0.1.0.20231030.222337";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/devel/flymake-codespell-0.1.0.20231030.222337.tar";
|
||||
sha256 = "1i4gk9z9yfs9gb9x64n8wzxqy8lb81j422173xxg1lwsirc9a040";
|
||||
};
|
||||
packageRequires = [ compat emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/flymake-codespell.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
flymake-proselint = callPackage ({ elpaBuild
|
||||
, emacs
|
||||
, fetchurl
|
||||
|
|
@ -2560,17 +2609,14 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
gpastel = callPackage ({ elpaBuild
|
||||
, emacs
|
||||
, fetchurl
|
||||
, lib }:
|
||||
gpastel = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "gpastel";
|
||||
ename = "gpastel";
|
||||
version = "0.5.0.0.20181231.183754";
|
||||
version = "0.5.0.0.20231030.71342";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/devel/gpastel-0.5.0.0.20181231.183754.tar";
|
||||
sha256 = "19byv5l09h8zdsgpifsc0j7np0iq1md4l0y7865g95xbax60i9id";
|
||||
url = "https://elpa.gnu.org/devel/gpastel-0.5.0.0.20231030.71342.tar";
|
||||
sha256 = "1vd49mn7xgys0apc7z6s6cs3yygznlyyf4l1hhfrgg5vwfb3c7ry";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -2637,10 +2683,10 @@
|
|||
elpaBuild {
|
||||
pname = "greader";
|
||||
ename = "greader";
|
||||
version = "0.5.0.0.20231026.5322";
|
||||
version = "0.6.0.0.20231104.45848";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/devel/greader-0.5.0.0.20231026.5322.tar";
|
||||
sha256 = "0m4d1cr637jsy75ax6y2aqhzjwax7qkidm25k4qiqa69lzbkckid";
|
||||
url = "https://elpa.gnu.org/devel/greader-0.6.0.0.20231104.45848.tar";
|
||||
sha256 = "1ppvgi17agzrsjfd9jaa5zszvqcm1n4rfy7z82da4rl5mbgnml9p";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -2738,10 +2784,10 @@
|
|||
elpaBuild {
|
||||
pname = "hiddenquote";
|
||||
ename = "hiddenquote";
|
||||
version = "1.2.0.20230911.171055";
|
||||
version = "1.2.0.20231107.184113";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/devel/hiddenquote-1.2.0.20230911.171055.tar";
|
||||
sha256 = "00basln4s5ngxp353ldpzxp382chdxp05bafsazgxkh5mg94jsyf";
|
||||
url = "https://elpa.gnu.org/devel/hiddenquote-1.2.0.20231107.184113.tar";
|
||||
sha256 = "0zgnxfcfd78c755rykmbnkvxx5lfpk7z3n8qky0lf3kj2hwas27v";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -2823,10 +2869,10 @@
|
|||
elpaBuild {
|
||||
pname = "hyperbole";
|
||||
ename = "hyperbole";
|
||||
version = "8.0.1pre0.20231022.151646";
|
||||
version = "8.0.1pre0.20231106.194732";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/devel/hyperbole-8.0.1pre0.20231022.151646.tar";
|
||||
sha256 = "1kr6ayfnq9ah8n8b6k4lxh5napghb90y5sz0g3fs5qjbszcbvxc9";
|
||||
url = "https://elpa.gnu.org/devel/hyperbole-8.0.1pre0.20231106.194732.tar";
|
||||
sha256 = "02d4r3w6angwjw2wr192gkgwyzfb3vszdsb18baziqbwq2xh5cch";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -3067,10 +3113,10 @@
|
|||
elpaBuild {
|
||||
pname = "jinx";
|
||||
ename = "jinx";
|
||||
version = "0.9.0.20231026.154650";
|
||||
version = "0.9.0.20231104.142700";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/devel/jinx-0.9.0.20231026.154650.tar";
|
||||
sha256 = "1fck948ay9n64mxqmx7j6fn6hzfn858l0s0gw544in2y617niyh6";
|
||||
url = "https://elpa.gnu.org/devel/jinx-0.9.0.20231104.142700.tar";
|
||||
sha256 = "16qq42qmklyls2fc482x2pv1l14x3kn78l41imvg8jrv3z64j89p";
|
||||
};
|
||||
packageRequires = [ compat emacs ];
|
||||
meta = {
|
||||
|
|
@ -3315,10 +3361,10 @@
|
|||
elpaBuild {
|
||||
pname = "llm";
|
||||
ename = "llm";
|
||||
version = "0.5.0.0.20231026.5843";
|
||||
version = "0.5.2.0.20231110.3036";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/devel/llm-0.5.0.0.20231026.5843.tar";
|
||||
sha256 = "0ywmfbis4jrqjg2gc3khgwc9kdbhjh99syag2bk1vzjmwfd2cq89";
|
||||
url = "https://elpa.gnu.org/devel/llm-0.5.2.0.20231110.3036.tar";
|
||||
sha256 = "0ai405k9lx0rmlawfmldphjpwrrpahyawhzzam0500jp6x02ppkg";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -3476,10 +3522,10 @@
|
|||
elpaBuild {
|
||||
pname = "marginalia";
|
||||
ename = "marginalia";
|
||||
version = "1.3.0.20231026.181335";
|
||||
version = "1.3.0.20231028.90751";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/devel/marginalia-1.3.0.20231026.181335.tar";
|
||||
sha256 = "1q7dbzrdzjwiyq09zbq8wbj673vaj5ss3xyrz3y226wb6jpmzr74";
|
||||
url = "https://elpa.gnu.org/devel/marginalia-1.3.0.20231028.90751.tar";
|
||||
sha256 = "05k37f3qjvm6kv7y6fa6g5z02irpifvl1as4allrxgn12408ydvh";
|
||||
};
|
||||
packageRequires = [ compat emacs ];
|
||||
meta = {
|
||||
|
|
@ -3674,10 +3720,10 @@
|
|||
elpaBuild {
|
||||
pname = "modus-themes";
|
||||
ename = "modus-themes";
|
||||
version = "4.3.0.0.20230926.152405";
|
||||
version = "4.3.0.0.20231031.71656";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/devel/modus-themes-4.3.0.0.20230926.152405.tar";
|
||||
sha256 = "04fncghgdsz0fb1f49dr64nvy4as9wrvlxnc7jlx1im1dgjv9lcq";
|
||||
url = "https://elpa.gnu.org/devel/modus-themes-4.3.0.0.20231031.71656.tar";
|
||||
sha256 = "04hjhg596qfkrnll0wrg4f50ilns28jpf2ws7021wivr370xajki";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -4093,10 +4139,10 @@
|
|||
elpaBuild {
|
||||
pname = "orderless";
|
||||
ename = "orderless";
|
||||
version = "1.0.0.20231025.204425";
|
||||
version = "1.0.0.20231107.210315";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/devel/orderless-1.0.0.20231025.204425.tar";
|
||||
sha256 = "1lsfa62hpq6zmk49mnf1434lqv3p472la3aky003xplkvl0xbw7l";
|
||||
url = "https://elpa.gnu.org/devel/orderless-1.0.0.20231107.210315.tar";
|
||||
sha256 = "0j5fkmw4qy40ab2c6d0mf6637s8q95gi3sp7w477d6ymck5i2ck8";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -4108,10 +4154,10 @@
|
|||
elpaBuild {
|
||||
pname = "org";
|
||||
ename = "org";
|
||||
version = "9.7pre0.20231027.91944";
|
||||
version = "9.7pre0.20231108.95550";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/devel/org-9.7pre0.20231027.91944.tar";
|
||||
sha256 = "0af65mm22bl6c38abqn39s5rz6i67pbcmhfq6n2hn0a8jgmmppwc";
|
||||
url = "https://elpa.gnu.org/devel/org-9.7pre0.20231108.95550.tar";
|
||||
sha256 = "01dk4sq5wfiwj9g5bfriqqkfrgdfy3c7kixd7y4cf9k6pbjl4sfp";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -4306,10 +4352,10 @@
|
|||
elpaBuild {
|
||||
pname = "osm";
|
||||
ename = "osm";
|
||||
version = "0.14.0.20231014.133720";
|
||||
version = "0.14.0.20231029.105928";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/devel/osm-0.14.0.20231014.133720.tar";
|
||||
sha256 = "1zfjn4p30f5d6j3mwgc7asvb2p4jfl16svq98mx0q1n270bgs098";
|
||||
url = "https://elpa.gnu.org/devel/osm-0.14.0.20231029.105928.tar";
|
||||
sha256 = "0hd2yg7yqnpdiy0icxz6fa128arrf2zl1sknj20ig52ba7z0wk2w";
|
||||
};
|
||||
packageRequires = [ compat emacs ];
|
||||
meta = {
|
||||
|
|
@ -4529,6 +4575,21 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
plz-see = callPackage ({ elpaBuild, emacs, fetchurl, lib, plz }:
|
||||
elpaBuild {
|
||||
pname = "plz-see";
|
||||
ename = "plz-see";
|
||||
version = "0.1.0.20231101.73512";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/devel/plz-see-0.1.0.20231101.73512.tar";
|
||||
sha256 = "1nqlv1ww8ba2a40bg3riv5w1sgj8cmhx6bldyzcgs88cpjjkia79";
|
||||
};
|
||||
packageRequires = [ emacs plz ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/plz-see.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
poke = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "poke";
|
||||
|
|
@ -4667,10 +4728,10 @@
|
|||
elpaBuild {
|
||||
pname = "project";
|
||||
ename = "project";
|
||||
version = "0.10.0.0.20231020.190403";
|
||||
version = "0.10.0.0.20231108.75740";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/devel/project-0.10.0.0.20231020.190403.tar";
|
||||
sha256 = "07ywa9rf3gy4jjh4xpyp9v6sk39jiqc1nifklrvckm1mp84hl0qq";
|
||||
url = "https://elpa.gnu.org/devel/project-0.10.0.0.20231108.75740.tar";
|
||||
sha256 = "02arwv35vcpspg2k8nasmaz2ggc32v7p3iq2q6z5sznmdanl1jm4";
|
||||
};
|
||||
packageRequires = [ emacs xref ];
|
||||
meta = {
|
||||
|
|
@ -4712,10 +4773,10 @@
|
|||
elpaBuild {
|
||||
pname = "pulsar";
|
||||
ename = "pulsar";
|
||||
version = "1.0.1.0.20230929.115806";
|
||||
version = "1.0.1.0.20231101.62313";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/devel/pulsar-1.0.1.0.20230929.115806.tar";
|
||||
sha256 = "1rs8jnvj4g5m675srf3civhk52csm4nf7df81xscgvh6pafgyfvj";
|
||||
url = "https://elpa.gnu.org/devel/pulsar-1.0.1.0.20231101.62313.tar";
|
||||
sha256 = "10k57sd29hkbja85sn5yf7wm0g5wyk216ykdjl4vr03891ic03dg";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -5269,10 +5330,10 @@
|
|||
elpaBuild {
|
||||
pname = "setup";
|
||||
ename = "setup";
|
||||
version = "1.3.2.0.20230826.202144";
|
||||
version = "1.3.2.0.20231031.80845";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/devel/setup-1.3.2.0.20230826.202144.tar";
|
||||
sha256 = "15nsn4kgh50qrcxvar1j9rbbg9d4szvyxhy13r7fq0vp9n6wv6iw";
|
||||
url = "https://elpa.gnu.org/devel/setup-1.3.2.0.20231031.80845.tar";
|
||||
sha256 = "0bm5rbhhsl1wfrrf5ikvn368xv49fzxh375jhl9f5r5m4dj1l0s4";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -5658,10 +5719,10 @@
|
|||
elpaBuild {
|
||||
pname = "srht";
|
||||
ename = "srht";
|
||||
version = "0.2.0.20221114.63606";
|
||||
version = "0.3.0.20231103.213748";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/devel/srht-0.2.0.20221114.63606.tar";
|
||||
sha256 = "0y3xl9l0c7mjppsglwnbawrq4wx402mjvgnim2ilw1d7568ahi9i";
|
||||
url = "https://elpa.gnu.org/devel/srht-0.3.0.20231103.213748.tar";
|
||||
sha256 = "1nr6faizww1nzv5lpdikbqxkc6i1hswg2qa50cybl05ycqq9b10a";
|
||||
};
|
||||
packageRequires = [ emacs plz ];
|
||||
meta = {
|
||||
|
|
@ -5694,10 +5755,10 @@
|
|||
elpaBuild {
|
||||
pname = "standard-themes";
|
||||
ename = "standard-themes";
|
||||
version = "1.2.0.0.20230916.90636";
|
||||
version = "1.2.0.0.20231031.71926";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/devel/standard-themes-1.2.0.0.20230916.90636.tar";
|
||||
sha256 = "0i1xqg65sbwm7xy26b116ips2769wa8yiqmyvcgsbsmig4vrydw8";
|
||||
url = "https://elpa.gnu.org/devel/standard-themes-1.2.0.0.20231031.71926.tar";
|
||||
sha256 = "10hj6w5wyr7kw4rargk9n1iiyl0i48cc9mbv2m0vg6bnb72237z5";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -5981,10 +6042,10 @@
|
|||
elpaBuild {
|
||||
pname = "tempel";
|
||||
ename = "tempel";
|
||||
version = "0.8.0.20230915.222920";
|
||||
version = "0.8.0.20231106.72513";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/devel/tempel-0.8.0.20230915.222920.tar";
|
||||
sha256 = "1lsc3d8sqydbhyrd9ja43y06i0qxwc0dns2n4rnnb8039y2dvfnn";
|
||||
url = "https://elpa.gnu.org/devel/tempel-0.8.0.20231106.72513.tar";
|
||||
sha256 = "1pbw7wrhz5h1xykbc1ihhpzqc0kki6k637wagx8yfz95n606808d";
|
||||
};
|
||||
packageRequires = [ compat emacs ];
|
||||
meta = {
|
||||
|
|
@ -6096,10 +6157,10 @@
|
|||
elpaBuild {
|
||||
pname = "tramp";
|
||||
ename = "tramp";
|
||||
version = "2.6.1.3.0.20230929.72305";
|
||||
version = "2.6.1.4.0.20231030.81039";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/devel/tramp-2.6.1.3.0.20230929.72305.tar";
|
||||
sha256 = "1k0hmnr7wnkmahmqxcg2km2cr44h3fiv4x4kv9h0297jqqi2jiq4";
|
||||
url = "https://elpa.gnu.org/devel/tramp-2.6.1.4.0.20231030.81039.tar";
|
||||
sha256 = "1m8ij5xrh5yp5n70yqlxdxgvk0ap6mqnymhasncm2vqfzlxkdd45";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -6169,10 +6230,10 @@
|
|||
elpaBuild {
|
||||
pname = "transient";
|
||||
ename = "transient";
|
||||
version = "0.4.3.0.20231024.181508";
|
||||
version = "0.4.3.0.20231027.212124";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/devel/transient-0.4.3.0.20231024.181508.tar";
|
||||
sha256 = "0b092m462gndqlyv8lvfikkdqmly2w5dkbbkn405rbmki2r4bggk";
|
||||
url = "https://elpa.gnu.org/devel/transient-0.4.3.0.20231027.212124.tar";
|
||||
sha256 = "0rzc5ks0b9nlnvggj7hn9648y5siw9qjpg8n3swlmkb68m3b2c05";
|
||||
};
|
||||
packageRequires = [ compat emacs seq ];
|
||||
meta = {
|
||||
|
|
@ -6347,10 +6408,10 @@
|
|||
elpaBuild {
|
||||
pname = "urgrep";
|
||||
ename = "urgrep";
|
||||
version = "0.3.0snapshot0.20231026.224925";
|
||||
version = "0.3.0snapshot0.20231101.193012";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/devel/urgrep-0.3.0snapshot0.20231026.224925.tar";
|
||||
sha256 = "07akrg4z177xjway75bl7281ic78j8sl818jd52nmxhx4wxys9mv";
|
||||
url = "https://elpa.gnu.org/devel/urgrep-0.3.0snapshot0.20231101.193012.tar";
|
||||
sha256 = "12hmms0yr0vybayvzkbqbp5j428lsnirzwg93f1l8m05xxs3xm9w";
|
||||
};
|
||||
packageRequires = [ compat emacs project ];
|
||||
meta = {
|
||||
|
|
@ -6582,10 +6643,10 @@
|
|||
elpaBuild {
|
||||
pname = "vertico";
|
||||
ename = "vertico";
|
||||
version = "1.4.0.20231015.92801";
|
||||
version = "1.4.0.20231108.202420";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/devel/vertico-1.4.0.20231015.92801.tar";
|
||||
sha256 = "0h73z4jbwd3pmn3rfgbklnrslcd0d60h1fg3j5ykbgqd770gklhc";
|
||||
url = "https://elpa.gnu.org/devel/vertico-1.4.0.20231108.202420.tar";
|
||||
sha256 = "1c34pq5l7ckjlyimpa528d8a7q5pakz3li5bc4ka86mwf861kd7v";
|
||||
};
|
||||
packageRequires = [ compat emacs ];
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -565,6 +565,21 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
bufferlo = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "bufferlo";
|
||||
ename = "bufferlo";
|
||||
version = "0.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/bufferlo-0.2.tar";
|
||||
sha256 = "1dvpzxlnzs037wz9xhiwiz2qrc7r2i05z6p6p0sy8i4kb6scc6gy";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/bufferlo.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
bug-hunter = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, seq }:
|
||||
elpaBuild {
|
||||
pname = "bug-hunter";
|
||||
|
|
@ -862,10 +877,10 @@
|
|||
elpaBuild {
|
||||
pname = "compat";
|
||||
ename = "compat";
|
||||
version = "29.1.4.2";
|
||||
version = "29.1.4.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/compat-29.1.4.2.tar";
|
||||
sha256 = "1njvbvvx2gl10psswb8md2s9diiy476gy4yj6vwips40r0n96l3g";
|
||||
url = "https://elpa.gnu.org/packages/compat-29.1.4.3.tar";
|
||||
sha256 = "08lg6jph1hqkamf1fhm5ajwy4klh2a2260llr1z7wlbbq52032k5";
|
||||
};
|
||||
packageRequires = [ emacs seq ];
|
||||
meta = {
|
||||
|
|
@ -1299,6 +1314,21 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
dired-duplicates = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "dired-duplicates";
|
||||
ename = "dired-duplicates";
|
||||
version = "0.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/dired-duplicates-0.2.tar";
|
||||
sha256 = "1n5n961f1mrvcqfrz56734qj1ynajdjblyf4y60pw9m3fn03db4s";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/dired-duplicates.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
dired-git-info = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "dired-git-info";
|
||||
|
|
@ -2022,6 +2052,25 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
flymake-codespell = callPackage ({ compat
|
||||
, elpaBuild
|
||||
, emacs
|
||||
, fetchurl
|
||||
, lib }:
|
||||
elpaBuild {
|
||||
pname = "flymake-codespell";
|
||||
ename = "flymake-codespell";
|
||||
version = "0.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/flymake-codespell-0.1.tar";
|
||||
sha256 = "0r1g0imh9azy1yf0naxif80vmzrjvn5dx3lcrlpj70xb86wzliym";
|
||||
};
|
||||
packageRequires = [ compat emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/flymake-codespell.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
flymake-proselint = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "flymake-proselint";
|
||||
|
|
@ -2358,10 +2407,10 @@
|
|||
elpaBuild {
|
||||
pname = "greader";
|
||||
ename = "greader";
|
||||
version = "0.5.0";
|
||||
version = "0.6.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/greader-0.5.0.tar";
|
||||
sha256 = "11rcppg3850dbrvwsp3y814bibkv0h35rc5sf4w9qlmd5rc5ilxj";
|
||||
url = "https://elpa.gnu.org/packages/greader-0.6.0.tar";
|
||||
sha256 = "01sral1nrgkpbrajvg2pqhaj4rx48rryqfxckj3xprrs0yls3k8q";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -2975,10 +3024,10 @@
|
|||
elpaBuild {
|
||||
pname = "llm";
|
||||
ename = "llm";
|
||||
version = "0.5.0";
|
||||
version = "0.5.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/llm-0.5.0.tar";
|
||||
sha256 = "07n32hfzyjzj7vjy5l7rxaldpa4hyjwharkizs2gzz66lg83wix8";
|
||||
url = "https://elpa.gnu.org/packages/llm-0.5.2.tar";
|
||||
sha256 = "1nbxdnxpbyvx5rww9mn0zr9hcnblrnk8790cih206y3p1kvs0pnq";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -3704,10 +3753,10 @@
|
|||
elpaBuild {
|
||||
pname = "org";
|
||||
ename = "org";
|
||||
version = "9.6.10";
|
||||
version = "9.6.11";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/org-9.6.10.tar";
|
||||
sha256 = "1lv503jf556hrv9s85q8sk6lg0rwxkchp2sn0sgdki208l0im8wj";
|
||||
url = "https://elpa.gnu.org/packages/org-9.6.11.tar";
|
||||
sha256 = "18hp5jx90wn9xsg8frql3r1kmn2q9qph6plcssj64fp34wcwxsd8";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -4060,6 +4109,21 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
plz-see = callPackage ({ elpaBuild, emacs, fetchurl, lib, plz }:
|
||||
elpaBuild {
|
||||
pname = "plz-see";
|
||||
ename = "plz-see";
|
||||
version = "0.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/plz-see-0.1.tar";
|
||||
sha256 = "0dmckrny21rlm5spiwx7j6q0xikzwlsrhg8yz890w47zpdxpl3bb";
|
||||
};
|
||||
packageRequires = [ emacs plz ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/plz-see.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
poke = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "poke";
|
||||
|
|
@ -5034,10 +5098,10 @@
|
|||
elpaBuild {
|
||||
pname = "srht";
|
||||
ename = "srht";
|
||||
version = "0.2";
|
||||
version = "0.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/srht-0.2.tar";
|
||||
sha256 = "1qps9vdsiy5zkz88kh9kl1hnn1wlfz6n5brzcxi28fwx0hb3ksz2";
|
||||
url = "https://elpa.gnu.org/packages/srht-0.3.tar";
|
||||
sha256 = "03am21w1gsc1af7slsxny9ga4vqd8rbabbp4rl6mkrq46y5ak375";
|
||||
};
|
||||
packageRequires = [ emacs plz ];
|
||||
meta = {
|
||||
|
|
@ -5418,10 +5482,10 @@
|
|||
elpaBuild {
|
||||
pname = "tramp";
|
||||
ename = "tramp";
|
||||
version = "2.6.1.3";
|
||||
version = "2.6.1.4";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/tramp-2.6.1.3.tar";
|
||||
sha256 = "0z7q55yilwicgzl2m69r275pq6bzpyksxcjaf8fb3bcr3zvzil0y";
|
||||
url = "https://elpa.gnu.org/packages/tramp-2.6.1.4.tar";
|
||||
sha256 = "1ajlx0982hx6ypby9dvw1yh9zyl1h4j9xp4n9rfzxhfvvq3139bi";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -64,10 +64,10 @@
|
|||
elpaBuild {
|
||||
pname = "annotate";
|
||||
ename = "annotate";
|
||||
version = "2.0.3";
|
||||
version = "2.1.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/annotate-2.0.3.tar";
|
||||
sha256 = "1kq195nmspysb1kiqcfh0kwxzp40ij9ccw1c204ayr40a0wp7ilc";
|
||||
url = "https://elpa.nongnu.org/nongnu/annotate-2.1.0.tar";
|
||||
sha256 = "07q8s3qi3lm8g01ypvqqq0cn5jx5jrgyv74fbfam3mmz5l3mqp6q";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
|
|
@ -261,10 +261,10 @@
|
|||
elpaBuild {
|
||||
pname = "blueprint-ts-mode";
|
||||
ename = "blueprint-ts-mode";
|
||||
version = "0.0.2";
|
||||
version = "0.0.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/blueprint-ts-mode-0.0.2.tar";
|
||||
sha256 = "0fyvff2zh6iiswhxcvqgnxdhq3yk5f0w4a2w0jp126fvd3ryspym";
|
||||
url = "https://elpa.nongnu.org/nongnu/blueprint-ts-mode-0.0.3.tar";
|
||||
sha256 = "1ii46kmiaxywymhjlj85c3ypdnkkhgyaqgzhnkzzfz6946dchj3v";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -361,10 +361,10 @@
|
|||
elpaBuild {
|
||||
pname = "cider";
|
||||
ename = "cider";
|
||||
version = "1.9.0";
|
||||
version = "1.11.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/cider-1.9.0.tar";
|
||||
sha256 = "08vc1v4gzh1njvqhg10c07wq28r2s9qq3y7i4b5clrzgy9l872cw";
|
||||
url = "https://elpa.nongnu.org/nongnu/cider-1.11.0.tar";
|
||||
sha256 = "010sl2l9vx3k095bkgvi7w1zvb68jh7lj4plmjn98lmzmbhq7q27";
|
||||
};
|
||||
packageRequires = [
|
||||
clojure-mode
|
||||
|
|
@ -1339,10 +1339,10 @@
|
|||
elpaBuild {
|
||||
pname = "git-modes";
|
||||
ename = "git-modes";
|
||||
version = "1.4.1";
|
||||
version = "1.4.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/git-modes-1.4.1.tar";
|
||||
sha256 = "0zxab7rjy5rh8y0ln9h04pvcim8a4qdpj1zs0c0dwbxcsa7v7hz1";
|
||||
url = "https://elpa.nongnu.org/nongnu/git-modes-1.4.2.tar";
|
||||
sha256 = "15lvya85710wyyynmgq7a92lc5mrrv2nfh19nxh92mkdd3r0c3fg";
|
||||
};
|
||||
packageRequires = [ compat emacs ];
|
||||
meta = {
|
||||
|
|
@ -2366,6 +2366,7 @@
|
|||
};
|
||||
}) {};
|
||||
package-lint = callPackage ({ cl-lib ? null
|
||||
, compat
|
||||
, elpaBuild
|
||||
, emacs
|
||||
, fetchurl
|
||||
|
|
@ -2374,12 +2375,12 @@
|
|||
elpaBuild {
|
||||
pname = "package-lint";
|
||||
ename = "package-lint";
|
||||
version = "0.19";
|
||||
version = "0.20";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/package-lint-0.19.tar";
|
||||
sha256 = "0zq4kbir2l5fly8a37fdp4msygswl44vhjpwpcj1zqz13w30cd8h";
|
||||
url = "https://elpa.nongnu.org/nongnu/package-lint-0.20.tar";
|
||||
sha256 = "13ff9g2lzcddi8n6bcmb7g93kxc8v9h3g9k8qcn42bl7jjy12iqf";
|
||||
};
|
||||
packageRequires = [ cl-lib emacs let-alist ];
|
||||
packageRequires = [ cl-lib compat emacs let-alist ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/package-lint.html";
|
||||
license = lib.licenses.free;
|
||||
|
|
@ -2607,10 +2608,10 @@
|
|||
elpaBuild {
|
||||
pname = "racket-mode";
|
||||
ename = "racket-mode";
|
||||
version = "1.0.20230919.113921";
|
||||
version = "1.0.20231109.110741";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20230919.113921.tar";
|
||||
sha256 = "00b4bw4cqm9yc8fxz14da5ahrjrmshf3497l8p65ss0s6qby5ag3";
|
||||
url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20231109.110741.tar";
|
||||
sha256 = "19d1bs0ajc28wa49f1mphdwrpfywib5cvv3mxip6az9x6faand7g";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -2986,10 +2987,10 @@
|
|||
elpaBuild {
|
||||
pname = "subed";
|
||||
ename = "subed";
|
||||
version = "1.2.5";
|
||||
version = "1.2.6";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/subed-1.2.5.tar";
|
||||
sha256 = "0qaliyn79zkpy3ppqb0s61i5hfbbcj8climj7x9c6vpq86s57mv1";
|
||||
url = "https://elpa.nongnu.org/nongnu/subed-1.2.6.tar";
|
||||
sha256 = "005nzmv5i24wxwhs1l76fpk06rpf8bw19fccrqkiph5k77lg42gr";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -3001,10 +3002,10 @@
|
|||
elpaBuild {
|
||||
pname = "sweeprolog";
|
||||
ename = "sweeprolog";
|
||||
version = "0.26.0";
|
||||
version = "0.26.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/sweeprolog-0.26.0.tar";
|
||||
sha256 = "0pgxz3ckw3qjzqyn6vr8k8y1gdiybsm47ik8j62ybsnqs7ivs208";
|
||||
url = "https://elpa.nongnu.org/nongnu/sweeprolog-0.26.2.tar";
|
||||
sha256 = "14rcg6rs4dd4a0pr4makkg1flwxfrxyg5xrs5sa034bzxj6zqal5";
|
||||
};
|
||||
packageRequires = [ compat emacs ];
|
||||
meta = {
|
||||
|
|
@ -3470,10 +3471,10 @@
|
|||
elpaBuild {
|
||||
pname = "xah-fly-keys";
|
||||
ename = "xah-fly-keys";
|
||||
version = "24.13.20231025112537";
|
||||
version = "24.15.20231105091131";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-24.13.20231025112537.tar";
|
||||
sha256 = "1h7z9g3307w0cg361md8mbhsia2534ncqihdfsasg5qhw9184sib";
|
||||
url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-24.15.20231105091131.tar";
|
||||
sha256 = "13wvf6zn87xpglpycxmjmq6mfvpr21bsihsshx06my38832kw128";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -1,20 +0,0 @@
|
|||
{ lib, stdenv, libX11, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "worker";
|
||||
version = "4.12.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.boomerangsworld.de/cms/worker/downloads/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-11tSOVuGuCU0IvqpEKiKvUZj9DtjWJErLpM8IsTtvcs=";
|
||||
};
|
||||
|
||||
buildInputs = [ libX11 ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A two-pane file manager with advanced file manipulation features";
|
||||
homepage = "http://www.boomerangsworld.de/cms/worker/index.html";
|
||||
license = licenses.gpl2;
|
||||
maintainers = [];
|
||||
};
|
||||
}
|
||||
|
|
@ -42,6 +42,11 @@ python.pkgs.pythonPackages.buildPythonPackage rec {
|
|||
patches = [
|
||||
# Allow setting MEDIA_ROOT through environment variable
|
||||
./media-root.patch
|
||||
# https://github.com/TandoorRecipes/recipes/pull/2706
|
||||
(fetchpatch {
|
||||
url = "https://github.com/TandoorRecipes/recipes/commit/8f66f5c3ca61751a80cc133ff4c59019d6fca406.patch";
|
||||
hash = "sha256-oF5YlPg1LEdLvKpxiSqjTmYPbrGquPlRIz6A05031gs=";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python.pkgs; [
|
||||
|
|
|
|||
|
|
@ -40,6 +40,6 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.skeidel ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,11 +14,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "upnp-router-control";
|
||||
version = "0.3.3";
|
||||
version = "0.3.4";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://launchpad.net/upnp-router-control/trunk/${version}/+download/upnp-router-control-${version}.tar.xz";
|
||||
hash = "sha256-d5NmA1tOQtYPjGXYfH0p9CCnWM+aVTX2KuV36QCDxd8=";
|
||||
hash = "sha256-28F/OB2fHemn7HLVFEDmefRA5AsEaQKy+Qbcv75z9w0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "clockify";
|
||||
version = "2.0.3";
|
||||
version = "2.1.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://web.archive.org/web/20211118160803/https://clockify-resources.s3.eu-central-1.amazonaws.com/downloads/Clockify_Setup.deb";
|
||||
sha256 = "sha256-eVZ3OqM1eoWfST7Qu9o8VmLm8ntD+ETf/0aes6RY4Y8=";
|
||||
url = "https://web.archive.org/web/20231110130133/https://clockify.me/downloads/Clockify_Setup_x64.deb";
|
||||
hash = "sha256-jndoMk3vqk8a5jMzKVo6ThovSISmcu+hef9IJcg3reQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
|
|||
mv opt $out
|
||||
|
||||
substituteInPlace $out/share/applications/clockify.desktop \
|
||||
--replace "/opt/Clockify" $out/bin
|
||||
--replace "/opt/Clockify/" ""
|
||||
|
||||
makeWrapper ${electron}/bin/electron $out/bin/clockify \
|
||||
--add-flags $out/opt/Clockify/resources/app.asar
|
||||
|
|
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://clockify.me";
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ wolfangaukang ];
|
||||
mainProgram = "clockify";
|
||||
platforms = [ "x86_64-linux" ];
|
||||
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -56,6 +56,6 @@ mkDerivation rec {
|
|||
homepage = "https://github.com/Swordfish90/cool-retro-term";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
platforms = with lib.platforms; linux ++ darwin;
|
||||
maintainers = with lib.maintainers; [ skeidel ];
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "iterm2";
|
||||
version = "3.4.21";
|
||||
version = "3.4.22";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://iterm2.com/downloads/stable/iTerm2-${lib.replaceStrings ["."] ["_"] version}.zip";
|
||||
hash = "sha256-hx2d08U4AeRCLtSV3QBcnRu1QS0RblLx/LUH6HHdQvw=";
|
||||
hash = "sha256-bHHAA9H6oUS0cXkGEaY/A0TLWrshgno3UN5xJA6+8lU=";
|
||||
};
|
||||
|
||||
dontFixup = true;
|
||||
|
|
|
|||
|
|
@ -8,31 +8,32 @@
|
|||
, pyyaml
|
||||
, markdown
|
||||
, ansi2html
|
||||
, lxml
|
||||
, python
|
||||
, unzip
|
||||
}:
|
||||
let
|
||||
version = "0.83.0";
|
||||
version = "0.86.10";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~sircmpwn";
|
||||
repo = "builds.sr.ht";
|
||||
rev = version;
|
||||
hash = "sha256-u/y+sYu/09LypWI/ngghbge5SvkuLQpray10j0SjlOo=";
|
||||
hash = "sha256-frwJgwJst2/NWd8VR0KbsVwm8JfWuekkY2oIIAdh3Fw=";
|
||||
};
|
||||
|
||||
buildsrht-api = buildGoModule ({
|
||||
inherit src version;
|
||||
pname = "buildsrht-api";
|
||||
modRoot = "api";
|
||||
vendorHash = "sha256-DfVWr/4J4ZrhHpy9CXPaAQcbag/9FmDgiexcNo0lEsk=";
|
||||
} // import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion= "0.17.20"; });
|
||||
vendorHash = "sha256-2khk7j22KON4MsuvFUNKSUpouJtVIOxE0hkh63iaxZ4=";
|
||||
} // import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion = "0.17.29"; });
|
||||
|
||||
buildsrht-worker = buildGoModule {
|
||||
inherit src version;
|
||||
sourceRoot = "${src.name}/worker";
|
||||
pname = "buildsrht-worker";
|
||||
vendorHash = "sha256-y5RFPbtaGmgPpiV2Q3njeWORGZF1TJRjAbY6VgC1hek=";
|
||||
vendorHash = "sha256-obdaeRwMhuiCV2kVwDo1c+rU/hmsbiL1IgAf7AcIpoc=";
|
||||
};
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -50,7 +51,9 @@ buildPythonPackage rec {
|
|||
celery
|
||||
pyyaml
|
||||
markdown
|
||||
# Unofficial dependencies
|
||||
ansi2html
|
||||
lxml
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
|
|
|
|||
|
|
@ -1,94 +1,78 @@
|
|||
{ lib
|
||||
, fetchFromSourcehut
|
||||
, fetchNodeModules
|
||||
, buildPythonPackage
|
||||
, pgpy
|
||||
, flask
|
||||
, bleach
|
||||
, misaka
|
||||
, humanize
|
||||
, html5lib
|
||||
, markdown
|
||||
, psycopg2
|
||||
, pygments
|
||||
, requests
|
||||
, sqlalchemy
|
||||
, cryptography
|
||||
, beautifulsoup4
|
||||
, sqlalchemy-utils
|
||||
, prometheus-client
|
||||
, celery
|
||||
, alembic
|
||||
, importlib-metadata
|
||||
, psycopg2
|
||||
, markdown
|
||||
, mistletoe
|
||||
, minio
|
||||
, sassc
|
||||
, nodejs
|
||||
, bleach
|
||||
, requests
|
||||
, beautifulsoup4
|
||||
, pygments
|
||||
, cryptography
|
||||
, prometheus-client
|
||||
, alembic
|
||||
, redis
|
||||
, celery
|
||||
, html5lib
|
||||
, importlib-metadata
|
||||
, tinycss2
|
||||
, sassc
|
||||
, minify
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "srht";
|
||||
version = "0.69.0";
|
||||
version = "0.69.15";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~sircmpwn";
|
||||
repo = "core.sr.ht";
|
||||
rev = version;
|
||||
sha256 = "sha256-s/I0wxtPggjTkkTZnhm77PxdQjiT0Vq2MIk7JMvdupc=";
|
||||
sha256 = "sha256-T9yewweqnWL3IW5PHGyAcsIWCGn1ayK2rwrHVukYpgE=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
node_modules = fetchNodeModules {
|
||||
src = "${src}/srht";
|
||||
nodejs = nodejs;
|
||||
sha256 = "sha256-IWKahdWv3qJ5DNyb1GB9JWYkZxghn6wzZe68clYXij8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Disable check for npm
|
||||
./disable-npm-install.patch
|
||||
# Fix Unix socket support in RedisQueueCollector
|
||||
patches/redis-socket/core/0001-Fix-Unix-socket-support-in-RedisQueueCollector.patch
|
||||
];
|
||||
|
||||
propagatedNativeBuildInputs = [
|
||||
sassc
|
||||
nodejs
|
||||
minify
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pgpy
|
||||
flask
|
||||
bleach
|
||||
misaka
|
||||
humanize
|
||||
html5lib
|
||||
markdown
|
||||
psycopg2
|
||||
pygments
|
||||
requests
|
||||
mistletoe
|
||||
sqlalchemy
|
||||
cryptography
|
||||
beautifulsoup4
|
||||
sqlalchemy-utils
|
||||
psycopg2
|
||||
markdown
|
||||
mistletoe
|
||||
bleach
|
||||
requests
|
||||
beautifulsoup4
|
||||
pygments
|
||||
cryptography
|
||||
prometheus-client
|
||||
|
||||
# Unofficial runtime dependencies?
|
||||
celery
|
||||
alembic
|
||||
importlib-metadata
|
||||
minio
|
||||
redis
|
||||
celery
|
||||
# Used transitively through beautifulsoup4
|
||||
html5lib
|
||||
# Used transitively trough bleach.css_sanitizer
|
||||
tinycss2
|
||||
# Used by srht.debug
|
||||
importlib-metadata
|
||||
];
|
||||
|
||||
PKGVER = version;
|
||||
|
||||
preBuild = ''
|
||||
cp -r ${node_modules} srht/node_modules
|
||||
'';
|
||||
|
||||
dontUseSetuptoolsCheck = true;
|
||||
pythonImportsCheck = [ "srht" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -3,17 +3,16 @@
|
|||
, recurseIntoAttrs
|
||||
, nixosTests
|
||||
, config
|
||||
, fetchPypi
|
||||
}:
|
||||
|
||||
# To expose the *srht modules, they have to be a python module so we use `buildPythonModule`
|
||||
# Then we expose them through all-packages.nix as an application through `toPythonApplication`
|
||||
# https://github.com/NixOS/nixpkgs/pull/54425#discussion_r250688781
|
||||
let
|
||||
fetchNodeModules = callPackage ./fetchNodeModules.nix { };
|
||||
|
||||
python = python3.override {
|
||||
packageOverrides = self: super: {
|
||||
srht = self.callPackage ./core.nix { inherit fetchNodeModules; };
|
||||
srht = self.callPackage ./core.nix { };
|
||||
|
||||
buildsrht = self.callPackage ./builds.nix { };
|
||||
gitsrht = self.callPackage ./git.nix { };
|
||||
|
|
@ -26,6 +25,52 @@ let
|
|||
todosrht = self.callPackage ./todo.nix { };
|
||||
|
||||
scmsrht = self.callPackage ./scm.nix { };
|
||||
|
||||
# sourcehut is not (yet) compatible with SQLAlchemy 2.x
|
||||
sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "1.4.46";
|
||||
src = fetchPypi {
|
||||
pname = "SQLAlchemy";
|
||||
inherit version;
|
||||
hash = "sha256-aRO4JH2KKS74MVFipRkx4rQM6RaB8bbxj2lwRSAMSjA=";
|
||||
};
|
||||
nativeCheckInputs = with super; [ pytestCheckHook mock ];
|
||||
disabledTestPaths = [];
|
||||
});
|
||||
|
||||
flask-sqlalchemy = super.flask-sqlalchemy.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "2.5.1";
|
||||
format = "setuptools";
|
||||
src = fetchPypi {
|
||||
pname = "Flask-SQLAlchemy";
|
||||
inherit version;
|
||||
hash = "sha256-K9pEtD58rLFdTgX/PMH4vJeTbMRkYjQkECv8LDXpWRI=";
|
||||
};
|
||||
propagatedBuildInputs = with self; [
|
||||
flask
|
||||
sqlalchemy
|
||||
];
|
||||
});
|
||||
|
||||
# sourcehut is not (yet) compatible with factory-boy 3.x
|
||||
factory-boy = super.factory-boy.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "2.12.0";
|
||||
src = fetchPypi {
|
||||
pname = "factory_boy";
|
||||
inherit version;
|
||||
hash = "sha256-+vSNYIoXNfDQo8nL9TbWT5EytUfa57pFLE2Zp56Eo3A=";
|
||||
};
|
||||
nativeCheckInputs = (with super; [
|
||||
django
|
||||
flask
|
||||
mongoengine
|
||||
pytestCheckHook
|
||||
]) ++ (with self; [
|
||||
sqlalchemy
|
||||
flask-sqlalchemy
|
||||
]);
|
||||
postPatch = "";
|
||||
});
|
||||
};
|
||||
};
|
||||
in
|
||||
|
|
|
|||
|
|
@ -1,14 +0,0 @@
|
|||
diff --git a/setup.py b/setup.py
|
||||
index d63bac8..e1d0c35 100755
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -5,9 +5,6 @@ import glob
|
||||
import os
|
||||
import sys
|
||||
|
||||
-if subprocess.call(["npm", "i"], cwd="srht") != 0:
|
||||
- sys.exit(1)
|
||||
-
|
||||
ver = os.environ.get("PKGVER") or subprocess.run(['git', 'describe', '--tags'],
|
||||
stdout=subprocess.PIPE).stdout.decode().strip()
|
||||
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
{ lib, stdenv, jq }: { src, nodejs, sha256 }:
|
||||
|
||||
# Only npm >= 5.4.2 is deterministic, see:
|
||||
# https://github.com/npm/npm/issues/17979#issuecomment-332701215
|
||||
assert lib.versionAtLeast nodejs.version "8.9.0";
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "node_modules";
|
||||
|
||||
outputHashAlgo = "sha256";
|
||||
outputHash = sha256;
|
||||
outputHashMode = "recursive";
|
||||
|
||||
nativeBuildInputs = [ jq nodejs ];
|
||||
|
||||
buildCommand = ''
|
||||
cp -r ${src}/* .
|
||||
HOME=. npm install --force --ignore-scripts --only=production
|
||||
for f in $(find node_modules -name package.json); do
|
||||
# https://github.com/npm/npm/issues/10393
|
||||
jq -S 'delpaths(keys | map(select(startswith("_")) | [.]))' $f > $f.tmp
|
||||
mv $f.tmp $f
|
||||
done
|
||||
mv node_modules $out
|
||||
'';
|
||||
}
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
{ unzip
|
||||
, gqlgenVersion ? "0.17.2"
|
||||
, gqlgenVersion ? "0.17.20"
|
||||
}:
|
||||
{
|
||||
overrideModAttrs = (_: {
|
||||
|
|
|
|||
|
|
@ -4,32 +4,38 @@
|
|||
, buildPythonPackage
|
||||
, python
|
||||
, srht
|
||||
, pygit2
|
||||
, scmsrht
|
||||
, pygit2
|
||||
, minio
|
||||
, unzip
|
||||
}:
|
||||
let
|
||||
version = "0.78.20";
|
||||
version = "0.84.2";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~sircmpwn";
|
||||
repo = "git.sr.ht";
|
||||
rev = version;
|
||||
sha256 = "sha256-rZsTtHobsgRVmMOjPa1fiKrPsNyFu/gOsmO0cTl5MqQ=";
|
||||
sha256 = "sha256-sAkTsQlWtNDQ5vAhA2EeOvuJcj9A6AG8pgDyIKtr65s=";
|
||||
};
|
||||
|
||||
gitApi = buildGoModule ({
|
||||
inherit src version;
|
||||
pname = "gitsrht-api";
|
||||
modRoot = "api";
|
||||
vendorHash = "sha256-cCs9FUBusaAou9w4TDOg8GKxhRcsPbSNcQpxvFH/+so=";
|
||||
vendorHash = "sha256-LAYp0zgosZnFEbtxzjuTH9++0lbxhACr705HqXJz3D0=";
|
||||
} // import ./fix-gqlgen-trimpath.nix { inherit unzip; });
|
||||
|
||||
gitDispatch = buildGoModule {
|
||||
inherit src version;
|
||||
pname = "gitsrht-dispatch";
|
||||
modRoot = "gitsrht-dispatch";
|
||||
vendorHash = "sha256-qWXPHo86s6iuRBhRMtmD5jxnAWKdrWHtA/iSUkdw89M=";
|
||||
vendorHash = "sha256-EDvSZ3/g0xDSohrsAIpNhk+F0yy8tbnTW/3tURTonMc=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace gitsrht-dispatch/main.go \
|
||||
--replace /var/log/gitsrht-dispatch /var/log/sourcehut/gitsrht-dispatch
|
||||
'';
|
||||
};
|
||||
|
||||
gitKeys = buildGoModule {
|
||||
|
|
@ -37,6 +43,11 @@ let
|
|||
pname = "gitsrht-keys";
|
||||
modRoot = "gitsrht-keys";
|
||||
vendorHash = "sha256-9pojS69HCKVHUceyOpGtv9ewcxFD4WsOVsEzkmWJkF4=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace gitsrht-keys/main.go \
|
||||
--replace /var/log/gitsrht-keys /var/log/sourcehut/gitsrht-keys
|
||||
'';
|
||||
};
|
||||
|
||||
gitShell = buildGoModule {
|
||||
|
|
@ -44,6 +55,11 @@ let
|
|||
pname = "gitsrht-shell";
|
||||
modRoot = "gitsrht-shell";
|
||||
vendorHash = "sha256-WqfvSPuVsOHA//86u33atMfeA11+DJhjLmWy8Ivq0NI=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace gitsrht-shell/main.go \
|
||||
--replace /var/log/gitsrht-shell /var/log/sourcehut/gitsrht-shell
|
||||
'';
|
||||
};
|
||||
|
||||
gitUpdateHook = buildGoModule {
|
||||
|
|
@ -51,6 +67,11 @@ let
|
|||
pname = "gitsrht-update-hook";
|
||||
modRoot = "gitsrht-update-hook";
|
||||
vendorHash = "sha256-Bc3yPabS2S+qiroHFKrtkII/CfzBDYQ6xWxKHAME+Tc=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace gitsrht-update-hook/main.go \
|
||||
--replace /var/log/gitsrht-update-hook /var/log/sourcehut/gitsrht-update-hook
|
||||
'';
|
||||
};
|
||||
|
||||
in
|
||||
|
|
@ -65,8 +86,9 @@ buildPythonPackage rec {
|
|||
|
||||
propagatedBuildInputs = [
|
||||
srht
|
||||
pygit2
|
||||
scmsrht
|
||||
pygit2
|
||||
minio
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
|
|
|
|||
|
|
@ -12,26 +12,29 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "hgsrht";
|
||||
version = "0.31.3";
|
||||
version = "0.32.4";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~sircmpwn";
|
||||
repo = "hg.sr.ht";
|
||||
rev = version;
|
||||
sha256 = "4Qe08gqsSTMQVQBchFPEUXuxM8ZAAQGJT1EOcDjkZa0=";
|
||||
sha256 = "mYkA44c9wy/Iy1h1lXkVpc9gN7rQXFm4T3YBlQ1Dj60=";
|
||||
vc = "hg";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile \
|
||||
--replace "all: api hgsrht-keys" ""
|
||||
|
||||
substituteInPlace hgsrht-shell \
|
||||
--replace /var/log/hgsrht-shell /var/log/sourcehut/hgsrht-shell
|
||||
'';
|
||||
|
||||
hgsrht-api = buildGoModule ({
|
||||
inherit src version;
|
||||
pname = "hgsrht-api";
|
||||
modRoot = "api";
|
||||
vendorHash = "sha256-uIP3W7UJkP68HJUF33kz5xfg/KBiaSwMozFYmQJQkys=";
|
||||
vendorHash = "sha256-vuOYpnF3WjA6kOe9MVSuVMhJBQqCmIex+QUBJrP+VDs=";
|
||||
} // import ./fix-gqlgen-trimpath.nix { inherit unzip; });
|
||||
|
||||
hgsrht-keys = buildGoModule {
|
||||
|
|
@ -39,12 +42,17 @@ buildPythonPackage rec {
|
|||
pname = "hgsrht-keys";
|
||||
modRoot = "hgsrht-keys";
|
||||
vendorHash = "sha256-7ti8xCjSrxsslF7/1X/GY4FDl+69hPL4UwCDfjxmJLU=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace hgsrht-keys/main.go \
|
||||
--replace /var/log/hgsrht-keys /var/log/sourcehut/hgsrht-keys
|
||||
'';
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
srht
|
||||
python-hglib
|
||||
scmsrht
|
||||
srht
|
||||
unidiff
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,21 +1,35 @@
|
|||
{ lib
|
||||
, fetchFromSourcehut
|
||||
, buildGoModule
|
||||
, buildPythonPackage
|
||||
, python
|
||||
, srht
|
||||
, pyyaml
|
||||
, unzip
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hubsrht";
|
||||
version = "0.14.14";
|
||||
version = "0.17.2";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~sircmpwn";
|
||||
repo = "hub.sr.ht";
|
||||
rev = version;
|
||||
sha256 = "sha256-4n6oQ+AAvdJY/5KflxAp62chjyrlSUkmt319DKZk33w=";
|
||||
sha256 = "sha256-A+lvRsPz5EBnM0gB4PJuxSMpELZTrK14ORxDbTKPXWg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile --replace "all: api" ""
|
||||
'';
|
||||
|
||||
hubsrht-api = buildGoModule ({
|
||||
inherit src version;
|
||||
pname = "hubsrht-api";
|
||||
modRoot = "api";
|
||||
vendorHash = "sha256-K5EmZ4U+xItTR85+SCwhwg5KUGLkKHo9Nr2pkvmJpfo=";
|
||||
} // import ./fix-gqlgen-trimpath.nix { inherit unzip; });
|
||||
|
||||
propagatedBuildInputs = [
|
||||
srht
|
||||
pyyaml
|
||||
|
|
@ -23,9 +37,13 @@ buildPythonPackage rec {
|
|||
|
||||
preBuild = ''
|
||||
export PKGVER=${version}
|
||||
export SRHT_PATH=${srht}/${python.sitePackages}/srht
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
ln -s ${hubsrht-api}/bin/api $out/bin/hubsrht-api
|
||||
'';
|
||||
|
||||
dontUseSetuptoolsCheck = true;
|
||||
pythonImportsCheck = [ "hubsrht" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -3,31 +3,30 @@
|
|||
, buildGoModule
|
||||
, buildPythonPackage
|
||||
, srht
|
||||
, asyncpg
|
||||
, aiosmtpd
|
||||
, asyncpg
|
||||
, pygit2
|
||||
, emailthreads
|
||||
, redis
|
||||
, python
|
||||
, unzip
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "listssrht";
|
||||
version = "0.51.11";
|
||||
version = "0.57.8";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~sircmpwn";
|
||||
repo = "lists.sr.ht";
|
||||
rev = version;
|
||||
sha256 = "sha256-Qb70oOazZfmHpC5r0oMYCFdvfAeKbq3mQA8+M56YYnY=";
|
||||
sha256 = "sha256-nQZRSTAyTWxcPHrRVCZ5TgcrNgrlxBFc1vRds0cQwA0=";
|
||||
};
|
||||
|
||||
listssrht-api = buildGoModule ({
|
||||
inherit src version;
|
||||
pname = "listssrht-api";
|
||||
modRoot = "api";
|
||||
vendorHash = "sha256-xnmMkRSokbhWD+kz0XQ9AinYdm6/50FRBISURPvlzD0=";
|
||||
vendorHash = "sha256-E5Zzft9ANJT/nhhCuenZpdo3t9QYLmA+AyDyrbGectE=";
|
||||
} // import ./fix-gqlgen-trimpath.nix { inherit unzip; });
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -37,11 +36,11 @@ buildPythonPackage rec {
|
|||
|
||||
propagatedBuildInputs = [
|
||||
srht
|
||||
pygit2
|
||||
asyncpg
|
||||
aiosmtpd
|
||||
asyncpg
|
||||
pygit2
|
||||
# Unofficial dependency
|
||||
emailthreads
|
||||
redis
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
|
|
|
|||
|
|
@ -1,22 +1,35 @@
|
|||
{ lib
|
||||
, fetchFromSourcehut
|
||||
, buildGoModule
|
||||
, buildPythonPackage
|
||||
, srht
|
||||
, pygit2
|
||||
, python
|
||||
, unzip
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mansrht";
|
||||
version = "0.15.26";
|
||||
version = "0.16.1";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~sircmpwn";
|
||||
repo = "man.sr.ht";
|
||||
rev = version;
|
||||
sha256 = "sha256-5xZH6DrTXMdWd26OGICp7lZ/QDjACIa7zNUJHB7jzGo=";
|
||||
sha256 = "sha256-94G9/Kzt1gaQ2CaXtsJYCB6W5OTdn27XhVdpNJ9a5cE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile --replace "all: api" ""
|
||||
'';
|
||||
|
||||
mansrht-api = buildGoModule ({
|
||||
inherit src version;
|
||||
pname = "mansrht-api";
|
||||
modRoot = "api";
|
||||
vendorHash = "sha256-K5EmZ4U+xItTR85+SCwhwg5KUGLkKHo9Nr2pkvmJpfo=";
|
||||
} // import ./fix-gqlgen-trimpath.nix { inherit unzip; });
|
||||
|
||||
propagatedBuildInputs = [
|
||||
srht
|
||||
pygit2
|
||||
|
|
@ -27,6 +40,10 @@ buildPythonPackage rec {
|
|||
export SRHT_PATH=${srht}/${python.sitePackages}/srht
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
ln -s ${mansrht-api}/bin/api $out/bin/mansrht-api
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "mansrht" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -2,38 +2,34 @@
|
|||
, fetchFromSourcehut
|
||||
, buildPythonPackage
|
||||
, buildGoModule
|
||||
, pgpy
|
||||
, srht
|
||||
, redis
|
||||
, bcrypt
|
||||
, qrcode
|
||||
, stripe
|
||||
, zxcvbn
|
||||
, alembic
|
||||
, pystache
|
||||
, bcrypt
|
||||
, dnspython
|
||||
, sshpubkeys
|
||||
, weasyprint
|
||||
, qrcode
|
||||
, redis
|
||||
, srht
|
||||
, stripe
|
||||
, prometheus-client
|
||||
, zxcvbn
|
||||
, python
|
||||
, unzip
|
||||
}:
|
||||
let
|
||||
version = "0.61.3";
|
||||
version = "0.64.8";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~sircmpwn";
|
||||
repo = "meta.sr.ht";
|
||||
rev = version;
|
||||
hash = "sha256-wMcpdRSRvxYEV163mdTGOemk62gljua89SOtwe6qGXU=";
|
||||
hash = "sha256-eiNvoy68PvjZ3iwdeNPjsXJjxAXb2PMF1/HvJquWa/U=";
|
||||
};
|
||||
|
||||
metasrht-api = buildGoModule ({
|
||||
inherit src version;
|
||||
pname = "metasrht-api";
|
||||
modRoot = "api";
|
||||
vendorHash = "sha256-ZoDRGmGe9o5pn89gJ60wjSp5Cc0yxRfvdhNnbwAhmSI=";
|
||||
} // import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion = "0.17.20"; });
|
||||
vendorHash = "sha256-D3stDSb99uXze49kKZgGrAq5Zmg6hkIzIpsQKlnKVtE=";
|
||||
} // import ./fix-gqlgen-trimpath.nix { inherit unzip; });
|
||||
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -46,19 +42,15 @@ buildPythonPackage rec {
|
|||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pgpy
|
||||
srht
|
||||
redis
|
||||
bcrypt
|
||||
qrcode
|
||||
stripe
|
||||
zxcvbn
|
||||
alembic
|
||||
pystache
|
||||
sshpubkeys
|
||||
weasyprint
|
||||
prometheus-client
|
||||
bcrypt
|
||||
dnspython
|
||||
qrcode
|
||||
redis
|
||||
srht
|
||||
stripe
|
||||
prometheus-client
|
||||
zxcvbn
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
buildGoModule (rec {
|
||||
pname = "pagessrht";
|
||||
version = "0.7.4";
|
||||
version = "0.13.0";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~sircmpwn";
|
||||
repo = "pages.sr.ht";
|
||||
rev = version;
|
||||
sha256 = "sha256-WM9T2LS8yIqaR0PQQRgMk/tiMYcw8DZVPMqMWkj/5RY=";
|
||||
sha256 = "sha256-vUN6c6cyhcLI8bKrFYKoxlBQ29VS/bowpSfBRmi47wg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -20,7 +20,7 @@ buildGoModule (rec {
|
|||
--replace "all: server" ""
|
||||
'';
|
||||
|
||||
vendorHash = "sha256-VOqY/nStqGyfWOXnJSZX8UYyp2kzcibQM2NRNysHYEc=";
|
||||
vendorHash = "sha256-GKuHkUqSVBLN3k8YsFtxdmdHFkqKo9YZqDk2GBmbfWo=";
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/sql/
|
||||
|
|
@ -35,4 +35,4 @@ buildGoModule (rec {
|
|||
};
|
||||
# There is no ./loaders but this does not cause troubles
|
||||
# to go generate
|
||||
} // import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion= "0.17.9"; })
|
||||
} // import ./fix-gqlgen-trimpath.nix { inherit unzip; })
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pastesrht";
|
||||
version = "0.13.8";
|
||||
version = "0.15.1";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~sircmpwn";
|
||||
repo = "paste.sr.ht";
|
||||
rev = version;
|
||||
sha256 = "sha256-Zji9FyYUtsklYz4qyLbtduusteC7WujLCMmvZKcqYis=";
|
||||
sha256 = "sha256-IUFX7/V8AWqN+iuisLAyu7lMNIUCzSMoOfcZiYJTnrM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -2,25 +2,23 @@
|
|||
, fetchFromSourcehut
|
||||
, buildPythonPackage
|
||||
, srht
|
||||
, redis
|
||||
, pyyaml
|
||||
, buildsrht
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "scmsrht";
|
||||
version = "0.22.22";
|
||||
version = "0.22.23";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~sircmpwn";
|
||||
repo = "scm.sr.ht";
|
||||
rev = version;
|
||||
sha256 = "sha256-iSzzyI8HZOpOb4dyt520MV/wds14fNag2+UOF09KS7w=";
|
||||
sha256 = "sha256-058dOEYJDY3jtxH1VkV1CFq5CZTkauSnTWg57DCnNtw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
srht
|
||||
redis
|
||||
pyyaml
|
||||
buildsrht
|
||||
];
|
||||
|
|
|
|||
|
|
@ -3,9 +3,7 @@
|
|||
, buildGoModule
|
||||
, buildPythonPackage
|
||||
, srht
|
||||
, redis
|
||||
, alembic
|
||||
, pystache
|
||||
, pytest
|
||||
, factory-boy
|
||||
, python
|
||||
|
|
@ -14,13 +12,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "todosrht";
|
||||
version = "0.72.2";
|
||||
version = "0.74.6";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~sircmpwn";
|
||||
repo = "todo.sr.ht";
|
||||
rev = version;
|
||||
sha256 = "sha256-FLjVO8Y/9s2gFfMXwcY7Rj3WNzPEBYs1AEjiVZFWsT8=";
|
||||
sha256 = "sha256-j12pCGfKf6+9R8NOBIrH2V4OuSMuncU6S1AMWFVoHts=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -32,14 +30,12 @@ buildPythonPackage rec {
|
|||
inherit src version;
|
||||
pname = "todosrht-api";
|
||||
modRoot = "api";
|
||||
vendorHash = "sha256-LB1H4jwnvoEyaaYJ09NI/M6IkgZwRet/fkso6b9EPV0=";
|
||||
vendorHash = "sha256-rvfG5F6ez8UM0dYVhKfzwtb7ZEJlaKMBAfKDbo3Aofc=";
|
||||
} // import ./fix-gqlgen-trimpath.nix { inherit unzip; });
|
||||
|
||||
propagatedBuildInputs = [
|
||||
srht
|
||||
redis
|
||||
alembic
|
||||
pystache
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
|
|
|
|||
|
|
@ -7,16 +7,26 @@ root=../../../..
|
|||
tmp=$(mktemp -d)
|
||||
trap 'rm -rf "$tmp"' EXIT
|
||||
|
||||
attr_path() {
|
||||
case "$1" in
|
||||
pagessrht) printf "sourcehut.$1";;
|
||||
*) printf "sourcehut.python.pkgs.$1";;
|
||||
esac
|
||||
}
|
||||
|
||||
default() {
|
||||
(cd "$root" && nix-instantiate --eval --strict -A "sourcehut.python.pkgs.$1.meta.position" | sed -re 's/^"(.*):[0-9]+"$/\1/')
|
||||
local p="$(attr_path "$1")"
|
||||
(cd "$root" && nix-instantiate --eval --strict -A $p.meta.position | sed -re 's/^"(.*):[0-9]+"$/\1/')
|
||||
}
|
||||
|
||||
version() {
|
||||
(cd "$root" && nix-instantiate --eval --strict -A "sourcehut.python.pkgs.$1.version" | tr -d '"')
|
||||
local p="$(attr_path "$1")"
|
||||
(cd "$root" && nix-instantiate --eval --strict -A $p.version | tr -d '"')
|
||||
}
|
||||
|
||||
src_url() {
|
||||
nix-instantiate --eval --strict --expr " with import $root {}; let src = sourcehut.python.pkgs.$1.drvAttrs.src; in src.meta.homepage" | tr -d '"'
|
||||
local p="$(attr_path "$1")"
|
||||
nix-instantiate --eval --strict --expr " with import $root {}; let src = $p.drvAttrs.src; in src.meta.homepage" | tr -d '"'
|
||||
}
|
||||
|
||||
get_latest_version() {
|
||||
|
|
@ -35,8 +45,9 @@ update_version() {
|
|||
default_nix="$(default "$1")"
|
||||
oldVersion="$(version "$1")"
|
||||
version="$(get_latest_version "$1")"
|
||||
local p="$(attr_path "$1")"
|
||||
|
||||
(cd "$root" && update-source-version "sourcehut.python.pkgs.$1" "$version")
|
||||
(cd "$root" && update-source-version "$p" "$version")
|
||||
|
||||
# Update vendorHash of Go modules
|
||||
retry=true
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ stdenvNoCC, fetchgit, lib
|
||||
{ lib, fetchgit, buildLua
|
||||
, yad, mkvtoolnix-cli, libnotify }:
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
buildLua {
|
||||
pname = "mpv-convert-script";
|
||||
version = "2016-03-18";
|
||||
src = fetchgit {
|
||||
|
|
@ -22,15 +22,9 @@ stdenvNoCC.mkDerivation {
|
|||
'yad_exe = "${yad}/bin/yad"' \
|
||||
--replace 'notify_send_exe = "notify-send"' \
|
||||
'notify_send_exe = "${libnotify}/bin/notify-send"' \
|
||||
|
||||
'';
|
||||
|
||||
dontBuild = true;
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/mpv/scripts
|
||||
cp convert_script.lua $out/share/mpv/scripts
|
||||
'';
|
||||
passthru.scriptName = "convert_script.lua";
|
||||
scriptPath = "convert_script.lua";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Convert parts of a video while you are watching it in mpv";
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ in lib.recurseIntoAttrs
|
|||
autodeint = callPackage ./autodeint.nix { };
|
||||
autoload = callPackage ./autoload.nix { };
|
||||
chapterskip = callPackage ./chapterskip.nix { inherit buildLua; };
|
||||
convert = callPackage ./convert.nix { };
|
||||
convert = callPackage ./convert.nix { inherit buildLua; };
|
||||
inhibit-gnome = callPackage ./inhibit-gnome.nix { };
|
||||
mpris = callPackage ./mpris.nix { };
|
||||
mpv-playlistmanager = callPackage ./mpv-playlistmanager.nix { inherit buildLua; };
|
||||
|
|
|
|||
|
|
@ -90,6 +90,7 @@ stdenvNoCC.mkDerivation {
|
|||
${netrcPhase}
|
||||
# required that git uses the netrc file
|
||||
mv {,.}netrc
|
||||
export NETRC=$PWD/.netrc
|
||||
export HOME=$PWD
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -425,8 +425,8 @@ fi
|
|||
|
||||
tmpHomePath="$(mktemp -d "${TMPDIR:-/tmp}/nix-prefetch-git-tmp-home-XXXXXXXXXX")"
|
||||
exit_handlers+=(remove_tmpHomePath)
|
||||
ln -s "${NETRC:-$HOME/.netrc}" "$tmpHomePath/.netrc"
|
||||
HOME="$tmpHomePath"
|
||||
ln -s "$NIX_BUILD_TOP/.netrc" "$HOME/"
|
||||
unset XDG_CONFIG_HOME
|
||||
export GIT_CONFIG_NOSYSTEM=1
|
||||
|
||||
|
|
|
|||
76
pkgs/by-name/sd/sdcc/package.nix
Normal file
76
pkgs/by-name/sd/sdcc/package.nix
Normal file
|
|
@ -0,0 +1,76 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, autoconf
|
||||
, bison
|
||||
, boost
|
||||
, flex
|
||||
, gputils
|
||||
, texinfo
|
||||
, zlib
|
||||
, withGputils ? false
|
||||
, excludePorts ? []
|
||||
}:
|
||||
|
||||
assert lib.subtractLists [
|
||||
"ds390" "ds400" "gbz80" "hc08" "mcs51" "pic14" "pic16" "r2k" "r3ka" "s08"
|
||||
"stm8" "tlcs90" "z80" "z180"
|
||||
] excludePorts == [];
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "sdcc";
|
||||
version = "4.2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/sdcc/sdcc-src-${finalAttrs.version}.tar.bz2";
|
||||
hash = "sha256-tJuuHSO81gV6gsT/5WE/nNDLz9HpQOnYTEv+nfCowFM=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "doc" "man" ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoconf
|
||||
bison
|
||||
flex
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
texinfo
|
||||
zlib
|
||||
] ++ lib.optionals withGputils [
|
||||
gputils
|
||||
];
|
||||
|
||||
configureFlags = let
|
||||
excludedPorts = excludePorts
|
||||
++ (lib.optionals (!withGputils) [ "pic14" "pic16" ]);
|
||||
in
|
||||
map (f: "--disable-${f}-port") excludedPorts;
|
||||
|
||||
preConfigure = ''
|
||||
if test -n "''${dontStrip-}"; then
|
||||
export STRIP=none
|
||||
fi
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://sdcc.sourceforge.net/";
|
||||
description = "Small Device C Compiler";
|
||||
longDescription = ''
|
||||
SDCC is a retargettable, optimizing ANSI - C compiler suite that targets
|
||||
the Intel MCS51 based microprocessors (8031, 8032, 8051, 8052, etc.),
|
||||
Maxim (formerly Dallas) DS80C390 variants, Freescale (formerly Motorola)
|
||||
HC08 based (hc08, s08) and Zilog Z80 based MCUs (z80, z180, gbz80, Rabbit
|
||||
2000/3000, Rabbit 3000A). Work is in progress on supporting the Microchip
|
||||
PIC16 and PIC18 targets. It can be retargeted for other microprocessors.
|
||||
'';
|
||||
license = if withGputils
|
||||
then lib.licenses.unfreeRedistributable
|
||||
else lib.licenses.gpl2Plus;
|
||||
mainProgram = "sdcc";
|
||||
maintainers = with lib.maintainers; [ bjornfor yorickvp ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
38
pkgs/by-name/wo/worker/package.nix
Normal file
38
pkgs/by-name/wo/worker/package.nix
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, libX11
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "worker";
|
||||
version = "4.12.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.boomerangsworld.de/cms/worker/downloads/worker-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-11tSOVuGuCU0IvqpEKiKvUZj9DtjWJErLpM8IsTtvcs=";
|
||||
};
|
||||
|
||||
buildInputs = [ libX11 ];
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
meta = {
|
||||
homepage = "http://www.boomerangsworld.de/cms/worker/index.html";
|
||||
description = "Advanced orthodox file manager";
|
||||
longDescription = ''
|
||||
Worker is a two-pane file manager for the X Window System on UN*X. The
|
||||
directories and files are shown in two independent panels supporting a lot
|
||||
of advanced file manipulation features. The main focus is to make managing
|
||||
files easy with full keyboard control, also assisting in finding files and
|
||||
directories by using history of accessed directories, live filtering, and
|
||||
access to commands by using the keyboard.
|
||||
'';
|
||||
license = with lib.licenses; [ gpl2Plus ];
|
||||
mainProgram = "worker";
|
||||
maintainers = with lib.maintainers; [ AndersonTorres ];
|
||||
inherit (libX11.meta) platforms;
|
||||
};
|
||||
})
|
||||
|
|
@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
homepage = "https://zealdocs.org/";
|
||||
changelog = "https://github.com/zealdocs/zeal/releases";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ skeidel peterhoeg AndersonTorres ];
|
||||
maintainers = with lib.maintainers; [ peterhoeg AndersonTorres ];
|
||||
inherit (qtbase.meta) platforms;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cairo";
|
||||
version = "2.2.0";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "starkware-libs";
|
||||
repo = "cairo";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-X8CqiikY1/S8/WxrZbcwOB+bz0PJsNpuLWLb+k3+5kw=";
|
||||
hash = "sha256-5UOLfsNgtg5EDDId23ysmWfeqMeh8R2UfMeBAtFCx6s=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-jrUH3vmTbbxod547JAE5sOSo+FR15XNgVpM15uXAsvg=";
|
||||
cargoHash = "sha256-YoPStyPeEqLoUvGLEPwXR8XVhXtb6XwFuPNoDCiT7OA=";
|
||||
|
||||
nativeCheckInputs = [
|
||||
rustfmt
|
||||
|
|
|
|||
|
|
@ -55,6 +55,6 @@ in stdenv.mkDerivation rec {
|
|||
homepage = "http://smalltalk.gnu.org/";
|
||||
license = with licenses; [ gpl2 lgpl2 ];
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ skeidel ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kotlin-native";
|
||||
version = "1.9.10";
|
||||
version = "1.9.20";
|
||||
|
||||
src = let
|
||||
getArch = {
|
||||
|
|
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
|||
getHash = arch: {
|
||||
"macos-aarch64" = "1pn371hy6hkyji4vkfiw3zw30wy0yyfhkxnkkyr8m0609945mkyj";
|
||||
"macos-x86_64" = "13c28czvja93zaff0kzqf8crzh998l90gznq0cl6k2j3c0jhyrgm";
|
||||
"linux-x86_64" = "0nxaiwn4akfpkibq42y8kfn5hdd7vzkm296qx4a9ai7l36cngcqx";
|
||||
"linux-x86_64" = "sha256-faMuBYUG5qj0N4vg5EcfWIC3UjXiPhFJuikzXVgNsjw=";
|
||||
}.${arch};
|
||||
in
|
||||
fetchurl {
|
||||
|
|
|
|||
|
|
@ -1,47 +0,0 @@
|
|||
{ lib, stdenv, fetchurl, autoconf, bison, boost, flex, texinfo, zlib, gputils ? null
|
||||
, excludePorts ? [] }:
|
||||
|
||||
let
|
||||
# choices: mcs51 z80 z180 r2k r3ka gbz80 tlcs90 ds390 ds400 pic14 pic16 hc08 s08 stm8
|
||||
excludedPorts = excludePorts ++ (lib.optionals (gputils == null) [ "pic14" "pic16" ]);
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sdcc";
|
||||
version = "4.2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/sdcc/sdcc-src-${version}.tar.bz2";
|
||||
sha256 = "sha256-tJuuHSO81gV6gsT/5WE/nNDLz9HpQOnYTEv+nfCowFM=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
buildInputs = [ boost gputils texinfo zlib ];
|
||||
|
||||
nativeBuildInputs = [ autoconf bison flex ];
|
||||
|
||||
configureFlags = map (f: "--disable-${f}-port") excludedPorts;
|
||||
|
||||
preConfigure = ''
|
||||
if test -n "''${dontStrip-}"; then
|
||||
export STRIP=none
|
||||
fi
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Small Device C Compiler";
|
||||
longDescription = ''
|
||||
SDCC is a retargettable, optimizing ANSI - C compiler suite that targets
|
||||
the Intel MCS51 based microprocessors (8031, 8032, 8051, 8052, etc.), Maxim
|
||||
(formerly Dallas) DS80C390 variants, Freescale (formerly Motorola) HC08 based
|
||||
(hc08, s08) and Zilog Z80 based MCUs (z80, z180, gbz80, Rabbit 2000/3000,
|
||||
Rabbit 3000A). Work is in progress on supporting the Microchip PIC16 and
|
||||
PIC18 targets. It can be retargeted for other microprocessors.
|
||||
'';
|
||||
homepage = "https://sdcc.sourceforge.net/";
|
||||
license = with licenses; if (gputils == null) then gpl2Plus else unfreeRedistributable;
|
||||
maintainers = with maintainers; [ bjornfor yorickvp ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -29,6 +29,6 @@ stdenv.mkDerivation {
|
|||
homepage = "http://roguecentral.org/doryen/libtcod/";
|
||||
license = lib.licenses.bsd3;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = [ lib.maintainers.skeidel ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -47,6 +47,11 @@ stdenv.mkDerivation rec {
|
|||
"-DNO_OPENCL=1"
|
||||
];
|
||||
|
||||
preBuild = let maxBuildCores = 16; in lib.optionalString cudaSupport ''
|
||||
# https://github.com/PixarAnimationStudios/OpenSubdiv/issues/1313
|
||||
NIX_BUILD_CORES=$(( NIX_BUILD_CORES < ${toString maxBuildCores} ? NIX_BUILD_CORES : ${toString maxBuildCores} ))
|
||||
'';
|
||||
|
||||
postInstall = "rm $out/lib/*.a";
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -44,6 +44,6 @@ stdenv.mkDerivation {
|
|||
homepage = "https://github.com/Swordfish90/qmltermwidget";
|
||||
license = lib.licenses.gpl2;
|
||||
platforms = with lib.platforms; linux ++ darwin;
|
||||
maintainers = with lib.maintainers; [ skeidel ];
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioesphomeapi";
|
||||
version = "18.3.0";
|
||||
version = "18.4.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -31,7 +31,7 @@ buildPythonPackage rec {
|
|||
owner = "esphome";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-hIwVnslBxWMjWxj1NN8If4MQn2jpFYyjmAVykQeY0hc=";
|
||||
hash = "sha256-jSPoVMtGRtqpDFagjvLTxps5plcN92Mp9vjtQlmqyGg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
let
|
||||
pname = "chacha20poly1305-reuseable";
|
||||
version = "0.10.2";
|
||||
version = "0.11.0";
|
||||
in
|
||||
|
||||
buildPythonPackage {
|
||||
|
|
@ -30,7 +30,7 @@ buildPythonPackage {
|
|||
owner = "bdraco";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-jLaYdVNgjpy/fjjt9om72jirgMaM61T/OZu/iHZ/W4k=";
|
||||
hash = "sha256-uRndA0NnSQtJTftALzBF3FWZtavRyMwBlnCBqoIXE5Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,19 +1,19 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, cython
|
||||
, cython_3
|
||||
, isPyPy
|
||||
, ipython
|
||||
, python
|
||||
, scikit-build
|
||||
, cmake
|
||||
, pythonOlder
|
||||
, pytestCheckHook
|
||||
, ubelt
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "line-profiler";
|
||||
version = "4.0.2";
|
||||
version = "4.1.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6" || isPyPy;
|
||||
|
|
@ -21,22 +21,23 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
pname = "line_profiler";
|
||||
inherit version;
|
||||
hash = "sha256-JejJ1CSNxIkFgBhR/4p1ucdIJ6CHHRGNEQTY5D1/sPw=";
|
||||
hash = "sha256-qlZXiw/1p1b+GAs/2nvWfCe71Hiz0BJGEtjPAOSiHfI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cython
|
||||
cython_3
|
||||
cmake
|
||||
scikit-build
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
ipython
|
||||
];
|
||||
passthru.optional-dependencies = {
|
||||
ipython = [ ipython ];
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
ubelt
|
||||
] ++ passthru.optional-dependencies.ipython;
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
|
|
@ -44,8 +45,9 @@ buildPythonPackage rec {
|
|||
rm -f _line_profiler.c
|
||||
'';
|
||||
|
||||
checkPhase = ''
|
||||
PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH cd tests && ${python.interpreter} -m unittest discover -s .
|
||||
preCheck = ''
|
||||
rm -r line_profiler
|
||||
export PATH=$out/bin:$PATH
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
|
@ -27,6 +27,6 @@ buildPythonPackage rec {
|
|||
'';
|
||||
homepage = "https://github.com/gpodder/mygpoclient";
|
||||
license = with licenses; [ gpl3 ];
|
||||
maintainers = with maintainers; [ skeidel ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -72,5 +72,6 @@ buildPythonPackage rec {
|
|||
changelog = "https://github.com/containers/podman-py/releases/tag/v${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
mainProgram = "podman";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,14 +14,14 @@
|
|||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "qpsolvers";
|
||||
version = "4.0.0";
|
||||
version = "4.0.1";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qpsolvers";
|
||||
repo = "qpsolvers";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-KkV61pBkIh+4Qav9TVobEBUCyMa6Xqg+eygnOoQRpcQ=";
|
||||
hash = "sha256-s1d8oTrmptS3exUqn9HSSla6P4dIxS/qNalsDTbFmFs=";
|
||||
};
|
||||
|
||||
pythonImportsCheck = [ "qpsolvers" ];
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "rns";
|
||||
version = "0.6.6";
|
||||
version = "0.6.7";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
owner = "markqvist";
|
||||
repo = "Reticulum";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-GKvtplzvSHCsSA4KJvtltzDy/gKpeFx05Ib1j69c09g=";
|
||||
hash = "sha256-u5GMCM9HyrblGbmIvfDWTfIAV8Zpn8tF0oOaolFtQMk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "sagemaker";
|
||||
version = "2.193.0";
|
||||
version = "2.197.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -35,7 +35,7 @@ buildPythonPackage rec {
|
|||
owner = "aws";
|
||||
repo = "sagemaker-python-sdk";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-5wMLzZjHgHGuIBxG0GNOVj1t32kEJ9scrS6bA6IW4WY=";
|
||||
hash = "sha256-d4HbwzgVfuo6n4FD/nl88XeQi/FPRrlq8AIV/eZz9f4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
70
pkgs/development/python-modules/ubelt/default.nix
Normal file
70
pkgs/development/python-modules/ubelt/default.nix
Normal file
|
|
@ -0,0 +1,70 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
, wheel
|
||||
, numpy
|
||||
, python-dateutil
|
||||
, xxhash
|
||||
, pytestCheckHook
|
||||
, requests
|
||||
, xdoctest
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ubelt";
|
||||
version = "1.3.4";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Erotemic";
|
||||
repo = "ubelt";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-pvCmmdPRLupMUCiOvfa+JTX8NPFZ/UcXSPEaaDG3eTk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
wheel
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
optional = [
|
||||
numpy
|
||||
python-dateutil
|
||||
xxhash
|
||||
];
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
requests
|
||||
xdoctest
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$TMPDIR
|
||||
'';
|
||||
|
||||
disabledTests = lib.optionals stdenv.isDarwin [
|
||||
# fail due to sandbox environment
|
||||
"CacheStamp.expired"
|
||||
"userhome"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "ubelt" ];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Python utility library with a stdlib like feel and extra batteries. Paths, Progress, Dicts, Downloads, Caching, Hashing: ubelt makes it easy";
|
||||
homepage = "https://github.com/Erotemic/ubelt";
|
||||
changelog = "https://github.com/Erotemic/ubelt/blob/${src.rev}/CHANGELOG.md";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ natsukium ];
|
||||
};
|
||||
}
|
||||
|
|
@ -85,5 +85,6 @@ buildPythonPackage rec {
|
|||
changelog = "https://github.com/pimutils/vdirsyncer/blob/v${version}/CHANGELOG.rst";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ loewenheim ];
|
||||
mainProgram = "vdirsyncer";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
48
pkgs/development/python-modules/xdoctest/default.nix
Normal file
48
pkgs/development/python-modules/xdoctest/default.nix
Normal file
|
|
@ -0,0 +1,48 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
, wheel
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "xdoctest";
|
||||
version = "1.1.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Erotemic";
|
||||
repo = "xdoctest";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-yTu5ldr9TkpYRP8hjgUPpexBVLjaK2gfPvISjMJLY74=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
wheel
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$TMPDIR
|
||||
export PATH=$out/bin:$PATH
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "xdoctest" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A rewrite of Python's builtin doctest module (with pytest plugin integration) with AST instead of REGEX";
|
||||
homepage = "https://github.com/Erotemic/xdoctest";
|
||||
changelog = "https://github.com/Erotemic/xdoctest/blob/${src.rev}/CHANGELOG.md";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ natsukium ];
|
||||
mainProgram = "xdoctest";
|
||||
};
|
||||
}
|
||||
|
|
@ -2,17 +2,17 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "inferno";
|
||||
version = "0.11.17";
|
||||
version = "0.11.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jonhoo";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-RDxHQgKVMqTFjiuxF87l4OXcAG9zIG8Xr0cnp/0J4Wg=";
|
||||
hash = "sha256-JP0n1sepH9kFOdrKTmt7Q79pe4GQInYKQH3xi2/G59s=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
cargoHash = "sha256-wQLECnW+z62okJKpebNvUeRCiUfbuHCou1/uhO8gH+0=";
|
||||
cargoHash = "sha256-YCa4WL2sgdITKfdfH3PGdiRHbSkE6JSJRHipaN00GwA=";
|
||||
|
||||
# skip flaky tests
|
||||
checkFlags = [
|
||||
|
|
|
|||
|
|
@ -16,14 +16,14 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "cvise";
|
||||
version = "2.8.0";
|
||||
version = "2.9.0";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "marxin";
|
||||
repo = "cvise";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-9HFCFgpRXqefFJLulwvi6nx0fl0G6IXI9gSinekJXRU=";
|
||||
hash = "sha256-4LEKVh3jNU3xOq75+IQezjhbL/6uAGQ3r0Au2cxx1WA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
|
|||
description = "A roguelike game";
|
||||
homepage = "https://sites.google.com/site/broguegame/";
|
||||
license = licenses.agpl3;
|
||||
maintainers = [ maintainers.skeidel ];
|
||||
maintainers = [ ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ let
|
|||
|
||||
meta = common.meta // {
|
||||
maintainers = with lib.maintainers;
|
||||
common.meta.maintainers ++ [ skeidel ];
|
||||
common.meta.maintainers;
|
||||
changelog = "https://github.com/CleverRaven/Cataclysm-DDA/blob/${version}/data/changelog.txt";
|
||||
};
|
||||
});
|
||||
|
|
|
|||
|
|
@ -24,11 +24,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "hikounomizu";
|
||||
version = "1.0";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.tuxfamily.org/hnm/${version}/hikounomizu-${version}-src.tar.bz2";
|
||||
hash = "sha256-Hw/BA7jOW9KGdde1NLDh4SfQXxvZkNGx/sHXukgFZ5M=";
|
||||
hash = "sha256-3wRhe6CDq1dD0SObAygfqslYJx+EM3LM3rj6HI0whYU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, ninja
|
||||
, p7zip
|
||||
|
|
@ -47,23 +46,13 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
inherit pname;
|
||||
version = "4.3.5";
|
||||
version = "4.4.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/${pname}/releases/${version}/${pname}_src.tar.xz";
|
||||
sha256 = "sha256-AdYI9vljjhTXyFffQK0znBv8IHoF2q/nFXrYZSo0BcM=";
|
||||
hash = "sha256-Ul77OihJWIH9H6FUpibGDjqX1BY4DWDQ3bR4lRDY9+U=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Upstream patch for curl-8.4 support,
|
||||
# TODO: remove on next release.
|
||||
(fetchpatch {
|
||||
name = "curl-8.4.patch";
|
||||
url = "https://github.com/Warzone2100/warzone2100/commit/db1cf70950d4fa6630f37a7bf85f548b48ed53cd.patch";
|
||||
hash = "sha256-/jRan5pi7CamZaCaRdfugFmtCbWTKmCt63q0NBuTrFk=";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
SDL2
|
||||
libtheora
|
||||
|
|
|
|||
|
|
@ -4,6 +4,8 @@ in {
|
|||
stdenvNoCC,
|
||||
fetchzip,
|
||||
lib,
|
||||
rdfind,
|
||||
which,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
|
|
@ -15,6 +17,11 @@ stdenvNoCC.mkDerivation rec {
|
|||
hash = source.sourceHash;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
rdfind
|
||||
which
|
||||
];
|
||||
|
||||
installFlags = [ "DESTDIR=$(out)" ];
|
||||
|
||||
# Firmware blobs do not need fixing and should not be modified
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
# This file is autogenerated! Run ./update.sh to regenerate.
|
||||
{
|
||||
version = "20231030";
|
||||
revision = "20231030";
|
||||
sourceHash = "sha256-ocqikHJfvs4gWqnBeLgSnXHzUTPi8l8cSfNarhD8G3w=";
|
||||
outputHash = "sha256-vaMYuAqkkuyY+bAxAe0uAokWZ7HlaR62UTu4L8yOofs=";
|
||||
version = "20231111";
|
||||
revision = "20231111";
|
||||
sourceHash = "sha256-S9Xkj2CbamHxqjTDfqRJu91MNrSntxrQ7HYyhvdH6Jo=";
|
||||
outputHash = "sha256-Qrz9fSHUQf0Gl8pfol4yfe95sD8DQV/+riT1NCFussQ=";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dolibarr";
|
||||
version = "18.0.2";
|
||||
version = "18.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Dolibarr";
|
||||
repo = "dolibarr";
|
||||
rev = version;
|
||||
sha256 = "sha256-dlyq+ZrsiodYwZqzFLdR067O6gaePdPIX3N0xvXLcwg=";
|
||||
sha256 = "sha256-8RZqzuMjy83WNvIBpNxjJpfuILCXIuwP0mrs+/cSTns=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
|
|
|||
|
|
@ -57,5 +57,6 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ bluescreen303 thoughtpolice ];
|
||||
platforms = platforms.linux;
|
||||
mainProgram = "duperemove";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -116,5 +116,6 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.lgpl2Plus;
|
||||
maintainers = with maintainers; [ kovirobi ];
|
||||
platforms = platforms.unix;
|
||||
mainProgram = "vips";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, autoreconfHook
|
||||
, intltool
|
||||
, libxml2
|
||||
|
|
@ -34,6 +35,14 @@ stdenv.mkDerivation rec {
|
|||
ddccontrol-db
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Upstream commit, fixed the version number in v1.0.0
|
||||
(fetchpatch {
|
||||
url = "https://github.com/ddccontrol/ddccontrol/commit/fc8c5b5d0f2b64b08b95f4a7d8f47f2fd8ceec34.patch";
|
||||
hash = "sha256-SB1BaolTNCUYgj38nMg1uLUqOHvnwCr8T3cnfu/7rjI=";
|
||||
})
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system"
|
||||
];
|
||||
|
|
|
|||
|
|
@ -24,5 +24,6 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
platforms = platforms.unix;
|
||||
mainProgram = "dynamic-colors";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -48,5 +48,6 @@ buildPythonApplication rec {
|
|||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ azahi lovek323 AndersonTorres peterhoeg ];
|
||||
platforms = platforms.unix;
|
||||
mainProgram = "grc";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ in stdenv.mkDerivation rec {
|
|||
homepage = "http://pipelight.net/";
|
||||
license = with lib.licenses; [ mpl11 gpl2 lgpl21 ];
|
||||
description = "A wrapper for using Windows plugins in Linux browsers";
|
||||
maintainers = with lib.maintainers; [ skeidel ];
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
platforms = [ "x86_64-linux" "i686-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,5 +31,6 @@ stdenv.mkDerivation rec {
|
|||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = [ lib.maintainers.devhell ];
|
||||
mainProgram = "profile-cleaner";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
, libsecret
|
||||
, python3
|
||||
, pkg-config
|
||||
, nodejs
|
||||
, nodePackages
|
||||
, electron
|
||||
, makeWrapper
|
||||
, makeDesktopItem
|
||||
|
|
@ -63,6 +63,7 @@ stdenvNoCC.mkDerivation rec {
|
|||
nativeBuildInputs = [
|
||||
python3
|
||||
pkg-config
|
||||
nodePackages.node-gyp
|
||||
];
|
||||
buildInputs = [
|
||||
libsecret
|
||||
|
|
@ -75,17 +76,6 @@ stdenvNoCC.mkDerivation rec {
|
|||
};
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
# Set up headers for node-gyp, which is needed to build keytar.
|
||||
mkdir -p "$HOME/.cache/node-gyp/${nodejs.version}"
|
||||
|
||||
# Set up version which node-gyp checks in <https://github.com/nodejs/node-gyp/blob/4937722cf597ccd1953628f3d5e2ab5204280051/lib/install.js#L87-L96> against the version in <https://github.com/nodejs/node-gyp/blob/4937722cf597ccd1953628f3d5e2ab5204280051/package.json#L15>.
|
||||
echo 9 > "$HOME/.cache/node-gyp/${nodejs.version}/installVersion"
|
||||
|
||||
# Link node headers so that node-gyp does not try to download them.
|
||||
ln -sfv "${nodejs}/include" "$HOME/.cache/node-gyp/${nodejs.version}"
|
||||
'';
|
||||
|
||||
packageJSON = "${src}/package.json";
|
||||
yarnLock = ./yarn.lock;
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mu";
|
||||
version = "1.10.7";
|
||||
version = "1.10.8";
|
||||
|
||||
outputs = [ "out" "mu4e" ];
|
||||
|
||||
|
|
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "djcb";
|
||||
repo = "mu";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-x1TsyTOK5U6/Y3QInm+XQ7T32X49iwa+4UnaHdiyqCI=";
|
||||
hash = "sha256-cDfW0yXA+0fZY5lv4XCHWu+5B0svpMeVMf8ttX/z4Og=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://www.jabberwocky.com/software/paperkey/";
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ skeidel ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -48,6 +48,7 @@ stdenv.mkDerivation {
|
|||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ kaction ];
|
||||
platforms = platforms.unix;
|
||||
mainProgram = "passage";
|
||||
|
||||
longDescription = ''
|
||||
passage is a fork of password-store (https://www.passwordstore.org) that uses
|
||||
|
|
|
|||
|
|
@ -50,5 +50,6 @@ python3Packages.buildPythonApplication rec {
|
|||
homepage = "https://gitlab.com/latex-rubber/rubber";
|
||||
maintainers = with maintainers; [ ttuegel peterhoeg ];
|
||||
platforms = platforms.unix;
|
||||
mainProgram = "rubber";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2999,8 +2999,6 @@ with pkgs;
|
|||
|
||||
walk = callPackage ../applications/file-managers/walk { };
|
||||
|
||||
worker = callPackage ../applications/file-managers/worker { };
|
||||
|
||||
xfe = callPackage ../applications/file-managers/xfe {
|
||||
fox = fox_1_6;
|
||||
};
|
||||
|
|
@ -4888,7 +4886,7 @@ with pkgs;
|
|||
clipster = callPackage ../tools/misc/clipster { };
|
||||
|
||||
clockify = callPackage ../applications/office/clockify {
|
||||
electron = electron_11;
|
||||
electron = electron_24;
|
||||
};
|
||||
|
||||
contrast = callPackage ../applications/accessibility/contrast { };
|
||||
|
|
@ -17269,10 +17267,6 @@ with pkgs;
|
|||
|
||||
scryer-prolog = callPackage ../development/compilers/scryer-prolog { };
|
||||
|
||||
sdcc = callPackage ../development/compilers/sdcc {
|
||||
gputils = null;
|
||||
};
|
||||
|
||||
seren = callPackage ../applications/networking/instant-messengers/seren { };
|
||||
|
||||
serialdv = callPackage ../development/libraries/serialdv { };
|
||||
|
|
|
|||
|
|
@ -221,6 +221,7 @@ mapAliases ({
|
|||
lazr_delegates = lazr-delegates; # added 2023-11-03
|
||||
lazy_imports = lazy-imports; # added 2023-10-13
|
||||
lektor = throw "lektor has been promoted to a top-level attribute"; # added 2023-08-01
|
||||
line_profiler = line-profiler; # added 2023-11-04
|
||||
logilab_astng = throw "logilab-astng has not been released since 2013 and is unmaintained"; # added 2022-11-29
|
||||
logilab_common = logilab-common; # added 2022-11-21
|
||||
loo-py = loopy; # added 2022-05-03
|
||||
|
|
|
|||
|
|
@ -6336,7 +6336,7 @@ self: super: with self; {
|
|||
|
||||
lineedit = callPackage ../development/python-modules/lineedit { };
|
||||
|
||||
line_profiler = callPackage ../development/python-modules/line_profiler { };
|
||||
line-profiler = callPackage ../development/python-modules/line-profiler { };
|
||||
|
||||
linetable = callPackage ../development/python-modules/linetable { };
|
||||
|
||||
|
|
@ -15157,6 +15157,8 @@ self: super: with self; {
|
|||
|
||||
uasiren = callPackage ../development/python-modules/uasiren { };
|
||||
|
||||
ubelt = callPackage ../development/python-modules/ubelt { };
|
||||
|
||||
uc-micro-py = callPackage ../development/python-modules/uc-micro-py { };
|
||||
|
||||
ucsmsdk = callPackage ../development/python-modules/ucsmsdk { };
|
||||
|
|
@ -15787,6 +15789,8 @@ self: super: with self; {
|
|||
|
||||
xdis = callPackage ../development/python-modules/xdis { };
|
||||
|
||||
xdoctest = callPackage ../development/python-modules/xdoctest { };
|
||||
|
||||
xdot = callPackage ../development/python-modules/xdot {
|
||||
inherit (pkgs) graphviz;
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in a new issue