Compare commits
No commits in common. "b6d85c936f8861cf2ce5221e1924dabfb096c34b" and "f0d74452855ce80495b2cc07230ca0f6d3163624" have entirely different histories.
b6d85c936f
...
f0d7445285
|
|
@ -14,7 +14,7 @@
|
|||
</p>
|
||||
|
||||
[Nixpkgs](https://github.com/nixos/nixpkgs) is a collection of over
|
||||
100,000 software packages that can be installed with the
|
||||
80,000 software packages that can be installed with the
|
||||
[Nix](https://nixos.org/nix/) package manager. It also implements
|
||||
[NixOS](https://nixos.org/nixos/), a purely-functional Linux distribution.
|
||||
|
||||
|
|
|
|||
|
|
@ -146,7 +146,7 @@ let
|
|||
scrubOptionValue literalExpression literalExample
|
||||
showOption showOptionWithDefLocs showFiles
|
||||
unknownModule mkOption mkPackageOption mkPackageOptionMD
|
||||
mdDoc literalMD;
|
||||
literalMD;
|
||||
inherit (self.types) isType setType defaultTypeMerge defaultFunctor
|
||||
isOptionType mkOptionType;
|
||||
inherit (self.asserts)
|
||||
|
|
|
|||
|
|
@ -404,7 +404,7 @@ rec {
|
|||
Kept here to alert downstream users who may not be aware of the migration's
|
||||
completion that it should be removed from modules.
|
||||
*/
|
||||
mdDoc = lib.warn "lib.mdDoc will be removed from nixpkgs in 24.11. Option descriptions are now in Markdown by default; you can remove any remaining uses of lib.mdDoc.";
|
||||
mdDoc = lib.warn "lib.mdDoc was removed from nixpkgs. Option descriptions are now in Markdown by default, you can remove any remaining uses of it.";
|
||||
|
||||
/* For use in the `defaultText` and `example` option attributes. Causes the
|
||||
given MD text to be inserted verbatim in the documentation, for when
|
||||
|
|
|
|||
|
|
@ -58,10 +58,6 @@
|
|||
nix-build lib/tests/maintainers.nix
|
||||
|
||||
See `./scripts/check-maintainer-github-handles.sh` for an example on how to work with this data.
|
||||
|
||||
When adding a new maintainer, be aware of the current commit conventions
|
||||
documented at [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#commit-conventions)
|
||||
file located in the root of the Nixpkgs repo.
|
||||
*/
|
||||
{
|
||||
_0b11stan = {
|
||||
|
|
@ -19037,6 +19033,12 @@
|
|||
githubId = 2798728;
|
||||
name = "Filip Czaplicki";
|
||||
};
|
||||
star-szr = {
|
||||
email = "nixpkgs@szr.fastmail.com";
|
||||
github = "star-szr";
|
||||
githubId = 327943;
|
||||
name = "Scott Zhu Reeves";
|
||||
};
|
||||
starzation = {
|
||||
email = "nixpkgs@starzation.net";
|
||||
github = "starzation";
|
||||
|
|
@ -20257,11 +20259,6 @@
|
|||
githubId = 9853194;
|
||||
name = "Philipp Bartsch";
|
||||
};
|
||||
toast = {
|
||||
name = "Toast";
|
||||
github = "toast003";
|
||||
githubId = 39011842;
|
||||
};
|
||||
toastal = {
|
||||
email = "toastal+nix@posteo.net";
|
||||
matrix = "@toastal:mozilla.org";
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ In addition to numerous new and updated packages, this release has the following
|
|||
|
||||
- [alertmanager-irc-relay](https://github.com/google/alertmanager-irc-relay), a Prometheus Alertmanager IRC Relay. Available as [services.prometheus.alertmanagerIrcRelay](options.html#opt-services.prometheus.alertmanagerIrcRelay.enable).
|
||||
|
||||
- [alice-lg](https://github.com/alice-lg/alice-lg), a looking-glass for BGP sessions. Available as [services.alice-lg](#opt-services.alice-lg.enable).
|
||||
- [alice-lg](github.com/alice-lg/alice-lg), a looking-glass for BGP sessions. Available as [services.alice-lg](#opt-services.alice-lg.enable).
|
||||
|
||||
- [atuin](https://github.com/ellie/atuin), a sync server for shell history. Available as [services.atuin](#opt-services.atuin.enable).
|
||||
|
||||
|
|
|
|||
|
|
@ -118,8 +118,6 @@ Use `services.pipewire.extraConfig` or `services.pipewire.configPackages` for Pi
|
|||
Matter Controller Server exposing websocket connections for use with other services, notably Home Assistant.
|
||||
Available as [services.matter-server](#opt-services.matter-server.enable)
|
||||
|
||||
- [db-rest](https://github.com/derhuerst/db-rest), a wrapper around Deutsche Bahn's internal API for public transport data. Available as [services.db-rest](#opt-services.db-rest.enable).
|
||||
|
||||
- [Anki Sync Server](https://docs.ankiweb.net/sync-server.html), the official sync server built into recent versions of Anki. Available as [services.anki-sync-server](#opt-services.anki-sync-server.enable).
|
||||
The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been marked deprecated and will be dropped after 24.05 due to lack of maintenance of the anki-sync-server softwares.
|
||||
|
||||
|
|
|
|||
|
|
@ -690,7 +690,6 @@
|
|||
./services/misc/clipmenu.nix
|
||||
./services/misc/confd.nix
|
||||
./services/misc/cpuminer-cryptonight.nix
|
||||
./services/misc/db-rest.nix
|
||||
./services/misc/devmon.nix
|
||||
./services/misc/dictd.nix
|
||||
./services/misc/disnix.nix
|
||||
|
|
|
|||
|
|
@ -1,182 +0,0 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
let
|
||||
inherit (lib) mkOption types mkIf mkMerge mkDefault mkEnableOption mkPackageOption maintainers;
|
||||
cfg = config.services.db-rest;
|
||||
in
|
||||
{
|
||||
options = {
|
||||
services.db-rest = {
|
||||
enable = mkEnableOption "db-rest service";
|
||||
|
||||
user = mkOption {
|
||||
type = types.str;
|
||||
default = "db-rest";
|
||||
description = "User account under which db-rest runs.";
|
||||
};
|
||||
|
||||
group = mkOption {
|
||||
type = types.str;
|
||||
default = "db-rest";
|
||||
description = "Group under which db-rest runs.";
|
||||
};
|
||||
|
||||
host = mkOption {
|
||||
type = types.str;
|
||||
default = "127.0.0.1";
|
||||
description = "The host address the db-rest server should listen on.";
|
||||
};
|
||||
|
||||
port = mkOption {
|
||||
type = types.port;
|
||||
default = 3000;
|
||||
description = "The port the db-rest server should listen on.";
|
||||
};
|
||||
|
||||
redis = {
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = "Enable caching with redis for db-rest.";
|
||||
};
|
||||
|
||||
createLocally = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = "Configure a local redis server for db-rest.";
|
||||
};
|
||||
|
||||
host = mkOption {
|
||||
type = with types; nullOr str;
|
||||
default = null;
|
||||
description = "Redis host.";
|
||||
};
|
||||
|
||||
port = mkOption {
|
||||
type = with types; nullOr port;
|
||||
default = null;
|
||||
description = "Redis port.";
|
||||
};
|
||||
|
||||
user = mkOption {
|
||||
type = with types; nullOr str;
|
||||
default = null;
|
||||
description = "Optional username used for authentication with redis.";
|
||||
};
|
||||
|
||||
passwordFile = mkOption {
|
||||
type = with types; nullOr path;
|
||||
default = null;
|
||||
example = "/run/keys/db-rest/pasword-redis-db";
|
||||
description = "Path to a file containing the redis password.";
|
||||
};
|
||||
|
||||
useSSL = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = "Use SSL if using a redis network connection.";
|
||||
};
|
||||
};
|
||||
|
||||
package = mkPackageOption pkgs "db-rest" { };
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
assertions = [
|
||||
{
|
||||
assertion = (cfg.redis.enable && !cfg.redis.createLocally) -> (cfg.redis.host != null && cfg.redis.port != null);
|
||||
message = ''
|
||||
{option}`services.db-rest.redis.createLocally` and redis network connection ({option}`services.db-rest.redis.host` or {option}`services.db-rest.redis.port`) enabled. Disable either of them.
|
||||
'';
|
||||
}
|
||||
{
|
||||
assertion = (cfg.redis.enable && !cfg.redis.createLocally) -> (cfg.redis.passwordFile != null);
|
||||
message = ''
|
||||
{option}`services.db-rest.redis.createLocally` is disabled, but {option}`services.db-rest.redis.passwordFile` is not set.
|
||||
'';
|
||||
}
|
||||
];
|
||||
|
||||
systemd.services.db-rest = mkMerge [
|
||||
{
|
||||
description = "db-rest service";
|
||||
after = [ "network.target" ]
|
||||
++ lib.optional cfg.redis.createLocally "redis-db-rest.service";
|
||||
requires = lib.optional cfg.redis.createLocally "redis-db-rest.service";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig = {
|
||||
Type = "simple";
|
||||
Restart = "always";
|
||||
RestartSec = 5;
|
||||
WorkingDirectory = cfg.package;
|
||||
User = cfg.user;
|
||||
Group = cfg.group;
|
||||
RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ];
|
||||
MemoryDenyWriteExecute = false;
|
||||
LoadCredential = lib.optional (cfg.redis.enable && cfg.redis.passwordFile != null) "REDIS_PASSWORD:${cfg.redis.passwordFile}";
|
||||
ExecStart = mkDefault "${cfg.package}/bin/db-rest";
|
||||
|
||||
RemoveIPC = true;
|
||||
NoNewPrivileges = true;
|
||||
PrivateDevices = true;
|
||||
ProtectClock = true;
|
||||
ProtectKernelLogs = true;
|
||||
ProtectControlGroups = true;
|
||||
ProtectKernelModules = true;
|
||||
PrivateMounts = true;
|
||||
SystemCallArchitectures = "native";
|
||||
ProtectHostname = true;
|
||||
LockPersonality = true;
|
||||
ProtectKernelTunables = true;
|
||||
RestrictRealtime = true;
|
||||
RestrictSUIDSGID = true;
|
||||
RestrictNamespaces = true;
|
||||
ProtectSystem = "strict";
|
||||
ProtectProc = "invisible";
|
||||
ProcSubset = "pid";
|
||||
ProtectHome = true;
|
||||
PrivateUsers = true;
|
||||
PrivateTmp = true;
|
||||
CapabilityBoundingSet = "";
|
||||
};
|
||||
environment = {
|
||||
NODE_ENV = "production";
|
||||
NODE_EXTRA_CA_CERTS = "/etc/ssl/certs/ca-certificates.crt";
|
||||
HOSTNAME = cfg.host;
|
||||
PORT = toString cfg.port;
|
||||
};
|
||||
}
|
||||
(mkIf cfg.redis.enable (if cfg.redis.createLocally then
|
||||
{ environment.REDIS_URL = config.services.redis.servers.db-rest.unixSocket; }
|
||||
else
|
||||
{
|
||||
script =
|
||||
let
|
||||
username = lib.optionalString (cfg.redis.user != null) (cfg.redis.user);
|
||||
host = cfg.redis.host;
|
||||
port = toString cfg.redis.port;
|
||||
protocol = if cfg.redis.useSSL then "rediss" else "redis";
|
||||
in
|
||||
''
|
||||
export REDIS_URL="${protocol}://${username}:$(${config.systemd.package}/bin/systemd-creds cat REDIS_PASSWORD)@${host}:${port}"
|
||||
exec ${cfg.package}/bin/db-rest
|
||||
'';
|
||||
}))
|
||||
];
|
||||
|
||||
users.users = lib.mkMerge [
|
||||
(lib.mkIf (cfg.user == "db-rest") {
|
||||
db-rest = {
|
||||
isSystemUser = true;
|
||||
group = cfg.group;
|
||||
};
|
||||
})
|
||||
(lib.mkIf cfg.redis.createLocally { ${cfg.user}.extraGroups = [ "redis-db-rest" ]; })
|
||||
];
|
||||
|
||||
users.groups = lib.mkIf (cfg.group == "db-rest") { db-rest = { }; };
|
||||
|
||||
services.redis.servers.db-rest.enable = cfg.redis.enable && cfg.redis.createLocally;
|
||||
};
|
||||
meta.maintainers = with maintainers; [ marie ];
|
||||
}
|
||||
|
|
@ -152,7 +152,9 @@ let
|
|||
copyKeys = concatStrings (mapAttrsToList (keyName: keyOptions: ''
|
||||
secret=$(cat "${keyOptions.keyFile}")
|
||||
dest="${stateDir}/private/${keyName}"
|
||||
install -m 0400 -o "${username}" -g "${username}" <(echo " secret: \"$secret\"") "$dest"
|
||||
echo " secret: \"$secret\"" > "$dest"
|
||||
chown ${username}:${username} "$dest"
|
||||
chmod 0400 "$dest"
|
||||
'') cfg.keys);
|
||||
|
||||
|
||||
|
|
@ -455,7 +457,9 @@ let
|
|||
dnssecTools = pkgs.bind.override { enablePython = true; };
|
||||
|
||||
signZones = optionalString dnssec ''
|
||||
install -m 0600 -o "${username}" -g "${username}" -d "${stateDir}/dnssec"
|
||||
mkdir -p ${stateDir}/dnssec
|
||||
chown ${username}:${username} ${stateDir}/dnssec
|
||||
chmod 0600 ${stateDir}/dnssec
|
||||
|
||||
${concatStrings (mapAttrsToList signZone dnssecZones)}
|
||||
'';
|
||||
|
|
@ -957,9 +961,9 @@ in
|
|||
rm -Rf "${stateDir}/private/"
|
||||
rm -Rf "${stateDir}/tmp/"
|
||||
|
||||
install -dm 0700 -o "${username}" -g "${username}" "${stateDir}/private"
|
||||
install -dm 0700 -o "${username}" -g "${username}" "${stateDir}/tmp"
|
||||
install -dm 0700 -o "${username}" -g "${username}" "${stateDir}/var"
|
||||
mkdir -m 0700 -p "${stateDir}/private"
|
||||
mkdir -m 0700 -p "${stateDir}/tmp"
|
||||
mkdir -m 0700 -p "${stateDir}/var"
|
||||
|
||||
cat > "${stateDir}/don't touch anything in here" << EOF
|
||||
Everything in this directory except NSD's state in var and dnssec
|
||||
|
|
@ -967,6 +971,10 @@ in
|
|||
the nsd.service pre-start script.
|
||||
EOF
|
||||
|
||||
chown ${username}:${username} -R "${stateDir}/private"
|
||||
chown ${username}:${username} -R "${stateDir}/tmp"
|
||||
chown ${username}:${username} -R "${stateDir}/var"
|
||||
|
||||
rm -rf "${stateDir}/zones"
|
||||
cp -rL "${nsdEnv}/zones" "${stateDir}/zones"
|
||||
|
||||
|
|
|
|||
|
|
@ -772,11 +772,6 @@ in {
|
|||
default = if lib.versionOlder config.system.stateVersion "24.05"
|
||||
then "${httpConf.scheme}://${httpConf.host}:${builtins.toString httpConf.port}/media/"
|
||||
else null;
|
||||
defaultText = literalExpression ''
|
||||
if lib.versionOlder config.system.stateVersion "24.05"
|
||||
then "$\{httpConf.scheme}://$\{httpConf.host}:$\{builtins.toString httpConf.port}/media/"
|
||||
else null;
|
||||
'';
|
||||
description = ''
|
||||
Base path which uploads will be stored at.
|
||||
Whilst this can just be set to a subdirectory of the main domain, it is now recommended to use a different subdomain.
|
||||
|
|
@ -809,7 +804,6 @@ in {
|
|||
enabled = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
defaultText = literalExpression "false";
|
||||
description = ''
|
||||
Whether to enable proxying of remote media through the instance's proxy.
|
||||
'';
|
||||
|
|
@ -819,11 +813,6 @@ in {
|
|||
default = if lib.versionOlder config.system.stateVersion "24.05"
|
||||
then "${httpConf.scheme}://${httpConf.host}:${builtins.toString httpConf.port}/media/"
|
||||
else null;
|
||||
defaultText = literalExpression ''
|
||||
if lib.versionOlder config.system.stateVersion "24.05"
|
||||
then "$\{httpConf.scheme}://$\{httpConf.host}:$\{builtins.toString httpConf.port}/media/"
|
||||
else null;
|
||||
'';
|
||||
description = ''
|
||||
Base path for the media proxy.
|
||||
Whilst this can just be set to a subdirectory of the main domain, it is now recommended to use a different subdomain.
|
||||
|
|
|
|||
|
|
@ -18,9 +18,6 @@ let
|
|||
cacheDir = "/var/cache/mediawiki";
|
||||
stateDir = "/var/lib/mediawiki";
|
||||
|
||||
# https://www.mediawiki.org/wiki/Compatibility
|
||||
php = pkgs.php81;
|
||||
|
||||
pkg = pkgs.stdenv.mkDerivation rec {
|
||||
pname = "mediawiki-full";
|
||||
inherit (src) version;
|
||||
|
|
@ -49,7 +46,7 @@ let
|
|||
} ''
|
||||
mkdir -p $out/bin
|
||||
for i in changePassword.php createAndPromote.php userOptions.php edit.php nukePage.php update.php; do
|
||||
makeWrapper ${php}/bin/php $out/bin/mediawiki-$(basename $i .php) \
|
||||
makeWrapper ${pkgs.php}/bin/php $out/bin/mediawiki-$(basename $i .php) \
|
||||
--set MEDIAWIKI_CONFIG ${mediawikiConfig} \
|
||||
--add-flags ${pkg}/share/mediawiki/maintenance/$i
|
||||
done
|
||||
|
|
@ -488,7 +485,8 @@ in
|
|||
services.phpfpm.pools.mediawiki = {
|
||||
inherit user group;
|
||||
phpEnv.MEDIAWIKI_CONFIG = "${mediawikiConfig}";
|
||||
phpPackage = php;
|
||||
# https://www.mediawiki.org/wiki/Compatibility
|
||||
phpPackage = pkgs.php81;
|
||||
settings = (if (cfg.webserver == "apache") then {
|
||||
"listen.owner" = config.services.httpd.user;
|
||||
"listen.group" = config.services.httpd.group;
|
||||
|
|
@ -600,8 +598,8 @@ in
|
|||
fi
|
||||
|
||||
echo "exit( wfGetDB( DB_MASTER )->tableExists( 'user' ) ? 1 : 0 );" | \
|
||||
${php}/bin/php ${pkg}/share/mediawiki/maintenance/eval.php --conf ${mediawikiConfig} && \
|
||||
${php}/bin/php ${pkg}/share/mediawiki/maintenance/install.php \
|
||||
${pkgs.php}/bin/php ${pkg}/share/mediawiki/maintenance/eval.php --conf ${mediawikiConfig} && \
|
||||
${pkgs.php}/bin/php ${pkg}/share/mediawiki/maintenance/install.php \
|
||||
--confpath /tmp \
|
||||
--scriptpath / \
|
||||
--dbserver ${lib.escapeShellArg dbAddr} \
|
||||
|
|
@ -615,7 +613,7 @@ in
|
|||
${lib.escapeShellArg cfg.name} \
|
||||
admin
|
||||
|
||||
${php}/bin/php ${pkg}/share/mediawiki/maintenance/update.php --conf ${mediawikiConfig} --quick
|
||||
${pkgs.php}/bin/php ${pkg}/share/mediawiki/maintenance/update.php --conf ${mediawikiConfig} --quick
|
||||
'';
|
||||
|
||||
serviceConfig = {
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ in {
|
|||
allowedUDPPorts = [ 9511 9512 ];
|
||||
};
|
||||
|
||||
systemd.user.services.urserver = {
|
||||
systemd.user.services.urserver = {
|
||||
description = ''
|
||||
Server for Unified Remote: The one-and-only remote for your computer.
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -236,7 +236,6 @@ in {
|
|||
darling = handleTest ./darling.nix {};
|
||||
dae = handleTest ./dae.nix {};
|
||||
davis = handleTest ./davis.nix {};
|
||||
db-rest = handleTest ./db-rest.nix {};
|
||||
dconf = handleTest ./dconf.nix {};
|
||||
deconz = handleTest ./deconz.nix {};
|
||||
deepin = handleTest ./deepin.nix {};
|
||||
|
|
|
|||
|
|
@ -1,107 +0,0 @@
|
|||
import ./make-test-python.nix ({ pkgs, ... }:
|
||||
{
|
||||
name = "db-rest";
|
||||
meta.maintainers = with pkgs.lib.maintainers; [ marie ];
|
||||
|
||||
nodes = {
|
||||
database = {
|
||||
networking = {
|
||||
interfaces.eth1 = {
|
||||
ipv4.addresses = [
|
||||
{ address = "192.168.2.10"; prefixLength = 24; }
|
||||
];
|
||||
};
|
||||
firewall.allowedTCPPorts = [ 31638 ];
|
||||
};
|
||||
|
||||
services.redis.servers.db-rest = {
|
||||
enable = true;
|
||||
bind = "0.0.0.0";
|
||||
requirePass = "choochoo";
|
||||
port = 31638;
|
||||
};
|
||||
};
|
||||
|
||||
serverWithTcp = { pkgs, ... }: {
|
||||
environment = {
|
||||
etc = {
|
||||
"db-rest/password-redis-db".text = ''
|
||||
choochoo
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
networking = {
|
||||
interfaces.eth1 = {
|
||||
ipv4.addresses = [
|
||||
{ address = "192.168.2.11"; prefixLength = 24; }
|
||||
];
|
||||
};
|
||||
firewall.allowedTCPPorts = [ 3000 ];
|
||||
};
|
||||
|
||||
services.db-rest = {
|
||||
enable = true;
|
||||
host = "0.0.0.0";
|
||||
redis = {
|
||||
enable = true;
|
||||
createLocally = false;
|
||||
host = "192.168.2.10";
|
||||
port = 31638;
|
||||
passwordFile = "/etc/db-rest/password-redis-db";
|
||||
useSSL = false;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
serverWithUnixSocket = { pkgs, ... }: {
|
||||
networking = {
|
||||
interfaces.eth1 = {
|
||||
ipv4.addresses = [
|
||||
{ address = "192.168.2.12"; prefixLength = 24; }
|
||||
];
|
||||
};
|
||||
firewall.allowedTCPPorts = [ 3000 ];
|
||||
};
|
||||
|
||||
services.db-rest = {
|
||||
enable = true;
|
||||
host = "0.0.0.0";
|
||||
redis = {
|
||||
enable = true;
|
||||
createLocally = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
client = {
|
||||
environment.systemPackages = [ pkgs.jq ];
|
||||
networking = {
|
||||
interfaces.eth1 = {
|
||||
ipv4.addresses = [
|
||||
{ address = "192.168.2.13"; prefixLength = 24; }
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
start_all()
|
||||
|
||||
with subtest("db-rest redis with TCP socket"):
|
||||
database.wait_for_unit("redis-db-rest.service")
|
||||
database.wait_for_open_port(31638)
|
||||
|
||||
serverWithTcp.wait_for_unit("db-rest.service")
|
||||
serverWithTcp.wait_for_open_port(3000)
|
||||
|
||||
client.succeed("curl --fail --get http://192.168.2.11:3000/stations --data-urlencode 'query=Köln Hbf' | jq -r '.\"8000207\".name' | grep 'Köln Hbf'")
|
||||
|
||||
with subtest("db-rest redis with Unix socket"):
|
||||
serverWithUnixSocket.wait_for_unit("db-rest.service")
|
||||
serverWithUnixSocket.wait_for_open_port(3000)
|
||||
|
||||
client.succeed("curl --fail --get http://192.168.2.12:3000/stations --data-urlencode 'query=Köln Hbf' | jq -r '.\"8000207\".name' | grep 'Köln Hbf'")
|
||||
'';
|
||||
})
|
||||
|
|
@ -16,13 +16,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mympd";
|
||||
version = "14.1.2";
|
||||
version = "14.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jcorporation";
|
||||
repo = "myMPD";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-CMqH9iy9U85bKj7YLcYsKFs5CDePGBEfUWL+sb7WzBw=";
|
||||
sha256 = "sha256-qGKTQAEwkv5Bz09GzmUHWnQ/DzmiexOY/dTkFyCtH/M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -45,13 +45,13 @@ stdenv.mkDerivation {
|
|||
pname = binName;
|
||||
# versions are specified in `squeezelite.h`
|
||||
# see https://github.com/ralph-irving/squeezelite/issues/29
|
||||
version = "2.0.0.1486";
|
||||
version = "2.0.0.1481";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ralph-irving";
|
||||
repo = "squeezelite";
|
||||
rev = "fd4a82e7d0e53124d9618320f3c115d90654509d";
|
||||
hash = "sha256-nR2Px7VYjAktUsueEyBAV2392+/dX6JYIy7YSMh05c0=";
|
||||
rev = "c751ef146265c243cdbd7c0353dd0b70ab51730c";
|
||||
hash = "sha256-wvHIKOTi/a5tdn7E4SnUrDz3htvyZQMJeQFa+24OKwI=";
|
||||
};
|
||||
|
||||
buildInputs = [ flac libmad libvorbis mpg123 ]
|
||||
|
|
|
|||
|
|
@ -1,37 +0,0 @@
|
|||
# Visual Studio Code Extensions
|
||||
|
||||
## Conventions for adding new extensions
|
||||
|
||||
* Extensions are named in the **lowercase** version of the extension's unique identifier. Which is found on the marketplace extension page, and is the name under which the extension is installed by VSCode under `~/.vscode`.
|
||||
Extension location should be: ${lib.strings.toLower mktplcRef.publisher}.${lib.string.toLower mktplcRef.name}
|
||||
|
||||
* Move extension to a discrete directory whenever the extension needs extra parameters/packages (at top of the file) or other files (such as patches, update script, components). Global index file parameters/packages should be utilities shared by many extensions. Extension specific parameters/packages should not be in the global index page.
|
||||
|
||||
* Currently `nixfmt-rfc-style` formatter is being used to format the VSCode extensions.
|
||||
|
||||
* Respect `alphabetical order` whenever adding extensions. On disorder, please, kindly open a PR re-establishing the order.
|
||||
|
||||
* Avoid [unnecessary](https://nix.dev/guides/best-practices.html#with-scopes) use of `with`, particularly `nested with`.
|
||||
|
||||
* Use `hash` instead of `sha256`.
|
||||
|
||||
* On `meta` field:
|
||||
- add a `changelog`.
|
||||
- `description` should mention it is a Visual Studio Code extension.
|
||||
- `downloadPage` is the VSCode marketplace URL.
|
||||
- `homepage` is the source-code URL.
|
||||
- verify `license` in upstream.
|
||||
|
||||
* On commit messages:
|
||||
- Naming convention for:
|
||||
- Adding a new extension:
|
||||
|
||||
> vscode-extensions.publisher.extension-name: init 1.2.3
|
||||
>
|
||||
> Release: https://github.com/owner/project/releases/tag/1.2.3
|
||||
- Updating an extension:
|
||||
|
||||
> vscode-extensions.publisher.extension-name: 1.2.3 -> 2.3.4
|
||||
>
|
||||
> Release: https://github.com/owner/project/releases/tag/2.3.4
|
||||
- Multiple extensions can be added in a single PR, but each extension requires it's own commit.
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
{
|
||||
asciidoctor,
|
||||
lib,
|
||||
vscode-utils,
|
||||
}:
|
||||
|
||||
vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "asciidoctor-vscode";
|
||||
publisher = "asciidoctor";
|
||||
version = "2.8.9";
|
||||
sha256 = "1xkxx5i3nhd0dzqhhdmx0li5jifsgfhv0p5h7xwsscz3gzgsdcyb";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace dist/src/text-parser.js \
|
||||
--replace "get('asciidoctor_command', 'asciidoctor')" \
|
||||
"get('asciidoctor_command', '${asciidoctor}/bin/asciidoctor')"
|
||||
substituteInPlace dist/src/commands/exportAsPDF.js \
|
||||
--replace "get('asciidoctorpdf_command', 'asciidoctor-pdf')" \
|
||||
"get('asciidoctorpdf_command', '${asciidoctor}/bin/asciidoctor-pdf')"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
{
|
||||
lib,
|
||||
jq,
|
||||
moreutils,
|
||||
millet,
|
||||
vscode-utils,
|
||||
}:
|
||||
|
||||
vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "Millet";
|
||||
publisher = "azdavis";
|
||||
version = "0.13.5";
|
||||
hash = "sha256-sWM7N+axgu1zOGWexR4JVupVmYhZrd4cZz3pmLxRj8Q=";
|
||||
};
|
||||
nativeBuildInputs = [
|
||||
jq
|
||||
moreutils
|
||||
];
|
||||
postInstall = ''
|
||||
cd "$out/$installPrefix"
|
||||
jq '.contributes.configuration.properties."millet.server.path".default = "${millet}/bin/millet-ls"' package.json | sponge package.json
|
||||
'';
|
||||
meta = {
|
||||
description = "Standard ML support for VS Code";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=azdavis.millet";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.smasher164 ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
{
|
||||
vscode-utils,
|
||||
jq,
|
||||
lib,
|
||||
moreutils,
|
||||
nixpkgs-fmt,
|
||||
}:
|
||||
|
||||
vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "nixpkgs-fmt";
|
||||
publisher = "B4dM4n";
|
||||
version = "0.0.1";
|
||||
hash = "sha256-vz2kU36B1xkLci2QwLpl/SBEhfSWltIDJ1r7SorHcr8=";
|
||||
};
|
||||
nativeBuildInputs = [
|
||||
jq
|
||||
moreutils
|
||||
];
|
||||
postInstall = ''
|
||||
cd "$out/$installPrefix"
|
||||
jq '.contributes.configuration.properties."nixpkgs-fmt.path".default = "${nixpkgs-fmt}/bin/nixpkgs-fmt"' package.json | sponge package.json
|
||||
'';
|
||||
meta = {
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
{
|
||||
clojure-lsp,
|
||||
jq,
|
||||
lib,
|
||||
moreutils,
|
||||
vscode-utils,
|
||||
}:
|
||||
|
||||
vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "calva";
|
||||
publisher = "betterthantomorrow";
|
||||
version = "2.0.374";
|
||||
hash = "sha256-VwdHOkduSSIrcOvrcVf7K8DSp3N1u9fvbaCVDCxp+bk=";
|
||||
};
|
||||
nativeBuildInputs = [
|
||||
jq
|
||||
moreutils
|
||||
];
|
||||
postInstall = ''
|
||||
cd "$out/$installPrefix"
|
||||
jq '.contributes.configuration[0].properties."calva.clojureLspPath".default = "${clojure-lsp}/bin/clojure-lsp"' package.json | sponge package.json
|
||||
'';
|
||||
meta = {
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,17 +1,28 @@
|
|||
# Before adding a new extension, read ./README.md
|
||||
|
||||
{ config
|
||||
, lib
|
||||
, fetchurl
|
||||
, callPackage
|
||||
, vscode-utils
|
||||
, asciidoctor
|
||||
, nodePackages
|
||||
, python3Packages
|
||||
, jdk
|
||||
, llvmPackages
|
||||
, llvmPackages_14
|
||||
, nixpkgs-fmt
|
||||
, protobuf
|
||||
, jq
|
||||
, shellcheck
|
||||
, moreutils
|
||||
, racket
|
||||
, clojure-lsp
|
||||
, alejandra
|
||||
, millet
|
||||
, craftos-pc
|
||||
, shfmt
|
||||
, tinymist
|
||||
, typst-lsp
|
||||
, typst-preview
|
||||
, autoPatchelfHook
|
||||
, zlib
|
||||
, stdenv
|
||||
|
|
@ -20,6 +31,15 @@
|
|||
let
|
||||
inherit (vscode-utils) buildVscodeMarketplaceExtension;
|
||||
|
||||
#
|
||||
# Unless there is a good reason not to, we attempt to use the lowercase
|
||||
# version of the extension's unique identifier. The unique identifier can be
|
||||
# found on the marketplace extension page, and is the name under which the
|
||||
# extension is installed by VSCode under `~/.vscode`.
|
||||
#
|
||||
# This means an extension should be located at
|
||||
# ${lib.strings.toLower mktplcRef.publisher}.${lib.string.toLower mktplcRef.name}
|
||||
#
|
||||
baseExtensions = self: lib.mapAttrs (_n: lib.recurseIntoAttrs)
|
||||
{
|
||||
"13xforever".language-x86-64-assembly = buildVscodeMarketplaceExtension {
|
||||
|
|
@ -348,7 +368,27 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
asciidoctor.asciidoctor-vscode = callPackage ./asciidoctor.asciidoctor-vscode { };
|
||||
asciidoctor.asciidoctor-vscode = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "asciidoctor-vscode";
|
||||
publisher = "asciidoctor";
|
||||
version = "2.8.9";
|
||||
sha256 = "1xkxx5i3nhd0dzqhhdmx0li5jifsgfhv0p5h7xwsscz3gzgsdcyb";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace dist/src/text-parser.js \
|
||||
--replace "get('asciidoctor_command', 'asciidoctor')" \
|
||||
"get('asciidoctor_command', '${asciidoctor}/bin/asciidoctor')"
|
||||
substituteInPlace dist/src/commands/exportAsPDF.js \
|
||||
--replace "get('asciidoctorpdf_command', 'asciidoctor-pdf')" \
|
||||
"get('asciidoctorpdf_command', '${asciidoctor}/bin/asciidoctor-pdf')"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
};
|
||||
|
||||
asdine.cue = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
|
|
@ -418,9 +458,42 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
azdavis.millet = callPackage ./azdavis.millet { };
|
||||
azdavis.millet = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "Millet";
|
||||
publisher = "azdavis";
|
||||
version = "0.13.5";
|
||||
hash = "sha256-sWM7N+axgu1zOGWexR4JVupVmYhZrd4cZz3pmLxRj8Q=";
|
||||
};
|
||||
nativeBuildInputs = [ jq moreutils ];
|
||||
postInstall = ''
|
||||
cd "$out/$installPrefix"
|
||||
jq '.contributes.configuration.properties."millet.server.path".default = "${millet}/bin/millet-ls"' package.json | sponge package.json
|
||||
'';
|
||||
meta = {
|
||||
description = "Standard ML support for VS Code";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=azdavis.millet";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.smasher164 ];
|
||||
};
|
||||
};
|
||||
|
||||
b4dm4n.vscode-nixpkgs-fmt = callPackage ./b4dm4n.vscode-nixpkgs-fmt { };
|
||||
b4dm4n.vscode-nixpkgs-fmt = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "nixpkgs-fmt";
|
||||
publisher = "B4dM4n";
|
||||
version = "0.0.1";
|
||||
hash = "sha256-vz2kU36B1xkLci2QwLpl/SBEhfSWltIDJ1r7SorHcr8=";
|
||||
};
|
||||
nativeBuildInputs = [ jq moreutils ];
|
||||
postInstall = ''
|
||||
cd "$out/$installPrefix"
|
||||
jq '.contributes.configuration.properties."nixpkgs-fmt.path".default = "${nixpkgs-fmt}/bin/nixpkgs-fmt"' package.json | sponge package.json
|
||||
'';
|
||||
meta = {
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
};
|
||||
|
||||
baccata.scaladex-search = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
|
|
@ -522,9 +595,24 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
betterthantomorrow.calva = callPackage ./betterthantomorrow.calva { };
|
||||
betterthantomorrow.calva = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "calva";
|
||||
publisher = "betterthantomorrow";
|
||||
version = "2.0.374";
|
||||
hash = "sha256-VwdHOkduSSIrcOvrcVf7K8DSp3N1u9fvbaCVDCxp+bk=";
|
||||
};
|
||||
nativeBuildInputs = [ jq moreutils ];
|
||||
postInstall = ''
|
||||
cd "$out/$installPrefix"
|
||||
jq '.contributes.configuration[0].properties."calva.clojureLspPath".default = "${clojure-lsp}/bin/clojure-lsp"' package.json | sponge package.json
|
||||
'';
|
||||
meta = {
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
};
|
||||
|
||||
bierner.docs-view = buildVscodeMarketplaceExtension {
|
||||
bierner.docs-view = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "docs-view";
|
||||
publisher = "bierner";
|
||||
|
|
@ -1546,7 +1634,27 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
eugleo.magic-racket = callPackage ./eugleo.magic-racket { };
|
||||
eugleo.magic-racket = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "magic-racket";
|
||||
publisher = "evzen-wybitul";
|
||||
version = "0.6.4";
|
||||
hash = "sha256-Hxa4VPm3QvJICzpDyfk94fGHu1hr+YN9szVBwDB8X4U=";
|
||||
};
|
||||
nativeBuildInputs = [ jq moreutils ];
|
||||
postInstall = ''
|
||||
cd "$out/$installPrefix"
|
||||
jq '.contributes.configuration.properties."magicRacket.general.racketPath".default = "${racket}/bin/racket"' package.json | sponge package.json
|
||||
jq '.contributes.configuration.properties."magicRacket.general.racoPath".default = "${racket}/bin/raco"' package.json | sponge package.json
|
||||
'';
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/evzen-wybitul.magic-racket/changelog";
|
||||
description = "The best coding experience for Racket in VS Code";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=evzen-wybitul.magic-racket";
|
||||
homepage = "https://github.com/Eugleo/magic-racket";
|
||||
license = lib.licenses.agpl3Only;
|
||||
};
|
||||
};
|
||||
|
||||
ExiaHuang.dictionary = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
|
|
@ -1667,7 +1775,28 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
foxundermoon.shell-format = callPackage ./foxundermoon.shell-format { };
|
||||
foxundermoon.shell-format = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "shell-format";
|
||||
publisher = "foxundermoon";
|
||||
version = "7.2.5";
|
||||
hash = "sha256-kfpRByJDcGY3W9+ELBzDOUMl06D/vyPlN//wPgQhByk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ jq moreutils ];
|
||||
|
||||
postInstall = ''
|
||||
cd "$out/$installPrefix"
|
||||
jq '.contributes.configuration.properties."shellformat.path".default = "${shfmt}/bin/shfmt"' package.json | sponge package.json
|
||||
'';
|
||||
|
||||
meta = {
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=foxundermoon.shell-format";
|
||||
homepage = "https://github.com/foxundermoon/vs-shell-format";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.dbirks ];
|
||||
};
|
||||
};
|
||||
|
||||
freebroccolo.reasonml = buildVscodeMarketplaceExtension {
|
||||
meta = {
|
||||
|
|
@ -2168,7 +2297,38 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
jackmacwindows.craftos-pc = callPackage ./jackmacwindows.craftos-pc { };
|
||||
jackmacwindows.craftos-pc = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "craftos-pc";
|
||||
publisher = "jackmacwindows";
|
||||
version = "1.2.2";
|
||||
hash = "sha256-A+MNroXv0t9Mw/gr0Fyov3cXyF/GGzwRLKrIxQ2tKCE=";
|
||||
};
|
||||
nativeBuildInputs = [ jq moreutils ];
|
||||
postInstall = ''
|
||||
cd "$out/$installPrefix"
|
||||
|
||||
jq -e '
|
||||
.contributes.configuration.properties."craftos-pc.executablePath.linux".default =
|
||||
"${lib.meta.getExe craftos-pc}" |
|
||||
.contributes.configuration.properties."craftos-pc.executablePath.mac".default =
|
||||
"${lib.meta.getExe craftos-pc}" |
|
||||
.contributes.configuration.properties."craftos-pc.executablePath.windows".default =
|
||||
"${lib.meta.getExe craftos-pc}"
|
||||
' \
|
||||
< package.json \
|
||||
| sponge package.json
|
||||
'';
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/jackmacwindows.craftos-pc/changelog";
|
||||
description = "A Visual Studio Code extension for opening a CraftOS-PC window";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=jackmacwindows.craftos-pc";
|
||||
homepage = "https://www.craftos-pc.cc/docs/extension";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ tomodachi94 ];
|
||||
platforms = craftos-pc.meta.platforms;
|
||||
};
|
||||
};
|
||||
|
||||
james-yu.latex-workshop = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
|
|
@ -2287,8 +2447,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "nix-ide";
|
||||
publisher = "jnoortheen";
|
||||
version = "0.3.1";
|
||||
hash = "sha256-05oMDHvFM/dTXB6T3rcDK3EiNG2T0tBN9Au9b+Bk7rI=";
|
||||
version = "0.2.2";
|
||||
hash = "sha256-jwOM+6LnHyCkvhOTVSTUZvgx77jAg6hFCCpBqY8AxIg=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/jnoortheen.nix-ide/changelog";
|
||||
|
|
@ -2386,7 +2546,33 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
kamadorueda.alejandra = callPackage ./kamadorueda.alejandra { };
|
||||
kamadorueda.alejandra = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "alejandra";
|
||||
publisher = "kamadorueda";
|
||||
version = "1.0.0";
|
||||
hash = "sha256-COlEjKhm8tK5XfOjrpVUDQ7x3JaOLiYoZ4MdwTL8ktk=";
|
||||
};
|
||||
nativeBuildInputs = [ jq moreutils ];
|
||||
postInstall = ''
|
||||
cd "$out/$installPrefix"
|
||||
|
||||
jq -e '
|
||||
.contributes.configuration.properties."alejandra.program".default =
|
||||
"${alejandra}/bin/alejandra" |
|
||||
.contributes.configurationDefaults."alejandra.program" =
|
||||
"${alejandra}/bin/alejandra"
|
||||
' \
|
||||
< package.json \
|
||||
| sponge package.json
|
||||
'';
|
||||
meta = {
|
||||
description = "The Uncompromising Nix Code Formatter";
|
||||
homepage = "https://github.com/kamadorueda/alejandra";
|
||||
license = lib.licenses.unlicense;
|
||||
maintainers = [ lib.maintainers.kamadorueda ];
|
||||
};
|
||||
};
|
||||
|
||||
kamikillerto.vscode-colorize = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
|
|
@ -2611,7 +2797,35 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
mgt19937.typst-preview = callPackage ./mgt19937.typst-preview { };
|
||||
# Keep pkgs/by-name/ty/typst-preview/package.nix in sync with this
|
||||
# extension
|
||||
mgt19937.typst-preview = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "typst-preview";
|
||||
publisher = "mgt19937";
|
||||
version = "0.11.4";
|
||||
hash = "sha256-GwlzFphZmP87pLys01+PWTv13imcdGjunCMH6atz9xs=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
typst-preview
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ jq moreutils ];
|
||||
|
||||
postInstall = ''
|
||||
cd "$out/$installPrefix"
|
||||
jq '.contributes.configuration.properties."typst-preview.executable".default = "${lib.getExe typst-preview}"' package.json | sponge package.json
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Typst Preview is an extension for previewing your Typst files in vscode instantly";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=mgt19937.typst-preview";
|
||||
homepage = "https://github.com/Enter-tainer/typst-preview-vscode";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.drupol ];
|
||||
};
|
||||
};
|
||||
|
||||
mhutchie.git-graph = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
|
|
@ -2653,9 +2867,10 @@ let
|
|||
mktplcRef = {
|
||||
name = "direnv";
|
||||
publisher = "mkhl";
|
||||
version = "0.17.0";
|
||||
hash = "sha256-9sFcfTMeLBGw2ET1snqQ6Uk//D/vcD9AVsZfnUNrWNg=";
|
||||
version = "0.16.0";
|
||||
hash = "sha256-u2AFjvhm3zio1ygW9yD9ZwbywLrEssd0O7/0AtfCvMo=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "direnv support for Visual Studio Code";
|
||||
license = lib.licenses.bsd0;
|
||||
|
|
@ -2764,7 +2979,25 @@ let
|
|||
|
||||
ms-python.python = callPackage ./ms-python.python { };
|
||||
|
||||
ms-python.vscode-pylance = callPackage ./ms-python.vscode-pylance { };
|
||||
ms-python.vscode-pylance = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "vscode-pylance";
|
||||
publisher = "MS-python";
|
||||
version = "2023.8.50";
|
||||
hash = "sha256-xJU/j5r/Idp/0VorEfciT4SFKRBpMCv9Z0LKO/++1Gk=";
|
||||
};
|
||||
|
||||
buildInputs = [ nodePackages.pyright ];
|
||||
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/ms-python.vscode-pylance/changelog";
|
||||
description = "A performant, feature-rich language server for Python in VS Code";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-python.vscode-pylance";
|
||||
homepage = "https://github.com/microsoft/pylance-release";
|
||||
license = lib.licenses.unfree;
|
||||
maintainers = [ lib.maintainers.ericthemagician ];
|
||||
};
|
||||
};
|
||||
|
||||
ms-toolsai.datawrangler = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
|
|
@ -3036,7 +3269,36 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
myriad-dreamin.tinymist = callPackage ./myriad-dreamin.tinymist { };
|
||||
myriad-dreamin.tinymist = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "tinymist";
|
||||
publisher = "myriad-dreamin";
|
||||
# Please update the corresponding binary (tinymist) when updating
|
||||
# this extension.
|
||||
version = "0.11.3";
|
||||
hash = "sha256-b5aD4gz4j+QAEPmYaNnaputbYTPoFxVFih76HmznUP8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ jq moreutils ];
|
||||
|
||||
buildInputs = [
|
||||
tinymist
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
cd "$out/$installPrefix"
|
||||
jq '.contributes.configuration.properties."tinymist.serverPath".default = "${lib.getExe tinymist}"' package.json | sponge package.json
|
||||
'';
|
||||
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/myriad-dreamin.tinymist/changelog";
|
||||
description = "A VSCode extension for providing an integration solution for Typst";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=myriad-dreamin.tinymist";
|
||||
homepage = "https://github.com/myriad-dreamin/tinymist";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ lib.maintainers.drupol ];
|
||||
};
|
||||
};
|
||||
|
||||
naumovs.color-highlight = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
|
|
@ -3121,7 +3383,36 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
nvarner.typst-lsp = callPackage ./nvarner.typst-lsp { };
|
||||
nvarner.typst-lsp = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "typst-lsp";
|
||||
publisher = "nvarner";
|
||||
# Please update the corresponding binary (typst-lsp) when updating
|
||||
# this extension.
|
||||
version = "0.12.1";
|
||||
hash = "sha256-JcfFaR1wU5XwapH8vnfVy7Cb7DfUWVeoLfBV3wEtCpE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ jq moreutils ];
|
||||
|
||||
buildInputs = [
|
||||
typst-lsp
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
cd "$out/$installPrefix"
|
||||
jq '.contributes.configuration.properties."typst-lsp.serverPath".default = "${lib.getExe typst-lsp}"' package.json | sponge package.json
|
||||
'';
|
||||
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/nvarner.typst-lsp/changelog";
|
||||
description = "A VSCode extension for providing a language server for Typst";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=nvarner.typst-lsp";
|
||||
homepage = "https://github.com/nvarner/typst-lsp";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.drupol ];
|
||||
};
|
||||
};
|
||||
|
||||
ocamllabs.ocaml-platform = buildVscodeMarketplaceExtension {
|
||||
meta = {
|
||||
|
|
@ -3610,23 +3901,6 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
signageos.signageos-vscode-sops = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "signageos-vscode-sops";
|
||||
publisher = "signageos";
|
||||
version = "0.9.1";
|
||||
hash = "sha256-b1Gp+tL5/e97xMuqkz4EvN0PxI7cJOObusEkcp+qKfM=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/signageos.signageos-vscode-sops/changelog";
|
||||
description = "A Visual Studio Code extension for SOPS support";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=signageos.signageos-vscode-sops";
|
||||
homepage = "https://github.com/signageos/vscode-sops";
|
||||
license = lib.licenses.unfree;
|
||||
maintainers = [ lib.maintainers.superherointj ];
|
||||
};
|
||||
};
|
||||
|
||||
silofy.hackthebox = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "hackthebox";
|
||||
|
|
@ -4050,7 +4324,26 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
timonwong.shellcheck = callPackage ./timonwong.shellcheck { };
|
||||
timonwong.shellcheck = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "shellcheck";
|
||||
publisher = "timonwong";
|
||||
version = "0.37.0";
|
||||
sha256 = "1d0blynn6c2hz4y9fk7b5wsa3x168gxyycr5d05zqp0rx520m5wc";
|
||||
};
|
||||
nativeBuildInputs = [ jq moreutils ];
|
||||
postInstall = ''
|
||||
cd "$out/$installPrefix"
|
||||
jq '.contributes.configuration.properties."shellcheck.executablePath".default = "${shellcheck}/bin/shellcheck"' package.json | sponge package.json
|
||||
'';
|
||||
meta = {
|
||||
description = "Integrates ShellCheck into VS Code, a linter for Shell scripts";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=timonwong.shellcheck";
|
||||
homepage = "https://github.com/vscode-shellcheck/vscode-shellcheck";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.raroh73 ];
|
||||
};
|
||||
};
|
||||
|
||||
tobiasalthoff.atom-material-theme = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
|
|
@ -4202,12 +4495,12 @@ let
|
|||
mktplcRef = {
|
||||
name = "errorlens";
|
||||
publisher = "usernamehw";
|
||||
version = "3.16.0";
|
||||
hash = "sha256-Y3M/A5rYLkxQPRIZ0BUjhlkvixDae+wIRUsBn4tREFw=";
|
||||
version = "3.14.0";
|
||||
sha256 = "0k70f5f4hcv3jl3a04736ml8amx8w7wb3mb8f6l5gngnvq9fj528";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/usernamehw.errorlens/changelog";
|
||||
description = "A Visual Studio Code extension that improves highlighting of errors, warnings and other language diagnostics";
|
||||
description = "Improve highlighting of errors, warnings and other language diagnostics.";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=usernamehw.errorlens";
|
||||
homepage = "https://github.com/usernamehw/vscode-error-lens";
|
||||
license = lib.licenses.mit;
|
||||
|
|
|
|||
|
|
@ -1,32 +0,0 @@
|
|||
{
|
||||
lib,
|
||||
jq,
|
||||
moreutils,
|
||||
racket,
|
||||
vscode-utils,
|
||||
}:
|
||||
|
||||
vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "magic-racket";
|
||||
publisher = "evzen-wybitul";
|
||||
version = "0.6.4";
|
||||
hash = "sha256-Hxa4VPm3QvJICzpDyfk94fGHu1hr+YN9szVBwDB8X4U=";
|
||||
};
|
||||
nativeBuildInputs = [
|
||||
jq
|
||||
moreutils
|
||||
];
|
||||
postInstall = ''
|
||||
cd "$out/$installPrefix"
|
||||
jq '.contributes.configuration.properties."magicRacket.general.racketPath".default = "${racket}/bin/racket"' package.json | sponge package.json
|
||||
jq '.contributes.configuration.properties."magicRacket.general.racoPath".default = "${racket}/bin/raco"' package.json | sponge package.json
|
||||
'';
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/evzen-wybitul.magic-racket/changelog";
|
||||
description = "The best coding experience for Racket in VS Code";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=evzen-wybitul.magic-racket";
|
||||
homepage = "https://github.com/Eugleo/magic-racket";
|
||||
license = lib.licenses.agpl3Only;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
{
|
||||
jq,
|
||||
lib,
|
||||
moreutils,
|
||||
shfmt,
|
||||
vscode-utils,
|
||||
}:
|
||||
|
||||
vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "shell-format";
|
||||
publisher = "foxundermoon";
|
||||
version = "7.2.5";
|
||||
hash = "sha256-kfpRByJDcGY3W9+ELBzDOUMl06D/vyPlN//wPgQhByk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
jq
|
||||
moreutils
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
cd "$out/$installPrefix"
|
||||
jq '.contributes.configuration.properties."shellformat.path".default = "${shfmt}/bin/shfmt"' package.json | sponge package.json
|
||||
'';
|
||||
|
||||
meta = {
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=foxundermoon.shell-format";
|
||||
homepage = "https://github.com/foxundermoon/vs-shell-format";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.dbirks ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,43 +0,0 @@
|
|||
{
|
||||
vscode-utils,
|
||||
craftos-pc,
|
||||
jq,
|
||||
lib,
|
||||
moreutils,
|
||||
}:
|
||||
|
||||
vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "craftos-pc";
|
||||
publisher = "jackmacwindows";
|
||||
version = "1.2.2";
|
||||
hash = "sha256-A+MNroXv0t9Mw/gr0Fyov3cXyF/GGzwRLKrIxQ2tKCE=";
|
||||
};
|
||||
nativeBuildInputs = [
|
||||
jq
|
||||
moreutils
|
||||
];
|
||||
postInstall = ''
|
||||
cd "$out/$installPrefix"
|
||||
|
||||
jq -e '
|
||||
.contributes.configuration.properties."craftos-pc.executablePath.linux".default =
|
||||
"${lib.meta.getExe craftos-pc}" |
|
||||
.contributes.configuration.properties."craftos-pc.executablePath.mac".default =
|
||||
"${lib.meta.getExe craftos-pc}" |
|
||||
.contributes.configuration.properties."craftos-pc.executablePath.windows".default =
|
||||
"${lib.meta.getExe craftos-pc}"
|
||||
' \
|
||||
< package.json \
|
||||
| sponge package.json
|
||||
'';
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/jackmacwindows.craftos-pc/changelog";
|
||||
description = "A Visual Studio Code extension for opening a CraftOS-PC window";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=jackmacwindows.craftos-pc";
|
||||
homepage = "https://www.craftos-pc.cc/docs/extension";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ tomodachi94 ];
|
||||
platforms = craftos-pc.meta.platforms;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,38 +0,0 @@
|
|||
{
|
||||
alejandra,
|
||||
jq,
|
||||
lib,
|
||||
moreutils,
|
||||
vscode-utils,
|
||||
}:
|
||||
|
||||
vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "alejandra";
|
||||
publisher = "kamadorueda";
|
||||
version = "1.0.0";
|
||||
hash = "sha256-COlEjKhm8tK5XfOjrpVUDQ7x3JaOLiYoZ4MdwTL8ktk=";
|
||||
};
|
||||
nativeBuildInputs = [
|
||||
jq
|
||||
moreutils
|
||||
];
|
||||
postInstall = ''
|
||||
cd "$out/$installPrefix"
|
||||
|
||||
jq -e '
|
||||
.contributes.configuration.properties."alejandra.program".default =
|
||||
"${alejandra}/bin/alejandra" |
|
||||
.contributes.configurationDefaults."alejandra.program" =
|
||||
"${alejandra}/bin/alejandra"
|
||||
' \
|
||||
< package.json \
|
||||
| sponge package.json
|
||||
'';
|
||||
meta = {
|
||||
description = "The Uncompromising Nix Code Formatter";
|
||||
homepage = "https://github.com/kamadorueda/alejandra";
|
||||
license = lib.licenses.unlicense;
|
||||
maintainers = [ lib.maintainers.kamadorueda ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,38 +0,0 @@
|
|||
# Keep pkgs/by-name/ty/typst-preview/package.nix in sync with this extension
|
||||
|
||||
{
|
||||
vscode-utils,
|
||||
lib,
|
||||
jq,
|
||||
moreutils,
|
||||
typst-preview,
|
||||
}:
|
||||
|
||||
vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "typst-preview";
|
||||
publisher = "mgt19937";
|
||||
version = "0.11.4";
|
||||
hash = "sha256-GwlzFphZmP87pLys01+PWTv13imcdGjunCMH6atz9xs=";
|
||||
};
|
||||
|
||||
buildInputs = [ typst-preview ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
jq
|
||||
moreutils
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
cd "$out/$installPrefix"
|
||||
jq '.contributes.configuration.properties."typst-preview.executable".default = "${lib.getExe typst-preview}"' package.json | sponge package.json
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Typst Preview is an extension for previewing your Typst files in vscode instantly";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=mgt19937.typst-preview";
|
||||
homepage = "https://github.com/Enter-tainer/typst-preview-vscode";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.drupol ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
{
|
||||
lib,
|
||||
nodePackages,
|
||||
vscode-utils,
|
||||
}:
|
||||
|
||||
vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "vscode-pylance";
|
||||
publisher = "MS-python";
|
||||
version = "2023.8.50";
|
||||
hash = "sha256-xJU/j5r/Idp/0VorEfciT4SFKRBpMCv9Z0LKO/++1Gk=";
|
||||
};
|
||||
|
||||
buildInputs = [ nodePackages.pyright ];
|
||||
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/ms-python.vscode-pylance/changelog";
|
||||
description = "A performant, feature-rich language server for Python in VS Code";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-python.vscode-pylance";
|
||||
homepage = "https://github.com/microsoft/pylance-release";
|
||||
license = lib.licenses.unfree;
|
||||
maintainers = [ lib.maintainers.ericthemagician ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,39 +0,0 @@
|
|||
{
|
||||
jq,
|
||||
lib,
|
||||
moreutils,
|
||||
tinymist,
|
||||
vscode-utils,
|
||||
}:
|
||||
|
||||
vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "tinymist";
|
||||
publisher = "myriad-dreamin";
|
||||
# Please update the corresponding binary (tinymist) when updating
|
||||
# this extension.
|
||||
version = "0.11.4";
|
||||
hash = "sha256-VR+vl6mctwq9oSIgnfutvPFwfGUdEco8fCOjzMvPtII=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
jq
|
||||
moreutils
|
||||
];
|
||||
|
||||
buildInputs = [ tinymist ];
|
||||
|
||||
postInstall = ''
|
||||
cd "$out/$installPrefix"
|
||||
jq '.contributes.configuration.properties."tinymist.serverPath".default = "${lib.getExe tinymist}"' package.json | sponge package.json
|
||||
'';
|
||||
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/myriad-dreamin.tinymist/changelog";
|
||||
description = "A VSCode extension for providing an integration solution for Typst";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=myriad-dreamin.tinymist";
|
||||
homepage = "https://github.com/myriad-dreamin/tinymist";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ lib.maintainers.drupol ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,39 +0,0 @@
|
|||
{
|
||||
jq,
|
||||
lib,
|
||||
moreutils,
|
||||
typst-lsp,
|
||||
vscode-utils,
|
||||
}:
|
||||
|
||||
vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "typst-lsp";
|
||||
publisher = "nvarner";
|
||||
# Please update the corresponding binary (typst-lsp) when updating
|
||||
# this extension.
|
||||
version = "0.12.1";
|
||||
hash = "sha256-JcfFaR1wU5XwapH8vnfVy7Cb7DfUWVeoLfBV3wEtCpE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
jq
|
||||
moreutils
|
||||
];
|
||||
|
||||
buildInputs = [ typst-lsp ];
|
||||
|
||||
postInstall = ''
|
||||
cd "$out/$installPrefix"
|
||||
jq '.contributes.configuration.properties."typst-lsp.serverPath".default = "${lib.getExe typst-lsp}"' package.json | sponge package.json
|
||||
'';
|
||||
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/nvarner.typst-lsp/changelog";
|
||||
description = "A VSCode extension for providing a language server for Typst";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=nvarner.typst-lsp";
|
||||
homepage = "https://github.com/nvarner/typst-lsp";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.drupol ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
{
|
||||
jq,
|
||||
lib,
|
||||
moreutils,
|
||||
shellcheck,
|
||||
vscode-utils,
|
||||
}:
|
||||
|
||||
vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "shellcheck";
|
||||
publisher = "timonwong";
|
||||
version = "0.37.0";
|
||||
sha256 = "1d0blynn6c2hz4y9fk7b5wsa3x168gxyycr5d05zqp0rx520m5wc";
|
||||
};
|
||||
nativeBuildInputs = [
|
||||
jq
|
||||
moreutils
|
||||
];
|
||||
postInstall = ''
|
||||
cd "$out/$installPrefix"
|
||||
jq '.contributes.configuration.properties."shellcheck.executablePath".default = "${shellcheck}/bin/shellcheck"' package.json | sponge package.json
|
||||
'';
|
||||
meta = {
|
||||
description = "Integrates ShellCheck into VS Code, a linter for Shell scripts";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=timonwong.shellcheck";
|
||||
homepage = "https://github.com/vscode-shellcheck/vscode-shellcheck";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.raroh73 ];
|
||||
};
|
||||
}
|
||||
|
|
@ -27,14 +27,8 @@ let
|
|||
|
||||
cargoHash = "sha256-e/Jki/4pCs0qzaBVR4iiUhdBFmWlTZYREQkuFSoWYFo=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ lldb ];
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
env = lib.optionalAttrs stdenv.isDarwin {
|
||||
NIX_LDFLAGS = "-llldb -lc++abi";
|
||||
};
|
||||
|
||||
buildAndTestSubdir = "adapter";
|
||||
|
||||
buildFeatures = [ "weak-linkage" ];
|
||||
|
|
@ -95,15 +89,6 @@ let
|
|||
'';
|
||||
};
|
||||
|
||||
# debugservers on macOS require the 'com.apple.security.cs.debugger'
|
||||
# entitlement which nixpkgs' lldb-server does not yet provide; see
|
||||
# <https://github.com/NixOS/nixpkgs/pull/38624> for details
|
||||
lldbServer =
|
||||
if stdenv.isDarwin then
|
||||
"/Applications/Xcode.app/Contents/SharedFrameworks/LLDB.framework/Versions/A/Resources/debugserver"
|
||||
else
|
||||
"${lldb.out}/bin/lldb-server";
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
pname = "vscode-extension-${publisher}-${pname}";
|
||||
inherit src version vscodeExtUniqueId vscodeExtPublisher vscodeExtName;
|
||||
|
|
@ -122,9 +107,6 @@ in stdenv.mkDerivation {
|
|||
|
||||
postConfigure = ''
|
||||
cp -r ${nodeDeps}/lib/node_modules .
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
export HOME="$TMPDIR/home"
|
||||
mkdir $HOME
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
@ -147,8 +129,7 @@ in stdenv.mkDerivation {
|
|||
mv -t $ext vsix-extracted/extension/*
|
||||
cp -t $ext/ -r ${adapter}/share/*
|
||||
wrapProgram $ext/adapter/codelldb \
|
||||
--prefix LD_LIBRARY_PATH : "$ext/lldb/lib" \
|
||||
--set-default LLDB_DEBUGSERVER_PATH "${lldbServer}"
|
||||
--set-default LLDB_DEBUGSERVER_PATH "${lldb.out}/bin/lldb-server"
|
||||
# Mark that all components are installed.
|
||||
touch $ext/platform.ok
|
||||
|
||||
|
|
|
|||
|
|
@ -15,11 +15,11 @@ let
|
|||
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
x86_64-linux = "1n3gb12asid2qwwzf9fj974ws9n7has9l23ni8jscx9cp63l5rbl";
|
||||
x86_64-darwin = "0gkplg2c5g7964m58fmv7b70d69g4yqrax5zn1rm4rl2agxgwyff";
|
||||
aarch64-linux = "0412222l9r81f3aa3zlzrg42hzslvvck5kds7zrmpssjrd41jxfh";
|
||||
aarch64-darwin = "1iv49m646vsbcgaxydxhpjbxspz7918brdk51gmbqf258shf8rii";
|
||||
armv7l-linux = "1sblaigrxscx4l1kln1zxzm5da5lr50y1k6qb4igq6wxbdx55iay";
|
||||
x86_64-linux = "1a9k4w6ggmrd17i038gi40d3hp24z5vs8nidxr5kvl74fi61js6y";
|
||||
x86_64-darwin = "1q9lwx96zcz517pvr97mjqhv86p41ff3cw5jisxbsg6f76aw8y1y";
|
||||
aarch64-linux = "1fdg9xz1fq9k8fc9x0an2kb8hn2vvbsnc48nv6lbx1j5aaa3k42g";
|
||||
aarch64-darwin = "0kqqn24cimbqb8s7rz64niyknpp36w5ycdw8xfms20zfm5ybm82k";
|
||||
armv7l-linux = "14rkr7k0axlaiplf0hdcmyqfgffng25s0j2i903if3i3sqv7316i";
|
||||
}.${system} or throwSystem;
|
||||
|
||||
sourceRoot = lib.optionalString (!stdenv.isDarwin) ".";
|
||||
|
|
@ -29,7 +29,7 @@ in
|
|||
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.88.1.24104";
|
||||
version = "1.88.0.24096";
|
||||
pname = "vscodium";
|
||||
|
||||
executableName = "codium";
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "geeqie";
|
||||
version = "2.4";
|
||||
version = "2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "BestImageViewer";
|
||||
repo = "geeqie";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-MVBKaiKcKknU0rChUYJ+N4oX4tVm145s+NqGQuDHY2g=";
|
||||
hash = "sha256-13Ayr6r4JhqexaUvwzdc6XHT+j2l2D5YBws6gSAhU3Y=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -24,6 +24,11 @@ stdenv.mkDerivation rec {
|
|||
url = "https://salsa.debian.org/debian/geeqie/-/raw/debian/master/debian/patches/Remove-changelog-from-menu-item.patch";
|
||||
hash = "sha256-0awKKTLg/gUZhmwluVbHCOqssog9SneFOaUtG89q0go=";
|
||||
})
|
||||
# Fix missing execute permissions for geocode-parametres.awk plugin
|
||||
(fetchpatch {
|
||||
url = "https://github.com/BestImageViewer/geeqie/commit/4d3ddcf5b9c0668bfdaf1dfe24219ee57c2f0237.patch";
|
||||
hash = "sha256-Na2qiwCTbOv1yt251oaSZiLaOwJCkjWew+us4lQju0I=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -24,14 +24,14 @@ assert svgSupport -> enableCairo;
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fuzzel";
|
||||
version = "1.10.2";
|
||||
version = "1.10.0";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "dnkl";
|
||||
repo = "fuzzel";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-I+h93/I1Kra2S5QSi2XgICAVrcUmO9cmb8UttVuzjwg=";
|
||||
hash = "sha256-4wTwsjnmPsg+kc05izeyXilzDO0LpD3g3PRBqgLPK2I=";
|
||||
};
|
||||
|
||||
depsBuildBuild = [
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "vhs";
|
||||
version = "0.7.2";
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "charmbracelet";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-CWurSAxEXAquWXEOyBWBF6JN9Pesm5hBS3jVNv56dvE=";
|
||||
hash = "sha256-4VQcIynkENScxpeM09IXrpMszqojlMuyjtXX2lbS9dg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Kh5Sy7URmhsyBF35I0TaDdpSLD96MnkwIS+96+tSyO0=";
|
||||
vendorHash = "sha256-/XW5Gq9Yz+M7Al1hy6pow34e3Cn3q8aA0ByRdhWXUIQ=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles makeWrapper ];
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -3,10 +3,10 @@
|
|||
{
|
||||
firefox = buildMozillaMach rec {
|
||||
pname = "firefox";
|
||||
version = "125.0.1";
|
||||
version = "125.0";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "6f2f336de8b0ec9cb19ba20c909407b7b88c0319ee3b2f1f3429133516b0c45b4c7846f287985a0cdb9f34acc7d5378ed14fb48e26bef113c8ac360501a30c4d";
|
||||
sha512 = "c520070e5a8872f3df4f5e35b9a605eef95f61254f6242040f02b2b68d6c8eef993885a18144353326a7488ac27115fa4ad2ef5615885e5155ab3f8194a61977";
|
||||
};
|
||||
|
||||
extraPatches = [
|
||||
|
|
@ -33,11 +33,11 @@
|
|||
|
||||
firefox-beta = buildMozillaMach rec {
|
||||
pname = "firefox-beta";
|
||||
version = "125.0b9";
|
||||
version = "125.0b3";
|
||||
applicationName = "Mozilla Firefox Beta";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "66d1b27355c105714b926b5424badc01582e5ad7e979104d05fa50748ea961c7f1e081b88978fb94aee54ed281931b8d0f0bb0e16670cf89e7f10703711e7f4e";
|
||||
sha512 = "7743cda6eed1274591243718dab2d85c0c84ebcaa97283eaded5293243c1c4a40712d3a4b66da4cd18e0eeb50296f3fc9b91a61a4a744b20dd70bd3b3291973d";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
@ -62,13 +62,13 @@
|
|||
|
||||
firefox-devedition = buildMozillaMach rec {
|
||||
pname = "firefox-devedition";
|
||||
version = "125.0b9";
|
||||
version = "125.0b3";
|
||||
applicationName = "Mozilla Firefox Developer Edition";
|
||||
requireSigning = false;
|
||||
branding = "browser/branding/aurora";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "a000d1ad29a6a83af6bb424d9b5099667b93907041ebcf8f18b22a2045f4d0f0292db3b331c33b30d142ee6feb58386cedcae356c79d2c5e31fc7a571af2b63c";
|
||||
sha512 = "9c452aa0358f227ec988058dc27cd4e3345dc2febea295fe1f061fa4a8d1d118c180e554836c647f4c82ab7a26a9ec9eeb8a73543ba1e23a511842b900ce56e5";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
((buildMozillaMach rec {
|
||||
pname = "floorp";
|
||||
packageVersion = "11.12.0";
|
||||
packageVersion = "11.11.2";
|
||||
applicationName = "Floorp";
|
||||
binaryName = "floorp";
|
||||
branding = "browser/branding/official";
|
||||
|
|
@ -22,7 +22,7 @@
|
|||
repo = "Floorp";
|
||||
fetchSubmodules = true;
|
||||
rev = "v${packageVersion}";
|
||||
hash = "sha256-9mJW8VFYClQ3D8/nPtlCVaVULvEICS+RQhz1dLujn6Q=";
|
||||
hash = "sha256-a9f4+t2w8aOOLNaKkr+FuY0ENa/Nkukg9pvJTiUMfWk=";
|
||||
};
|
||||
|
||||
extraConfigureFlags = [
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ updateBaseVersion() {
|
|||
|
||||
updateHash() {
|
||||
local hash
|
||||
hash=$(nix-prefetch-github --fetch-submodules --rev "v$1" $owner $repo | jq -r .hash)
|
||||
hash=$(nix-prefetch-github --fetch-submodules --rev "v$1" $owner $repo | jq .hash)
|
||||
sed -i "s|hash = \"[a-zA-Z0-9\/+-=]*\";|hash = \"$hash\";|g" "$dirname/default.nix"
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -14,15 +14,23 @@
|
|||
, libpulseaudio
|
||||
, makeDesktopItem
|
||||
, wrapGAppsHook
|
||||
, writeScript
|
||||
, testers
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "palemoon-bin";
|
||||
version = "33.0.2";
|
||||
version = "33.0.0";
|
||||
|
||||
src = finalAttrs.passthru.sources."gtk${if withGTK3 then "3" else "2"}";
|
||||
src = fetchzip {
|
||||
urls = [
|
||||
"https://rm-eu.palemoon.org/release/palemoon-${finalAttrs.version}.linux-x86_64-gtk${if withGTK3 then "3" else "2"}.tar.xz"
|
||||
"https://rm-us.palemoon.org/release/palemoon-${finalAttrs.version}.linux-x86_64-gtk${if withGTK3 then "3" else "2"}.tar.xz"
|
||||
];
|
||||
hash = if withGTK3 then
|
||||
"sha256-qZX23dsKNg5AOIaBAAmTWT6VDEl3OGz3kb3idtvJElw="
|
||||
else
|
||||
"sha256-Lz1+5I8Rj0GrBUBTJoRsatpyzkqVHZuWbKARkuWFs5U=";
|
||||
};
|
||||
|
||||
preferLocalBuild = true;
|
||||
|
||||
|
|
@ -147,49 +155,8 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
wrapGApp $out/lib/palemoon/palemoon
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
sources = let
|
||||
urlRegionVariants = buildVariant: map
|
||||
(region: "https://rm-${region}.palemoon.org/release/palemoon-${finalAttrs.version}.linux-x86_64-${buildVariant}.tar.xz")
|
||||
[
|
||||
"eu"
|
||||
"us"
|
||||
];
|
||||
in {
|
||||
gtk3 = fetchzip {
|
||||
urls = urlRegionVariants "gtk3";
|
||||
hash = "sha256-Kahnwlj9PIWB24lvH6h9cZK459NW2Vo2g6ckuv0Ax48=";
|
||||
};
|
||||
gtk2 = fetchzip {
|
||||
urls = urlRegionVariants "gtk2";
|
||||
hash = "sha256-XOiLGmU8O96clUpnp/OkzXmWR1PJ2AdzbVFj6adbcvY=";
|
||||
};
|
||||
};
|
||||
|
||||
tests.version = testers.testVersion {
|
||||
package = finalAttrs.finalPackage;
|
||||
};
|
||||
|
||||
updateScript = writeScript "update-palemoon-bin" ''
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p common-updater-scripts curl libxml2
|
||||
|
||||
set -eu -o pipefail
|
||||
|
||||
# Only release note announcement == finalized release
|
||||
version="$(
|
||||
curl -s 'http://www.palemoon.org/releasenotes.shtml' |
|
||||
xmllint --html --xpath 'html/body/table/tbody/tr/td/h3/text()' - 2>/dev/null | head -n1 |
|
||||
sed 's/v\(\S*\).*/\1/'
|
||||
)"
|
||||
|
||||
for variant in gtk3 gtk2; do
|
||||
# The script will not perform an update when the version attribute is up to date from previous platform run
|
||||
# We need to clear it before each run
|
||||
update-source-version palemoon-bin 0 "${lib.fakeHash}" --source-key="sources.$variant"
|
||||
update-source-version palemoon-bin "$version" --source-key="sources.$variant"
|
||||
done
|
||||
'';
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = finalAttrs.finalPackage;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "cni";
|
||||
version = "1.2.0";
|
||||
version = "1.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containernetworking";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-32rmfBjPtc9w+B8PIb8sFOIlzZ7PnS6XSZRNLreMVl4=";
|
||||
sha256 = "sha256-g7fVeoqquxPa17AfTu6wnB6PQJDluJ21T3ETrcvWtWg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-JWaQacekMQGT710U5UgiIpmEYgyUCh1uks5eSV5nhWc=";
|
||||
vendorHash = "sha256-nH/myA/KdTeFXvmBymXITyx5fdCGnWRn6hNRinXc3/s=";
|
||||
|
||||
subPackages = [
|
||||
"./cnitool"
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "rke";
|
||||
version = "1.5.8";
|
||||
version = "1.5.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rancher";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-f1Ilf2HSsp0Ygp0fItJVd8iJq12Z1jw2WKmLR4NgUKA=";
|
||||
hash = "sha256-4fan6+ka0CH8wa/+7ouTuOuTfWPQE5EqsjAfj3zdrA0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-/HsZAMPGCaM5Em6doC8qffoSEveX/yDNwAGog3I0+c4=";
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "dnscontrol";
|
||||
version = "4.9.0";
|
||||
version = "4.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "StackExchange";
|
||||
repo = "dnscontrol";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-E5/7qAK2pvl1ADioF7Iwe9SgCE6tVaQdtOAwNo3XZx8=";
|
||||
hash = "sha256-9myo073/yl9CWwmVb3Gkihf6I/60kSOl0Pk8+dE39KM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-5VTC6Y3Bs2ViW5/O8TeD0i6Boeu71b9C+B/3O73bCbk=";
|
||||
vendorHash = "sha256-jOLFqCeBxQLXgUAdDbk/QnPBAtMBQi5VR+oKjgZLb28=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
|
|||
|
|
@ -22,11 +22,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "filezilla";
|
||||
version = "3.67.0";
|
||||
version = "3.66.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.xz";
|
||||
hash = "sha256-5drcgH25mc60ZJhPl00+9ZtWLFlUZlgFfpsgEYOtr5o=";
|
||||
hash = "sha256-khIoGbrmNBBwuktuy0V+ZzC0bn3ImUKZCQPymJA9Gzs=";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "signalbackup-tools";
|
||||
version = "20240415-2";
|
||||
version = "20240412-2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bepaald";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-fMt5F+ykMxaP/6gEVN7TabENTSKbO4Gpms5yD+MBzPc=";
|
||||
hash = "sha256-e+QA8pqMz/XH+JpKErGYWKwsxHoFPTsFrSremfOaVbg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -20,13 +20,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "teams-for-linux";
|
||||
version = "1.4.27";
|
||||
version = "1.4.22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "IsmaelMartinez";
|
||||
repo = "teams-for-linux";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-nUHiveS1XI+vC2Tj1DK/DS4CrKTLMg1IYgTPWXuLrAc=";
|
||||
hash = "sha256-eNd12p9QvuYpiy9FaGaMSfQ3qVYzmYyO2/v/rdV3nN8=";
|
||||
};
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
|
|
|
|||
|
|
@ -63,14 +63,14 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "telegram-desktop";
|
||||
version = "4.16.7";
|
||||
version = "4.16.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "telegramdesktop";
|
||||
repo = "tdesktop";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-+BXuFHXGOgpmAX7wsGLxZxfzvNsntFLtd+Obhb339Yc=";
|
||||
hash = "sha256-1NRA8guTbDEraW1uXSo7q54d1e8/QnXwxkfb6k3e6b0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.81";
|
||||
version = "0.80";
|
||||
pname = "putty";
|
||||
|
||||
src = fetchurl {
|
||||
|
|
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
|||
"https://the.earth.li/~sgtatham/putty/${version}/${pname}-${version}.tar.gz"
|
||||
"ftp://ftp.wayne.edu/putty/putty-website-mirror/${version}/${pname}-${version}.tar.gz"
|
||||
];
|
||||
hash = "sha256-y4sAqU9FNJTjRaPfKB16PtJrsN1+NiZPFFIG+IV2Of4=";
|
||||
hash = "sha256-IBPIOnIbF1NSnpCQ98ODDo/kyAoHDMznZFObrbP2cIE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake perl pkg-config copyDesktopItems ];
|
||||
|
|
|
|||
|
|
@ -11,16 +11,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "rymdport";
|
||||
version = "3.6.0";
|
||||
version = "3.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Jacalz";
|
||||
repo = "rymdport";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-PMCetU+E0Kl50K7sJB6UiHVouWPtfW8ALXFacxCvAhE=";
|
||||
hash = "sha256-lCtFm360UeypzYpivlYXxuqZ0BzGzGkkq31dmgjwv4M=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-RsmwTRVjhEgKAT9aekSfkRuai2165KG7q5aFjAiLSPU=";
|
||||
vendorHash = "sha256-PXRy12JWYQQMMzh7jrEhquileY2oYFvqt8KZvrfp2o0=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ assert withQt -> qt6 != null;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wireshark-${if withQt then "qt" else "cli"}";
|
||||
version = "4.2.4";
|
||||
version = "4.2.3";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
|
|
@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
|
|||
repo = "wireshark";
|
||||
owner = "wireshark";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-yGKqklNy1SkmWOaYI0jsTy2rLq5W/dbh8fIUrBSSdw8=";
|
||||
hash = "sha256-2kJBVO40F1m43317g337bk84ZSf6WPK04ir0xc5qxTc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -12,9 +12,6 @@
|
|||
, dconf
|
||||
, librsvg
|
||||
, gdk-pixbuf
|
||||
# some scripts need these when used in conjuction with firejail
|
||||
, coreutils
|
||||
, gnugrep
|
||||
# Configuration options for the wrapper
|
||||
, extraMakeWrapperArgs ? []
|
||||
, dbusVerify ? stdenv.isLinux
|
||||
|
|
@ -35,7 +32,6 @@ let
|
|||
"--prefix" "XDG_DATA_DIRS" ":" "${hicolor-icon-theme}/share"
|
||||
"--prefix" "GST_PLUGIN_SYSTEM_PATH_1_0" ":"
|
||||
"${lib.makeSearchPath "lib/girepository-1.0" unwrapped.gst_packages}"
|
||||
"--suffix" "PATH" ":" "${lib.makeBinPath [ coreutils gnugrep ]}"
|
||||
] ++ lib.optionals unwrapped.kdeIntegration [
|
||||
"--prefix" "QT_PLUGIN_PATH" ":" "${
|
||||
lib.makeSearchPath
|
||||
|
|
|
|||
|
|
@ -2,11 +2,12 @@
|
|||
, coreutils
|
||||
, fetchFromGitHub
|
||||
, ghostscript
|
||||
, locale
|
||||
, glibc
|
||||
, gnome
|
||||
, gnused
|
||||
, lib
|
||||
, resholve
|
||||
, xorg
|
||||
}:
|
||||
|
||||
resholve.mkDerivation rec {
|
||||
|
|
@ -34,16 +35,15 @@ resholve.mkDerivation rec {
|
|||
inputs = [
|
||||
coreutils
|
||||
ghostscript
|
||||
locale
|
||||
glibc
|
||||
gnome.zenity
|
||||
gnused
|
||||
xorg.xmessage
|
||||
];
|
||||
fake = {
|
||||
# only need xmessage if zenity is unavailable
|
||||
external = [ "xmessage" ];
|
||||
};
|
||||
execer = [
|
||||
"cannot:${glibc.bin}/bin/locale"
|
||||
"cannot:${gnome.zenity}/bin/zenity"
|
||||
"cannot:${xorg.xmessage}/bin/xmessage"
|
||||
];
|
||||
keep."$toutLu" = true;
|
||||
};
|
||||
|
|
@ -54,6 +54,5 @@ resholve.mkDerivation rec {
|
|||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ urandom ];
|
||||
mainProgram = "pdfmm";
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,96 +1,45 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitea
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, libusb1
|
||||
}:
|
||||
let
|
||||
generic = { version, pname, src, meta }:
|
||||
stdenv.mkDerivation {
|
||||
inherit version pname src;
|
||||
nativeBuildInputs = [ pkg-config cmake ];
|
||||
propagatedBuildInputs = [ libusb1 ];
|
||||
|
||||
cmakeFlags = lib.optionals stdenv.isLinux [
|
||||
"-DINSTALL_UDEV_RULES=ON"
|
||||
"-DWITH_RPC=ON"
|
||||
];
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rtl-sdr";
|
||||
version = "0.9.0";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace '/etc/udev/rules.d' "$out/etc/udev/rules.d" \
|
||||
--replace "VERSION_INFO_PATCH_VERSION git" "VERSION_INFO_PATCH_VERSION ${lib.versions.patch version}"
|
||||
|
||||
substituteInPlace rtl-sdr.rules \
|
||||
--replace 'MODE:="0666"' 'ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev"'
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
inherit (meta) longDescription homepage;
|
||||
description = "Software to turn the RTL2832U into a SDR receiver";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ bjornfor skovati Tungsten842 ];
|
||||
platforms = platforms.unix;
|
||||
mainProgram = "rtl_sdr";
|
||||
};
|
||||
};
|
||||
in
|
||||
{
|
||||
rtl-sdr-osmocom = generic rec {
|
||||
pname = "rtl-sdr-osmocom";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "gitea.osmocom.org";
|
||||
owner = "sdr";
|
||||
repo = "rtl-sdr";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-+RYSCn+wAkb9e7NRI5kLY8a6OXtJu7QcSUht1R6wDX0=";
|
||||
};
|
||||
meta = {
|
||||
longDescription = "Rtl-sdr library by the Osmocom project";
|
||||
homepage = "https://gitea.osmocom.org/sdr/rtl-sdr";
|
||||
};
|
||||
src = fetchFromGitHub {
|
||||
owner = "librtlsdr";
|
||||
repo = "librtlsdr";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-I1rbywQ0ZBw26wZdtMBkfpj7+kv09XKrrcoDuhIkRmw=";
|
||||
};
|
||||
|
||||
rtl-sdr-librtlsdr = generic rec {
|
||||
pname = "rtl-sdr-librtlsdr";
|
||||
version = "0.9.0";
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace '/etc/udev/rules.d' "$out/etc/udev/rules.d" \
|
||||
--replace "VERSION_INFO_PATCH_VERSION git" "VERSION_INFO_PATCH_VERSION ${lib.versions.patch version}"
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "librtlsdr";
|
||||
repo = "librtlsdr";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-I1rbywQ0ZBw26wZdtMBkfpj7+kv09XKrrcoDuhIkRmw=";
|
||||
};
|
||||
meta = {
|
||||
longDescription = ''
|
||||
Fork of the rtl-sdr library by the Osmocom project. A list of differences
|
||||
can be found here: https://github.com/librtlsdr/librtlsdr/blob/master/README_improvements.md
|
||||
'';
|
||||
homepage = "https://github.com/librtlsdr/librtlsdr";
|
||||
};
|
||||
substituteInPlace rtl-sdr.rules \
|
||||
--replace 'MODE:="0666"' 'ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev"'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkg-config cmake ];
|
||||
|
||||
propagatedBuildInputs = [ libusb1 ];
|
||||
|
||||
cmakeFlags = lib.optionals stdenv.isLinux [
|
||||
"-DINSTALL_UDEV_RULES=ON"
|
||||
"-DWITH_RPC=ON"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Turns your Realtek RTL2832 based DVB dongle into a SDR receiver";
|
||||
homepage = "https://github.com/librtlsdr/librtlsdr";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ bjornfor ];
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
};
|
||||
|
||||
rtl-sdr-blog = generic rec {
|
||||
pname = "rtl-sdr-blog";
|
||||
version = "1.3.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rtlsdrblog";
|
||||
repo = "rtl-sdr-blog";
|
||||
rev = version;
|
||||
hash = "sha256-7FpT+BoQ2U8KiKwX4NfEwrO3lMBti7RX8uKtT5dFH8M=";
|
||||
};
|
||||
meta = {
|
||||
longDescription = ''
|
||||
Fork of the rtl-sdr library by the Osmocom project. A list of differences
|
||||
can be found here: https://github.com/rtlsdrblog/rtl-sdr-blog/blob/master/README
|
||||
'';
|
||||
homepage = "https://github.com/rtlsdrblog/rtl-sdr-blog";
|
||||
};
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, gcc, gcc-unwrapped }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "4.2.1";
|
||||
version = "4.2";
|
||||
pname = "messer-slim";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MesserLab";
|
||||
repo = "SLiM";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ba5I/bsDNAhDb1Kq0lWTC6YgpZ1PpeHPmB/vXx/JRK0=";
|
||||
sha256 = "sha256-PDIaOMA1QHrJC5xVW+Mzx8ja/YvZBMKvV88MjSoSpfM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake gcc gcc-unwrapped ];
|
||||
|
|
|
|||
|
|
@ -20,13 +20,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nest";
|
||||
version = "3.7";
|
||||
version = "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nest";
|
||||
repo = "nest-simulator";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-KoeehD0HNG6Uafv6ICf8d4gjggJ7+/8RBJCpttf7AGk=";
|
||||
hash = "sha256-sXtF4JmHYoLp0t3o4KF6R2E0qLnKrzSPMXOxVJAm+sU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "cwltool";
|
||||
version = "3.1.20240404144621";
|
||||
version = "3.1.20240112164112";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "common-workflow-language";
|
||||
repo = "cwltool";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-atpXkMIQ60POuUk99uiiuCoRXt4Seg11g/eHCeTDe+Q=";
|
||||
hash = "sha256-Y0DORypXlTDv04qh796oXPSTxCXGb7rLQ8Su+/As7Lo=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "git-machete";
|
||||
version = "3.25.0";
|
||||
version = "3.24.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "virtuslab";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-tLEuSwM8X0+oQDB9fmj5OQsC7iA906EQZz3yvB6rXfk=";
|
||||
hash = "sha256-nxfSdgGF/hDFf7KIJ+tqCvxEi1GOjTAbpcJylIqhd/M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
{
|
||||
"version": "16.10.3",
|
||||
"repo_hash": "sha256-JeZHnoNMk7NYBeUy25YK+f6K7WOeTQnYV/pG08bmiwA=",
|
||||
"version": "16.10.2",
|
||||
"repo_hash": "sha256-hKd++fjBaCidBB9DbitWTJjvmiXU0iN1HY4S2gtscW8=",
|
||||
"yarn_hash": "0yzywfg4lqxjwm5cqsm4bn97zcrfvpnrs8rjrv9wv3xqvi9h9skd",
|
||||
"owner": "gitlab-org",
|
||||
"repo": "gitlab",
|
||||
"rev": "v16.10.3-ee",
|
||||
"rev": "v16.10.2-ee",
|
||||
"passthru": {
|
||||
"GITALY_SERVER_VERSION": "16.10.3",
|
||||
"GITLAB_PAGES_VERSION": "16.10.3",
|
||||
"GITALY_SERVER_VERSION": "16.10.2",
|
||||
"GITLAB_PAGES_VERSION": "16.10.2",
|
||||
"GITLAB_SHELL_VERSION": "14.34.0",
|
||||
"GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.8.0",
|
||||
"GITLAB_WORKHORSE_VERSION": "16.10.3"
|
||||
"GITLAB_WORKHORSE_VERSION": "16.10.2"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "16.10.3";
|
||||
version = "16.10.2";
|
||||
package_version = "v${lib.versions.major version}";
|
||||
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
|
||||
|
||||
|
|
@ -18,7 +18,7 @@ let
|
|||
owner = "gitlab-org";
|
||||
repo = "gitaly";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-WdEYZL3g/aYh2Iy1ZgJhIHgQ4967FOxhiuQEokk1S2A=";
|
||||
hash = "sha256-oV6MV9W5kC43orMn78A3UpuR71crN7tcN3xy56S/Ar0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-zaldiRg7fk/HncpfR7k+dDprsOp1ziQHgX8B4l7bwe0=";
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gitlab-pages";
|
||||
version = "16.10.3";
|
||||
version = "16.10.2";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitLab {
|
||||
owner = "gitlab-org";
|
||||
repo = "gitlab-pages";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-mQNDnxdrM679ejjXZuqSV8SwLXFcKKKGOQt3DJWOZOo=";
|
||||
hash = "sha256-lJYQBNJFAVq9SKS1gc2rhdE3qFO7x7xcCXT4hlDwtB8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-WrR4eZRAuYkhr7ZqP7OXqJ6uwvxzn+t+3OdBNcNaq0M=";
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ in
|
|||
buildGoModule rec {
|
||||
pname = "gitlab-workhorse";
|
||||
|
||||
version = "16.10.3";
|
||||
version = "16.10.2";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitLab {
|
||||
|
|
|
|||
163
pkgs/applications/video/aegisub/default.nix
Normal file
163
pkgs/applications/video/aegisub/default.nix
Normal file
|
|
@ -0,0 +1,163 @@
|
|||
{ lib
|
||||
, config
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, boost179
|
||||
, cmake
|
||||
, expat
|
||||
, harfbuzz
|
||||
, ffmpeg
|
||||
, ffms
|
||||
, fftw
|
||||
, fontconfig
|
||||
, freetype
|
||||
, fribidi
|
||||
, glib
|
||||
, icu
|
||||
, intltool
|
||||
, libGL
|
||||
, libGLU
|
||||
, libX11
|
||||
, libass
|
||||
, libiconv
|
||||
, libuchardet
|
||||
, luajit
|
||||
, pcre
|
||||
, pkg-config
|
||||
, which
|
||||
, wrapGAppsHook
|
||||
, wxGTK
|
||||
, zlib
|
||||
|
||||
, spellcheckSupport ? true
|
||||
, hunspell ? null
|
||||
|
||||
, openalSupport ? false
|
||||
, openal ? null
|
||||
|
||||
, alsaSupport ? stdenv.isLinux
|
||||
, alsa-lib ? null
|
||||
|
||||
, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux
|
||||
, libpulseaudio ? null
|
||||
|
||||
, portaudioSupport ? false
|
||||
, portaudio ? null
|
||||
|
||||
, useBundledLuaJIT ? false
|
||||
, darwin
|
||||
}:
|
||||
|
||||
assert spellcheckSupport -> (hunspell != null);
|
||||
assert openalSupport -> (openal != null);
|
||||
assert alsaSupport -> (alsa-lib != null);
|
||||
assert pulseaudioSupport -> (libpulseaudio != null);
|
||||
assert portaudioSupport -> (portaudio != null);
|
||||
|
||||
let
|
||||
luajit52 = luajit.override { enable52Compat = true; };
|
||||
inherit (lib) optional;
|
||||
inherit (darwin.apple_sdk.frameworks) CoreText CoreFoundation AppKit Carbon IOKit Cocoa;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aegisub";
|
||||
version = "3.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wangqr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-oKhLv81EFudrJaaJ2ga3pVh4W5Hd2YchpjsoYoqRm78=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
intltool
|
||||
luajit52
|
||||
pkg-config
|
||||
which
|
||||
cmake
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
boost179
|
||||
expat
|
||||
ffmpeg
|
||||
ffms
|
||||
fftw
|
||||
fontconfig
|
||||
freetype
|
||||
fribidi
|
||||
glib
|
||||
harfbuzz
|
||||
icu
|
||||
libGL
|
||||
libGLU
|
||||
libX11
|
||||
libass
|
||||
libiconv
|
||||
libuchardet
|
||||
pcre
|
||||
wxGTK
|
||||
zlib
|
||||
]
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
CoreText
|
||||
CoreFoundation
|
||||
AppKit
|
||||
Carbon
|
||||
IOKit
|
||||
Cocoa
|
||||
]
|
||||
++ optional alsaSupport alsa-lib
|
||||
++ optional openalSupport openal
|
||||
++ optional portaudioSupport portaudio
|
||||
++ optional pulseaudioSupport libpulseaudio
|
||||
++ optional spellcheckSupport hunspell
|
||||
;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
hardeningDisable = [
|
||||
"bindnow"
|
||||
"relro"
|
||||
];
|
||||
|
||||
patches = lib.optionals (!useBundledLuaJIT) [
|
||||
./remove-bundled-luajit.patch
|
||||
];
|
||||
|
||||
# error: unknown type name 'NSUInteger'
|
||||
postPatch = ''
|
||||
substituteInPlace src/dialog_colorpicker.cpp \
|
||||
--replace "NSUInteger" "size_t"
|
||||
'';
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-I${luajit52}/include";
|
||||
NIX_CFLAGS_LINK = "-L${luajit52}/lib";
|
||||
|
||||
configurePhase = ''
|
||||
export FORCE_GIT_VERSION=${version}
|
||||
# Workaround for a Nixpkgs bug; remove when the fix arrives
|
||||
mkdir build-dir
|
||||
cd build-dir
|
||||
cmake -DCMAKE_INSTALL_PREFIX=$out ..
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/wangqr/Aegisub";
|
||||
description = "An advanced subtitle editor";
|
||||
longDescription = ''
|
||||
Aegisub is a free, cross-platform open source tool for creating and
|
||||
modifying subtitles. Aegisub makes it quick and easy to time subtitles to
|
||||
audio, and features many powerful tools for styling them, including a
|
||||
built-in real-time video preview.
|
||||
'';
|
||||
# The Aegisub sources are itself BSD/ISC, but they are linked against GPL'd
|
||||
# softwares - so the resulting program will be GPL
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ AndersonTorres wegank ];
|
||||
platforms = platforms.unix;
|
||||
mainProgram = "aegisub";
|
||||
};
|
||||
}
|
||||
|
|
@ -8,35 +8,26 @@
|
|||
, xorg
|
||||
, libxkbcommon
|
||||
, libxkbfile
|
||||
, SDL2
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "obs-input-overlay";
|
||||
version = "5.0.4";
|
||||
version = "5.0.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "univrsal";
|
||||
repo = "input-overlay";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-MON68yjHUOF/bggWqhw8D0+23HpKQN3jWs+5lLAacaQ=";
|
||||
sha256 = "sha256-kpVAvQpBU8TxHAFcx/ok67++4MHh5saoRHJc5XpY4YQ=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
buildInputs = [
|
||||
obs-studio libuiohook qtbase SDL2
|
||||
obs-studio libuiohook qtbase
|
||||
xorg.libX11 xorg.libXau xorg.libXdmcp xorg.libXtst xorg.libXext
|
||||
xorg.libXi xorg.libXt xorg.libXinerama libxkbcommon libxkbfile
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_CXX_FLAGS=-msse4.1"
|
||||
];
|
||||
|
||||
postUnpack = ''
|
||||
sed -i '/set(CMAKE_CXX_FLAGS "-march=native")/d' 'source/CMakeLists.txt'
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
mkdir $out/lib $out/share
|
||||
mv $out/obs-plugins/64bit $out/lib/obs-plugins
|
||||
|
|
|
|||
|
|
@ -22,9 +22,9 @@ stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
postFixup = ''
|
||||
mkdir -p $out/lib $out/share/obs/obs-plugins
|
||||
mkdir $out/lib $out/share
|
||||
mv $out/${pname}/bin/64bit $out/lib/obs-plugins
|
||||
mv $out/${pname}/data $out/share/obs/obs-plugins/${pname}
|
||||
mv $out/${pname}/data $out/share/obs
|
||||
rm -rf $out/${pname}
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -7,12 +7,12 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "streamlink";
|
||||
version = "6.7.3";
|
||||
version = "6.7.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Da+J+NOXW+n55LvaPQw6XiRhJJQ4Pc4Z1p21qMym/Xw=";
|
||||
hash = "sha256-enRwASn1wpwAYmDfU5djhDAJgcmv+dPVwut+kdPco1k=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -38,6 +38,6 @@ buildGoModule rec {
|
|||
license = licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
mainProgram = "ddev";
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ star-szr ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ fetchurl, lib, stdenv }:
|
||||
|
||||
let
|
||||
version = "1.7.0";
|
||||
version = "1.6.0";
|
||||
# nixpkgs-update: no auto update
|
||||
|
||||
suffix = {
|
||||
|
|
@ -23,8 +23,8 @@ stdenv.mkDerivation {
|
|||
|
||||
sourceRoot = ".";
|
||||
src = dlbin {
|
||||
x86_64-linux = "sha256-Vb0+bVmf3RCONuUvmu4jGfBsGKkPL6SbZOk/3wb1/1M=";
|
||||
aarch64-linux = "sha256-PLoQA4a6qulxSns/ZRSgn6EtHr46/hstNhP1pAHt9VA=";
|
||||
x86_64-linux = "sha256-FflAYvWTcigIchVrAaUgg6IRleEtis6eh6fCqrZ5lb8=";
|
||||
aarch64-linux = "sha256-4O0kPMl7RbMjszUNql0OQrl/4or/e8ZCHPngqq0CNxk=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "nixpacks";
|
||||
version = "1.21.3";
|
||||
version = "1.21.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "railwayapp";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-niEuOsSOjHDP4KEax/OqQfxWC3XmTRUKB8k0DQ3Ybq0=";
|
||||
sha256 = "sha256-GY5fwmwr2FAJB9SjTaghlC4GD6ECnect21VInTXseRE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-LMVYrxYpkwM9rdGkKaeLFKB+B2HI+AEDwrdBCAFLpJQ=";
|
||||
cargoHash = "sha256-kXfNWAloMwpykv6zJS5g6ng8RGn+NBNgYJmUg/I7dBg=";
|
||||
|
||||
# skip test due FHS dependency
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitea
|
||||
, fetchFromGitHub
|
||||
, libGL
|
||||
, libX11
|
||||
, libevdev
|
||||
|
|
@ -12,7 +12,7 @@
|
|||
, udev
|
||||
, wayland
|
||||
, wayland-protocols
|
||||
, wlroots_0_17
|
||||
, wlroots_0_16
|
||||
, xwayland
|
||||
, zig_0_11
|
||||
, withManpages ? true
|
||||
|
|
@ -21,17 +21,16 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "river";
|
||||
version = "0.3.0";
|
||||
version = "0.2.6";
|
||||
|
||||
outputs = [ "out" ] ++ lib.optionals withManpages [ "man" ];
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "river";
|
||||
src = fetchFromGitHub {
|
||||
owner = "riverwm";
|
||||
repo = "river";
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-6LZuWx0sC6bW0K7D0PR8hJlVW6i6NIzOOORdMu3Gk5U=";
|
||||
hash = "sha256-JPb8l5ANxYCqinWNoQK5PAyn4CaiSj0e9mAhZwd9HOw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -50,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
pixman
|
||||
udev
|
||||
wayland-protocols
|
||||
wlroots_0_17
|
||||
wlroots_0_16
|
||||
] ++ lib.optional xwaylandSupport libX11;
|
||||
|
||||
dontConfigure = true;
|
||||
|
|
@ -65,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
passthru.providedSessions = [ "river" ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://codeberg.org/river/river";
|
||||
homepage = "https://github.com/ifreund/river";
|
||||
description = "A dynamic tiling wayland compositor";
|
||||
longDescription = ''
|
||||
River is a dynamic tiling Wayland compositor with flexible runtime
|
||||
|
|
@ -80,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
- Scriptable configuration and control through a custom Wayland protocol
|
||||
and separate riverctl binary implementing it.
|
||||
'';
|
||||
changelog = "https://codeberg.org/river/river/releases/tag/v${finalAttrs.version}";
|
||||
changelog = "https://github.com/ifreund/river/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [
|
||||
adamcstephens
|
||||
|
|
|
|||
|
|
@ -1,164 +0,0 @@
|
|||
{
|
||||
lib,
|
||||
alsa-lib,
|
||||
boost,
|
||||
cmake,
|
||||
config,
|
||||
darwin,
|
||||
expat,
|
||||
fetchFromGitHub,
|
||||
ffmpeg,
|
||||
ffms,
|
||||
fftw,
|
||||
fontconfig,
|
||||
freetype,
|
||||
fribidi,
|
||||
glib,
|
||||
harfbuzz,
|
||||
hunspell,
|
||||
icu,
|
||||
intltool,
|
||||
libGL,
|
||||
libGLU,
|
||||
libX11,
|
||||
libass,
|
||||
libiconv,
|
||||
libpulseaudio,
|
||||
libuchardet,
|
||||
luajit,
|
||||
ninja,
|
||||
openal,
|
||||
pcre,
|
||||
pkg-config,
|
||||
portaudio,
|
||||
stdenv,
|
||||
which,
|
||||
wrapGAppsHook,
|
||||
wxGTK,
|
||||
zlib,
|
||||
# Boolean guard flags
|
||||
alsaSupport ? stdenv.isLinux,
|
||||
openalSupport ? true,
|
||||
portaudioSupport ? true,
|
||||
pulseaudioSupport ? config.pulseaudio or stdenv.isLinux,
|
||||
spellcheckSupport ? true,
|
||||
useBundledLuaJIT ? false,
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (darwin.apple_sdk.frameworks)
|
||||
AppKit
|
||||
Carbon
|
||||
Cocoa
|
||||
CoreFoundation
|
||||
CoreText
|
||||
IOKit
|
||||
OpenAL;
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "aegisub";
|
||||
version = "3.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wangqr";
|
||||
repo = "aegisub";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-oKhLv81EFudrJaaJ2ga3pVh4W5Hd2YchpjsoYoqRm78=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
intltool
|
||||
luajit
|
||||
ninja
|
||||
pkg-config
|
||||
which
|
||||
wrapGAppsHook
|
||||
wxGTK
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
expat
|
||||
ffmpeg
|
||||
ffms
|
||||
fftw
|
||||
fontconfig
|
||||
freetype
|
||||
fribidi
|
||||
glib
|
||||
harfbuzz
|
||||
icu
|
||||
libGL
|
||||
libGLU
|
||||
libX11
|
||||
libass
|
||||
libiconv
|
||||
libuchardet
|
||||
pcre
|
||||
wxGTK
|
||||
zlib
|
||||
]
|
||||
++ lib.optionals alsaSupport [ alsa-lib ]
|
||||
++ lib.optionals openalSupport [
|
||||
(if stdenv.isDarwin then OpenAL else openal)
|
||||
]
|
||||
++ lib.optionals portaudioSupport [ portaudio ]
|
||||
++ lib.optionals pulseaudioSupport [ libpulseaudio ]
|
||||
++ lib.optionals spellcheckSupport [ hunspell ]
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
AppKit
|
||||
Carbon
|
||||
Cocoa
|
||||
CoreFoundation
|
||||
CoreText
|
||||
IOKit
|
||||
];
|
||||
|
||||
hardeningDisable = [
|
||||
"bindnow"
|
||||
"relro"
|
||||
];
|
||||
|
||||
patches = lib.optionals (!useBundledLuaJIT) [
|
||||
./000-remove-bundled-luajit.patch
|
||||
];
|
||||
|
||||
# error: unknown type name 'NSUInteger'
|
||||
postPatch = ''
|
||||
substituteInPlace src/dialog_colorpicker.cpp \
|
||||
--replace "NSUInteger" "size_t"
|
||||
'';
|
||||
|
||||
env = {
|
||||
NIX_CFLAGS_COMPILE = "-I${lib.getDev luajit}/include";
|
||||
NIX_CFLAGS_LINK = "-L${lib.getLib luajit}/lib";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
export FORCE_GIT_VERSION=${finalAttrs.version}
|
||||
'';
|
||||
|
||||
cmakeBuildDir = "build-directory";
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/wangqr/Aegisub";
|
||||
description = "An advanced subtitle editor; wangqr's fork";
|
||||
longDescription = ''
|
||||
Aegisub is a free, cross-platform open source tool for creating and
|
||||
modifying subtitles. Aegisub makes it quick and easy to time subtitles to
|
||||
audio, and features many powerful tools for styling them, including a
|
||||
built-in real-time video preview.
|
||||
'';
|
||||
# The Aegisub sources are itself BSD/ISC, but they are linked against GPL'd
|
||||
# softwares - so the resulting program will be GPL
|
||||
license = with lib.licenses; [
|
||||
bsd3
|
||||
];
|
||||
mainProgram = "aegisub";
|
||||
maintainers = with lib.maintainers; [ AndersonTorres wegank ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
|
|
@ -1,58 +0,0 @@
|
|||
{
|
||||
lib,
|
||||
SDL2,
|
||||
autoreconfHook,
|
||||
fetchFromGitHub,
|
||||
libGLU,
|
||||
pkg-config,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "aranym";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aranym";
|
||||
repo = "aranym";
|
||||
rev = "ARANYM_${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}";
|
||||
hash = "sha256-dtcLIA1oC6sPOeGTRmXhMEbuLan9/JWTbQvO5lp3gKo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libGLU
|
||||
SDL2
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
meta = {
|
||||
homepage = "https://aranym.github.io";
|
||||
description = "Atari Running on Any Machine";
|
||||
longDescription = ''
|
||||
ARAnyM is a software virtual machine (similar to VirtualBox or Bochs)
|
||||
designed and developed for running 32-bit Atari ST/TT/Falcon operating
|
||||
systems (TOS, FreeMiNT, MagiC and Linux-m68k) and TOS/GEM applications on
|
||||
any kind of hardware - be it an IBM clone (read it as "PC" :-), an Apple,
|
||||
an Unix server, a graphics workstation or even a portable computer.
|
||||
|
||||
ARAnyM is not meant as an emulator of Atari Falcon (even though it has a
|
||||
rather high Falcon software compatibility and includes most of Falcon
|
||||
custom chips including VIDEL and DSP). ARAnyM is better in the sense that
|
||||
it's not tied to specification of an existing Atari machine so we were
|
||||
free to select the most complete CPU (68040 with MMU) and FPU (68882), add
|
||||
loads of RAM (up to 4 GB), host accelerated graphics (even with OpenGL)
|
||||
and direct access to various host resources including sound, disk drives,
|
||||
optical storage devices (CD/DVD-ROMs), parallel port and more.
|
||||
'';
|
||||
license = with lib.licenses; [ gpl2Plus ];
|
||||
mainProgram = "aranym";
|
||||
maintainers = with lib.maintainers; [ AndersonTorres ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "atlauncher";
|
||||
version = "3.4.36.3";
|
||||
version = "3.4.35.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ATLauncher/ATLauncher/releases/download/v${finalAttrs.version}/ATLauncher-${finalAttrs.version}.jar";
|
||||
hash = "sha256-qeH3W7G6xxlIrLK04A3GTKtZsvmii6acWY4clPIL8Rk=";
|
||||
hash = "sha256-Y2MGhzq4IbtjEG+CER+FWU8CY+hn5ehjMOcP02zIsR4=";
|
||||
};
|
||||
|
||||
env.ICON = fetchurl {
|
||||
|
|
|
|||
|
|
@ -10,20 +10,20 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "atuin";
|
||||
version = "18.2.0";
|
||||
version = "18.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "atuinsh";
|
||||
repo = "atuin";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-TTQ2XLqng7TMLnRsLDb/50yyHYuMSPZJ4H+7CEFWQQ0=";
|
||||
hash = "sha256-ddj8vHFTRBzeueSvY9kS1ZIcAID8k3MXrQkUVt04rQg=";
|
||||
};
|
||||
|
||||
# TODO: unify this to one hash because updater do not support this
|
||||
cargoHash =
|
||||
if stdenv.isLinux
|
||||
then "sha256-KMH19Op7uyb3Z/cjT6bdmO+JEp1o2n6rWRNYmn1+0hE="
|
||||
else "sha256-mBOyo6bKipMfmsowQujeUpog12jXAiqx5CtkwCxquRU=";
|
||||
then "sha256-LKHBXm9ZThX96JjxJb8d7cRdhWL1t/3aG3Qq1TYBC74="
|
||||
else "sha256-RSkC062XB5zy3lmI0OQhJfJ6FqFWXhpMPNIIqbrrlso=";
|
||||
|
||||
# atuin's default features include 'check-updates', which do not make sense
|
||||
# for distribution builds. List all other default features.
|
||||
|
|
@ -60,8 +60,6 @@ rustPlatform.buildRustPackage rec {
|
|||
# PermissionDenied (Operation not permitted)
|
||||
"--skip=change_password"
|
||||
"--skip=multi_user_test"
|
||||
# Tries to touch files
|
||||
"--skip=build_aliases"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -10,18 +10,18 @@
|
|||
|
||||
buildNpmPackage rec {
|
||||
pname = "bitwarden-cli";
|
||||
version = "2024.3.1";
|
||||
version = "2024.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bitwarden";
|
||||
repo = "clients";
|
||||
rev = "cli-v${version}";
|
||||
hash = "sha256-JBEP4dNGL4rYKl2qNyhB2y/wZunikaGFltGVXLxgMWI=";
|
||||
hash = "sha256-g9enDEIdVj9R3xkx5qllf7aTDa6F+MvozhwbJn9w/VY=";
|
||||
};
|
||||
|
||||
nodejs = nodejs_18;
|
||||
|
||||
npmDepsHash = "sha256-vNudSHIMmF7oXGz+ZymQahyHebs/CBDc6Oy1g0A5nqA=";
|
||||
npmDepsHash = "sha256-fkoI8a8iVMWxtXAj5zNg2xwK/ZPyRZGPo7rnxHpKV7k=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
python3
|
||||
|
|
|
|||
|
|
@ -29,13 +29,13 @@ let
|
|||
electron = electron_28;
|
||||
in buildNpmPackage rec {
|
||||
pname = "bitwarden-desktop";
|
||||
version = "2024.4.1";
|
||||
version = "2024.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bitwarden";
|
||||
repo = "clients";
|
||||
rev = "desktop-v${version}";
|
||||
hash = "sha256-UzVzo8tq719W2EwUE4NfvUrqhb61fvd60EGkavQmv3Q=";
|
||||
hash = "sha256-XEZB95GnfSy/wtTWpF8KlUQwyephUZmSLtbOwbcvd7g=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -60,7 +60,7 @@ in buildNpmPackage rec {
|
|||
makeCacheWritable = true;
|
||||
npmFlags = [ "--legacy-peer-deps" ];
|
||||
npmWorkspace = "apps/desktop";
|
||||
npmDepsHash = "sha256-qkg1psct/ekIXB6QmJX1n/UOKUhYSD9Su7t/b4/4miM=";
|
||||
npmDepsHash = "sha256-EpZXA+GkmHl5eqwIPTGHJZqrpr6k8gXneJG+GXumlkc=";
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
name = "${pname}-${version}";
|
||||
|
|
@ -76,7 +76,7 @@ in buildNpmPackage rec {
|
|||
patches;
|
||||
patchFlags = [ "-p4" ];
|
||||
sourceRoot = "${src.name}/${cargoRoot}";
|
||||
hash = "sha256-lvEJmjzhpMhm+9INYHWpdltinUOI3DMtFN/ddDQrUvo=";
|
||||
hash = "sha256-qAqEFlUzT28fw6kLB8d7U8yXWevAU+q03zjN2xWsGyI=";
|
||||
};
|
||||
cargoRoot = "apps/desktop/desktop_native";
|
||||
|
||||
|
|
|
|||
|
|
@ -27,20 +27,20 @@ let
|
|||
in
|
||||
buildNpmPackage' rec {
|
||||
pname = "bruno";
|
||||
version = "1.13.1";
|
||||
version = "1.12.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "usebruno";
|
||||
repo = "bruno";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-fVbwHmJ/5OtMM0lkOIo6zPXkAa8mIK+WRHCTXJ1XEIw=";
|
||||
hash = "sha256-ubvsTJ/MSEguVeJg91LvgARWte+p5MHdqhXIVqbyPhQ=";
|
||||
|
||||
postFetch = ''
|
||||
${lib.getExe npm-lockfile-fix} $out/package-lock.json
|
||||
'';
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-D90y6NaiR9zpgtjfm9QgLxBVbHa09OMSi+fvgwqSjgY=";
|
||||
npmDepsHash = "sha256-Zt5cVB1S86iPYKOUj7FwyR97lwmnFz6sZ+S3Ms/b9+o=";
|
||||
npmFlags = [ "--legacy-peer-deps" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -73,7 +73,7 @@ buildNpmPackage' rec {
|
|||
|
||||
postPatch = ''
|
||||
substituteInPlace scripts/build-electron.sh \
|
||||
--replace-fail 'if [ "$1" == "snap" ]; then' 'exit 0; if [ "$1" == "snap" ]; then'
|
||||
--replace 'if [ "$1" == "snap" ]; then' 'exit 0; if [ "$1" == "snap" ]; then'
|
||||
'';
|
||||
|
||||
ELECTRON_SKIP_BINARY_DOWNLOAD=1;
|
||||
|
|
@ -94,8 +94,8 @@ buildNpmPackage' rec {
|
|||
find ./Electron.app -name 'Info.plist' | xargs -d '\n' chmod +rw
|
||||
|
||||
substituteInPlace electron-builder-config.js \
|
||||
--replace-fail "identity: 'Anoop MD (W7LPPWA48L)'" 'identity: null' \
|
||||
--replace-fail "afterSign: 'notarize.js'," ""
|
||||
--replace "identity: 'Anoop MD (W7LPPWA48L)'" 'identity: null' \
|
||||
--replace "afterSign: 'notarize.js'," ""
|
||||
|
||||
npm exec electron-builder -- \
|
||||
--dir \
|
||||
|
|
@ -151,7 +151,7 @@ buildNpmPackage' rec {
|
|||
homepage = "https://www.usebruno.com";
|
||||
inherit (electron.meta) platforms;
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ gepbird kashw2 lucasew mattpolzin water-sucks ];
|
||||
maintainers = with maintainers; [ water-sucks lucasew kashw2 mattpolzin ];
|
||||
mainProgram = "bruno";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
276
pkgs/by-name/cr/crunchy-cli/Cargo.lock
generated
276
pkgs/by-name/cr/crunchy-cli/Cargo.lock
generated
|
|
@ -91,9 +91,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "anyhow"
|
||||
version = "1.0.82"
|
||||
version = "1.0.81"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519"
|
||||
checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247"
|
||||
|
||||
[[package]]
|
||||
name = "async-speed-limit"
|
||||
|
|
@ -109,9 +109,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "async-trait"
|
||||
version = "0.1.80"
|
||||
version = "0.1.79"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca"
|
||||
checksum = "a507401cad91ec6a857ed5513a2073c82a9b9048762b885bb98655b306964681"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
|
|
@ -175,21 +175,9 @@ checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
|
|||
|
||||
[[package]]
|
||||
name = "bumpalo"
|
||||
version = "3.16.0"
|
||||
version = "3.15.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
|
||||
|
||||
[[package]]
|
||||
name = "bytemuck"
|
||||
version = "1.15.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15"
|
||||
|
||||
[[package]]
|
||||
name = "byteorder"
|
||||
version = "1.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
|
||||
checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa"
|
||||
|
||||
[[package]]
|
||||
name = "bytes"
|
||||
|
|
@ -199,9 +187,9 @@ checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
|
|||
|
||||
[[package]]
|
||||
name = "cc"
|
||||
version = "1.0.94"
|
||||
version = "1.0.90"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "17f6e324229dc011159fcc089755d1e2e216a90d43a7dea6853ca740b84f35e7"
|
||||
checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5"
|
||||
|
||||
[[package]]
|
||||
name = "cfg-if"
|
||||
|
|
@ -227,7 +215,7 @@ dependencies = [
|
|||
"num-traits",
|
||||
"serde",
|
||||
"wasm-bindgen",
|
||||
"windows-targets 0.52.5",
|
||||
"windows-targets 0.52.4",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -254,9 +242,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "clap_complete"
|
||||
version = "4.5.2"
|
||||
version = "4.5.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "dd79504325bf38b10165b02e89b4347300f855f273c4cb30c4a3209e6583275e"
|
||||
checksum = "885e4d7d5af40bfb99ae6f9433e292feac98d452dcb3ec3d25dfe7552b77da8c"
|
||||
dependencies = [
|
||||
"clap",
|
||||
]
|
||||
|
|
@ -354,7 +342,7 @@ checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
|
|||
|
||||
[[package]]
|
||||
name = "crunchy-cli"
|
||||
version = "3.4.3"
|
||||
version = "3.3.4"
|
||||
dependencies = [
|
||||
"chrono",
|
||||
"clap",
|
||||
|
|
@ -367,7 +355,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "crunchy-cli-core"
|
||||
version = "3.4.3"
|
||||
version = "3.3.4"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"async-speed-limit",
|
||||
|
|
@ -381,8 +369,6 @@ dependencies = [
|
|||
"fs2",
|
||||
"futures-util",
|
||||
"http",
|
||||
"image",
|
||||
"image_hasher",
|
||||
"indicatif",
|
||||
"lazy_static",
|
||||
"log",
|
||||
|
|
@ -404,9 +390,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "crunchyroll-rs"
|
||||
version = "0.10.7"
|
||||
version = "0.10.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3eaf93641a3697ba4cd6845b3a741089f4b4c692a91ed40dece6d7376c419ef9"
|
||||
checksum = "0010e5dded0388e3a1e69105c2e65637d092eff049ba10f132f216c8e26a2473"
|
||||
dependencies = [
|
||||
"async-trait",
|
||||
"chrono",
|
||||
|
|
@ -424,15 +410,14 @@ dependencies = [
|
|||
"smart-default",
|
||||
"tokio",
|
||||
"tower-service",
|
||||
"uuid",
|
||||
"webpki-roots",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "crunchyroll-rs-internal"
|
||||
version = "0.10.7"
|
||||
version = "0.10.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "48daba6fe0296c2b400cd6545cf2e8ee23870f1a5a35291fa2d61987098a5692"
|
||||
checksum = "7e5226275711b3d1dc6afdc5e2241a45bb5d4dc1a813902265d628ccfe1ab67d"
|
||||
dependencies = [
|
||||
"darling",
|
||||
"quote",
|
||||
|
|
@ -564,9 +549,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "either"
|
||||
version = "1.11.0"
|
||||
version = "1.10.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2"
|
||||
checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a"
|
||||
|
||||
[[package]]
|
||||
name = "encode_unicode"
|
||||
|
|
@ -576,9 +561,9 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
|
|||
|
||||
[[package]]
|
||||
name = "encoding_rs"
|
||||
version = "0.8.34"
|
||||
version = "0.8.33"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59"
|
||||
checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
]
|
||||
|
|
@ -723,9 +708,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "getrandom"
|
||||
version = "0.2.14"
|
||||
version = "0.2.12"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c"
|
||||
checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"js-sys",
|
||||
|
|
@ -951,32 +936,6 @@ dependencies = [
|
|||
"unicode-normalization",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "image"
|
||||
version = "0.25.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11"
|
||||
dependencies = [
|
||||
"bytemuck",
|
||||
"byteorder",
|
||||
"num-traits",
|
||||
"zune-core",
|
||||
"zune-jpeg",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "image_hasher"
|
||||
version = "2.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9481465fe767d92494987319b0b447a5829edf57f09c52bf8639396abaaeaf78"
|
||||
dependencies = [
|
||||
"base64 0.22.0",
|
||||
"image",
|
||||
"rustdct",
|
||||
"serde",
|
||||
"transpose",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "indexmap"
|
||||
version = "1.9.3"
|
||||
|
|
@ -1184,30 +1143,12 @@ dependencies = [
|
|||
"minimal-lexical",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num-complex"
|
||||
version = "0.4.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6"
|
||||
dependencies = [
|
||||
"num-traits",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num-conv"
|
||||
version = "0.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
|
||||
|
||||
[[package]]
|
||||
name = "num-integer"
|
||||
version = "0.1.46"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
|
||||
dependencies = [
|
||||
"num-traits",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num-traits"
|
||||
version = "0.2.18"
|
||||
|
|
@ -1364,15 +1305,6 @@ version = "0.2.0"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
|
||||
|
||||
[[package]]
|
||||
name = "primal-check"
|
||||
version = "0.3.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9df7f93fd637f083201473dab4fee2db4c429d32e55e3299980ab3957ab916a0"
|
||||
dependencies = [
|
||||
"num-integer",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro2"
|
||||
version = "1.0.79"
|
||||
|
|
@ -1410,9 +1342,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "quote"
|
||||
version = "1.0.36"
|
||||
version = "1.0.35"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
|
||||
checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
]
|
||||
|
|
@ -1459,11 +1391,11 @@ checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
|
|||
|
||||
[[package]]
|
||||
name = "reqwest"
|
||||
version = "0.12.3"
|
||||
version = "0.12.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3e6cc1e89e689536eb5aeede61520e874df5a4707df811cd5da4aa5fbb2aae19"
|
||||
checksum = "2d66674f2b6fb864665eea7a3c1ac4e3dfacd2fda83cf6f935a612e01b0e3338"
|
||||
dependencies = [
|
||||
"base64 0.22.0",
|
||||
"base64 0.21.7",
|
||||
"bytes",
|
||||
"cookie",
|
||||
"cookie_store",
|
||||
|
|
@ -1488,7 +1420,7 @@ dependencies = [
|
|||
"percent-encoding",
|
||||
"pin-project-lite",
|
||||
"rustls",
|
||||
"rustls-pemfile",
|
||||
"rustls-pemfile 1.0.4",
|
||||
"rustls-pki-types",
|
||||
"serde",
|
||||
"serde_json",
|
||||
|
|
@ -1537,30 +1469,6 @@ version = "0.1.23"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
|
||||
|
||||
[[package]]
|
||||
name = "rustdct"
|
||||
version = "0.7.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8b61555105d6a9bf98797c063c362a1d24ed8ab0431655e38f1cf51e52089551"
|
||||
dependencies = [
|
||||
"rustfft",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rustfft"
|
||||
version = "6.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "43806561bc506d0c5d160643ad742e3161049ac01027b5e6d7524091fd401d86"
|
||||
dependencies = [
|
||||
"num-complex",
|
||||
"num-integer",
|
||||
"num-traits",
|
||||
"primal-check",
|
||||
"strength_reduce",
|
||||
"transpose",
|
||||
"version_check",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rustix"
|
||||
version = "0.38.32"
|
||||
|
|
@ -1595,7 +1503,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792"
|
||||
dependencies = [
|
||||
"openssl-probe",
|
||||
"rustls-pemfile",
|
||||
"rustls-pemfile 2.1.1",
|
||||
"rustls-pki-types",
|
||||
"schannel",
|
||||
"security-framework",
|
||||
|
|
@ -1603,11 +1511,20 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "rustls-pemfile"
|
||||
version = "2.1.2"
|
||||
version = "1.0.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d"
|
||||
checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c"
|
||||
dependencies = [
|
||||
"base64 0.22.0",
|
||||
"base64 0.21.7",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rustls-pemfile"
|
||||
version = "2.1.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f48172685e6ff52a556baa527774f61fcaa884f59daf3375c62a3f1cd2549dab"
|
||||
dependencies = [
|
||||
"base64 0.21.7",
|
||||
"rustls-pki-types",
|
||||
]
|
||||
|
||||
|
|
@ -1812,12 +1729,6 @@ version = "0.9.8"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
|
||||
|
||||
[[package]]
|
||||
name = "strength_reduce"
|
||||
version = "0.2.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fe895eb47f22e2ddd4dabc02bce419d2e643c8e3b585c78158b349195bc24d82"
|
||||
|
||||
[[package]]
|
||||
name = "strsim"
|
||||
version = "0.10.0"
|
||||
|
|
@ -1917,9 +1828,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "time"
|
||||
version = "0.3.36"
|
||||
version = "0.3.34"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
|
||||
checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749"
|
||||
dependencies = [
|
||||
"deranged",
|
||||
"itoa",
|
||||
|
|
@ -1938,9 +1849,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
|
|||
|
||||
[[package]]
|
||||
name = "time-macros"
|
||||
version = "0.2.18"
|
||||
version = "0.2.17"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
|
||||
checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774"
|
||||
dependencies = [
|
||||
"num-conv",
|
||||
"time-core",
|
||||
|
|
@ -2096,16 +2007,6 @@ dependencies = [
|
|||
"once_cell",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "transpose"
|
||||
version = "0.2.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1ad61aed86bc3faea4300c7aee358b4c6d0c8d6ccc36524c96e4c92ccf26e77e"
|
||||
dependencies = [
|
||||
"num-integer",
|
||||
"strength_reduce",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "try-lock"
|
||||
version = "0.2.5"
|
||||
|
|
@ -2171,15 +2072,6 @@ version = "0.2.1"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
|
||||
|
||||
[[package]]
|
||||
name = "uuid"
|
||||
version = "1.8.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0"
|
||||
dependencies = [
|
||||
"getrandom",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "vcpkg"
|
||||
version = "0.2.15"
|
||||
|
|
@ -2333,7 +2225,7 @@ version = "0.52.0"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
|
||||
dependencies = [
|
||||
"windows-targets 0.52.5",
|
||||
"windows-targets 0.52.4",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -2351,7 +2243,7 @@ version = "0.52.0"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
|
||||
dependencies = [
|
||||
"windows-targets 0.52.5",
|
||||
"windows-targets 0.52.4",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -2371,18 +2263,17 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "windows-targets"
|
||||
version = "0.52.5"
|
||||
version = "0.52.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
|
||||
checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b"
|
||||
dependencies = [
|
||||
"windows_aarch64_gnullvm 0.52.5",
|
||||
"windows_aarch64_msvc 0.52.5",
|
||||
"windows_i686_gnu 0.52.5",
|
||||
"windows_i686_gnullvm",
|
||||
"windows_i686_msvc 0.52.5",
|
||||
"windows_x86_64_gnu 0.52.5",
|
||||
"windows_x86_64_gnullvm 0.52.5",
|
||||
"windows_x86_64_msvc 0.52.5",
|
||||
"windows_aarch64_gnullvm 0.52.4",
|
||||
"windows_aarch64_msvc 0.52.4",
|
||||
"windows_i686_gnu 0.52.4",
|
||||
"windows_i686_msvc 0.52.4",
|
||||
"windows_x86_64_gnu 0.52.4",
|
||||
"windows_x86_64_gnullvm 0.52.4",
|
||||
"windows_x86_64_msvc 0.52.4",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -2393,9 +2284,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
|
|||
|
||||
[[package]]
|
||||
name = "windows_aarch64_gnullvm"
|
||||
version = "0.52.5"
|
||||
version = "0.52.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
|
||||
checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9"
|
||||
|
||||
[[package]]
|
||||
name = "windows_aarch64_msvc"
|
||||
|
|
@ -2405,9 +2296,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
|
|||
|
||||
[[package]]
|
||||
name = "windows_aarch64_msvc"
|
||||
version = "0.52.5"
|
||||
version = "0.52.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
|
||||
checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_gnu"
|
||||
|
|
@ -2417,15 +2308,9 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
|
|||
|
||||
[[package]]
|
||||
name = "windows_i686_gnu"
|
||||
version = "0.52.5"
|
||||
version = "0.52.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_gnullvm"
|
||||
version = "0.52.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
|
||||
checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_msvc"
|
||||
|
|
@ -2435,9 +2320,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
|
|||
|
||||
[[package]]
|
||||
name = "windows_i686_msvc"
|
||||
version = "0.52.5"
|
||||
version = "0.52.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
|
||||
checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnu"
|
||||
|
|
@ -2447,9 +2332,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
|
|||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnu"
|
||||
version = "0.52.5"
|
||||
version = "0.52.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
|
||||
checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnullvm"
|
||||
|
|
@ -2459,9 +2344,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
|
|||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnullvm"
|
||||
version = "0.52.5"
|
||||
version = "0.52.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
|
||||
checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_msvc"
|
||||
|
|
@ -2471,15 +2356,15 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
|
|||
|
||||
[[package]]
|
||||
name = "windows_x86_64_msvc"
|
||||
version = "0.52.5"
|
||||
version = "0.52.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
|
||||
checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8"
|
||||
|
||||
[[package]]
|
||||
name = "winreg"
|
||||
version = "0.52.0"
|
||||
version = "0.50.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5"
|
||||
checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"windows-sys 0.48.0",
|
||||
|
|
@ -2501,18 +2386,3 @@ name = "zeroize"
|
|||
version = "1.7.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d"
|
||||
|
||||
[[package]]
|
||||
name = "zune-core"
|
||||
version = "0.4.12"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a"
|
||||
|
||||
[[package]]
|
||||
name = "zune-jpeg"
|
||||
version = "0.4.11"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ec866b44a2a1fd6133d363f073ca1b179f438f99e7e5bfb1e33f7181facfe448"
|
||||
dependencies = [
|
||||
"zune-core",
|
||||
]
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "crunchy-cli";
|
||||
version = "3.4.3";
|
||||
version = "3.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "crunchy-labs";
|
||||
repo = "crunchy-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-/7zJbmMPoHEpcsDPe1eVenxGenPCU6CcHE8nTBTHil8=";
|
||||
hash = "sha256-yhihHHanUYa6+UeNUKDCpr0Z0ad+A0iS1eUtouOZurA=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
|
|
|
|||
|
|
@ -6,14 +6,14 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "dep-scan";
|
||||
version = "5.3.3";
|
||||
version = "5.3.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "owasp-dep-scan";
|
||||
repo = "dep-scan";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ehQsRTMoHr6LDXCka3/4YcyEKLN7DQW4mUp4nyid/aE=";
|
||||
hash = "sha256-2WV4f9vHdfnzoQWvwK/+lT9IS0v0sGBqnwDFHWG48G4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -1,26 +1,17 @@
|
|||
{ lib, rustPlatform, fetchCrate
|
||||
, testers, nix-update-script, dotslash
|
||||
}:
|
||||
{ lib, rustPlatform, fetchCrate }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "dotslash";
|
||||
version = "0.4.1";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-d9ig6YO5kx4Qd8Ut70U4X+t8a9+MUyzPoDF/y7avP38=";
|
||||
hash = "sha256-rgcvpr6/Xss4zDR7IRXL2THAtUQL6WE8Mv9XuM9unBI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-URZ6HfyfY2Fh4iVMoG4OkQFFuLIRV7s5hlZLUFzeUvA=";
|
||||
cargoHash = "sha256-WkC+8epqCJWIU1f5kCLsqgGiSvWZH1mbZabQUnGVwB4=";
|
||||
doCheck = false; # http tests
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
tests = testers.testVersion {
|
||||
package = dotslash;
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://dotslash-cli.com";
|
||||
description = "Simplified multi-platform executable deployment";
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@
|
|||
, installShellFiles
|
||||
, udev
|
||||
, stdenv
|
||||
, CoreServices
|
||||
, Security
|
||||
, nix-update-script
|
||||
, openssl
|
||||
|
|
@ -15,13 +14,13 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "espflash";
|
||||
version = "3.0.0";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "esp-rs";
|
||||
repo = "espflash";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-0CnYdz1KG/y4B+dOp9rYE097ctf4GNmyqv3/xywdA6A=";
|
||||
hash = "sha256-Nv2/33VYpCkPYyUhlVDYJR1BkbtEvEPtmgyZXfVn1ug=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -35,12 +34,11 @@ rustPlatform.buildRustPackage rec {
|
|||
buildInputs = [ openssl ] ++ lib.optionals stdenv.isLinux [
|
||||
udev
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
CoreServices
|
||||
Security
|
||||
SystemConfiguration
|
||||
];
|
||||
|
||||
cargoHash = "sha256-CmhBl+d5odc0QL45aWCJcBZIVeJsdpxJweh7FT8cpyY=";
|
||||
cargoHash = "sha256-Xj5FVTssC3e+mMhDHmKqV6lUQgaIv3aVc1yewbQSy9E=";
|
||||
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd espflash \
|
||||
|
|
|
|||
|
|
@ -2,9 +2,9 @@
|
|||
|
||||
buildDotnetGlobalTool {
|
||||
pname = "fantomas";
|
||||
version = "6.3.4";
|
||||
version = "6.3.1";
|
||||
|
||||
nugetSha256 = "sha256-1aWqZynBkQoznenGoP0sbf1PcUXAbcHiWyECuv89xa0=";
|
||||
nugetSha256 = "sha256-mPuY2OwVK6dLtI+L8SIK5i7545VQ0ChhUPdQwBlvcE4=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "F# source code formatter";
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "files-cli";
|
||||
version = "2.13.2";
|
||||
version = "2.12.56";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "files-cli";
|
||||
owner = "files-com";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-xlsM3WVnhZlEwnPNpUaB8IIwsoqt1C0XVsbqm9G1vuU=";
|
||||
hash = "sha256-0cvGdYy84gfxDIPcz4GqUNwwADSDaSdTlpkD6eYh2CU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-7KL73P7oKrK2Sfgk/74D3cmQGXoDau+3gBThn+37pb8=";
|
||||
vendorHash = "sha256-igFqxTkSJpWHfquvRnBDLXcW8VNsJJK4fNIDob5oCuE=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
|||
|
|
@ -1,24 +1,23 @@
|
|||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gickup";
|
||||
version = "0.10.29";
|
||||
version = "0.10.28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cooperspencer";
|
||||
repo = "gickup";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Y03SdmO/GJx1gans58IW/Q9N7spRswvjyNbzYLdkD80=";
|
||||
hash = "sha256-IGzwMSpbGiUjlO7AtxL20m72VXYW3MJemLpO5BN2rMo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-XxDsEmi945CduurQRsH7rjFAEu/SMX3rSd63Dwq2r8A=";
|
||||
vendorHash = "sha256-sINmTwUERhxZ/qEAhKiJratWV6fDxrP21cJg97RBKVc=";
|
||||
|
||||
ldflags = [ "-X main.version=${version}" ];
|
||||
ldflags = ["-X main.version=${version}"];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
|
|
|
|||
|
|
@ -12,16 +12,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "gitu";
|
||||
version = "0.16.0";
|
||||
version = "0.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "altsem";
|
||||
repo = "gitu";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ePyMyKCI8fHKfoNCMYyYeCPkyYF5KyMYaPrB1NtovCs=";
|
||||
hash = "sha256-/yPP8GzeaVMauhcYLDAgXzOafUpOhJF2tyHOyD6KWS8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-1komuFSucXYdgeAFWeeuMmZYxb6Mzku7hdltDwKAa7A=";
|
||||
cargoHash = "sha256-eKRFPnH9MvSykrnPo4dc5DtEfb79s0hBtmYfERGQbWg=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
@ -32,7 +32,6 @@ rustPlatform.buildRustPackage rec {
|
|||
openssl
|
||||
zlib
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.AppKit
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
description = "Linux support for handheld gaming devices like the Legion Go, ROG Ally, and GPD Win";
|
||||
platforms = platforms.linux;
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ appsforartists toast ];
|
||||
maintainers = with maintainers; [ appsforartists ];
|
||||
mainProgram = "hhd";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,14 +16,14 @@
|
|||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "home-manager";
|
||||
version = "unstable-2024-04-10";
|
||||
version = "unstable-2024-04-06";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
name = "home-manager-source";
|
||||
owner = "nix-community";
|
||||
repo = "home-manager";
|
||||
rev = "31357486b0ef6f4e161e002b6893eeb4fafc3ca9";
|
||||
hash = "sha256-2APpO3ZW4idlgtlb8hB04u/rmIcKA8O7pYqxF66xbNY=";
|
||||
rev = "b787726a8413e11b074cde42704b4af32d95545c";
|
||||
hash = "sha256-ebq+fJZfobqpsAdGDGpxNWSySbQejRwW9cdiil6krCo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,49 +0,0 @@
|
|||
{
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchzip,
|
||||
jdk,
|
||||
gawk,
|
||||
makeBinaryWrapper,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
name = "CMAK";
|
||||
version = "3.0.0.6";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/yahoo/CMAK/releases/latest/download/cmak-${finalAttrs.version}.zip";
|
||||
hash = "sha256-jMF1v2WV8ataFkz2VuVXOE6/QV+Kb0KBVRfj8yKdkUQ=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
gawk
|
||||
jdk
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeBinaryWrapper
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin
|
||||
mv ./* $out
|
||||
wrapProgram $out/bin/cmak \
|
||||
--set JAVA_HOME ${jdk.home} \
|
||||
--prefix PATH : ${lib.makeBinPath [ gawk ]}
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Cluster Manager for Apache Kafka, previously known as Kafka Manager";
|
||||
license = licenses.apsl20;
|
||||
maintainers = with maintainers; [cafkafk];
|
||||
platforms = lib.platforms.unix;
|
||||
mainProgram = "cmak";
|
||||
};
|
||||
})
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p nix-update
|
||||
|
||||
nix-update kafka-cmak
|
||||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kubo";
|
||||
version = "0.28.0"; # When updating, also check if the repo version changed and adjust repoVersion below
|
||||
version = "0.27.0"; # When updating, also check if the repo version changed and adjust repoVersion below
|
||||
rev = "v${version}";
|
||||
|
||||
passthru.repoVersion = "15"; # Also update kubo-migrator when changing the repo version
|
||||
|
|
@ -15,7 +15,7 @@ buildGoModule rec {
|
|||
# Kubo makes changes to its source tarball that don't match the git source.
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ipfs/kubo/releases/download/${rev}/kubo-source.tar.gz";
|
||||
hash = "sha256-nq9NpbK9Fql0o1TG8p9lIlnKUnxvMMimz8AYKVozkwY=";
|
||||
hash = "sha256-xWVV2AUpogZaMb3v0w/C+DXvR2rmbOj1Bpyb3on2hfY=";
|
||||
};
|
||||
|
||||
# tarball contains multiple files/directories
|
||||
|
|
|
|||
|
|
@ -1,60 +0,0 @@
|
|||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
python3Packages,
|
||||
qt6,
|
||||
makeDesktopItem,
|
||||
copyDesktopItems,
|
||||
}:
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "labelle";
|
||||
version = "1.1.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "labelle-org";
|
||||
repo = "labelle";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-JnV5A3/toTCHCEb0dygouR9MZfk2kdmsKVscwYI2y/Y=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -i 's/hatch-vcs >=0.3.0,<0.4/hatch-vcs >=0.3.0/' pyproject.toml
|
||||
'';
|
||||
|
||||
buildInputs = [ qt6.qtwayland ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
qt6.wrapQtAppsHook
|
||||
python3Packages.hatchling
|
||||
python3Packages.hatch-vcs
|
||||
copyDesktopItems
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
darkdetect
|
||||
pillow
|
||||
platformdirs
|
||||
pyqrcode
|
||||
pyqt6
|
||||
python-barcode
|
||||
pyusb
|
||||
];
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "labelle GUI";
|
||||
exec = "labelle-gui";
|
||||
desktopName = "labelle GUI";
|
||||
})
|
||||
];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/labelle-org/labelle/releases/tag/${src.rev}";
|
||||
description = "Print labels with LabelManager PnP from Dymo";
|
||||
homepage = "https://github.com/labelle-org/labelle";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ fabianrig ];
|
||||
mainProgram = "labelle";
|
||||
};
|
||||
}
|
||||
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
let
|
||||
pname = "lefthook";
|
||||
version = "1.6.10";
|
||||
version = "1.6.8";
|
||||
in
|
||||
buildGoModule {
|
||||
inherit pname version;
|
||||
|
|
@ -15,10 +15,10 @@ buildGoModule {
|
|||
owner = "evilmartians";
|
||||
repo = "lefthook";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-6VjvlGA6PBYLa1Ct05jokgF9zlYKihr+ESG4C8MHnO0=";
|
||||
hash = "sha256-GeI2vhTRiz8krYuolUxsWvFy4TIflOvFCAaa1b7Fex0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-sDqP+fzAFavqtvJ98nwsD5+GxNhmLgtOkTzIK06wp9E=";
|
||||
vendorHash = "sha256-/eNhVD/9MZm1nVNmfqmLEfoySa8Krdzle2SLKpf1XlM=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "namespace-cli";
|
||||
version = "0.0.356";
|
||||
version = "0.0.355";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "namespacelabs";
|
||||
repo = "foundation";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-sQZ0kwZXaYoiXCaSvCcnMqYNeLHvtZzHih52+2AYdeY=";
|
||||
hash = "sha256-St/zZqfoate9TwYo7q9Za+T6q4kRw9vSzcBfMW7AXkw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-a/e+xPOD9BDSlKknmfcX2tTMyIUrzKxqtUpFXcFIDSE=";
|
||||
|
|
|
|||
|
|
@ -12,14 +12,14 @@ let
|
|||
in
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "pacu";
|
||||
version = "1.5.3";
|
||||
version = "1.5.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RhinoSecurityLabs";
|
||||
repo = "pacu";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-DLyTWyfDOawtBZ7rIzVc0PFgagpM7qbaAbOJE6nh0Wo=";
|
||||
hash = "sha256-Ty++jNJTk8YKy6Sl6xj1Xs25ZxJCeF9m/iwdA2fRXnI=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
|
|
|||
|
|
@ -1,28 +0,0 @@
|
|||
{ buildGoModule
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "pgroll";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xataio";
|
||||
repo = "pgroll";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-VYGwIJsPVilFxvglj+E7H9NpqUV1CV/ggBP3gFleWIA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Fz+o1jSoMfqKYo1I7VUFqbhBEgcoQEx7aYsmzCLsbnI=";
|
||||
|
||||
# Tests require a running docker daemon
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "PostgreSQL zero-downtime migrations made easy";
|
||||
license = licenses.asl20;
|
||||
homepage = "https://github.com/xataio/pgroll";
|
||||
maintainers = with maintainers; [ ilyakooo0 ];
|
||||
};
|
||||
}
|
||||
705
pkgs/by-name/pi/pixi/Cargo.lock
generated
705
pkgs/by-name/pi/pixi/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user