Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
@@ -33,6 +33,7 @@ __pycache__
|
||||
|
||||
# generated by pkgs/common-updater/update-script.nix
|
||||
update-git-commits.txt
|
||||
/*.log
|
||||
|
||||
# JetBrains IDEA module declaration file
|
||||
/nixpkgs.iml
|
||||
|
||||
@@ -96,7 +96,12 @@ let
|
||||
rebuildsByKernel
|
||||
rebuildCountByKernel
|
||||
;
|
||||
labels = getLabels rebuildCountByKernel;
|
||||
labels =
|
||||
(getLabels rebuildCountByKernel)
|
||||
# Adds "10.rebuild-*-stdenv" label if the "stdenv" attribute was changed
|
||||
++ lib.mapAttrsToList (kernel: _: "10.rebuild-${kernel}-stdenv") (
|
||||
lib.filterAttrs (_: kernelRebuilds: kernelRebuilds ? "stdenv") rebuildsByKernel
|
||||
);
|
||||
}
|
||||
);
|
||||
in
|
||||
|
||||
@@ -48,6 +48,10 @@
|
||||
name = "path";
|
||||
description = "path functions";
|
||||
}
|
||||
{
|
||||
name = "fetchers";
|
||||
description = "functions which can be reused across fetchers";
|
||||
}
|
||||
{
|
||||
name = "filesystem";
|
||||
description = "filesystem functions";
|
||||
|
||||
@@ -155,6 +155,9 @@
|
||||
"sec-functions-library-cli": [
|
||||
"index.html#sec-functions-library-cli"
|
||||
],
|
||||
"sec-functions-library-fetchers": [
|
||||
"index.html#sec-functions-library-fetchers"
|
||||
],
|
||||
"sec-functions-library-generators": [
|
||||
"index.html#sec-functions-library-generators"
|
||||
],
|
||||
|
||||
@@ -23,7 +23,7 @@ for the maintainers to provide feedback.
|
||||
|
||||
For critical packages, this convention needs to be negotiated with the
|
||||
maintainer. A critical package is one that causes mass-rebuild, or where an
|
||||
author is listed in the [`CODEOWNERS`](../.github/CODEOWNERS) file.
|
||||
author is listed in the [`OWNERS`](../ci/OWNERS) file.
|
||||
|
||||
In case of critical security updates, the [security team](https://nixos.org/community/teams/security) might override these
|
||||
heuristics in order to get the fixes in as fast as possible.
|
||||
|
||||
@@ -4869,6 +4869,12 @@
|
||||
githubId = 217899;
|
||||
name = "Cyryl Płotnicki";
|
||||
};
|
||||
cything = {
|
||||
name = "cy";
|
||||
email = "nix@cything.io";
|
||||
github = "cything";
|
||||
githubId = 45041772;
|
||||
};
|
||||
d3vil0p3r = {
|
||||
name = "Antonio Voza";
|
||||
email = "vozaanthony@gmail.com";
|
||||
@@ -12221,6 +12227,12 @@
|
||||
githubId = 1903418;
|
||||
name = "Kovacsics Robert";
|
||||
};
|
||||
kpcyrd = {
|
||||
email = "git@rxv.cc";
|
||||
github = "kpcyrd";
|
||||
githubId = 7763184;
|
||||
name = "kpcyrd";
|
||||
};
|
||||
kquick = {
|
||||
email = "quick@sparq.org";
|
||||
github = "kquick";
|
||||
@@ -14966,6 +14978,12 @@
|
||||
githubId = 54669781;
|
||||
keys = [ { fingerprint = "293B 93D8 A471 059F 85D7 16A6 5BA9 2099 D9BE 2DAA"; } ];
|
||||
};
|
||||
misilelab = {
|
||||
name = "misilelab";
|
||||
email = "misileminecord@gmail.com";
|
||||
github = "misilelab";
|
||||
githubId = 74066467;
|
||||
};
|
||||
mislavzanic = {
|
||||
email = "mislavzanic3@gmail.com";
|
||||
github = "mislavzanic";
|
||||
@@ -21485,6 +21503,12 @@
|
||||
github = "srounce";
|
||||
githubId = 60792;
|
||||
};
|
||||
srv6d = {
|
||||
name = "Marvin Vogt";
|
||||
github = "SRv6d";
|
||||
githubId = 18124752;
|
||||
email = "m@rvinvogt.com";
|
||||
};
|
||||
Srylax = {
|
||||
name = "Srylax";
|
||||
email = "srylax+nixpkgs@srylax.dev";
|
||||
|
||||
+1
-1
@@ -40,7 +40,7 @@ Module updates are submissions changing modules in some ways. These often contai
|
||||
Reviewing process:
|
||||
|
||||
- Ensure that the module maintainers are notified.
|
||||
- [CODEOWNERS](https://help.github.com/articles/about-codeowners/) will make GitHub notify users based on the submitted changes, but it can happen that it misses some of the package maintainers.
|
||||
- The continuous integration system will make GitHub notify users based on the submitted changes, but it can happen that it misses some of the package maintainers.
|
||||
- Ensure that the module tests, if any, are succeeding.
|
||||
- You may invoke OfBorg with `@ofborg test <module>` to build `nixosTests.<module>`
|
||||
- Ensure that the introduced options are correct.
|
||||
|
||||
@@ -45,6 +45,8 @@
|
||||
|
||||
- [Omnom](https://github.com/asciimoo/omnom), a webpage bookmarking and snapshotting service. Available as [services.omnom](options.html#opt-services.omnom.enable).
|
||||
|
||||
- [Zenoh](https://zenoh.io/), a pub/sub/query protocol with low overhead. The Zenoh router daemon is available as [services.zenohd](options.html#opt-services.zenohd.enable)
|
||||
|
||||
- [MaryTTS](https://github.com/marytts/marytts), an open-source, multilingual text-to-speech synthesis system written in pure Java. Available as [services.marytts](options.html#opt-services.marytts).
|
||||
|
||||
- [networking.modemmanager](options.html#opt-networking.modemmanager) has been split out of [networking.networkmanager](options.html#opt-networking.networkmanager). NetworkManager still enables ModemManager by default, but options exist now to run NetworkManager without ModemManager.
|
||||
@@ -139,6 +141,8 @@
|
||||
|
||||
- `programs.less.lessopen` is now null by default. To restore the previous behaviour, set it to `''|${lib.getExe' pkgs.lesspipe "lesspipe.sh"} %s''`.
|
||||
|
||||
- `hardware.pulseaudio` has been renamed to `services.pulseaudio`. The deprecated option names will continue to work, but causes a warning.
|
||||
|
||||
- `minetest` has been renamed to `luanti` to match the upstream name change but aliases have been added. The new name hasn't resulted in many changes as of yet but older references to minetest should be sunset. See the [new name announcement](https://blog.minetest.net/2024/10/13/Introducing-Our-New-Name/) for more details.
|
||||
|
||||
- `racket_7_9` has been removed, as it is insecure. It is recommended to use Racket 8 instead.
|
||||
|
||||
@@ -96,7 +96,7 @@ let
|
||||
# services.printing.enable = true;
|
||||
|
||||
# Enable sound.
|
||||
# hardware.pulseaudio.enable = true;
|
||||
# services.pulseaudio.enable = true;
|
||||
# OR
|
||||
# services.pipewire = {
|
||||
# enable = true;
|
||||
|
||||
@@ -22,7 +22,6 @@
|
||||
./config/nix-remote-build.nix
|
||||
./config/nsswitch.nix
|
||||
./config/power-management.nix
|
||||
./config/pulseaudio.nix
|
||||
./config/qt.nix
|
||||
./config/resolvconf.nix
|
||||
./config/shells-environment.nix
|
||||
@@ -407,6 +406,7 @@
|
||||
./services/audio/mympd.nix
|
||||
./services/audio/navidrome.nix
|
||||
./services/audio/networkaudiod.nix
|
||||
./services/audio/pulseaudio.nix
|
||||
./services/audio/roon-bridge.nix
|
||||
./services/audio/roon-server.nix
|
||||
./services/audio/slimserver.nix
|
||||
@@ -1316,6 +1316,7 @@
|
||||
./services/networking/yggdrasil.nix
|
||||
./services/networking/zapret.nix
|
||||
./services/networking/zerobin.nix
|
||||
./services/networking/zenohd.nix
|
||||
./services/networking/zeronet.nix
|
||||
./services/networking/zerotierone.nix
|
||||
./services/networking/zeronsd.nix
|
||||
|
||||
@@ -197,7 +197,7 @@ in {
|
||||
services.displayManager.sessionPackages = lib.mkIf cfg.gamescopeSession.enable [ gamescopeSessionFile ];
|
||||
|
||||
# enable 32bit pulseaudio/pipewire support if needed
|
||||
hardware.pulseaudio.support32Bit = config.hardware.pulseaudio.enable;
|
||||
services.pulseaudio.support32Bit = config.services.pulseaudio.enable;
|
||||
services.pipewire.alsa.support32Bit = config.services.pipewire.alsa.enable;
|
||||
|
||||
hardware.steam-hardware.enable = true;
|
||||
|
||||
@@ -258,7 +258,7 @@ in
|
||||
{
|
||||
User = "jackaudio";
|
||||
SupplementaryGroups = lib.optional (
|
||||
config.hardware.pulseaudio.enable && !config.hardware.pulseaudio.systemWide
|
||||
config.services.pulseaudio.enable && !config.services.pulseaudio.systemWide
|
||||
) "users";
|
||||
ExecStart = "${cfg.jackd.package}/bin/jackd ${lib.escapeShellArgs cfg.jackd.extraOptions}";
|
||||
LimitRTPRIO = 99;
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
}:
|
||||
let
|
||||
|
||||
cfg = config.hardware.pulseaudio;
|
||||
cfg = config.services.pulseaudio;
|
||||
|
||||
hasZeroconf =
|
||||
let
|
||||
@@ -90,10 +90,13 @@ let
|
||||
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
(lib.mkRenamedOptionModule [ "hardware" "pulseaudio" ] [ "services" "pulseaudio" ])
|
||||
];
|
||||
|
||||
options = {
|
||||
|
||||
hardware.pulseaudio = {
|
||||
services.pulseaudio = {
|
||||
enable = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
@@ -239,13 +242,13 @@ in
|
||||
"libao.conf".source = pkgs.writeText "libao.conf" "default_driver=pulse";
|
||||
};
|
||||
|
||||
hardware.pulseaudio.configFile = lib.mkDefault "${lib.getBin overriddenPackage}/etc/pulse/default.pa";
|
||||
services.pulseaudio.configFile = lib.mkDefault "${lib.getBin overriddenPackage}/etc/pulse/default.pa";
|
||||
|
||||
# Disable flat volumes to enable relative ones
|
||||
hardware.pulseaudio.daemon.config.flat-volumes = lib.mkDefault "no";
|
||||
services.pulseaudio.daemon.config.flat-volumes = lib.mkDefault "no";
|
||||
|
||||
# Upstream defaults to speex-float-1 which results in audible artifacts
|
||||
hardware.pulseaudio.daemon.config.resample-method = lib.mkDefault "speex-float-5";
|
||||
services.pulseaudio.daemon.config.resample-method = lib.mkDefault "speex-float-5";
|
||||
|
||||
# Allow PulseAudio to get realtime priority using rtkit.
|
||||
security.rtkit.enable = true;
|
||||
@@ -257,7 +260,7 @@ in
|
||||
}
|
||||
|
||||
(lib.mkIf (cfg.extraModules != [ ]) {
|
||||
hardware.pulseaudio.daemon.config.dl-search-path =
|
||||
services.pulseaudio.daemon.config.dl-search-path =
|
||||
let
|
||||
overriddenModules = builtins.map (
|
||||
drv: drv.override { pulseaudio = overriddenPackage; }
|
||||
@@ -146,7 +146,7 @@ in
|
||||
ayatana-indicator-power
|
||||
]
|
||||
++ lib.optionals config.hardware.bluetooth.enable [ ayatana-indicator-bluetooth ]
|
||||
++ lib.optionals (config.hardware.pulseaudio.enable || config.services.pipewire.pulse.enable) [
|
||||
++ lib.optionals (config.services.pulseaudio.enable || config.services.pipewire.pulse.enable) [
|
||||
ayatana-indicator-sound
|
||||
]
|
||||
)
|
||||
|
||||
@@ -207,7 +207,7 @@ in
|
||||
pkgs.obexftp
|
||||
]
|
||||
++ lib.optional config.networking.networkmanager.enable plasma-nm
|
||||
++ lib.optional config.hardware.pulseaudio.enable plasma-pa
|
||||
++ lib.optional config.services.pulseaudio.enable plasma-pa
|
||||
++ lib.optional config.services.pipewire.pulse.enable plasma-pa
|
||||
++ lib.optional config.powerManagement.enable powerdevil
|
||||
++ lib.optional config.services.printing.enable print-manager
|
||||
|
||||
@@ -347,8 +347,8 @@ in
|
||||
config = mkIf cfg.enable {
|
||||
assertions = [
|
||||
{
|
||||
assertion = cfg.audio.enable -> !config.hardware.pulseaudio.enable;
|
||||
message = "Using PipeWire as the sound server conflicts with PulseAudio. This option requires `hardware.pulseaudio.enable` to be set to false";
|
||||
assertion = cfg.audio.enable -> !config.services.pulseaudio.enable;
|
||||
message = "Using PipeWire as the sound server conflicts with PulseAudio. This option requires `services.pulseaudio.enable` to be set to false";
|
||||
}
|
||||
{
|
||||
assertion = cfg.jack.enable -> !config.services.jack.jackd.enable;
|
||||
|
||||
@@ -109,6 +109,7 @@ in
|
||||
"AF_INET"
|
||||
"AF_INET6"
|
||||
"AF_NETLINK"
|
||||
"AF_UNIX"
|
||||
];
|
||||
RestrictNamespaces = true;
|
||||
RestrictRealtime = true;
|
||||
|
||||
@@ -84,7 +84,7 @@ in
|
||||
createHome = true;
|
||||
home = "/var/lib/shairport-sync";
|
||||
group = cfg.group;
|
||||
extraGroups = [ "audio" ] ++ optional (config.hardware.pulseaudio.enable || config.services.pipewire.pulse.enable) "pulse";
|
||||
extraGroups = [ "audio" ] ++ optional (config.services.pulseaudio.enable || config.services.pipewire.pulse.enable) "pulse";
|
||||
};
|
||||
groups.${cfg.group} = {};
|
||||
};
|
||||
|
||||
@@ -135,7 +135,7 @@ in
|
||||
(mkIf cfg.audio.enable {
|
||||
environment.systemPackages = [ cfg.audio.package ]; # needed for autostart
|
||||
|
||||
hardware.pulseaudio.extraModules = [ cfg.audio.package ];
|
||||
services.pulseaudio.extraModules = [ cfg.audio.package ];
|
||||
})
|
||||
|
||||
(mkIf cfg.enable {
|
||||
|
||||
@@ -0,0 +1,136 @@
|
||||
{
|
||||
lib,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (lib)
|
||||
types
|
||||
mkDefault
|
||||
mkOption
|
||||
;
|
||||
|
||||
json = pkgs.formats.json { };
|
||||
|
||||
cfg = config.services.zenohd;
|
||||
|
||||
in
|
||||
{
|
||||
options = {
|
||||
services.zenohd = {
|
||||
enable = lib.mkEnableOption "Zenoh daemon.";
|
||||
|
||||
package = mkOption {
|
||||
description = "The zenoh package to use.";
|
||||
type = types.package;
|
||||
default = pkgs.zenoh;
|
||||
defaultText = "pkgs.zenoh";
|
||||
};
|
||||
|
||||
settings = mkOption {
|
||||
description = ''
|
||||
Config options for `zenoh.json5` configuration file.
|
||||
|
||||
See <https://github.com/eclipse-zenoh/zenoh/blob/main/DEFAULT_CONFIG.json5>
|
||||
for more information.
|
||||
'';
|
||||
default = { };
|
||||
type = types.submodule {
|
||||
freeformType = json.type;
|
||||
};
|
||||
};
|
||||
|
||||
plugins = mkOption {
|
||||
description = "Plugin packages to add to zenohd search paths.";
|
||||
type = with types; listOf package;
|
||||
default = [ ];
|
||||
example = lib.literalExpression ''
|
||||
[ pkgs.zenoh-plugin-mqtt ]
|
||||
'';
|
||||
};
|
||||
|
||||
backends = mkOption {
|
||||
description = "Storage backend packages to add to zenohd search paths.";
|
||||
type = with types; listOf package;
|
||||
default = [ ];
|
||||
example = lib.literalExpression ''
|
||||
[ pkgs.zenoh-backend-rocksdb ]
|
||||
'';
|
||||
};
|
||||
|
||||
home = mkOption {
|
||||
description = "Base directory for zenohd related files defined via ZENOH_HOME.";
|
||||
type = types.str;
|
||||
default = "/var/lib/zenoh";
|
||||
};
|
||||
|
||||
env = mkOption {
|
||||
description = ''
|
||||
Set environment variables consumed by zenohd and its plugins.
|
||||
'';
|
||||
type = with types; attrsOf str;
|
||||
default = { };
|
||||
};
|
||||
|
||||
extraOptions = mkOption {
|
||||
description = "Extra command line options for zenohd.";
|
||||
type = with types; listOf str;
|
||||
default = [ ];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
systemd.services.zenohd =
|
||||
let
|
||||
cfgFile = json.generate "zenohd.json" cfg.settings;
|
||||
|
||||
in
|
||||
{
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
wants = [ "network-online.target" ];
|
||||
after = [ "network-online.target" ];
|
||||
|
||||
environment = cfg.env;
|
||||
|
||||
serviceConfig = {
|
||||
Type = "simple";
|
||||
User = "zenohd";
|
||||
Group = "zenohd";
|
||||
ExecStart =
|
||||
"${lib.getExe cfg.package} -c ${cfgFile} " + (lib.concatStringsSep " " cfg.extraOptions);
|
||||
};
|
||||
};
|
||||
|
||||
users = {
|
||||
users.zenohd = {
|
||||
description = "Zenoh daemon user";
|
||||
group = "zenohd";
|
||||
isSystemUser = true;
|
||||
};
|
||||
|
||||
groups.zenohd = { };
|
||||
};
|
||||
|
||||
services.zenohd = {
|
||||
env.ZENOH_HOME = cfg.home;
|
||||
|
||||
settings = {
|
||||
plugins_loading = {
|
||||
enabled = mkDefault true;
|
||||
search_dirs = mkDefault (
|
||||
(map (x: "${lib.getLib x}/lib") cfg.plugins) ++ [ "${lib.getLib cfg.package}/lib" ]
|
||||
); # needed for internal plugins
|
||||
};
|
||||
|
||||
plugins.storage_manager.backend_search_dirs = mkDefault (
|
||||
map (x: "${lib.getLib x}/lib") cfg.backends
|
||||
);
|
||||
};
|
||||
};
|
||||
|
||||
systemd.tmpfiles.rules = [ "d ${cfg.home} 750 zenohd zenohd -" ];
|
||||
};
|
||||
}
|
||||
@@ -238,6 +238,7 @@ in
|
||||
services.phpfpm.pools = mapAttrs' (
|
||||
hostName: cfg:
|
||||
(nameValuePair "kimai-${hostName}" {
|
||||
phpPackage = cfg.package.php;
|
||||
inherit user;
|
||||
group = webserver.group;
|
||||
settings = {
|
||||
@@ -335,7 +336,7 @@ in
|
||||
|
||||
(mapAttrs' (
|
||||
hostName: cfg:
|
||||
(nameValuePair "phpfpm-kimai-${hostName}.service" {
|
||||
(nameValuePair "phpfpm-kimai-${hostName}" {
|
||||
serviceConfig = {
|
||||
EnvironmentFile = [ cfg.environmentFile ];
|
||||
};
|
||||
|
||||
@@ -292,7 +292,7 @@ in
|
||||
# Optional hardware support features
|
||||
++ lib.optionals config.hardware.bluetooth.enable [ bluedevil bluez-qt pkgs.openobex pkgs.obexftp ]
|
||||
++ lib.optional config.networking.networkmanager.enable plasma-nm
|
||||
++ lib.optional config.hardware.pulseaudio.enable plasma-pa
|
||||
++ lib.optional config.services.pulseaudio.enable plasma-pa
|
||||
++ lib.optional config.services.pipewire.pulse.enable plasma-pa
|
||||
++ lib.optional config.powerManagement.enable powerdevil
|
||||
++ lib.optional config.services.colord.enable pkgs.colord-kde
|
||||
@@ -477,7 +477,7 @@ in
|
||||
}
|
||||
{
|
||||
# The user interface breaks without pulse
|
||||
assertion = config.hardware.pulseaudio.enable || (config.services.pipewire.enable && config.services.pipewire.pulse.enable);
|
||||
assertion = config.services.pulseaudio.enable || (config.services.pipewire.enable && config.services.pipewire.pulse.enable);
|
||||
message = "Plasma Mobile requires a Pulseaudio compatible sound server.";
|
||||
}
|
||||
];
|
||||
|
||||
@@ -132,7 +132,7 @@ in
|
||||
] # TODO: NetworkManager doesn't belong here
|
||||
++ optional config.networking.networkmanager.enable networkmanagerapplet
|
||||
++ optional config.powerManagement.enable xfce.xfce4-power-manager
|
||||
++ optionals (config.hardware.pulseaudio.enable || config.services.pipewire.pulse.enable) [
|
||||
++ optionals (config.services.pulseaudio.enable || config.services.pipewire.pulse.enable) [
|
||||
pavucontrol
|
||||
# volume up/down keys support:
|
||||
# xfce4-pulseaudio-plugin includes all the functionalities of xfce4-volumed-pulse
|
||||
|
||||
@@ -196,7 +196,7 @@ in
|
||||
[
|
||||
"d /run/gdm/.config 0711 gdm gdm"
|
||||
]
|
||||
++ lib.optionals config.hardware.pulseaudio.enable [
|
||||
++ lib.optionals config.services.pulseaudio.enable [
|
||||
"d /run/gdm/.config/pulse 0711 gdm gdm"
|
||||
"L+ /run/gdm/.config/pulse/${pulseConfig.name} - - - - ${pulseConfig}"
|
||||
]
|
||||
|
||||
@@ -251,8 +251,8 @@ in
|
||||
|
||||
environment.systemPackages = [pkgs.xpra];
|
||||
|
||||
hardware.pulseaudio.enable = mkDefault cfg.pulseaudio;
|
||||
hardware.pulseaudio.systemWide = mkDefault cfg.pulseaudio;
|
||||
services.pulseaudio.enable = mkDefault cfg.pulseaudio;
|
||||
services.pulseaudio.systemWide = mkDefault cfg.pulseaudio;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@@ -154,9 +154,10 @@ in
|
||||
description = ''
|
||||
If enabled, copies the NixOS configuration file
|
||||
(usually {file}`/etc/nixos/configuration.nix`)
|
||||
and links it from the resulting system
|
||||
and symlinks it from the resulting system
|
||||
(getting to {file}`/run/current-system/configuration.nix`).
|
||||
Note that only this single file is copied, even if it imports others.
|
||||
Warning: This feature cannot be used when the system is configured by a flake
|
||||
'';
|
||||
};
|
||||
|
||||
|
||||
@@ -333,26 +333,41 @@ in
|
||||
|
||||
# We use `mkAfter` to ensure that LUKS password prompt would be shown earlier than the splash screen.
|
||||
boot.initrd.preLVMCommands = mkIf (!config.boot.initrd.systemd.enable) (mkAfter ''
|
||||
mkdir -p /etc/plymouth
|
||||
mkdir -p /run/plymouth
|
||||
ln -s $extraUtils/etc/plymouth/logo.png /etc/plymouth/logo.png
|
||||
ln -s ${configFile} /etc/plymouth/plymouthd.conf
|
||||
ln -s $extraUtils/share/plymouth/plymouthd.defaults /run/plymouth/plymouthd.defaults
|
||||
ln -s $extraUtils/share/plymouth/themes /run/plymouth/themes
|
||||
ln -s $extraUtils/lib/plymouth /run/plymouth/plugins
|
||||
ln -s $extraUtils/etc/fonts /etc/fonts
|
||||
plymouth_enabled=1
|
||||
for o in $(cat /proc/cmdline); do
|
||||
case $o in
|
||||
plymouth.enable=0)
|
||||
plymouth_enabled=0
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
plymouthd --mode=boot --pid-file=/run/plymouth/pid --attach-to-session
|
||||
plymouth show-splash
|
||||
if [ "$plymouth_enabled" != 0 ]; then
|
||||
mkdir -p /etc/plymouth
|
||||
mkdir -p /run/plymouth
|
||||
ln -s $extraUtils/etc/plymouth/logo.png /etc/plymouth/logo.png
|
||||
ln -s ${configFile} /etc/plymouth/plymouthd.conf
|
||||
ln -s $extraUtils/share/plymouth/plymouthd.defaults /run/plymouth/plymouthd.defaults
|
||||
ln -s $extraUtils/share/plymouth/themes /run/plymouth/themes
|
||||
ln -s $extraUtils/lib/plymouth /run/plymouth/plugins
|
||||
ln -s $extraUtils/etc/fonts /etc/fonts
|
||||
|
||||
plymouthd --mode=boot --pid-file=/run/plymouth/pid --attach-to-session
|
||||
plymouth show-splash
|
||||
fi
|
||||
'');
|
||||
|
||||
boot.initrd.postMountCommands = mkIf (!config.boot.initrd.systemd.enable) ''
|
||||
plymouth update-root-fs --new-root-dir="$targetRoot"
|
||||
if [ "$plymouth_enabled" != 0 ]; then
|
||||
plymouth update-root-fs --new-root-dir="$targetRoot"
|
||||
fi
|
||||
'';
|
||||
|
||||
# `mkBefore` to ensure that any custom prompts would be visible.
|
||||
boot.initrd.preFailCommands = mkIf (!config.boot.initrd.systemd.enable) (mkBefore ''
|
||||
plymouth quit --wait
|
||||
if [ "$plymouth_enabled" != 0 ]; then
|
||||
plymouth quit --wait
|
||||
fi
|
||||
'');
|
||||
|
||||
};
|
||||
|
||||
@@ -140,7 +140,7 @@ in {
|
||||
atd = handleTest ./atd.nix {};
|
||||
atop = handleTest ./atop.nix {};
|
||||
atticd = runTest ./atticd.nix;
|
||||
atuin = handleTest ./atuin.nix {};
|
||||
atuin = runTest ./atuin.nix;
|
||||
audiobookshelf = handleTest ./audiobookshelf.nix {};
|
||||
auth-mysql = handleTest ./auth-mysql.nix {};
|
||||
authelia = handleTest ./authelia.nix {};
|
||||
@@ -1186,6 +1186,7 @@ in {
|
||||
yggdrasil = handleTest ./yggdrasil.nix {};
|
||||
your_spotify = handleTest ./your_spotify.nix {};
|
||||
zammad = handleTest ./zammad.nix {};
|
||||
zenohd = handleTest ./zenohd.nix {};
|
||||
zeronet-conservancy = handleTest ./zeronet-conservancy.nix {};
|
||||
zfs = handleTest ./zfs.nix {};
|
||||
zigbee2mqtt = handleTest ./zigbee2mqtt.nix {};
|
||||
|
||||
+47
-38
@@ -1,36 +1,46 @@
|
||||
import ./make-test-python.nix (
|
||||
{ pkgs, lib, ... }:
|
||||
{ lib, ... }:
|
||||
|
||||
let
|
||||
testPort = 8888;
|
||||
testUser = "testerman";
|
||||
testPass = "password";
|
||||
testEmail = "test.testerman@test.com";
|
||||
in
|
||||
{
|
||||
name = "atuin";
|
||||
meta.maintainers = with lib.maintainers; [ devusb ];
|
||||
|
||||
nodes = {
|
||||
server =
|
||||
{ ... }:
|
||||
{
|
||||
services.postgresql.enable = true;
|
||||
|
||||
services.atuin = {
|
||||
enable = true;
|
||||
port = testPort;
|
||||
host = "0.0.0.0";
|
||||
openFirewall = true;
|
||||
openRegistration = true;
|
||||
};
|
||||
};
|
||||
|
||||
client = { ... }: { };
|
||||
let
|
||||
testPort = 8888;
|
||||
testUser = "testerman";
|
||||
testPass = "password";
|
||||
testEmail = "test.testerman@test.com";
|
||||
in
|
||||
{
|
||||
name = "atuin";
|
||||
meta.maintainers = with lib.maintainers; [ devusb ];
|
||||
|
||||
defaults =
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
environment.systemPackages = [
|
||||
pkgs.atuin
|
||||
];
|
||||
};
|
||||
|
||||
testScript = with pkgs; ''
|
||||
nodes = {
|
||||
server =
|
||||
{ ... }:
|
||||
{
|
||||
services.postgresql.enable = true;
|
||||
|
||||
services.atuin = {
|
||||
enable = true;
|
||||
port = testPort;
|
||||
host = "0.0.0.0";
|
||||
openFirewall = true;
|
||||
openRegistration = true;
|
||||
};
|
||||
};
|
||||
|
||||
client = { ... }: { };
|
||||
|
||||
};
|
||||
|
||||
testScript =
|
||||
{ nodes, ... }:
|
||||
#python
|
||||
''
|
||||
start_all()
|
||||
|
||||
# wait for atuin server startup
|
||||
@@ -42,25 +52,24 @@ import ./make-test-python.nix (
|
||||
server.execute("echo 'sync_address = \"http://localhost:${toString testPort}\"' > ~/.config/atuin/config.toml")
|
||||
|
||||
# register with atuin server on server node
|
||||
server.succeed("${atuin}/bin/atuin register -u ${testUser} -p ${testPass} -e ${testEmail}")
|
||||
_, key = server.execute("${atuin}/bin/atuin key")
|
||||
server.succeed("atuin register -u ${testUser} -p ${testPass} -e ${testEmail}")
|
||||
_, key = server.execute("atuin key")
|
||||
|
||||
# store test record in atuin server and sync
|
||||
server.succeed("ATUIN_SESSION=$(${atuin}/bin/atuin uuid) ${atuin}/bin/atuin history start 'shazbot'")
|
||||
server.succeed("${atuin}/bin/atuin sync")
|
||||
server.succeed("ATUIN_SESSION=$(atuin uuid) atuin history start 'shazbot'")
|
||||
server.succeed("ATUIN_SESSION=$(atuin uuid) atuin sync")
|
||||
|
||||
# configure atuin client on client node
|
||||
client.execute("mkdir -p ~/.config/atuin")
|
||||
client.execute("echo 'sync_address = \"http://server:${toString testPort}\"' > ~/.config/atuin/config.toml")
|
||||
|
||||
# log in to atuin server on client node
|
||||
client.succeed(f"${atuin}/bin/atuin login -u ${testUser} -p ${testPass} -k \"{key}\"")
|
||||
client.succeed(f"atuin login -u ${testUser} -p ${testPass} -k \"{key}\"")
|
||||
|
||||
# pull records from atuin server
|
||||
client.succeed("${atuin}/bin/atuin sync -f")
|
||||
client.succeed("atuin sync -f")
|
||||
|
||||
# check for test record
|
||||
client.succeed("ATUIN_SESSION=$(${atuin}/bin/atuin uuid) ${atuin}/bin/atuin history list | grep shazbot")
|
||||
client.succeed("ATUIN_SESSION=$(atuin uuid) atuin history list | grep shazbot")
|
||||
'';
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
+1
-1
@@ -99,7 +99,7 @@ import ./make-test-python.nix (
|
||||
musicService = musicService { inherit (defaultMpdCfg) user group musicDirectory; };
|
||||
})
|
||||
{
|
||||
hardware.pulseaudio = {
|
||||
services.pulseaudio = {
|
||||
enable = true;
|
||||
systemWide = true;
|
||||
tcp.enable = true;
|
||||
|
||||
@@ -66,8 +66,6 @@ import ../make-test-python.nix (
|
||||
+ "jq '.data.result[0].metric.version' | grep '\"${pkgs.prometheus-pushgateway.version}\"'"
|
||||
)
|
||||
|
||||
client.wait_for_unit("network-online.target")
|
||||
|
||||
# Add a metric and check in Prometheus
|
||||
client.wait_until_succeeds(
|
||||
"echo 'some_metric 3.14' | curl --data-binary @- http://pushgateway:9091/metrics/job/some_job"
|
||||
|
||||
@@ -38,7 +38,7 @@ let
|
||||
|
||||
{
|
||||
imports = [ ./common/wayland-cage.nix ];
|
||||
hardware.pulseaudio =
|
||||
services.pulseaudio =
|
||||
{
|
||||
enable = true;
|
||||
support32Bit = true;
|
||||
|
||||
@@ -27,7 +27,7 @@ import ./make-test-python.nix (
|
||||
services.xrdp.audio.enable = true;
|
||||
services.xrdp.defaultWindowManager = "${pkgs.xterm}/bin/xterm";
|
||||
|
||||
hardware.pulseaudio = {
|
||||
services.pulseaudio = {
|
||||
enable = true;
|
||||
};
|
||||
|
||||
@@ -65,7 +65,7 @@ import ./make-test-python.nix (
|
||||
services.xrdp.audio.enable = true;
|
||||
services.xrdp.defaultWindowManager = "${pkgs.icewm}/bin/icewm";
|
||||
|
||||
hardware.pulseaudio = {
|
||||
services.pulseaudio = {
|
||||
enable = true;
|
||||
};
|
||||
};
|
||||
|
||||
@@ -0,0 +1,94 @@
|
||||
import ./make-test-python.nix (
|
||||
{ pkgs, lib, ... }:
|
||||
|
||||
{
|
||||
name = "zenohd";
|
||||
meta.maintainers = [ lib.maintainers.markuskowa ];
|
||||
|
||||
nodes = {
|
||||
router =
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
{
|
||||
networking.firewall.allowedTCPPorts = [
|
||||
7447 # zenohd default port
|
||||
config.services.zenohd.settings.plugins.mqtt.port
|
||||
config.services.zenohd.settings.plugins.webserver.http_port
|
||||
];
|
||||
|
||||
services.zenohd = {
|
||||
enable = true;
|
||||
|
||||
plugins = with pkgs; [
|
||||
zenoh-plugin-mqtt
|
||||
zenoh-plugin-webserver
|
||||
];
|
||||
|
||||
backends = with pkgs; [
|
||||
zenoh-backend-filesystem
|
||||
zenoh-backend-rocksdb
|
||||
];
|
||||
|
||||
settings = {
|
||||
plugins = {
|
||||
mqtt = {
|
||||
port = 1883;
|
||||
allow = ".*";
|
||||
};
|
||||
webserver.http_port = 8000;
|
||||
storage_manager = {
|
||||
volumes = {
|
||||
fs = { };
|
||||
rocksdb = { };
|
||||
};
|
||||
storages = {
|
||||
mem = {
|
||||
key_expr = "mem/**";
|
||||
volume = "memory";
|
||||
};
|
||||
fs = {
|
||||
key_expr = "fs/**";
|
||||
volume = {
|
||||
id = "fs";
|
||||
dir = "zenoh-fs";
|
||||
strip_prefix = "fs";
|
||||
};
|
||||
};
|
||||
rocksdb = {
|
||||
key_expr = "rocksdb/**";
|
||||
volume = {
|
||||
id = "rocksdb";
|
||||
dir = "zenoh-rocksdb";
|
||||
strip_prefix = "rocksdb";
|
||||
create_db = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
client = {
|
||||
environment.systemPackages = [
|
||||
pkgs.mosquitto
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
start_all()
|
||||
router.wait_for_unit("zenohd.service")
|
||||
client.wait_for_unit("multi-user.target")
|
||||
|
||||
for be in ["fs", "rocksdb", "mem" ]:
|
||||
client.succeed(f"mosquitto_pub -h router -t {be}/test -m hello")
|
||||
client.succeed(f"curl router:8000/{be}/test | grep hello")
|
||||
'';
|
||||
}
|
||||
)
|
||||
+1
-1
@@ -914,7 +914,7 @@ Reviewing process:
|
||||
- Ensure that the package versioning [fits the guidelines](#versioning).
|
||||
- Ensure that the commit text [fits the guidelines](../CONTRIBUTING.md#commit-conventions).
|
||||
- Ensure that the package maintainers are notified.
|
||||
- [CODEOWNERS](https://help.github.com/articles/about-codeowners) will make GitHub notify users based on the submitted changes, but it can happen that it misses some of the package maintainers.
|
||||
- The continuous integration system will make GitHub notify users based on the submitted changes, but it can happen that it misses some of the package maintainers.
|
||||
- Ensure that the meta field information [fits the guidelines](#meta-attributes) and is correct:
|
||||
- License can change with version updates, so it should be checked to match the upstream license.
|
||||
- If the package has no maintainer, a maintainer must be set. This can be the update submitter or a community member that accepts to take maintainership of the package.
|
||||
|
||||
-27634
File diff suppressed because it is too large
Load Diff
@@ -45,19 +45,8 @@ rustPlatform.buildRustPackage rec {
|
||||
rm .git_commit
|
||||
'';
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"ark-secret-scalar-0.0.2" = "sha256-yvgTxccxeUrnBhElI7AY3ad0PqmGCDlsoi8jH2Cceks=";
|
||||
"common-0.1.0" = "sha256-Jbl5b0zIDFBcu2lYi5LYRdABq3vxgPlE4EsFucTWQd8=";
|
||||
"fflonk-0.1.0" = "sha256-+BvZ03AhYNP0D8Wq9EMsP+lSgPA6BBlnWkoxTffVLwo=";
|
||||
"ipfs-hasher-0.21.3" = "sha256-AH3NMil07F+kkWjqAbMaMbjnTisSQiCd3tJz934ZICw=";
|
||||
"simple-mermaid-0.1.0" = "sha256-IekTldxYq+uoXwGvbpkVTXv2xrcZ0TQfyyE2i2zH+6w=";
|
||||
"sp-ark-bls12-381-0.4.2" = "sha256-nNr0amKhSvvI9BlsoP+8v6Xppx/s7zkf0l9Lm3DW8w8=";
|
||||
"sp-crypto-ec-utils-0.4.1" = "sha256-KXyG43YIzMG2r6kCTyQyCIHSAkXSlZv8pbFEXXvC4JU=";
|
||||
"sp-debug-derive-8.0.0" = "sha256-/Sw1ZM/JcJBokFE4y2mv/P43ciTL5DEm0PDG0jZvMkI=";
|
||||
};
|
||||
};
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-ueTEx6oqfMzM1ytXavRxLrWf4+8jYqVY9JJJbl8j2YY=";
|
||||
|
||||
buildType = "production";
|
||||
buildAndTestSubdir = "polkadot";
|
||||
@@ -83,9 +72,11 @@ rustPlatform.buildRustPackage rec {
|
||||
SystemConfiguration
|
||||
];
|
||||
|
||||
# NOTE: disable building `core`/`std` in wasm environment since rust-src isn't
|
||||
# available for `rustc-wasm32`
|
||||
WASM_BUILD_STD = 0;
|
||||
# NOTE: currently we can't build the runtimes since it requires rebuilding rust std
|
||||
# (-Zbuild-std), for which rust-src is required to be available in the sysroot of rustc.
|
||||
# this should no longer be needed after: https://github.com/paritytech/polkadot-sdk/pull/7008
|
||||
# since the new wasmv1-none target won't require rebuilding std.
|
||||
SKIP_WASM_BUILD = 1;
|
||||
|
||||
OPENSSL_NO_VENDOR = 1;
|
||||
PROTOC = "${protobuf}/bin/protoc";
|
||||
|
||||
@@ -17,8 +17,8 @@ let
|
||||
sha256Hash = "sha256-zfiTjyD2bMIJ+GVQyg7qUT7306roqYsdRkPECZ/Rdnc=";
|
||||
};
|
||||
latestVersion = {
|
||||
version = "2024.3.1.6"; # "Android Studio Meerkat | 2024.3.1 Canary 6"
|
||||
sha256Hash = "sha256-2b2Fp5bjCRT/1f4JUkHkA9PBHM2umwQ9nObevcVYFSw=";
|
||||
version = "2024.3.1.7"; # "Android Studio Meerkat | 2024.3.1 Canary 7"
|
||||
sha256Hash = "sha256-1XwL0H675eGfuJPTwoIbcdDwpC7QU7Xl7ppfQIvJGMM=";
|
||||
};
|
||||
in {
|
||||
# Attributes are named by their corresponding release channels
|
||||
|
||||
@@ -15596,6 +15596,18 @@ final: prev:
|
||||
meta.homepage = "https://github.com/jelera/vim-javascript-syntax/";
|
||||
};
|
||||
|
||||
vim-jetpack = buildVimPlugin {
|
||||
pname = "vim-jetpack";
|
||||
version = "2024-04-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tani";
|
||||
repo = "vim-jetpack";
|
||||
rev = "2ae7300f774cf1692bdb49c47c8c3ff15dd8d9b5";
|
||||
sha256 = "1vml4asdapkgz0fl2yqry158mz7b71fjlyxsrm04mazr5q53vgq0";
|
||||
};
|
||||
meta.homepage = "https://github.com/tani/vim-jetpack/";
|
||||
};
|
||||
|
||||
vim-jinja = buildVimPlugin {
|
||||
pname = "vim-jinja";
|
||||
version = "2021-08-26";
|
||||
|
||||
@@ -21,6 +21,7 @@
|
||||
coc-css,
|
||||
coc-diagnostic,
|
||||
coc-pyright,
|
||||
coc-toml,
|
||||
code-minimap,
|
||||
dasht,
|
||||
deno,
|
||||
@@ -590,6 +591,12 @@ in
|
||||
src = "${nodePackages."@yaegassy/coc-nginx"}/lib/node_modules/@yaegassy/coc-nginx";
|
||||
};
|
||||
|
||||
coc-toml = buildVimPlugin {
|
||||
pname = "coc-toml";
|
||||
inherit (coc-toml) version meta;
|
||||
src = "${coc-toml}/lib/node_modules/coc-toml";
|
||||
};
|
||||
|
||||
codecompanion-nvim = super.codecompanion-nvim.overrideAttrs {
|
||||
dependencies = [ self.plenary-nvim ];
|
||||
nvimRequireCheck = "codecompanion";
|
||||
@@ -3711,7 +3718,6 @@ in
|
||||
"coc-sumneko-lua"
|
||||
"coc-tabnine"
|
||||
"coc-texlab"
|
||||
"coc-toml"
|
||||
"coc-tsserver"
|
||||
"coc-ultisnips"
|
||||
"coc-vetur"
|
||||
|
||||
@@ -1295,6 +1295,7 @@ https://github.com/mhinz/vim-janah/,,
|
||||
https://github.com/artur-shaik/vim-javacomplete2/,,
|
||||
https://github.com/pangloss/vim-javascript/,,
|
||||
https://github.com/jelera/vim-javascript-syntax/,,
|
||||
https://github.com/tani/vim-jetpack/,HEAD,
|
||||
https://github.com/lepture/vim-jinja/,,
|
||||
https://github.com/seirl/vim-jinja-languages/,HEAD,
|
||||
https://github.com/avm99963/vim-jjdescription/,HEAD,
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
fetchpatch,
|
||||
sane-backends,
|
||||
libX11,
|
||||
gtk2,
|
||||
@@ -18,9 +19,47 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1ad4zr7rcxpda8yzvfkq1rfjgx9nl6lan5a628wvpdbh3fn9v0z7";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
sed -e '/SANE_CAP_ALWAYS_SETTABLE/d' -i src/gtkglue.c
|
||||
'';
|
||||
# add all fedora patchs. fix gcc-14 build among other things
|
||||
# https://src.fedoraproject.org/rpms/sane-frontends/tree/main
|
||||
patches =
|
||||
let
|
||||
fetchFedoraPatch =
|
||||
{ name, hash }:
|
||||
fetchpatch {
|
||||
inherit name hash;
|
||||
url = "https://src.fedoraproject.org/rpms/sane-frontends/raw/89f752d7e236e86be8d64b7ac6991a36f9e9f7d0/f/${name}";
|
||||
};
|
||||
in
|
||||
map fetchFedoraPatch [
|
||||
{
|
||||
name = "0001-src-scanadf.c-Fix-segfault-when-scanadf-h-d-device.patch";
|
||||
hash = "sha256-sSUWm5fL7YTebzXh3Thb/qwgr7d++1Y+74uI8R5oF0g=";
|
||||
}
|
||||
{
|
||||
name = "frontends-scanadf-segv.patch";
|
||||
hash = "sha256-VRag9nMk8ZCjg9Oq0siHdT8J6sbNjq9cU2ktOH2vkLo=";
|
||||
}
|
||||
{
|
||||
name = "sane-frontends-1.0.14-array-out-of-bounds.patch";
|
||||
hash = "sha256-a0lzbAogSrXsK5jVeNffDS+zFxpuDHXpHQlOJ5874+U=";
|
||||
}
|
||||
{
|
||||
name = "sane-frontends-1.0.14-sane-backends-1.0.20.patch";
|
||||
hash = "sha256-ViYjxXGj58P6EaZ+fIiAydrgbyS1ivn39uN3EWcvnZg=";
|
||||
}
|
||||
{
|
||||
name = "sane-frontends-1.0.14-xcam-man.patch";
|
||||
hash = "sha256-HGANgQPujn/jjOMGs9LlzYvYZphMWwbsI74NCad5ADc=";
|
||||
}
|
||||
{
|
||||
name = "sane-frontends-c99.patch";
|
||||
hash = "sha256-LPELEG11wEom05ECAMgXUDRWvrbuU4nT3apuS1eITyA=";
|
||||
}
|
||||
{
|
||||
name = "sane-frontends-configure-c99.patch";
|
||||
hash = "sha256-SPvMDCZv8VRGP+cXRFjVbqgbTeVhdLOTEQbbBgSMLvY=";
|
||||
}
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
sane-backends
|
||||
|
||||
@@ -290,6 +290,9 @@ buildStdenv.mkDerivation {
|
||||
# https://bugzilla.mozilla.org/show_bug.cgi?id=1935621
|
||||
# https://phabricator.services.mozilla.com/D231480
|
||||
./mozbz-1935621-attachment-9442305.patch
|
||||
# Fix for missing vector header on macOS
|
||||
# https://bugzilla.mozilla.org/show_bug.cgi?id=1939405
|
||||
./firefox-mac-missing-vector-header.patch
|
||||
]
|
||||
++ extraPatches;
|
||||
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
diff -r 8273f6f8f9b6 security/sandbox/mac/Sandbox.h
|
||||
--- a/security/sandbox/mac/Sandbox.h Mon Sep 02 00:19:08 2024 +0000
|
||||
+++ b/security/sandbox/mac/Sandbox.h Sun Dec 29 11:41:25 2024 -0500
|
||||
@@ -7,6 +7,7 @@
|
||||
#define mozilla_Sandbox_h
|
||||
|
||||
#include <string>
|
||||
+#include <vector>
|
||||
#include "mozilla/ipc/UtilityProcessSandboxing.h"
|
||||
|
||||
enum MacSandboxType {
|
||||
@@ -27,11 +27,11 @@
|
||||
"vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk="
|
||||
},
|
||||
"aiven": {
|
||||
"hash": "sha256-O3OcgNyzHMJFB/MlTdwIN/t0bvE/fAlgYt4acZ4saIk=",
|
||||
"hash": "sha256-rtqGkVtB69yt98bTb/g2iZtZNtCn7V5Q4uSBDx+/xGQ=",
|
||||
"homepage": "https://registry.terraform.io/providers/aiven/aiven",
|
||||
"owner": "aiven",
|
||||
"repo": "terraform-provider-aiven",
|
||||
"rev": "v4.31.0",
|
||||
"rev": "v4.31.1",
|
||||
"spdx": "MIT",
|
||||
"vendorHash": "sha256-dIQ5WATs8HOjJpLyVPDgT+WZ8GkkSoNsmavxpCj4jmE="
|
||||
},
|
||||
@@ -81,11 +81,11 @@
|
||||
"vendorHash": "sha256-0UM4I/oxIsWIP1G93KJsJxYofXrO4Yy86PEk0FnB1DE="
|
||||
},
|
||||
"artifactory": {
|
||||
"hash": "sha256-bb0W1NjcF8JbWw9VEYD9fnw9WN7fCwIQISg9QZQD3YY=",
|
||||
"hash": "sha256-xVblndBzxCtfM6yIKGYt08owo9z9ZdccbvdAXbB+mf0=",
|
||||
"homepage": "https://registry.terraform.io/providers/jfrog/artifactory",
|
||||
"owner": "jfrog",
|
||||
"repo": "terraform-provider-artifactory",
|
||||
"rev": "v12.7.0",
|
||||
"rev": "v12.7.1",
|
||||
"spdx": "Apache-2.0",
|
||||
"vendorHash": "sha256-J+JBq8QybqIQp2j5EtZhpdGvDd84lwmzezcWl5pXxRs="
|
||||
},
|
||||
@@ -813,13 +813,13 @@
|
||||
"vendorHash": "sha256-QxbZv6YMa5/I4bTeQBNdmG3EKtLEmstnH7HMiZzFJrI="
|
||||
},
|
||||
"migadu": {
|
||||
"hash": "sha256-Z9doPI2ARlwqeeFai3ysyDk2f2FHrZUewqcz6IzaMHo=",
|
||||
"hash": "sha256-Pmc09MRNxrJHXlb74EnHkmML90pbKSLCyTrFlI+j3d8=",
|
||||
"homepage": "https://registry.terraform.io/providers/metio/migadu",
|
||||
"owner": "metio",
|
||||
"repo": "terraform-provider-migadu",
|
||||
"rev": "2024.12.12",
|
||||
"rev": "2024.12.26",
|
||||
"spdx": "0BSD",
|
||||
"vendorHash": "sha256-Fc7ZoUtThsJd3rvn/j1gU4tpEj2ofg1pgCzQOYEdQFA="
|
||||
"vendorHash": "sha256-YFzYLUfyJglKaJSBksrI1DBHmK6+yoMIg9QlGIEZFkU="
|
||||
},
|
||||
"minio": {
|
||||
"hash": "sha256-aSEzsncqNLWfVnnGfz/fDpRw9w2muGnybX8WYd1tP/Y=",
|
||||
@@ -1120,11 +1120,11 @@
|
||||
"vendorHash": "sha256-JytWDb7d2RW/fp5rptAzmfTTuytZ+lp6cB05ol9mhhM="
|
||||
},
|
||||
"sentry": {
|
||||
"hash": "sha256-+Cmlkxr9wHHZ8wbohkxisqvf/JxpOBFAk/0MU+Xh0ho=",
|
||||
"hash": "sha256-2JfzteVripOz96bAtQXC32wi8dWUQw8bry0HllNRQRA=",
|
||||
"homepage": "https://registry.terraform.io/providers/jianyuan/sentry",
|
||||
"owner": "jianyuan",
|
||||
"repo": "terraform-provider-sentry",
|
||||
"rev": "v0.14.2",
|
||||
"rev": "v0.14.3",
|
||||
"spdx": "MIT",
|
||||
"vendorHash": "sha256-RbUBHX0/nUihgiK6ibbkR/2DKJOdJt9VYyCJgWsj2zo="
|
||||
},
|
||||
@@ -1246,13 +1246,13 @@
|
||||
"vendorHash": "sha256-Q/fFd3ahIY1L2s8vE8KY/DtahS948qnoaFLQBQfyNH4="
|
||||
},
|
||||
"talos": {
|
||||
"hash": "sha256-bOwvTIXYQwsyKPx6aMY+VzyVuCQimPK8UrPkeWpU48c=",
|
||||
"hash": "sha256-7VBoihwejNDRnIYsFS/dAiCE+JaMALkuVVqHaKQYUGU=",
|
||||
"homepage": "https://registry.terraform.io/providers/siderolabs/talos",
|
||||
"owner": "siderolabs",
|
||||
"repo": "terraform-provider-talos",
|
||||
"rev": "v0.6.0",
|
||||
"rev": "v0.7.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-tb9raTGqEuvqfMO/5s4Oc7x/EAk4qBWWDiOgRMB3uAU="
|
||||
"vendorHash": "sha256-4jsFsHuKMujOkBMA/+rGcYmHinWLuhon10CoO01DZsY="
|
||||
},
|
||||
"temporalcloud": {
|
||||
"hash": "sha256-nAOHdok/nK33zyEYmyB2nA+y2/mpkigZk4WTyl2F7XA=",
|
||||
|
||||
@@ -20,14 +20,14 @@
|
||||
let
|
||||
pname = "qownnotes";
|
||||
appname = "QOwnNotes";
|
||||
version = "24.12.4";
|
||||
version = "24.12.7";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/pbek/QOwnNotes/releases/download/v${version}/qownnotes-${version}.tar.xz";
|
||||
hash = "sha256-1DHBi++7GlSxnA8fAWC4rHej9wi8jDvI2pQduqZhNZQ=";
|
||||
hash = "sha256-48puEyScG6EIrsXZpFc62dl4a23p+TO2buzuwq9m3Sw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
buildKodiAddon rec {
|
||||
pname = "youtube";
|
||||
namespace = "plugin.video.youtube";
|
||||
version = "7.1.0.1";
|
||||
version = "7.1.1.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anxdpanic";
|
||||
repo = "plugin.video.youtube";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-5tctuY2vYEfkkNVjprnUPJ/crwmMGCEdcRxUQR5EQxw=";
|
||||
hash = "sha256-fcr7FDTaStr9EaEaC3QG3uJQav0YuEITa62Y1kW1vlM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
}:
|
||||
buildLua (finalAttrs: {
|
||||
pname = "modernx-zydezu";
|
||||
version = "0.3.8";
|
||||
version = "0.3.9";
|
||||
|
||||
scriptPath = "modernx.lua";
|
||||
src = fetchFromGitHub {
|
||||
owner = "zydezu";
|
||||
repo = "ModernX";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-dHjEmE/m5lAF3XyyebO/23BLmoS5sfSoNZuTtJv/JEA=";
|
||||
hash = "sha256-wjBFI69lcsVY3HDXyz1VV5IkQvkJQQfMbGwUYmwlJ9w=";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ab-av1";
|
||||
version = "0.8.0";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alexheretic";
|
||||
repo = "ab-av1";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-NzGhpj+INJ8iAXxWeaMJ1MbeCZ2nzx88vEkL/fW5OxU=";
|
||||
hash = "sha256-xKZVvwRSCd4AxJnfEnRYuyB0yhxkg19a2tI0x2rcvWs=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-PTLvZZmDdaGBTYZjSm9p6Sb5a2fBnxDFLS2GRgI/E2A=";
|
||||
cargoHash = "sha256-nK3ye3wJBBv4ei41e9V/bj5kg5ujjzi0EvLwKKfvfUU=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "abctl";
|
||||
version = "0.23.0";
|
||||
version = "0.24.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "airbytehq";
|
||||
repo = "abctl";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-8zNXx0J+p1ARCxxnD3Bz95uDgPD8Cr8dL4oDlc1HPxI=";
|
||||
hash = "sha256-O+ABjageccJudXtO5wUYLIT/kI04f68RLW0B7d//jdw=";
|
||||
};
|
||||
|
||||
checkFlags =
|
||||
@@ -33,7 +33,7 @@ buildGoModule rec {
|
||||
in
|
||||
[ "-skip=^${lib.concatStringsSep "$|^" skippedTests}$" ];
|
||||
|
||||
vendorHash = "sha256-pGNKrWgBjMeSUDE7hiJI0h1zytF+v7yuftKFxONsOHQ=";
|
||||
vendorHash = "sha256-4pi5EX7N4zf72rez2aClFezgnT70A7Crd2YTasl5CvU=";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "1.7.4";
|
||||
version = "1.7.5";
|
||||
in
|
||||
buildGoModule {
|
||||
pname = "actionlint";
|
||||
@@ -22,10 +22,10 @@ buildGoModule {
|
||||
owner = "rhysd";
|
||||
repo = "actionlint";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-NPlDD74vrVXsVgdoMHD0F3SYebH1p/RH9h1qVgLQMRw=";
|
||||
hash = "sha256-CJ3T47zPO1p29Nxpxtgf7oTe3TT240RXJG14DW1uANY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-pKmN5duaSp5EuQ8L2SWduh3g1gbQq2jrUaKsQuEuy98=";
|
||||
vendorHash = "sha256-3c+0Hxn7JcJzrg9Ep/BKKb0mu0nbb5qX2snljCeu1N0=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
|
||||
@@ -14,7 +14,8 @@ stdenvNoCC.mkDerivation (self: {
|
||||
owner = "alacritty";
|
||||
repo = "alacritty-theme";
|
||||
rev = "95a7d695605863ede5b7430eb80d9e80f5f504bc";
|
||||
hash = "sha256-D37MQtNS20ESny5UhW1u6ELo9czP4l+q0S8neH7Wdbc=";
|
||||
hash = "sha256-IsUIfoacXJYilTPQBKXnDEuyQCt9ofBMJ8UZ1McFwXM=";
|
||||
sparseCheckout = [ "themes" ];
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@@ -4,28 +4,27 @@
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
rustPlatform,
|
||||
buildPackages,
|
||||
apple-sdk_11,
|
||||
nixosTests,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "atuin";
|
||||
version = "18.3.0";
|
||||
version = "18.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "atuinsh";
|
||||
repo = "atuin";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Q3UI1IUD5Jz2O4xj3mFM7DqY3lTy3WhWYPa8QjJHTKE=";
|
||||
hash = "sha256-P/q4XYhpXo9kwiltA0F+rQNSlqI+s8TSi5v5lFJWJ/4=";
|
||||
};
|
||||
|
||||
# TODO: unify this to one hash because updater do not support this
|
||||
cargoHash =
|
||||
if stdenv.hostPlatform.isLinux then
|
||||
"sha256-K4Vw/d0ZOROWujWr76I3QvfKefLhXLeFufUrgStAyjQ="
|
||||
"sha256-JDm7HWMaLSodpOhrR7rm6ZS/ATX/q8fRK+OJ/EKqg3U="
|
||||
else
|
||||
"sha256-8NAfE7cGFT64ntNXK9RT0D/MbDJweN7vvsG/KlrY4K4=";
|
||||
"sha256-mrsqaqJHMyNi3yFDIyAXFBS+LY71VWXE8O7mjvgI6lo=";
|
||||
|
||||
# atuin's default features include 'check-updates', which do not make sense
|
||||
# for distribution builds. List all other default features.
|
||||
@@ -44,11 +43,6 @@ rustPlatform.buildRustPackage rec {
|
||||
apple-sdk_11
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
export PROTOC=${buildPackages.protobuf}/bin/protoc
|
||||
export PROTOC_INCLUDE="${buildPackages.protobuf}/include";
|
||||
'';
|
||||
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd atuin \
|
||||
--bash <($out/bin/atuin gen-completions -s bash) \
|
||||
|
||||
@@ -5,16 +5,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "automatic-timezoned";
|
||||
version = "2.0.42";
|
||||
version = "2.0.44";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "maxbrunet";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-HbBxzIuni106kz3YX68Mk+ecb605hugcMf/QMLzElKA=";
|
||||
sha256 = "sha256-+DLuvB6jOgZwZVjztsTpZ5z8tQDlpWDQvtM6yW1y/O0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-JfEyak0ORuXwR+QwVS3sjIJ+/eZIpIvU0MBREv2EPdg=";
|
||||
cargoHash = "sha256-73aBnRdcxdcYBuk8oe8AvAQ1T9GELniHqBMsuF3PJog=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Automatically update system timezone based on location";
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "aws-iam-authenticator";
|
||||
version = "0.6.28";
|
||||
version = "0.6.29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubernetes-sigs";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-+cMgB1FHNFtvDz6x3fPuzMkKLytlipX6CE5Xs2e9UCc=";
|
||||
hash = "sha256-xjHwnzh22cGv1Q2civdgLz9sFoV5p3exyG8P26u4hi0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-gFz1QrzLGMPyjB8yo+/FscZEpb2msshoUfBGmNRbvJM=";
|
||||
vendorHash = "sha256-TcEpIyBSXiKZxiVMWJycRLfNL6oogRo98yoza093AtQ=";
|
||||
|
||||
ldflags =
|
||||
let
|
||||
|
||||
@@ -30,13 +30,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ayatana-indicator-sound";
|
||||
version = "24.5.0";
|
||||
version = "24.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AyatanaIndicators";
|
||||
repo = "ayatana-indicator-sound";
|
||||
rev = "refs/tags/${finalAttrs.version}";
|
||||
hash = "sha256-sFl1PM0vZIJVSDiq5z7w/CS3rFuq6Z09Uks4Ik239Cc=";
|
||||
hash = "sha256-icHX/uZQIkS08RByjvlcX7whXtUYc+osBMbqngKqmGU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
+275
@@ -0,0 +1,275 @@
|
||||
From 0fada0c6fe84bed0b311c493aa3f91bf35428bc8 Mon Sep 17 00:00:00 2001
|
||||
From: "Queen Vinyl Da.i'gyu-Kazotetsu" <vinyldarkscratch@gmail.com>
|
||||
Date: Fri, 26 Apr 2024 09:56:49 -0700
|
||||
Subject: [PATCH 1/4] Replace deprecated boost/filesystem/string_file.hpp
|
||||
header
|
||||
|
||||
---
|
||||
src/libslic3r/Format/bbs_3mf.cpp | 48 ++++++++++++++++++-------
|
||||
src/libslic3r/Model.cpp | 6 ++--
|
||||
src/slic3r/GUI/MediaPlayCtrl.cpp | 9 +++--
|
||||
src/slic3r/Utils/PresetUpdater.cpp | 56 +++++++++++++++++++++++++-----
|
||||
4 files changed, 91 insertions(+), 28 deletions(-)
|
||||
|
||||
diff --git a/src/libslic3r/Format/bbs_3mf.cpp b/src/libslic3r/Format/bbs_3mf.cpp
|
||||
index f13c62148..0e3b4e433 100644
|
||||
--- a/src/libslic3r/Format/bbs_3mf.cpp
|
||||
+++ b/src/libslic3r/Format/bbs_3mf.cpp
|
||||
@@ -25,7 +25,6 @@
|
||||
#include <boost/algorithm/string/predicate.hpp>
|
||||
#include <boost/algorithm/string/replace.hpp>
|
||||
#include <boost/filesystem/operations.hpp>
|
||||
-#include <boost/filesystem/string_file.hpp>
|
||||
#include <boost/lexical_cast.hpp>
|
||||
#include <boost/nowide/fstream.hpp>
|
||||
#include <boost/nowide/cstdio.hpp>
|
||||
@@ -1296,12 +1295,19 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
|
||||
m_backup_path = filename.substr(0, filename.size() - 5);
|
||||
model.set_backup_path(m_backup_path);
|
||||
try {
|
||||
- if (boost::filesystem::exists(model.get_backup_path() + "/origin.txt"))
|
||||
- boost::filesystem::load_string_file(model.get_backup_path() + "/origin.txt", m_origin_file);
|
||||
+ std::string filepath = model.get_backup_path() + "/origin.txt";
|
||||
+ if (boost::filesystem::exists(filepath)) {
|
||||
+ boost::filesystem::ifstream originfile(filepath);
|
||||
+ m_origin_file.assign(
|
||||
+ (std::istreambuf_iterator<char>(originfile)),
|
||||
+ (std::istreambuf_iterator<char>())
|
||||
+ );
|
||||
+ originfile.close();
|
||||
+ }
|
||||
} catch (...) {}
|
||||
- boost::filesystem::save_string_file(
|
||||
- model.get_backup_path() + "/lock.txt",
|
||||
- boost::lexical_cast<std::string>(get_current_pid()));
|
||||
+ boost::filesystem::ofstream lockfile(model.get_backup_path() + "/lock.txt");
|
||||
+ lockfile << boost::lexical_cast<std::string>(get_current_pid());
|
||||
+ lockfile.close();
|
||||
}
|
||||
else {
|
||||
m_backup_path = model.get_backup_path();
|
||||
@@ -1312,7 +1318,9 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
|
||||
file_version = *m_bambuslicer_generator_version;
|
||||
// save for restore
|
||||
if (result && m_load_aux && !m_load_restore) {
|
||||
- boost::filesystem::save_string_file(model.get_backup_path() + "/origin.txt", filename);
|
||||
+ boost::filesystem::ofstream originfile(model.get_backup_path() + "/origin.txt");
|
||||
+ originfile << filename;
|
||||
+ originfile.close();
|
||||
}
|
||||
if (m_load_restore && !result) // not clear failed backup data for later analyze
|
||||
model.set_backup_path("detach");
|
||||
@@ -5571,6 +5579,7 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
|
||||
boost::system::error_code ec;
|
||||
std::string filename = std::string(store_params.path);
|
||||
boost::filesystem::remove(filename + ".tmp", ec);
|
||||
+ boost::filesystem::ofstream outputfile;
|
||||
|
||||
bool result = _save_model_to_file(filename + ".tmp", *store_params.model, store_params.plate_data_list, store_params.project_presets, store_params.config,
|
||||
store_params.thumbnail_data, store_params.no_light_thumbnail_data, store_params.top_thumbnail_data, store_params.pick_thumbnail_data,
|
||||
@@ -5584,7 +5593,9 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
|
||||
return false;
|
||||
}
|
||||
if (!(store_params.strategy & SaveStrategy::Silence))
|
||||
- boost::filesystem::save_string_file(store_params.model->get_backup_path() + "/origin.txt", filename);
|
||||
+ outputfile.open(store_params.model->get_backup_path() + "/origin.txt");
|
||||
+ outputfile << filename;
|
||||
+ outputfile.close();
|
||||
}
|
||||
return result;
|
||||
}
|
||||
@@ -8488,9 +8499,14 @@ bool has_restore_data(std::string & path, std::string& origin)
|
||||
origin = "<lock>";
|
||||
return false;
|
||||
}
|
||||
- if (boost::filesystem::exists(path + "/lock.txt")) {
|
||||
- std::string pid;
|
||||
- boost::filesystem::load_string_file(path + "/lock.txt", pid);
|
||||
+ const std::string lockfile_path = path + "/lock.txt";
|
||||
+ if (boost::filesystem::exists(lockfile_path)) {
|
||||
+ boost::filesystem::ifstream lockfile(lockfile_path);
|
||||
+ std::string pid(
|
||||
+ (std::istreambuf_iterator<char>(lockfile)),
|
||||
+ (std::istreambuf_iterator<char>())
|
||||
+ );
|
||||
+ lockfile.close();
|
||||
try {
|
||||
if (get_process_name(boost::lexical_cast<int>(pid)) ==
|
||||
get_process_name(0)) {
|
||||
@@ -8506,8 +8522,14 @@ bool has_restore_data(std::string & path, std::string& origin)
|
||||
if (!boost::filesystem::exists(file3mf))
|
||||
return false;
|
||||
try {
|
||||
- if (boost::filesystem::exists(path + "/origin.txt"))
|
||||
- boost::filesystem::load_string_file(path + "/origin.txt", origin);
|
||||
+ if (boost::filesystem::exists(path + "/origin.txt")) {
|
||||
+ boost::filesystem::ifstream originfile(path + "/origin.txt");
|
||||
+ origin.assign(
|
||||
+ (std::istreambuf_iterator<char>(originfile)),
|
||||
+ (std::istreambuf_iterator<char>())
|
||||
+ );
|
||||
+ originfile.close();
|
||||
+ }
|
||||
}
|
||||
catch (...) {
|
||||
}
|
||||
diff --git a/src/libslic3r/Model.cpp b/src/libslic3r/Model.cpp
|
||||
index 82328083c..51da0fb8b 100644
|
||||
--- a/src/libslic3r/Model.cpp
|
||||
+++ b/src/libslic3r/Model.cpp
|
||||
@@ -23,7 +23,6 @@
|
||||
#include <boost/algorithm/string/predicate.hpp>
|
||||
#include <boost/algorithm/string/replace.hpp>
|
||||
#include <boost/filesystem.hpp>
|
||||
-#include <boost/filesystem/string_file.hpp>
|
||||
#include <boost/lexical_cast.hpp>
|
||||
#include <boost/log/trivial.hpp>
|
||||
#include <boost/nowide/iostream.hpp>
|
||||
@@ -980,8 +979,9 @@ std::string Model::get_backup_path()
|
||||
BOOST_LOG_TRIVIAL(info) << "create /Metadata in " << temp_path;
|
||||
boost::filesystem::create_directories(backup_path + "/Metadata");
|
||||
BOOST_LOG_TRIVIAL(info) << "create /lock.txt in " << temp_path;
|
||||
- boost::filesystem::save_string_file(backup_path + "/lock.txt",
|
||||
- boost::lexical_cast<std::string>(get_current_pid()));
|
||||
+ boost::filesystem::ofstream lockfile(backup_path + "/lock.txt");
|
||||
+ lockfile << boost::lexical_cast<std::string>(get_current_pid());
|
||||
+ lockfile.close();
|
||||
}
|
||||
} catch (std::exception &ex) {
|
||||
BOOST_LOG_TRIVIAL(error) << "Failed to create backup path" << temp_path << ": " << ex.what();
|
||||
diff --git a/src/slic3r/GUI/MediaPlayCtrl.cpp b/src/slic3r/GUI/MediaPlayCtrl.cpp
|
||||
index 9af0cc116..45de6fe1a 100644
|
||||
--- a/src/slic3r/GUI/MediaPlayCtrl.cpp
|
||||
+++ b/src/slic3r/GUI/MediaPlayCtrl.cpp
|
||||
@@ -8,7 +8,6 @@
|
||||
#include "MsgDialog.hpp"
|
||||
#include "DownloadProgressDialog.hpp"
|
||||
|
||||
-#include <boost/filesystem/string_file.hpp>
|
||||
#include <boost/lexical_cast.hpp>
|
||||
#include <boost/log/trivial.hpp>
|
||||
#include <boost/nowide/cstdio.hpp>
|
||||
@@ -824,8 +823,12 @@ bool MediaPlayCtrl::start_stream_service(bool *need_install)
|
||||
file_url2.Replace("\\", "/");
|
||||
file_url2 = wxURI(file_url2).BuildURI();
|
||||
try {
|
||||
- std::string configs;
|
||||
- boost::filesystem::load_string_file(file_ff_cfg, configs);
|
||||
+ boost::filesystem::ifstream configfile(file_ff_cfg);
|
||||
+ std::string configs(
|
||||
+ (std::istreambuf_iterator<char>(configfile)),
|
||||
+ (std::istreambuf_iterator<char>())
|
||||
+ );
|
||||
+ configfile.close();
|
||||
std::vector<std::string> configss;
|
||||
boost::algorithm::split(configss, configs, boost::algorithm::is_any_of("\r\n"));
|
||||
configss.erase(std::remove(configss.begin(), configss.end(), std::string()), configss.end());
|
||||
diff --git a/src/slic3r/Utils/PresetUpdater.cpp b/src/slic3r/Utils/PresetUpdater.cpp
|
||||
index 268c2685a..eb92e052b 100644
|
||||
--- a/src/slic3r/Utils/PresetUpdater.cpp
|
||||
+++ b/src/slic3r/Utils/PresetUpdater.cpp
|
||||
@@ -9,7 +9,6 @@
|
||||
#include <boost/format.hpp>
|
||||
#include <boost/algorithm/string.hpp>
|
||||
#include <boost/filesystem.hpp>
|
||||
-#include <boost/filesystem/string_file.hpp>
|
||||
#include <boost/filesystem/fstream.hpp>
|
||||
#include <boost/lexical_cast.hpp>
|
||||
#include <boost/log/trivial.hpp>
|
||||
@@ -1042,10 +1041,24 @@ void PresetUpdater::priv::sync_tooltip(std::string http_url, std::string languag
|
||||
std::string language_version = "00.00.00.00";
|
||||
fs::path cache_root = fs::path(data_dir()) / "resources/tooltip";
|
||||
try {
|
||||
- auto vf = cache_root / "common" / "version";
|
||||
- if (fs::exists(vf)) fs::load_string_file(vf, common_version);
|
||||
+ fs::path vf = cache_root / "common" / "version";
|
||||
+ if (fs::exists(vf)) {
|
||||
+ boost::filesystem::ifstream versionfile(vf);
|
||||
+ common_version.assign(
|
||||
+ (std::istreambuf_iterator<char>(versionfile)),
|
||||
+ (std::istreambuf_iterator<char>())
|
||||
+ );
|
||||
+ versionfile.close();
|
||||
+ }
|
||||
vf = cache_root / language / "version";
|
||||
- if (fs::exists(vf)) fs::load_string_file(vf, language_version);
|
||||
+ if (fs::exists(vf)) {
|
||||
+ boost::filesystem::ifstream versionfile(vf);
|
||||
+ language_version.assign(
|
||||
+ (std::istreambuf_iterator<char>(versionfile)),
|
||||
+ (std::istreambuf_iterator<char>())
|
||||
+ );
|
||||
+ versionfile.close();
|
||||
+ }
|
||||
} catch (...) {}
|
||||
std::map<std::string, Resource> resources
|
||||
{
|
||||
@@ -1183,13 +1196,23 @@ void PresetUpdater::priv::sync_printer_config(std::string http_url)
|
||||
|
||||
try {
|
||||
if (fs::exists(config_folder / "version.txt")) {
|
||||
- fs::load_string_file(config_folder / "version.txt", curr_version);
|
||||
+ boost::filesystem::ifstream filedata(config_folder / "version.txt");
|
||||
+ curr_version.assign(
|
||||
+ (std::istreambuf_iterator<char>(filedata)),
|
||||
+ (std::istreambuf_iterator<char>())
|
||||
+ );
|
||||
+ filedata.close();
|
||||
boost::algorithm::trim(curr_version);
|
||||
}
|
||||
} catch (...) {}
|
||||
try {
|
||||
if (fs::exists(cache_folder / "version.txt")) {
|
||||
- fs::load_string_file(cache_folder / "version.txt", cached_version);
|
||||
+ boost::filesystem::ifstream filedata(cache_folder / "version.txt");
|
||||
+ cached_version.assign(
|
||||
+ (std::istreambuf_iterator<char>(filedata)),
|
||||
+ (std::istreambuf_iterator<char>())
|
||||
+ );
|
||||
+ filedata.close();
|
||||
boost::algorithm::trim(cached_version);
|
||||
}
|
||||
} catch (...) {}
|
||||
@@ -1229,7 +1252,12 @@ void PresetUpdater::priv::sync_printer_config(std::string http_url)
|
||||
bool result = false;
|
||||
try {
|
||||
if (fs::exists(cache_folder / "version.txt")) {
|
||||
- fs::load_string_file(cache_folder / "version.txt", cached_version);
|
||||
+ boost::filesystem::ifstream filedata(cache_folder / "version.txt");
|
||||
+ cached_version.assign(
|
||||
+ (std::istreambuf_iterator<char>(filedata)),
|
||||
+ (std::istreambuf_iterator<char>())
|
||||
+ );
|
||||
+ filedata.close();
|
||||
boost::algorithm::trim(cached_version);
|
||||
result = true;
|
||||
}
|
||||
@@ -1334,13 +1362,23 @@ Updates PresetUpdater::priv::get_printer_config_updates(bool update) const
|
||||
std::string resc_version;
|
||||
try {
|
||||
if (fs::exists(resc_folder / "version.txt")) {
|
||||
- fs::load_string_file(resc_folder / "version.txt", resc_version);
|
||||
+ boost::filesystem::ifstream filedata(resc_folder / "version.txt");
|
||||
+ resc_version.assign(
|
||||
+ (std::istreambuf_iterator<char>(filedata)),
|
||||
+ (std::istreambuf_iterator<char>())
|
||||
+ );
|
||||
+ filedata.close();
|
||||
boost::algorithm::trim(resc_version);
|
||||
}
|
||||
} catch (...) {}
|
||||
try {
|
||||
if (fs::exists(config_folder / "version.txt")) {
|
||||
- fs::load_string_file(config_folder / "version.txt", curr_version);
|
||||
+ boost::filesystem::ifstream filedata(config_folder / "version.txt");
|
||||
+ curr_version.assign(
|
||||
+ (std::istreambuf_iterator<char>(filedata)),
|
||||
+ (std::istreambuf_iterator<char>())
|
||||
+ );
|
||||
+ filedata.close();
|
||||
boost::algorithm::trim(curr_version);
|
||||
}
|
||||
} catch (...) {}
|
||||
--
|
||||
2.47.0
|
||||
|
||||
@@ -0,0 +1,84 @@
|
||||
From f2135e69ac314f7aded3c3c1fc6650370c71ffc4 Mon Sep 17 00:00:00 2001
|
||||
From: "Queen Vinyl Da.i'gyu-Kazotetsu" <vinyldarkscratch@gmail.com>
|
||||
Date: Fri, 26 Apr 2024 10:03:43 -0700
|
||||
Subject: [PATCH 2/4] Replace deprecated Boost methods/options
|
||||
|
||||
---
|
||||
src/libslic3r/PrintBase.cpp | 2 +-
|
||||
src/libslic3r/utils.cpp | 2 +-
|
||||
src/slic3r/GUI/Auxiliary.cpp | 12 ++++++------
|
||||
3 files changed, 8 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/src/libslic3r/PrintBase.cpp b/src/libslic3r/PrintBase.cpp
|
||||
index 00c1b01bd..6921edc58 100644
|
||||
--- a/src/libslic3r/PrintBase.cpp
|
||||
+++ b/src/libslic3r/PrintBase.cpp
|
||||
@@ -80,7 +80,7 @@ std::string PrintBase::output_filename(const std::string &format, const std::str
|
||||
cfg.opt_string("input_filename_base") + default_ext :
|
||||
this->placeholder_parser().process(format, 0, &cfg);
|
||||
if (filename.extension().empty())
|
||||
- filename = boost::filesystem::change_extension(filename, default_ext);
|
||||
+ filename.replace_extension(default_ext);
|
||||
return filename.string();
|
||||
} catch (std::runtime_error &err) {
|
||||
throw Slic3r::PlaceholderParserError(L("Failed processing of the filename_format template.") + "\n" + err.what());
|
||||
diff --git a/src/libslic3r/utils.cpp b/src/libslic3r/utils.cpp
|
||||
index 226b01e7b..72157f4da 100644
|
||||
--- a/src/libslic3r/utils.cpp
|
||||
+++ b/src/libslic3r/utils.cpp
|
||||
@@ -830,7 +830,7 @@ CopyFileResult copy_file_inner(const std::string& from, const std::string& to, s
|
||||
// That may happen when copying on some exotic file system, for example Linux on Chrome.
|
||||
copy_file_linux(source, target, ec);
|
||||
#else // __linux__
|
||||
- boost::filesystem::copy_file(source, target, boost::filesystem::copy_option::overwrite_if_exists, ec);
|
||||
+ boost::filesystem::copy_file(source, target, boost::filesystem::copy_options::overwrite_existing, ec);
|
||||
#endif // __linux__
|
||||
if (ec) {
|
||||
error_message = ec.message();
|
||||
diff --git a/src/slic3r/GUI/Auxiliary.cpp b/src/slic3r/GUI/Auxiliary.cpp
|
||||
index 7ee2a4428..91cc01fb5 100644
|
||||
--- a/src/slic3r/GUI/Auxiliary.cpp
|
||||
+++ b/src/slic3r/GUI/Auxiliary.cpp
|
||||
@@ -346,7 +346,7 @@ void AuFile::on_input_enter(wxCommandEvent &evt)
|
||||
}
|
||||
|
||||
auto existing = false;
|
||||
- auto dir = m_file_path.branch_path();
|
||||
+ auto dir = m_file_path.parent_path();
|
||||
auto new_fullname = new_file_name + m_file_path.extension().string();
|
||||
|
||||
|
||||
@@ -462,8 +462,8 @@ void AuFile::on_set_cover()
|
||||
wxGetApp().plater()->model().model_info->cover_file = path.string();
|
||||
//wxGetApp().plater()->model().model_info->cover_file = m_file_name.ToStdString();
|
||||
|
||||
- auto full_path = m_file_path.branch_path();
|
||||
- auto full_root_path = full_path.branch_path();
|
||||
+ auto full_path = m_file_path.parent_path();
|
||||
+ auto full_root_path = full_path.parent_path();
|
||||
auto full_root_path_str = encode_path(full_root_path.string().c_str());
|
||||
auto dir = wxString::Format("%s/.thumbnails", full_root_path_str);
|
||||
|
||||
@@ -507,8 +507,8 @@ void AuFile::on_set_delete()
|
||||
auto is_fine = fs::remove(bfs_path);
|
||||
|
||||
if (m_cover) {
|
||||
- auto full_path = m_file_path.branch_path();
|
||||
- auto full_root_path = full_path.branch_path();
|
||||
+ auto full_path = m_file_path.parent_path();
|
||||
+ auto full_root_path = full_path.parent_path();
|
||||
auto full_root_path_str = encode_path(full_root_path.string().c_str());
|
||||
auto dir = wxString::Format("%s/.thumbnails", full_root_path_str);
|
||||
fs::path dir_path(dir.c_str());
|
||||
@@ -949,7 +949,7 @@ void AuxiliaryPanel::on_import_file(wxCommandEvent &event)
|
||||
|
||||
|
||||
boost::system::error_code ec;
|
||||
- if (!fs::copy_file(src_bfs_path, fs::path(dir_path.ToStdWstring()), fs::copy_option::overwrite_if_exists, ec)) continue;
|
||||
+ if (!fs::copy_file(src_bfs_path, fs::path(dir_path.ToStdWstring()), fs::copy_options::overwrite_existing, ec)) continue;
|
||||
Slic3r::put_other_changes();
|
||||
|
||||
// add in file list
|
||||
--
|
||||
2.47.0
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
From 2e8c6d293d15345e7bfd37529557833fc010e064 Mon Sep 17 00:00:00 2001
|
||||
From: "Queen Vinyl Da.i'gyu-Kazotetsu" <vinyldarkscratch@gmail.com>
|
||||
Date: Mon, 29 Apr 2024 02:13:59 -0700
|
||||
Subject: [PATCH 3/4] Fix additional Boost upgrade issues
|
||||
|
||||
---
|
||||
src/slic3r/GUI/AuxiliaryDataViewModel.cpp | 2 +-
|
||||
src/slic3r/GUI/MediaPlayCtrl.cpp | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/slic3r/GUI/AuxiliaryDataViewModel.cpp b/src/slic3r/GUI/AuxiliaryDataViewModel.cpp
|
||||
index f68f73306..9bb8835bf 100644
|
||||
--- a/src/slic3r/GUI/AuxiliaryDataViewModel.cpp
|
||||
+++ b/src/slic3r/GUI/AuxiliaryDataViewModel.cpp
|
||||
@@ -336,7 +336,7 @@ wxDataViewItemArray AuxiliaryModel::ImportFile(AuxiliaryModelNode* sel, wxArrayS
|
||||
dir_path += "\\" + src_bfs_path.filename().generic_wstring();
|
||||
|
||||
boost::system::error_code ec;
|
||||
- if (!fs::copy_file(src_bfs_path, fs::path(dir_path.ToStdWstring()), fs::copy_option::overwrite_if_exists, ec))
|
||||
+ if (!fs::copy_file(src_bfs_path, fs::path(dir_path.ToStdWstring()), fs::copy_options::overwrite_existing, ec))
|
||||
continue;
|
||||
|
||||
// Update model data
|
||||
diff --git a/src/slic3r/GUI/MediaPlayCtrl.cpp b/src/slic3r/GUI/MediaPlayCtrl.cpp
|
||||
index 45de6fe1a..762088431 100644
|
||||
--- a/src/slic3r/GUI/MediaPlayCtrl.cpp
|
||||
+++ b/src/slic3r/GUI/MediaPlayCtrl.cpp
|
||||
@@ -840,7 +840,7 @@ bool MediaPlayCtrl::start_stream_service(bool *need_install)
|
||||
auto file_dll = tools_dir + dll;
|
||||
auto file_dll2 = plugins_dir + dll;
|
||||
if (!boost::filesystem::exists(file_dll) || boost::filesystem::last_write_time(file_dll) != boost::filesystem::last_write_time(file_dll2))
|
||||
- boost::filesystem::copy_file(file_dll2, file_dll, boost::filesystem::copy_option::overwrite_if_exists);
|
||||
+ boost::filesystem::copy_file(file_dll2, file_dll, boost::filesystem::copy_options::overwrite_existing);
|
||||
}
|
||||
boost::process::child process_source(file_source, file_url2.ToStdWstring(), boost::process::start_dir(tools_dir),
|
||||
boost::process::windows::create_no_window,
|
||||
--
|
||||
2.47.0
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
From 1ff7f81740f9df7889f21ee3f779d90246890e4f Mon Sep 17 00:00:00 2001
|
||||
From: Emily <hello@emily.moe>
|
||||
Date: Mon, 25 Nov 2024 17:44:31 +0000
|
||||
Subject: [PATCH 4/4] Remove deprecated Boost filesystem header
|
||||
|
||||
---
|
||||
src/slic3r/GUI/RemovableDriveManager.cpp | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/slic3r/GUI/RemovableDriveManager.cpp b/src/slic3r/GUI/RemovableDriveManager.cpp
|
||||
index fcddcbd61..b4e895c78 100644
|
||||
--- a/src/slic3r/GUI/RemovableDriveManager.cpp
|
||||
+++ b/src/slic3r/GUI/RemovableDriveManager.cpp
|
||||
@@ -22,7 +22,6 @@
|
||||
#include <pwd.h>
|
||||
#include <boost/filesystem.hpp>
|
||||
#include <boost/system/error_code.hpp>
|
||||
-#include <boost/filesystem/convenience.hpp>
|
||||
#include <boost/process.hpp>
|
||||
#endif
|
||||
|
||||
@@ -202,7 +201,7 @@ namespace search_for_drives_internal
|
||||
stat(path.c_str(), &buf);
|
||||
uid_t uid = buf.st_uid;
|
||||
if (getuid() == uid)
|
||||
- out.emplace_back(DriveData{ boost::filesystem::basename(boost::filesystem::path(path)), path });
|
||||
+ out.emplace_back(DriveData{ boost::filesystem::path(path).stem().string(), path });
|
||||
}
|
||||
}
|
||||
}
|
||||
--
|
||||
2.47.0
|
||||
|
||||
@@ -4,9 +4,10 @@
|
||||
binutils,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
ninja,
|
||||
pkg-config,
|
||||
wrapGAppsHook3,
|
||||
boost180,
|
||||
boost,
|
||||
cereal,
|
||||
cgal,
|
||||
curl,
|
||||
@@ -26,7 +27,6 @@
|
||||
hicolor-icon-theme,
|
||||
ilmbase,
|
||||
libpng,
|
||||
mesa,
|
||||
mpfr,
|
||||
nlopt,
|
||||
opencascade-occt_7_6,
|
||||
@@ -67,13 +67,14 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
ninja
|
||||
pkg-config
|
||||
wrapGAppsHook3
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
binutils
|
||||
boost180
|
||||
boost
|
||||
cereal
|
||||
cgal
|
||||
curl
|
||||
@@ -95,7 +96,6 @@ stdenv.mkDerivation rec {
|
||||
hicolor-icon-theme
|
||||
ilmbase
|
||||
libpng
|
||||
mesa.osmesa
|
||||
mpfr
|
||||
nlopt
|
||||
opencascade-occt_7_6
|
||||
@@ -113,6 +113,14 @@ stdenv.mkDerivation rec {
|
||||
./patches/0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch
|
||||
# Fix an issue with
|
||||
./patches/dont-link-opencv-world-bambu.patch
|
||||
# Don't link osmesa
|
||||
./patches/no-osmesa.patch
|
||||
# Fix the build with newer Boost versions. All but one commit is
|
||||
# from <https://github.com/bambulab/BambuStudio/pull/3968>.
|
||||
./0001-Replace-deprecated-boost-filesystem-string_file.hpp-.patch
|
||||
./0002-Replace-deprecated-Boost-methods-options.patch
|
||||
./0003-Fix-additional-Boost-upgrade-issues.patch
|
||||
./0004-Remove-deprecated-Boost-filesystem-header.patch
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
@@ -126,10 +134,11 @@ stdenv.mkDerivation rec {
|
||||
# additionally need to set the path via the NLOPT environment variable.
|
||||
NLOPT = nlopt;
|
||||
|
||||
# Disable compiler warnings that clutter the build log.
|
||||
# It seems to be a known issue for Eigen:
|
||||
# http://eigen.tuxfamily.org/bz/show_bug.cgi?id=1221
|
||||
NIX_CFLAGS_COMPILE = toString [
|
||||
"-DBOOST_TIMER_ENABLE_DEPRECATED"
|
||||
# Disable compiler warnings that clutter the build log.
|
||||
# It seems to be a known issue for Eigen:
|
||||
# http://eigen.tuxfamily.org/bz/show_bug.cgi?id=1221
|
||||
"-Wno-ignored-attributes"
|
||||
"-I${opencv.out}/include/opencv4"
|
||||
];
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
diff --git a/src/slic3r/CMakeLists.txt b/src/slic3r/CMakeLists.txt
|
||||
index e695acd48..174e233e6 100644
|
||||
--- a/src/slic3r/CMakeLists.txt
|
||||
+++ b/src/slic3r/CMakeLists.txt
|
||||
@@ -587,7 +587,7 @@ elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux")
|
||||
FIND_LIBRARY(WAYLAND_EGL_LIBRARIES NAMES wayland-egl)
|
||||
FIND_LIBRARY(WAYLAND_CLIENT_LIBRARIES NAMES wayland-client)
|
||||
find_package(CURL REQUIRED)
|
||||
- target_link_libraries(libslic3r_gui ${DBUS_LIBRARIES} OSMesa)
|
||||
+ target_link_libraries(libslic3r_gui ${DBUS_LIBRARIES})
|
||||
target_link_libraries(libslic3r_gui
|
||||
OpenGL::EGL
|
||||
${WAYLAND_SERVER_LIBRARIES}
|
||||
@@ -5,13 +5,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "bee";
|
||||
version = "2.3.1";
|
||||
version = "2.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ethersphere";
|
||||
repo = "bee";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-pl0zx1Vmu1pC1JSGrz1M72ObzckUT1HbtgKb8hV1RG8=";
|
||||
hash = "sha256-/fyonUp8LxZrnvIk06DnacHlKgSLjIjirGr7MEVU9nc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-kxfdreEGRY9NHxpGwgvdeYBg0m+itEhy7ih1JSD2E44=";
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "boxbuddy";
|
||||
version = "2.5.0";
|
||||
version = "2.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Dvlv";
|
||||
repo = "BoxBuddyRS";
|
||||
rev = version;
|
||||
hash = "sha256-SI/Yxk3bJayXPIWlJLG/je7NBG0I+49cIIlfBeMhTBk=";
|
||||
hash = "sha256-W+SeleZsQbHw0sS7du8AylERt1FBxxLUvnxfvS9YQGM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-5R+PWV34Ob9y/EtO+46kI/fzqYw6QI86bRVpvMznw9Y=";
|
||||
cargoHash = "sha256-nFBLhCxHmdF7WvYcmt5aLVhCO/q1LLgMldc7nofX+CU=";
|
||||
|
||||
# The software assumes it is installed either in flatpak or in the home directory
|
||||
# so the xdg data path needs to be patched here
|
||||
|
||||
@@ -3,24 +3,24 @@
|
||||
|
||||
let
|
||||
pname = "brave";
|
||||
version = "1.73.101";
|
||||
version = "1.73.104";
|
||||
|
||||
allArchives = {
|
||||
aarch64-linux = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
|
||||
hash = "sha256-0nV+NxiXM+m1GbAxECXC/8QWiOyVaMb63JmGtrIFcqM=";
|
||||
hash = "sha256-qSV3b3h09B5Wk0BCuFupsAYNvaBUvbhUfDn6RG6v7Ak=";
|
||||
};
|
||||
x86_64-linux = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
|
||||
hash = "sha256-yz3EENDg0khJYVF/W6RAvO3qWoDqs9oFH22WxqWay78=";
|
||||
hash = "sha256-LfMquxaern9DqJObgtYJEoHRzI7+FSrFSjHFOpVXsOM=";
|
||||
};
|
||||
aarch64-darwin = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
|
||||
hash = "sha256-EQjgQAI+limWvU/qcU/MaP4I2zWtqXz5R3zPvMlZnCc=";
|
||||
hash = "sha256-VgRAyZn7NmhSku6Yl2pdTiyH96boXkVwNS2yw9dxjY0=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
|
||||
hash = "sha256-11oDvX3O20N2q6vKd7r9rfUhRTkMe1dRQSQZ27QKKDs=";
|
||||
hash = "sha256-FBZHhAZvb4eGDKQk1ZPV6HbFurP3Tfers/Qd5NeUv7c=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "buildkit";
|
||||
version = "0.18.1";
|
||||
version = "0.18.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "moby";
|
||||
repo = "buildkit";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Rz360/cq2orr3L1hvvtftJkRqPAg1ACthU4HHiPF9PU=";
|
||||
hash = "sha256-VjyrW2PwJ8/36V9PnLoMzAhJW9rKyg12V2KChD10XEw=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -12,16 +12,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-binstall";
|
||||
version = "1.10.16";
|
||||
version = "1.10.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cargo-bins";
|
||||
repo = "cargo-binstall";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-a7EH6WvFJGzyFZ6qZEcMbo5JIsYhHWFMDB163g2Qges=";
|
||||
hash = "sha256-MJMJWP3tISmlO4iUgkQf9veAJfLBCt2nS7LfZTicH/I=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-gpwC3mDJ+tAOTojFfOhKWjVUuHcKZm8kOPHPf71wRUI=";
|
||||
cargoHash = "sha256-zliUrsRt+ObcpswRl+qKoUxSMpgRqR5ltj905xx54KI=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -5,16 +5,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-features-manager";
|
||||
version = "0.9.0";
|
||||
version = "0.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ToBinio";
|
||||
repo = "cargo-features-manager";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-g4iJ9iZp7vmnSE/P76ocDu/XKeSbPjosB97ojLI30oE=";
|
||||
hash = "sha256-NjXJCrLsX52M7CBg8wdgwlK3gaGiznfdRGz7BAbVVPk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-O0MQAgOZdiVW6GU69BAn2beDDqNNwijLlmfC7I3Qd0A=";
|
||||
cargoHash = "sha256-vCV5b4ljlDgwsYvxrPFe9rsfJjHHBCcM3QoZ4t8ZdRw=";
|
||||
|
||||
meta = {
|
||||
description = "Command-line tool for managing Architectural Decision Records";
|
||||
|
||||
@@ -14,16 +14,16 @@ let
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "centrifugo";
|
||||
version = "5.4.8";
|
||||
version = "5.4.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "centrifugal";
|
||||
repo = "centrifugo";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-B6V4Apnwcb/G//PYa/kHRcgRkYSM+fQmoRimNoe6yhY=";
|
||||
hash = "sha256-FDtAkoN1bdqVUEP0obbXBfQfVRpZN5YXbU1KT1yXWuI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-n+5EsSA984VXd8G1eXlzBPjIlSQeL5fRcGIFIKZGQ4o=";
|
||||
vendorHash = "sha256-WfYN7bhtOPDp2UeB/WqtN3dD3+WO9lIxnXe2iTqn000=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
diff --git a/configure b/configure
|
||||
index c564dc1..e13c67c 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -6512,7 +6512,7 @@ else
|
||||
#include <stdlib.h>
|
||||
#include <readline/readline.h>
|
||||
|
||||
-main()
|
||||
+int main()
|
||||
{
|
||||
FILE *fp;
|
||||
fp = fopen("conftest.rlv", "w");
|
||||
@@ -2,28 +2,37 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
flex,
|
||||
ncurses,
|
||||
readline,
|
||||
flex,
|
||||
texinfo,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cgdb";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://cgdb.me/files/${pname}-${version}.tar.gz";
|
||||
url = "https://cgdb.me/files/cgdb-${finalAttrs.version}.tar.gz";
|
||||
sha256 = "sha256-DTi1JNN3JXsQa61thW2K4zBBQOHuJAhTQ+bd8bZYEfE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./gcc14.patch
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
ncurses
|
||||
readline
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
flex
|
||||
texinfo
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Curses interface to gdb";
|
||||
mainProgram = "cgdb";
|
||||
@@ -35,4 +44,4 @@ stdenv.mkDerivation rec {
|
||||
platforms = with platforms; linux ++ cygwin;
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchYarnDeps,
|
||||
yarnConfigHook,
|
||||
yarnBuildHook,
|
||||
yarnInstallHook,
|
||||
nodejs,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "coc-toml";
|
||||
version = "1.2.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kkiyama117";
|
||||
repo = "coc-toml";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-iyQRa4h23mfmCmujNYYV8Y+82+HLYUtXgBzU1dtovYc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
yarnBuildHook
|
||||
yarnConfigHook
|
||||
yarnInstallHook
|
||||
nodejs
|
||||
];
|
||||
|
||||
yarnOfflineCache = fetchYarnDeps {
|
||||
yarnLock = finalAttrs.src + "/yarn.lock";
|
||||
hash = "sha256-jZZUrpi3Bg4qQ/NyUDPW7zNuUz/399wAf+gdeZHp+B0=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "toml extension for coc.nvim";
|
||||
homepage = "https://github.com/kkiyama117/coc-toml";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ soopyc ];
|
||||
};
|
||||
})
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "code-minimap";
|
||||
version = "0.6.7";
|
||||
version = "0.6.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wfxr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-d9qcSSiRv1I7NYuLrra5ShIUXT2HVeHGD0WPb+dnQCc=";
|
||||
sha256 = "sha256-unf7gFc/tQiUw3VqQ0KC96Srxn1E27WsmJviSggaCF4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-5/UgEzkJw9XDgtS1jKyWh5ijTp3L+UQLuE5CXcyIgTs=";
|
||||
cargoHash = "sha256-7RmYVg2mOGSdwvADXtbPupoRUUpyYUwYZFM7f24GxQU=";
|
||||
|
||||
buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv;
|
||||
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
gitUpdater,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
@@ -11,7 +12,7 @@ buildGoModule rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "glitchedgitz";
|
||||
repo = "cook";
|
||||
rev = "refs/tags/v${version}";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-DK0kbvM11t64nGkrzThZgSruHTCHAPP374YPWmoM50g=";
|
||||
};
|
||||
|
||||
@@ -21,6 +22,8 @@ buildGoModule rec {
|
||||
|
||||
doCheck = false; # uses network to fetch data sources
|
||||
|
||||
passthru.updateScript = gitUpdater { rev-prefix = "v"; };
|
||||
|
||||
meta = {
|
||||
description = "Wordlist generator, splitter, merger, finder, saver for security researchers, bug bounty and hackers";
|
||||
homepage = "https://github.com/glitchedgitz/cook";
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "corrosion";
|
||||
version = "0.5";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "corrosion-rs";
|
||||
repo = "corrosion";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-vaNXXXaGqYNmhonU+ANN857LAUgwv+PMcON+nBuUoeo=";
|
||||
hash = "sha256-/Xq0SKaKuOgrMXbgw+Aa59NEnU1mPQhARoh7EqV01K8=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv;
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
libevent,
|
||||
pkg-config,
|
||||
libprom,
|
||||
libpromhttp,
|
||||
libmicrohttpd,
|
||||
sqlite,
|
||||
nixosTests,
|
||||
@@ -31,7 +30,6 @@ stdenv.mkDerivation rec {
|
||||
openssl
|
||||
(libevent.override { inherit openssl; })
|
||||
libprom
|
||||
libpromhttp
|
||||
libmicrohttpd
|
||||
sqlite.dev
|
||||
];
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cppcheck";
|
||||
version = "2.16.1";
|
||||
version = "2.16.2";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "danmar";
|
||||
repo = "cppcheck";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-rx/JtpNPo8uDr4MR6h0ANK0erK8oMhlJp+4BQtc/poc=";
|
||||
hash = "sha256-awmWfVl7gMLROEkjYdSpbXnFaWQwEX9Ah8B9E0OOFm0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -117,7 +117,7 @@ OPTION(ENABLE_BASHCOMP "Install Bash autocompletions?" ON)
|
||||
IF (ENABLE_BASHCOMP)
|
||||
pkg_check_modules(BASHCOMP bash-completion)
|
||||
IF (BASHCOMP_FOUND)
|
||||
- execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=completionsdir bash-completion OUTPUT_VARIABLE BASHCOMP_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||
+ SET(BASHCOMP_DIR "@BASHCOMP_DIR@")
|
||||
message("Bash completion directory: ${BASHCOMP_DIR}")
|
||||
INSTALL(FILES createrepo_c.bash DESTINATION ${BASHCOMP_DIR} RENAME createrepo_c)
|
||||
INSTALL(CODE "
|
||||
@@ -1,11 +0,0 @@
|
||||
--- a/src/python/CMakeLists.txt
|
||||
+++ b/src/python/CMakeLists.txt
|
||||
@@ -14,7 +14,7 @@ if (NOT SKBUILD)
|
||||
FIND_PACKAGE(PythonLibs 3 REQUIRED)
|
||||
endif (NOT SKBUILD)
|
||||
|
||||
-EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib(True))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR)
|
||||
+SET(PYTHON_INSTALL_DIR "@PYTHON_INSTALL_DIR@")
|
||||
INCLUDE_DIRECTORIES (${PYTHON_INCLUDE_PATH})
|
||||
|
||||
MESSAGE(STATUS "Python install dir is ${PYTHON_INSTALL_DIR}")
|
||||
@@ -5,7 +5,6 @@
|
||||
cmake,
|
||||
pkg-config,
|
||||
bzip2,
|
||||
expat,
|
||||
glib,
|
||||
curl,
|
||||
libxml2,
|
||||
@@ -15,7 +14,6 @@
|
||||
sqlite,
|
||||
file,
|
||||
xz,
|
||||
pcre,
|
||||
bash-completion,
|
||||
zstd,
|
||||
zchunk,
|
||||
@@ -24,38 +22,31 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "createrepo_c";
|
||||
version = "0.17.2";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rpm-software-management";
|
||||
repo = "createrepo_c";
|
||||
rev = version;
|
||||
sha256 = "sha256-rcrJjcWj+cTAE3k11Ynr7CQCOWD+rb60lcar0G2w06A=";
|
||||
tag = version;
|
||||
hash = "sha256-IWn1in1AMN4brekerj+zu1OjTl+PE7fthU5+gcBzVU0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Use the output directory to install the bash completions.
|
||||
./fix-bash-completion-path.patch
|
||||
# Use the output directory to install the python modules.
|
||||
./fix-python-install-path.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace '@BASHCOMP_DIR@' "$out/share/bash-completion/completions"
|
||||
--replace-fail 'execute_process(COMMAND ''${PKG_CONFIG_EXECUTABLE} --variable=completionsdir bash-completion OUTPUT_VARIABLE BASHCOMP_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)' "SET(BASHCOMP_DIR \"$out/share/bash-completion/completions\")"
|
||||
substituteInPlace src/python/CMakeLists.txt \
|
||||
--replace "@PYTHON_INSTALL_DIR@" "$out/${python3.sitePackages}"
|
||||
--replace-fail "EXECUTE_PROCESS(COMMAND \''${PYTHON_EXECUTABLE} -c \"from sys import stdout; from sysconfig import get_path; stdout.write(get_path('platlib'))\" OUTPUT_VARIABLE PYTHON_INSTALL_DIR)" "SET(PYTHON_INSTALL_DIR \"$out/${python3.sitePackages}\")"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
rpm
|
||||
bash-completion
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
bzip2
|
||||
expat
|
||||
glib
|
||||
curl
|
||||
libxml2
|
||||
@@ -64,8 +55,6 @@ stdenv.mkDerivation rec {
|
||||
sqlite
|
||||
file
|
||||
xz
|
||||
pcre
|
||||
bash-completion
|
||||
zstd
|
||||
zchunk
|
||||
libmodulemd
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "csview";
|
||||
version = "1.3.3";
|
||||
version = "1.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wfxr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-9rjrNxMUUuH3S6fVsooscgIP+oFeQ6/gBQmuUMPDfp0=";
|
||||
sha256 = "sha256-JFuqaGwCSfEIncBgLu6gGaOvAC5vojKFjruWcuSghS0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-/0jviI91y4eAJ0uZDQqnw9htcl+j0aybY0U5gCc9DFg=";
|
||||
cargoHash = "sha256-mH1YpuYahdHFS+1cK9dryHbUqjewdbkNGxRBUOd2Hws=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "High performance csv viewer with cjk/emoji support";
|
||||
|
||||
@@ -6,39 +6,50 @@
|
||||
python3,
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
let
|
||||
py = python3.override {
|
||||
packageOverrides = final: prev: {
|
||||
# Requires "pydot >= 1.4.1, <3",
|
||||
pydot = prev.pydot.overridePythonAttrs (old: rec {
|
||||
version = "2.0.0";
|
||||
src = old.src.override {
|
||||
inherit version;
|
||||
hash = "sha256-YCRq8hUSP6Bi8hzXkb5n3aI6bygN8J9okZ5jeh5PMjU=";
|
||||
};
|
||||
doCheck = false;
|
||||
});
|
||||
};
|
||||
};
|
||||
in
|
||||
with py.pkgs;
|
||||
|
||||
py.pkgs.buildPythonApplication rec {
|
||||
pname = "cwltool";
|
||||
version = "3.1.20241024121129";
|
||||
version = "3.1.20241217163858";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "common-workflow-language";
|
||||
repo = "cwltool";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-MocgfELgis9b+byeDU7mDQcXnLhaWBtvGbqm7MtRdf8=";
|
||||
hash = "sha256-46x/7ewnt1eTu+1GdmPUExpiFfYE3mN8N8VFMM4r1Vk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace-fail "ruamel.yaml >= 0.16, < 0.19" "ruamel.yaml" \
|
||||
--replace-fail "prov == 1.5.1" "prov" \
|
||||
--replace-fail '"schema-salad >= 8.7, < 9",' '"schema-salad",' \
|
||||
--replace-fail "PYTEST_RUNNER + " ""
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail "ruamel.yaml>=0.16.0,<0.18" "ruamel.yaml" \
|
||||
--replace-fail "mypy==1.13.0" "mypy"
|
||||
'';
|
||||
|
||||
nativeBuildInputs =
|
||||
[
|
||||
git
|
||||
]
|
||||
++ (with python3.pkgs; [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
]);
|
||||
build-system = with py.pkgs; [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
dependencies = with python3.pkgs; [
|
||||
nativeBuildInputs = [ git ];
|
||||
|
||||
dependencies = with py.pkgs; [
|
||||
argcomplete
|
||||
bagit
|
||||
coloredlogs
|
||||
@@ -50,6 +61,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
pydot
|
||||
rdflib
|
||||
requests
|
||||
rich-argparse
|
||||
ruamel-yaml
|
||||
schema-salad
|
||||
shellescape
|
||||
@@ -60,7 +72,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
nativeCheckInputs = with python3.pkgs; [
|
||||
nativeCheckInputs = with py.pkgs; [
|
||||
mock
|
||||
nodejs
|
||||
pytest-mock
|
||||
@@ -89,7 +101,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
description = "Common Workflow Language reference implementation";
|
||||
homepage = "https://www.commonwl.org";
|
||||
changelog = "https://github.com/common-workflow-language/cwltool/releases/tag/${version}";
|
||||
license = with licenses; [ asl20 ];
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ veprbl ];
|
||||
mainProgram = "cwltool";
|
||||
};
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ddccontrol";
|
||||
version = "1.0.0";
|
||||
version = "1.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ddccontrol";
|
||||
repo = "ddccontrol";
|
||||
rev = version;
|
||||
sha256 = "sha256-100SITpGbui/gRhFjVZxn6lZRB0najtGHd18oUpByJo=";
|
||||
sha256 = "sha256-qyD6i44yH3EufIW+LA/LBMW20Tejb49zvsDfv6YFD6c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -36,14 +36,6 @@ stdenv.mkDerivation rec {
|
||||
ddccontrol-db
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Upstream commit, fixed the version number in v1.0.0
|
||||
(fetchpatch {
|
||||
url = "https://github.com/ddccontrol/ddccontrol/commit/fc8c5b5d0f2b64b08b95f4a7d8f47f2fd8ceec34.patch";
|
||||
hash = "sha256-SB1BaolTNCUYgj38nMg1uLUqOHvnwCr8T3cnfu/7rjI=";
|
||||
})
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system"
|
||||
];
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "decker";
|
||||
version = "1.52";
|
||||
version = "1.53";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "JohnEarnest";
|
||||
repo = "Decker";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-D9GaOi6jqTJ0c/hn4Qfdx96vf1RqCIzzKJ/MfhgYVE4=";
|
||||
hash = "sha256-TsEGErzekSmAEJLKao74FxdfMq3yTuFrru6HncEvQ38=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -6,15 +6,15 @@
|
||||
stateDir ? "/var/lib/dolibarr",
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dolibarr";
|
||||
version = "20.0.2";
|
||||
version = "20.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Dolibarr";
|
||||
repo = "dolibarr";
|
||||
tag = version;
|
||||
hash = "sha256-5OEZpBxTYXhO27ea/GBmJI9uDLRDgMNc9ehQ7mvvSrY=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-JqCDFdOkVQb9zH/ZCm7LsQktYDXXaB+0lS3HWqxE3YM=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
@@ -40,9 +40,9 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = {
|
||||
description = "Enterprise resource planning (ERP) and customer relationship manager (CRM) server";
|
||||
changelog = "https://github.com/Dolibarr/dolibarr/releases/tag/${src.tag}";
|
||||
changelog = "https://github.com/Dolibarr/dolibarr/releases/tag/${finalAttrs.version}";
|
||||
homepage = "https://dolibarr.org/";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ GaetanLepage ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -1,9 +1,7 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
apple-sdk_11,
|
||||
installShellFiles,
|
||||
}:
|
||||
|
||||
@@ -30,8 +28,6 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
}:
|
||||
let
|
||||
pname = "e1s";
|
||||
version = "1.0.43";
|
||||
version = "1.0.44";
|
||||
in
|
||||
buildGoModule {
|
||||
inherit pname version;
|
||||
@@ -14,7 +14,7 @@ buildGoModule {
|
||||
owner = "keidarcy";
|
||||
repo = "e1s";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-1RyVgdtw6PLJKq8VZqGx9rHlO+mSs0zHzP816Y2pIQ0=";
|
||||
hash = "sha256-cq2iv502Cr2r20/qba9+648yNmhNoEbaySNoijCbXcM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-bBl4D7HNIiAym6BWSJ0x4LZnIEUMfECj6dDDVZIFrHA=";
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
let
|
||||
pname = "ecm";
|
||||
version = "7.0.4";
|
||||
version = "7.0.6";
|
||||
name = "${pname}-${version}";
|
||||
in
|
||||
|
||||
@@ -16,10 +16,16 @@ stdenv.mkDerivation {
|
||||
inherit name;
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://gforge.inria.fr/frs/download.php/file/36224/ecm-${version}.tar.gz";
|
||||
sha256 = "0hxs24c2m3mh0nq1zz63z3sb7dhy1rilg2s1igwwcb26x3pb7xqc";
|
||||
url = "https://gitlab.inria.fr/zimmerma/ecm/uploads/ad3e5019fef98819ceae58b78f4cce93/ecm-${version}.tar.gz";
|
||||
hash = "sha256-fSDs5hq2ogrYXywYBkyr133Eapb/iUtSINuxbkZm6KU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs test.ecmfactor
|
||||
patchShebangs test.ecm
|
||||
substituteInPlace test.ecm --replace /bin/rm rm
|
||||
'';
|
||||
|
||||
# See https://trac.sagemath.org/ticket/19233
|
||||
configureFlags = lib.optional stdenv.hostPlatform.isDarwin "--disable-asm-redc";
|
||||
|
||||
@@ -33,8 +39,8 @@ stdenv.mkDerivation {
|
||||
meta = {
|
||||
description = "Elliptic Curve Method for Integer Factorization";
|
||||
mainProgram = "ecm";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
homepage = "http://ecm.gforge.inria.fr/";
|
||||
license = lib.licenses.gpl3Only;
|
||||
homepage = "https://gitlab.inria.fr/zimmerma/ecm";
|
||||
maintainers = [ lib.maintainers.roconnor ];
|
||||
platforms = with lib.platforms; linux ++ darwin;
|
||||
};
|
||||
|
||||
@@ -141,7 +141,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ejabberd";
|
||||
version = "24.10";
|
||||
version = "24.12";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
@@ -170,7 +170,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "processone";
|
||||
repo = "ejabberd";
|
||||
rev = "refs/tags/${finalAttrs.version}";
|
||||
hash = "sha256-WQCFwhyaTVAX1bQURJkiCupgr3zc5yKrhQBiGyYsWZk=";
|
||||
hash = "sha256-9TyIgsinUpUbirwqg61EYnPB/OyE5vhl3MBMRihqAtE=";
|
||||
};
|
||||
|
||||
passthru.tests = {
|
||||
|
||||
@@ -44,21 +44,21 @@ let
|
||||
};
|
||||
yconf = builder {
|
||||
name = "yconf";
|
||||
version = "1.0.16";
|
||||
version = "1.0.17";
|
||||
src = fetchHex {
|
||||
pkg = "yconf";
|
||||
version = "1.0.16";
|
||||
sha256 = "sha256-6UeBMnPzhxHHsuWo5KzJpRx7voVPdEo0X2AwCzhYbIk=";
|
||||
version = "1.0.17";
|
||||
sha256 = "sha256-3SiSkjJBRJpGzIRXuewPsUAwcAc1pYhZVWd8c1w0GiU=";
|
||||
};
|
||||
beamDeps = [ fast_yaml ];
|
||||
};
|
||||
xmpp = builder {
|
||||
name = "xmpp";
|
||||
version = "1.9.0";
|
||||
version = "1.9.1";
|
||||
src = fetchHex {
|
||||
pkg = "xmpp";
|
||||
version = "1.9.0";
|
||||
sha256 = "sha256-wbkb50qalQOvpnZvdWR3UWkg/7/uoMJgwvoXE1X1PCc=";
|
||||
version = "1.9.1";
|
||||
sha256 = "sha256-0rFDGvbkwaTIv5DK8MwRzesEe4MjuH6dfkgm1JEyddw=";
|
||||
};
|
||||
beamDeps = [
|
||||
ezlib
|
||||
@@ -124,11 +124,11 @@ let
|
||||
};
|
||||
p1_pgsql = builder {
|
||||
name = "p1_pgsql";
|
||||
version = "1.1.28";
|
||||
version = "1.1.29";
|
||||
src = fetchHex {
|
||||
pkg = "p1_pgsql";
|
||||
version = "1.1.28";
|
||||
sha256 = "sha256-ZVu3XfA2rOVd3OF8p0EUPELgZnxiBqwnpNy8Zfcaye8=";
|
||||
version = "1.1.29";
|
||||
sha256 = "sha256-pv9Y6LF0mT84ldo+piEan50MVNGm4ouzIdo7PNaLOME=";
|
||||
};
|
||||
beamDeps = [ xmpp ];
|
||||
};
|
||||
@@ -154,11 +154,11 @@ let
|
||||
};
|
||||
p1_acme = builder {
|
||||
name = "p1_acme";
|
||||
version = "1.0.24";
|
||||
version = "1.0.25";
|
||||
src = fetchHex {
|
||||
pkg = "p1_acme";
|
||||
version = "1.0.24";
|
||||
sha256 = "sha256-8UUdcGWV75l6scoXFi3axY+HSsl+MVpfrb48+iYUgAI=";
|
||||
version = "1.0.25";
|
||||
sha256 = "sha256-p7VbR0ld20+YoV5lRR7DrUP0Y3uVXHTNaV2Y5qZF0Iw=";
|
||||
};
|
||||
beamDeps = [
|
||||
base64url
|
||||
@@ -180,11 +180,11 @@ let
|
||||
};
|
||||
luerl = builder {
|
||||
name = "luerl";
|
||||
version = "1.2.0";
|
||||
version = "1.2.3";
|
||||
src = fetchHex {
|
||||
pkg = "luerl";
|
||||
version = "1.2.0";
|
||||
sha256 = "sha256-nK/U9glP8PWp0nj9gdYNPgJsggvftsrNSxvZCfIbUl0=";
|
||||
version = "1.2.3";
|
||||
sha256 = "sha256-G0udDKXX0oDR0nh6al7p9aISZBtiv/kVVrqlOAXfOu0=";
|
||||
};
|
||||
beamDeps = [ ];
|
||||
};
|
||||
@@ -220,11 +220,11 @@ let
|
||||
};
|
||||
fast_xml = builder {
|
||||
name = "fast_xml";
|
||||
version = "1.1.53";
|
||||
version = "1.1.55";
|
||||
src = fetchHex {
|
||||
pkg = "fast_xml";
|
||||
version = "1.1.53";
|
||||
sha256 = "sha256-UGQzbW82Pu5Ql6pdxc7Ztn8FFS8ua4Ug/VDSaMKrg5w=";
|
||||
version = "1.1.55";
|
||||
sha256 = "sha256-g/PiOngO1fVnzexzlT8GyVuDjXCdv6hrWamKjSPJn4U=";
|
||||
};
|
||||
beamDeps = [ p1_utils ];
|
||||
};
|
||||
@@ -264,11 +264,11 @@ let
|
||||
};
|
||||
eredis = builder {
|
||||
name = "eredis";
|
||||
version = "1.2.0";
|
||||
version = "1.7.1";
|
||||
src = fetchHex {
|
||||
pkg = "eredis";
|
||||
version = "1.2.0";
|
||||
sha256 = "sha256-2bWr7ywsirqPMqoBggPgs9yLEVd3OyVKsdTCACMX8eE=";
|
||||
version = "1.7.1";
|
||||
sha256 = "sha256-fCtUxWb+1V/u8zQcp5sBAKY0j9PxYhhLftURjSWMPME=";
|
||||
};
|
||||
beamDeps = [ ];
|
||||
};
|
||||
|
||||
@@ -15,18 +15,39 @@
|
||||
nixosTests,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "evcc";
|
||||
version = "0.131.12";
|
||||
let
|
||||
version = "0.132.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "evcc-io";
|
||||
repo = "evcc";
|
||||
rev = version;
|
||||
hash = "sha256-wctSgB5NRuS1+g+MEiHDS4oyFVNdwP2WFJF5kj9nFig=";
|
||||
tag = version;
|
||||
hash = "sha256-9HF9Beu2nLUoRViFluEc4kqGah2NfN/K0hqTZ4Bmo5c=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-xravbTVzmS7loLKtzuT3Yw7FkEnDFLw+GrwnAVV36Yw=";
|
||||
vendorHash = "sha256-xxE/KBZvPBMd9cLE/uU74iyLaOYRd6m9HokTDi0FnRg=";
|
||||
|
||||
commonMeta = with lib; {
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ hexa ];
|
||||
};
|
||||
|
||||
decorate = buildGoModule {
|
||||
pname = "evcc-decorate";
|
||||
inherit version src vendorHash;
|
||||
|
||||
subPackages = "cmd/decorate";
|
||||
|
||||
meta = commonMeta // {
|
||||
description = "EVCC decorate helper";
|
||||
homepage = "https://github.com/evcc-io/evcc/tree/master/cmd/decorate";
|
||||
};
|
||||
};
|
||||
in
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "evcc";
|
||||
inherit version src vendorHash;
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
inherit src;
|
||||
@@ -40,6 +61,7 @@ buildGoModule rec {
|
||||
|
||||
overrideModAttrs = _: {
|
||||
nativeBuildInputs = [
|
||||
decorate
|
||||
enumer
|
||||
go
|
||||
git
|
||||
@@ -59,7 +81,7 @@ buildGoModule rec {
|
||||
|
||||
ldflags = [
|
||||
"-X github.com/evcc-io/evcc/server.Version=${version}"
|
||||
"-X github.com/evcc-io/evcc/server.Commit=${src.rev}"
|
||||
"-X github.com/evcc-io/evcc/server.Commit=${src.tag}"
|
||||
"-s"
|
||||
"-w"
|
||||
];
|
||||
@@ -82,17 +104,16 @@ buildGoModule rec {
|
||||
[ "-skip=^${lib.concatStringsSep "$|^" skippedTests}$" ];
|
||||
|
||||
passthru = {
|
||||
inherit decorate;
|
||||
tests = {
|
||||
inherit (nixosTests) evcc;
|
||||
};
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
meta = commonMeta // {
|
||||
description = "EV Charge Controller";
|
||||
homepage = "https://evcc.io";
|
||||
changelog = "https://github.com/evcc-io/evcc/releases/tag/${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ hexa ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -6,10 +6,10 @@
|
||||
|
||||
let
|
||||
pname = "fflogs";
|
||||
version = "8.15.4";
|
||||
version = "8.15.13";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/RPGLogs/Uploaders-fflogs/releases/download/v${version}/fflogs-v${version}.AppImage";
|
||||
hash = "sha256-/lpt4pZT7etNCmT1lg5Vfx0IP9pbaqBUppJlu8HN47E=";
|
||||
hash = "sha256-bd3UtmRNbHmF7P46GNpNTsF5k0DiowPmN7Ul3cM0xkA=";
|
||||
};
|
||||
extracted = appimageTools.extractType2 { inherit pname version src; };
|
||||
in
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "files-cli";
|
||||
version = "2.13.209";
|
||||
version = "2.13.213";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "files-cli";
|
||||
owner = "files-com";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-plqYfVgDDx7DDkLIWJOA/GQESvUXw3cumIGdKBAGA1Q=";
|
||||
hash = "sha256-KMCOdEdBxgHb7j95v9LQWOuxzTeaW2uAWJBwELfZkC0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-T89iIx7ZTwn/k2qiixSG2QCJs8s/9lzJY+yK0dik+Wg=";
|
||||
vendorHash = "sha256-IbFfPRsbxGlZvBTOD2mOcUiEL1ZEn/5hrCXHwcj00Jc=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
|
||||
done
|
||||
'' + lib.optionalString withGui ''
|
||||
substituteInPlace src/firewall-applet.in \
|
||||
--replace "/usr/bin/nm-connection-editor" "${networkmanagerapplet}/bin/nm-conenction-editor"
|
||||
--replace "/usr/bin/nm-connection-editor" "${networkmanagerapplet}/bin/nm-connection-editor"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
Generated
+348
-55
@@ -1,61 +1,6 @@
|
||||
{
|
||||
"!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.",
|
||||
"!version": 1,
|
||||
"https://jcenter.bintray.com": {
|
||||
"io/pebbletemplates#pebble-project/3.1.5": {
|
||||
"pom": "sha256-TSnFtsOFqJp3c0S4sPjcKe/j+q06e5f4faJfAnOnOJM="
|
||||
},
|
||||
"io/pebbletemplates#pebble/3.1.5": {
|
||||
"jar": "sha256-0lOm3eWeE4aYqqruVGRh0vH2yL0qo47N00ffF8+Q1vA=",
|
||||
"pom": "sha256-kGnsr9XZc4ey9mNXp1X5Ghv4kZC0yHZ6zyCJDlFAuzc="
|
||||
},
|
||||
"junit#junit/4.12": {
|
||||
"jar": "sha256-WXIfCAXiI9hLkGd4h9n/Vn3FNNfFAsqQPAwrF/BcEWo=",
|
||||
"pom": "sha256-kPFj944/+28cetl96efrpO6iWAcUG4XW0SvmfKJUScQ="
|
||||
},
|
||||
"net/java/dev/jna#jna-platform/4.5.2": {
|
||||
"jar": "sha256-8dAMFn2JIcbiPGJu+fHDrgvkc8lcaP+gErx65VqH4tY=",
|
||||
"pom": "sha256-+mLh78vRkHG+SzftEFPa3AymCICzmA9Yq9SX8qnxPQU="
|
||||
},
|
||||
"net/java/dev/jna#jna/4.5.2": {
|
||||
"jar": "sha256-DI63rPZyYWVteQBRkd66ujtr9d1gpDc1okVCk4Hb7P8=",
|
||||
"pom": "sha256-nfQrTM73BF1uT7ZLg3bdCS3XTZc3zGSVx2mO7MvTxE8="
|
||||
},
|
||||
"org/bouncycastle#bcprov-jdk15on/1.59": {
|
||||
"jar": "sha256-HDHkTjMdJeRtKTs+juLQcCimfbAR50yyRDKFrtHVnIU=",
|
||||
"pom": "sha256-QeZGb3GwjQXw0+tdhFXATl42hpxjXhFq4Nt04oAD7OU="
|
||||
},
|
||||
"org/hamcrest#hamcrest-core/1.3": {
|
||||
"jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=",
|
||||
"pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM="
|
||||
},
|
||||
"org/hamcrest#hamcrest-library/1.3": {
|
||||
"jar": "sha256-cR1kUi+exBCYO9MQk0KW2hNL5CVKElCAoEFuwXjfrRw=",
|
||||
"pom": "sha256-HOtL+w8JiuKbk1BEsjY+ETIzE/4+0gVd+LeXN9UFYnc="
|
||||
},
|
||||
"org/hamcrest#hamcrest-parent/1.3": {
|
||||
"pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps="
|
||||
},
|
||||
"org/mockito#mockito-core/1.9.5": {
|
||||
"jar": "sha256-+XSDuglEufoTOqKWOHZN2+rbUew9vAIHTFj6LK7NB/o=",
|
||||
"pom": "sha256-9DIR3AoX/PzVBDCr1bx0e2/SOu9FaWgrZc8rrw8gcnw="
|
||||
},
|
||||
"org/objenesis#objenesis/1.0": {
|
||||
"jar": "sha256-xWlLVdklJ0eTgvJUGZs8ax2HgPZSrWHpylmRmIf0kag=",
|
||||
"pom": "sha256-JInYiwSZ9V5173Xw8lBUV8cSxc+oR8maRvjes+fqPOs="
|
||||
},
|
||||
"org/slf4j#slf4j-api/1.7.25": {
|
||||
"jar": "sha256-GMSgCV1cHaa4F1kudnuyPSndL1YK1033X/OWHb3iW3k=",
|
||||
"pom": "sha256-fNnXoLXZPf1GGhSIkbQ1Cc9AOpx/n7SQYNNVTfHIHh4="
|
||||
},
|
||||
"org/slf4j#slf4j-parent/1.7.25": {
|
||||
"pom": "sha256-GPXFISDbA26I1hNviDnIMtB0vdqVx1bG9CkknS21SsY="
|
||||
},
|
||||
"org/unbescape#unbescape/1.1.6.RELEASE": {
|
||||
"jar": "sha256-WXz4fVsaTzhbnRzsl0t7SDq7PuhfxbP4tir45L7JXCw=",
|
||||
"pom": "sha256-AgOVYrsyfVQcDwUHZ+kYmPo4l0eSZojMITvRG8dRJ9E="
|
||||
}
|
||||
},
|
||||
"https://mvn.freenetproject.org": {
|
||||
"org/freenetproject#freenet-ext/29": {
|
||||
"jar": "sha256-MvKz1r7t9UE36i+aPr72dmbXafCWawjNF/19tZuk158="
|
||||
@@ -98,6 +43,30 @@
|
||||
"jar": "sha256-KUCCoJLJeibyMtC+EhCamQj7pI/dOfdkWTI2nONiD5Q=",
|
||||
"pom": "sha256-yTWvDWMw7Lk41paAn7mIG5hMz07owjDEUP8nqVNIFv0="
|
||||
},
|
||||
"com/android/tools/build/builder-model/0.9.2/builder-model-0.9.2.jar": {
|
||||
"asc": "sha256-mvzW7dRcRrToD9jWhsDp1nwq2XVTZeOUx5/CYFLukfQ="
|
||||
},
|
||||
"com/android/tools/build/builder-model/0.9.2/builder-model-0.9.2.pom": {
|
||||
"asc": "sha256-n958l8bKaQ1Qx2r+bcAlndat8CwvZbZiNe+cxPi2MMQ="
|
||||
},
|
||||
"com/android/tools/build/builder-test-api/0.9.2/builder-test-api-0.9.2.jar": {
|
||||
"asc": "sha256-6v/kcHV6Usj90eieQgOgMl2b3q1LS1i6KJQItY/o2cg="
|
||||
},
|
||||
"com/android/tools/build/builder-test-api/0.9.2/builder-test-api-0.9.2.pom": {
|
||||
"asc": "sha256-Crh44ObdpB0SJ+h9M7pWIE/bYK4l5rrx0fak28HgSNI="
|
||||
},
|
||||
"com/android/tools/build/builder/0.9.2/builder-0.9.2.jar": {
|
||||
"asc": "sha256-ztAiK1VbDcSvFZ0j9rXrFVNf33Rhzrm8wzn5gPGvfzk="
|
||||
},
|
||||
"com/android/tools/build/builder/0.9.2/builder-0.9.2.pom": {
|
||||
"asc": "sha256-syEEuQm2v5Z8NNGANlh/myoZfi4OaIjjk4Al3x5ljYw="
|
||||
},
|
||||
"com/android/tools/build/gradle/0.9.2/gradle-0.9.2.jar": {
|
||||
"asc": "sha256-qyO5UMul04CKVrdOCBB+ouP1H03GgG9GFYI0dksRNHo="
|
||||
},
|
||||
"com/android/tools/build/gradle/0.9.2/gradle-0.9.2.pom": {
|
||||
"asc": "sha256-IgxhubDsggD6cinAXDC2WgyKq0rQpE7mQHSnTdkhKNE="
|
||||
},
|
||||
"com/android/tools/build/gradle/maven-metadata": {
|
||||
"xml": {
|
||||
"groupId": "com.android.tools.build",
|
||||
@@ -105,18 +74,54 @@
|
||||
"release": "2.3.0"
|
||||
}
|
||||
},
|
||||
"com/android/tools/build/manifest-merger/22.7.2/manifest-merger-22.7.2.jar": {
|
||||
"asc": "sha256-l7sOFoQMAzDBHZmJAI4oAcEMEj8IZDkULMZpj4+RkEE="
|
||||
},
|
||||
"com/android/tools/build/manifest-merger/22.7.2/manifest-merger-22.7.2.pom": {
|
||||
"asc": "sha256-jHFCoJT3Vklk1CHcU5htftAxjHayTF3PQp0/BAhI2BA="
|
||||
},
|
||||
"com/android/tools/common/22.7.2/common-22.7.2.jar": {
|
||||
"asc": "sha256-n/wISK1w475HWWyAVpyFf0vfrZk+SuDoJPnab+1N2kE="
|
||||
},
|
||||
"com/android/tools/common/22.7.2/common-22.7.2.pom": {
|
||||
"asc": "sha256-TFNSXpxIshBScNQNWSba6QOuxtEQai2OdOBohuCgKzI="
|
||||
},
|
||||
"com/android/tools/ddms#ddmlib/22.7.2": {
|
||||
"jar": "sha256-NZ5F7s1IkUbifaIimc7nOzYL1Ox/wCfb2zXKys5BOfk=",
|
||||
"pom": "sha256-YrMjYBcQ4UiBuJ/LDEJ/DfnNbewtmiY+F17jMt8iMXY="
|
||||
},
|
||||
"com/android/tools/ddms/ddmlib/22.7.2/ddmlib-22.7.2.jar": {
|
||||
"asc": "sha256-vSgCnTMlLGziMsAKCJKTne+asEEe8K8R+poeHCmL+hI="
|
||||
},
|
||||
"com/android/tools/ddms/ddmlib/22.7.2/ddmlib-22.7.2.pom": {
|
||||
"asc": "sha256-FnOAxy4OttUH0A1K72JWeH+siIglSW68ArW9oQhdJIc="
|
||||
},
|
||||
"com/android/tools/dvlib/22.7.2/dvlib-22.7.2.jar": {
|
||||
"asc": "sha256-WgfgmfP4gV9Y3me/FSkYjHmm5QXHO2P1GqFTNsVXGJM="
|
||||
},
|
||||
"com/android/tools/dvlib/22.7.2/dvlib-22.7.2.pom": {
|
||||
"asc": "sha256-PIx3iCiWEA/GYUfT0L+Y+lhfa98ssDWLSjWl1qF5okA="
|
||||
},
|
||||
"com/android/tools/external/lombok#lombok-ast/0.2.2": {
|
||||
"jar": "sha256-Ww2J1DBMXGFGDkijsPMTf3EitDOBuLtQWr9HzF/bmoE=",
|
||||
"pom": "sha256-iuaeannJXNEvRP80ak/B1wrnLTlkqnk3cTbGPIv0074="
|
||||
},
|
||||
"com/android/tools/external/lombok/lombok-ast/0.2.2/lombok-ast-0.2.2.jar": {
|
||||
"asc": "sha256-ubvH9/JIm1E4JxKsA2I8gmKSgedhyQrehjbtKvkvXuk="
|
||||
},
|
||||
"com/android/tools/external/lombok/lombok-ast/0.2.2/lombok-ast-0.2.2.pom": {
|
||||
"asc": "sha256-h86LTl/gH52T3cqAVBNuNX6F4EgX2y2aXWGQ3ie0R1o="
|
||||
},
|
||||
"com/android/tools/layoutlib#layoutlib-api/22.7.2": {
|
||||
"jar": "sha256-X/eOSXu1N9Hi9toYoVGvyQZ7Cj6Q6KQvHJldOxd0kSw=",
|
||||
"pom": "sha256-dyDIj0DkMDb+tWMd2uEnO8XSwURDnqGK3/p0J3LzHnM="
|
||||
},
|
||||
"com/android/tools/layoutlib/layoutlib-api/22.7.2/layoutlib-api-22.7.2.jar": {
|
||||
"asc": "sha256-3tXQc62IfKonpENS1sEbBJap0hhdcUSqWbkpvu/vyFs="
|
||||
},
|
||||
"com/android/tools/layoutlib/layoutlib-api/22.7.2/layoutlib-api-22.7.2.pom": {
|
||||
"asc": "sha256-C09wcRuPuH4qsmXkncBSeO0Z2GZxKPOQQvJDQwfMBZ4="
|
||||
},
|
||||
"com/android/tools/lint#lint-api/22.7.2": {
|
||||
"jar": "sha256-1faoCgpY1ycOFmiZGr+akAkteBBqy1qDRGddCv71Tv4=",
|
||||
"pom": "sha256-gs32TSJflZ0SMJzK4k21b17zmJzn27TrE/oEW01RaQM="
|
||||
@@ -129,6 +134,36 @@
|
||||
"jar": "sha256-vyzGoCzhz2/wdqBBo6GC8G8chqZfU/vR69VK/cxqjrg=",
|
||||
"pom": "sha256-PPoEnyzLSe5u7n55c5WjqGrpizxkIIINKEb+B6bqKlc="
|
||||
},
|
||||
"com/android/tools/lint/lint-api/22.7.2/lint-api-22.7.2.jar": {
|
||||
"asc": "sha256-YH4XVrtDVk9Gey/I60RSUWWu0QtFFSCZpg6O5h87CIw="
|
||||
},
|
||||
"com/android/tools/lint/lint-api/22.7.2/lint-api-22.7.2.pom": {
|
||||
"asc": "sha256-5UjETgtrLCNiMvg+uWqet4FnrvoLiQq3wITS6oGX13o="
|
||||
},
|
||||
"com/android/tools/lint/lint-checks/22.7.2/lint-checks-22.7.2.jar": {
|
||||
"asc": "sha256-P0Kq4YSaRD91xQCOWv7WO6Ae7Kv0DQpf0icYXPEkssU="
|
||||
},
|
||||
"com/android/tools/lint/lint-checks/22.7.2/lint-checks-22.7.2.pom": {
|
||||
"asc": "sha256-uR2CLmzh+m7mAA5SDvS5eeGlIveZmzpLpfDsW1CHIps="
|
||||
},
|
||||
"com/android/tools/lint/lint/22.7.2/lint-22.7.2.jar": {
|
||||
"asc": "sha256-k1lNA9bAtAVz6GA00rkJusVIoUiNn+J+hXvUch7SYyQ="
|
||||
},
|
||||
"com/android/tools/lint/lint/22.7.2/lint-22.7.2.pom": {
|
||||
"asc": "sha256-Q16Lx4njfrT0vUR4/oCA6AZ9XjBOV2F7YW0HxTEBu/s="
|
||||
},
|
||||
"com/android/tools/sdk-common/22.7.2/sdk-common-22.7.2.jar": {
|
||||
"asc": "sha256-F7wcwNMx92sutxXHVpsI8vkvHiXngBvbpwbF5teMCr4="
|
||||
},
|
||||
"com/android/tools/sdk-common/22.7.2/sdk-common-22.7.2.pom": {
|
||||
"asc": "sha256-HAG4PLQozpyFKT1Z4RWJbkqCcLdqKIX1jMzq7xEdVYs="
|
||||
},
|
||||
"com/android/tools/sdklib/22.7.2/sdklib-22.7.2.jar": {
|
||||
"asc": "sha256-y7XVQ5ikgdTJx/9DxBCcFFBLefGH8eUEXM8i6xNj6Dc="
|
||||
},
|
||||
"com/android/tools/sdklib/22.7.2/sdklib-22.7.2.pom": {
|
||||
"asc": "sha256-LdpmibFMCP7bk1qQd7r7pdSfSEVX1fItSq/A3XYohvs="
|
||||
},
|
||||
"com/google/guava#guava-parent/15.0": {
|
||||
"pom": "sha256-9RllyaeD1msuchhUmHcfYJsJcQik/g9xfPwzCBWV2js="
|
||||
},
|
||||
@@ -136,21 +171,94 @@
|
||||
"jar": "sha256-ejRXV3DuvGClR2YW42dqbLbyl1x4xBXipgFKxyS6V4M=",
|
||||
"pom": "sha256-lxBXG7i0qZL0X/gKSOL+Ws7cdD6/iD1M/cuSBgIruFs="
|
||||
},
|
||||
"com/google/guava/guava-parent/15.0/guava-parent-15.0.pom": {
|
||||
"asc": "sha256-GTlOaEPTfDFHy1xkMncIK2RKh3V0ltThkNvZ/iTKQPw="
|
||||
},
|
||||
"com/google/guava/guava/15.0/guava-15.0.jar": {
|
||||
"asc": "sha256-O+b5j21kF4SwFWVKdhyosCbDa8YDmyir0I3dFePvdoU="
|
||||
},
|
||||
"com/google/guava/guava/15.0/guava-15.0.pom": {
|
||||
"asc": "sha256-6UQa9fz5vuf/GA+ByIcpViliI9pUc8+rjRzHVJL/iCw="
|
||||
},
|
||||
"com/squareup#javawriter/2.2.1": {
|
||||
"jar": "sha256-HIIW3l9u2UaerpQhAybEt/5hFmvlAnaOkCd5xqe6vOo=",
|
||||
"pom": "sha256-XNmnCSuBlmCSc4cBpL28LkoDm/r8E6NcfKCYEc+7MPA="
|
||||
},
|
||||
"com/squareup/javawriter/2.2.1/javawriter-2.2.1.jar": {
|
||||
"asc": "sha256-3Yy6yNGFQ/RrvC9/hh9/Sng320M+zSdgydw2D0IICO0="
|
||||
},
|
||||
"com/squareup/javawriter/2.2.1/javawriter-2.2.1.pom": {
|
||||
"asc": "sha256-NPDWZzyuLZPDZkxtM3X4fNkrcOgBlA25Ur4bQLv7QAg="
|
||||
},
|
||||
"commons-codec#commons-codec/1.4": {
|
||||
"jar": "sha256-aqQjTHTzoQNXUaJYIlRYZ8jDcnElpkK24ElmXRhjYxs=",
|
||||
"pom": "sha256-9fMAaUIboBPna+znYEB9zIACJGHclVXcvXX9sG2aQI8="
|
||||
},
|
||||
"commons-codec/commons-codec/1.4/commons-codec-1.4.jar": {
|
||||
"asc": "sha256-nnSvNrWBCQnQHrEmCToDzejnbXJImQrPe+ffRPCgipw="
|
||||
},
|
||||
"commons-codec/commons-codec/1.4/commons-codec-1.4.pom": {
|
||||
"asc": "sha256-4YgQcyQZ5ziWdGwzeWxMn/oOM2UdYLrhq5wUtjjKJPc="
|
||||
},
|
||||
"commons-logging#commons-logging/1.1.1": {
|
||||
"jar": "sha256-zm+RPK0fDbOq1wGG1lxbx//Mmpnj/o4LE3MSgZ98Ni8=",
|
||||
"pom": "sha256-0PLhbQVOi7l63ZyiZSXrI0b2koCfzSooeH2ozrPDXug="
|
||||
},
|
||||
"commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar": {
|
||||
"asc": "sha256-wY7phz0hNTOPi8YInSBZ+DH75wcqsAYvq6svJABO8BY="
|
||||
},
|
||||
"commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.pom": {
|
||||
"asc": "sha256-5O+8adBtGElIn97Mi2kMVHXSJlNDj0C1uc2txt/HcJs="
|
||||
},
|
||||
"io/pebbletemplates#pebble-project/3.1.5": {
|
||||
"pom": "sha256-TSnFtsOFqJp3c0S4sPjcKe/j+q06e5f4faJfAnOnOJM="
|
||||
},
|
||||
"io/pebbletemplates#pebble/3.1.5": {
|
||||
"jar": "sha256-0lOm3eWeE4aYqqruVGRh0vH2yL0qo47N00ffF8+Q1vA=",
|
||||
"pom": "sha256-kGnsr9XZc4ey9mNXp1X5Ghv4kZC0yHZ6zyCJDlFAuzc="
|
||||
},
|
||||
"io/pebbletemplates/pebble-project/3.1.5/pebble-project-3.1.5.pom": {
|
||||
"asc": "sha256-xVWh8tfwv8bCI1PiVOOgDx3O/fpvFTTdScy5Zw2Q/To="
|
||||
},
|
||||
"io/pebbletemplates/pebble/3.1.5/pebble-3.1.5.jar": {
|
||||
"asc": "sha256-cFF8mZganRCeN3NneTDN1q23v7gpiaQmqF1xB+gDf1Y="
|
||||
},
|
||||
"io/pebbletemplates/pebble/3.1.5/pebble-3.1.5.pom": {
|
||||
"asc": "sha256-qzOpaSYC/oOoJLkeqRdWDoFp1tMNERW/eZM7y2yJ90M="
|
||||
},
|
||||
"junit#junit/4.13.2": {
|
||||
"jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=",
|
||||
"pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ="
|
||||
},
|
||||
"junit/junit/4.13.2/junit-4.13.2.jar": {
|
||||
"asc": "sha256-qFOPh/WLb1S3ps7/0BJisILDiWIrCIbFIIeN4e+56rk="
|
||||
},
|
||||
"junit/junit/4.13.2/junit-4.13.2.pom": {
|
||||
"asc": "sha256-gIzTYDjanf/1IzpX45EvG3BKlDTnp02va57XpLBi9d0="
|
||||
},
|
||||
"kxml2#kxml2/2.3.0": {
|
||||
"pom": "sha256-CVvyT0be2d4LZsqdZx3PVPj2FbqVFQsaMTw0dcVf1qU="
|
||||
},
|
||||
"net/java/dev/jna#jna-platform/4.5.2": {
|
||||
"jar": "sha256-8dAMFn2JIcbiPGJu+fHDrgvkc8lcaP+gErx65VqH4tY=",
|
||||
"pom": "sha256-+mLh78vRkHG+SzftEFPa3AymCICzmA9Yq9SX8qnxPQU="
|
||||
},
|
||||
"net/java/dev/jna#jna/4.5.2": {
|
||||
"jar": "sha256-DI63rPZyYWVteQBRkd66ujtr9d1gpDc1okVCk4Hb7P8=",
|
||||
"pom": "sha256-nfQrTM73BF1uT7ZLg3bdCS3XTZc3zGSVx2mO7MvTxE8="
|
||||
},
|
||||
"net/java/dev/jna/jna-platform/4.5.2/jna-platform-4.5.2.jar": {
|
||||
"asc": "sha256-mCY0PWlQJMB6IzgJ1xaO/nJZJZC0PDYDYwIjLKzaTcg="
|
||||
},
|
||||
"net/java/dev/jna/jna-platform/4.5.2/jna-platform-4.5.2.pom": {
|
||||
"asc": "sha256-Jpde2ET9nK96bRMGPKRXJD8naBJCRtNLZS5/J1f8AVc="
|
||||
},
|
||||
"net/java/dev/jna/jna/4.5.2/jna-4.5.2.jar": {
|
||||
"asc": "sha256-9KXn9EXk1JJdLNAxXt23tC4ZvAc8YyQcPUtAhmPRy30="
|
||||
},
|
||||
"net/java/dev/jna/jna/4.5.2/jna-4.5.2.pom": {
|
||||
"asc": "sha256-EgEfn4uqaMa1yS1oAC6BYwnERayRmBUfNiN0vAMGAqI="
|
||||
},
|
||||
"net/sf/kxml#kxml2/2.3.0": {
|
||||
"jar": "sha256-8mTdn3mh/eEM5ezFMiHv8kvkyTMcgwt9UvLwintjPeI=",
|
||||
"pom": "sha256-Mc5gb06VGJNimbsNJ8l4+mHhhf0d58mHT+lZpT40poU="
|
||||
@@ -166,9 +274,27 @@
|
||||
"net/sf/proguard#proguard-parent/4.10": {
|
||||
"pom": "sha256-31W088lOxk4iyZFZ/VmWktA9VNdaFRMXMqovUDOeLGM="
|
||||
},
|
||||
"net/sf/proguard/proguard-base/4.10/proguard-base-4.10.jar": {
|
||||
"asc": "sha256-TL4/Aaaoj77RknIIiDFg34ZvkkmI92HUjA38kfABdc0="
|
||||
},
|
||||
"net/sf/proguard/proguard-base/4.10/proguard-base-4.10.pom": {
|
||||
"asc": "sha256-KzDBhyCZaQn/l1lk5J1qSUDpC2l96x3lUkv6HiiPu0k="
|
||||
},
|
||||
"net/sf/proguard/proguard-gradle/4.10/proguard-gradle-4.10.jar": {
|
||||
"asc": "sha256-nsPmzDnUqRzyKzVolwnP+R8YgVDziMqZaR82RolwmK0="
|
||||
},
|
||||
"net/sf/proguard/proguard-gradle/4.10/proguard-gradle-4.10.pom": {
|
||||
"asc": "sha256-xLysB82xpC/dbOBFGqBK0sa6vitiUpSKmGAN7wbidX8="
|
||||
},
|
||||
"net/sf/proguard/proguard-parent/4.10/proguard-parent-4.10.pom": {
|
||||
"asc": "sha256-QyzAPExvQl0zxiS6j2eZJxPoiAA3RAl4X8FM3OD4+GI="
|
||||
},
|
||||
"org/apache#apache/4": {
|
||||
"pom": "sha256-npMjomuo6yOU7+8MltMbcN9XCAhjDcFHyrHnNUHMUZQ="
|
||||
},
|
||||
"org/apache/apache/4/apache-4.pom": {
|
||||
"asc": "sha256-aAalIBTrcoWtABbZ1280b5N7+qINywPWWTtR2Gw9pak="
|
||||
},
|
||||
"org/apache/commons#commons-compress/1.0": {
|
||||
"jar": "sha256-CehOeXeMoboVtzNll6MhRX/CJb1dQfe0aTXSeSL8KnQ=",
|
||||
"pom": "sha256-O4swzTU6QIV7IEMRzGQVBLATSET8lhOMIkMlniAo/5E="
|
||||
@@ -179,6 +305,18 @@
|
||||
"org/apache/commons#commons-parent/5": {
|
||||
"pom": "sha256-i9YywAvfgKfeNsIrYPEkUsFH2Oyi8A151maZ6+faoCo="
|
||||
},
|
||||
"org/apache/commons/commons-compress/1.0/commons-compress-1.0.jar": {
|
||||
"asc": "sha256-IEO1Qm7Y1AdNkfT99t+8mqQ7KwPoLSEBlc8Ups3nUyY="
|
||||
},
|
||||
"org/apache/commons/commons-compress/1.0/commons-compress-1.0.pom": {
|
||||
"asc": "sha256-tuFXfC5uycG29GlxwmhjY65JuNabajDXHLJbGdAQjlE="
|
||||
},
|
||||
"org/apache/commons/commons-parent/11/commons-parent-11.pom": {
|
||||
"asc": "sha256-hgEzyW2ItIA1+P6i6cHRWr3bILkS2ynh/pyNFS4/OLM="
|
||||
},
|
||||
"org/apache/commons/commons-parent/5/commons-parent-5.pom": {
|
||||
"asc": "sha256-6ZA2PdnME62+KkCoEMHjJMBZRWLlGefwiMyaMJLIiLQ="
|
||||
},
|
||||
"org/apache/httpcomponents#httpclient/4.1.1": {
|
||||
"jar": "sha256-6uUm0Ipmeb9soTjUWgAFsgum7EpAJ4i+gQlwcTyOR1E=",
|
||||
"pom": "sha256-rboX2TSKl9TOBfKCZ5cP2BlcYaVssG1eDdFfr/YP4qc="
|
||||
@@ -203,6 +341,36 @@
|
||||
"org/apache/httpcomponents#project/4.1.1": {
|
||||
"pom": "sha256-IbtNRN/1TjOjfBGvaYWacUICrgCWmqtUU+unJ2aI+Ow="
|
||||
},
|
||||
"org/apache/httpcomponents/httpclient/4.1.1/httpclient-4.1.1.jar": {
|
||||
"asc": "sha256-IBjcWIUV/O4A7rHpXO+Jd64Lm+d4W7xYU+Nv00kCXeg="
|
||||
},
|
||||
"org/apache/httpcomponents/httpclient/4.1.1/httpclient-4.1.1.pom": {
|
||||
"asc": "sha256-YezBIVduwFwXabNCrrZn7oEFO1tLJ5ztz+RJHqGWjLE="
|
||||
},
|
||||
"org/apache/httpcomponents/httpcomponents-client/4.1.1/httpcomponents-client-4.1.1.pom": {
|
||||
"asc": "sha256-bKJv92oBSHgdXHI884xvZ22L38qboC1BKWO08HUrz0Y="
|
||||
},
|
||||
"org/apache/httpcomponents/httpcomponents-client/4.1/httpcomponents-client-4.1.pom": {
|
||||
"asc": "sha256-EutH7JPGE7OMO4mOsWpAIw9j9shsWd+obgCKe+Vx2KU="
|
||||
},
|
||||
"org/apache/httpcomponents/httpcomponents-core/4.1/httpcomponents-core-4.1.pom": {
|
||||
"asc": "sha256-dXFGZMsRHYLkjBv4QBH8mr1U5xm1fytTKAb2KFE2FEY="
|
||||
},
|
||||
"org/apache/httpcomponents/httpcore/4.1/httpcore-4.1.jar": {
|
||||
"asc": "sha256-xqZuKzF6klaO0bD8bXE5tyiWkO1Hpe9387qt/AJcs54="
|
||||
},
|
||||
"org/apache/httpcomponents/httpcore/4.1/httpcore-4.1.pom": {
|
||||
"asc": "sha256-ovZWk6l1FQsg0C65j4H3srHRuqGYZ1QWLE72AsmnPPk="
|
||||
},
|
||||
"org/apache/httpcomponents/httpmime/4.1/httpmime-4.1.jar": {
|
||||
"asc": "sha256-QJ5DghXtPl2nissIn4G6sZHdPngQHL7iCn7H7BxM5Yw="
|
||||
},
|
||||
"org/apache/httpcomponents/httpmime/4.1/httpmime-4.1.pom": {
|
||||
"asc": "sha256-tWXRxOIKfwDlekZQPv6Dsyo82VgiFRwpoPA9c7xxqFA="
|
||||
},
|
||||
"org/apache/httpcomponents/project/4.1.1/project-4.1.1.pom": {
|
||||
"asc": "sha256-RC9FuVR7UWWSIVwOci4aF3BPeHZAaAP4hSyXhU1ahFY="
|
||||
},
|
||||
"org/bouncycastle#bcpkix-jdk15on/1.48": {
|
||||
"jar": "sha256-U0czNrTlqtd5aKGLFsVNFc28Q/Plehh4eZ7faUHQujc=",
|
||||
"pom": "sha256-v3z/mqxILUKuuKFVHQDrZ81DbsjNThJuyKHgnITdIX0="
|
||||
@@ -211,10 +379,85 @@
|
||||
"jar": "sha256-gEt+Ljuax3Hf07Q94WZmrGAI+GAPSPKN3JTjmhFOIog=",
|
||||
"pom": "sha256-KRIr50qOwbT8VB49opmL62Irw4wEuovx9Vk4aReCeYI="
|
||||
},
|
||||
"org/bouncycastle#bcprov-jdk15on/1.59": {
|
||||
"jar": "sha256-HDHkTjMdJeRtKTs+juLQcCimfbAR50yyRDKFrtHVnIU=",
|
||||
"pom": "sha256-QeZGb3GwjQXw0+tdhFXATl42hpxjXhFq4Nt04oAD7OU="
|
||||
},
|
||||
"org/bouncycastle/bcpkix-jdk15on/1.48/bcpkix-jdk15on-1.48.jar": {
|
||||
"asc": "sha256-6tXbsLOuaFcz7tQZL5gydPf5nC4ghFFt49OXSkQEZEA="
|
||||
},
|
||||
"org/bouncycastle/bcpkix-jdk15on/1.48/bcpkix-jdk15on-1.48.pom": {
|
||||
"asc": "sha256-bx8bIFid6sxY9CdeW+Hs97+FLy1DscS6wC9u+P63LT0="
|
||||
},
|
||||
"org/bouncycastle/bcprov-jdk15on/1.48/bcprov-jdk15on-1.48.jar": {
|
||||
"asc": "sha256-f9qKQ9gEnRNI3dvoQpvrTFO6QEZM8hTDXNg3G5/N104="
|
||||
},
|
||||
"org/bouncycastle/bcprov-jdk15on/1.48/bcprov-jdk15on-1.48.pom": {
|
||||
"asc": "sha256-fzInz+bfjfvS6HWuYgtz9P6KEXK0tRt+r+weNqVS/Yw="
|
||||
},
|
||||
"org/bouncycastle/bcprov-jdk15on/1.59/bcprov-jdk15on-1.59.jar": {
|
||||
"asc": "sha256-ICEPWOGva/aukTU8MqzkEKgtMKCLlHROqYt5HOYJ5mk="
|
||||
},
|
||||
"org/bouncycastle/bcprov-jdk15on/1.59/bcprov-jdk15on-1.59.pom": {
|
||||
"asc": "sha256-F6lDq/sfWn2DvCZzOpgvKvxByFso/1OSOHPNtCKIF78="
|
||||
},
|
||||
"org/eclipse/jdt/core/compiler#ecj/4.2.2": {
|
||||
"jar": "sha256-THTfiGENZzssdL9bSLYoS65C+biA8K2JqK2mn+hKDXA=",
|
||||
"pom": "sha256-sh7YTnfE/FhyYqADSzUx+vt+WxGlMWqbjKo/47fqYj0="
|
||||
},
|
||||
"org/eclipse/jdt/core/compiler/ecj/4.2.2/ecj-4.2.2.jar": {
|
||||
"asc": "sha256-4EsxB+k8PkrYaQC659GD+f17mBEi6FQqihlswUFZGjg="
|
||||
},
|
||||
"org/eclipse/jdt/core/compiler/ecj/4.2.2/ecj-4.2.2.pom": {
|
||||
"asc": "sha256-tnaW/JMy9jqxXze2MoL0xsIQL/K6fiiyBA6EfrsCUfc="
|
||||
},
|
||||
"org/hamcrest#hamcrest-core/1.3": {
|
||||
"jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=",
|
||||
"pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM="
|
||||
},
|
||||
"org/hamcrest#hamcrest-parent/1.3": {
|
||||
"pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps="
|
||||
},
|
||||
"org/hamcrest#hamcrest/3.0": {
|
||||
"jar": "sha256-XWa2pKaAdVy27XyxBPp4Ne9kRmdYb/Bzet65d8Oezbw=",
|
||||
"module": "sha256-mhBVNzjTWME+a69Zeb8sGlSQ7uScLcas8xcPzKCSDd4=",
|
||||
"pom": "sha256-SgSmgTO/MkYfR7ilPI7p30zi9JoNrZeUvOhxe+5brDE="
|
||||
},
|
||||
"org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar": {
|
||||
"asc": "sha256-YNmOD50t5Jur372FbCQ67ZeNG0jNA/+j3Y+8SGmGGXc="
|
||||
},
|
||||
"org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.pom": {
|
||||
"asc": "sha256-l6OtfH63FxpqJBn5YBbgEATt+c7SkwBtlz8QhThi7kM="
|
||||
},
|
||||
"org/hamcrest/hamcrest-parent/1.3/hamcrest-parent-1.3.pom": {
|
||||
"asc": "sha256-0Iq1QfQtuRW9U8CAaXL08S6msdH/wJeUYMQ6H5ql0aY="
|
||||
},
|
||||
"org/hamcrest/hamcrest/3.0/hamcrest-3.0.jar": {
|
||||
"asc": "sha256-RneFTdkbhb4gYFeggKnn7GGxx9bwh1oPKhaV+rOSPiw="
|
||||
},
|
||||
"org/hamcrest/hamcrest/3.0/hamcrest-3.0.module": {
|
||||
"asc": "sha256-/J6pffAL2DCSbrZPuO6qDMktPg9RjMZutKGFyEU7aTI="
|
||||
},
|
||||
"org/mockito#mockito-core/1.9.5": {
|
||||
"jar": "sha256-+XSDuglEufoTOqKWOHZN2+rbUew9vAIHTFj6LK7NB/o=",
|
||||
"pom": "sha256-9DIR3AoX/PzVBDCr1bx0e2/SOu9FaWgrZc8rrw8gcnw="
|
||||
},
|
||||
"org/mockito/mockito-core/1.9.5/mockito-core-1.9.5.jar": {
|
||||
"asc": "sha256-eIfgc49Zw5Oqx+vVeB66zTNKoBvixcE6KDkf7Aav6Lo="
|
||||
},
|
||||
"org/mockito/mockito-core/1.9.5/mockito-core-1.9.5.pom": {
|
||||
"asc": "sha256-rfCK39qLfToRTlvgFQpZnFMEYMCZqDtcFd1KvNjpwbo="
|
||||
},
|
||||
"org/objenesis#objenesis/1.0": {
|
||||
"jar": "sha256-xWlLVdklJ0eTgvJUGZs8ax2HgPZSrWHpylmRmIf0kag=",
|
||||
"pom": "sha256-JInYiwSZ9V5173Xw8lBUV8cSxc+oR8maRvjes+fqPOs="
|
||||
},
|
||||
"org/objenesis/objenesis/1.0/objenesis-1.0.jar": {
|
||||
"asc": "sha256-3mmf2B0Qzgs7ymDdqIa2Viw3V+DZa/nhNlnbG5+Jctw="
|
||||
},
|
||||
"org/objenesis/objenesis/1.0/objenesis-1.0.pom": {
|
||||
"asc": "sha256-qcTqne8ZjjbFkMP5t/2gwG0i/dVrTD+SjTHY0Wn7IqA="
|
||||
},
|
||||
"org/ow2#ow2/1.3": {
|
||||
"pom": "sha256-USFcZ9LAaNi30vb4D1E3KgmAdd7MxEjUvde5h7qDKPs="
|
||||
},
|
||||
@@ -233,8 +476,58 @@
|
||||
"jar": "sha256-+y3ekCCke7AkxD2d4KlOc6vveTvwjwE1TMl8stLiqVc=",
|
||||
"pom": "sha256-5jzvroWeRrEtOd1Yh3oZ+JN0pM6xvLE2Fz+nbUfXhtc="
|
||||
},
|
||||
"org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar": {
|
||||
"asc": "sha256-3a/+snWLUZFPxcIcazh0kRrFMkBveZi4KH96bF7wzfI="
|
||||
},
|
||||
"org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.pom": {
|
||||
"asc": "sha256-qq5cOCS/6PDbcjQEO/oiw/vBd9uOr+KUYikDHuHyzCk="
|
||||
},
|
||||
"org/ow2/asm/asm-parent/4.0/asm-parent-4.0.pom": {
|
||||
"asc": "sha256-eonTcSxLVAyUxUyG6KXF04wV9IO1MoHzL7hpcKE9i6E="
|
||||
},
|
||||
"org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar": {
|
||||
"asc": "sha256-LZuPDX8KrSvgD7DfnRyoENbfW8oGMqiazi3MtugqBTA="
|
||||
},
|
||||
"org/ow2/asm/asm-tree/4.0/asm-tree-4.0.pom": {
|
||||
"asc": "sha256-pZUFC8L/8axy7jgRmvHo0E5/X9wWWLpjh43D6X3p4Sg="
|
||||
},
|
||||
"org/ow2/asm/asm/4.0/asm-4.0.jar": {
|
||||
"asc": "sha256-6k6hHuOMwtShQlN69KEfZe6t1U84URL8qA9zpF2EQC4="
|
||||
},
|
||||
"org/ow2/asm/asm/4.0/asm-4.0.pom": {
|
||||
"asc": "sha256-Chrj2eVc9d/X29xW6MDTXx9jyiT/FA8BnHMOONKFGFw="
|
||||
},
|
||||
"org/ow2/ow2/1.3/ow2-1.3.pom": {
|
||||
"asc": "sha256-EKqTTnapQPgeFNBNoK+2aBGNwuHZZMHbwpEutEQO7ZE="
|
||||
},
|
||||
"org/slf4j#slf4j-api/1.7.25": {
|
||||
"jar": "sha256-GMSgCV1cHaa4F1kudnuyPSndL1YK1033X/OWHb3iW3k=",
|
||||
"pom": "sha256-fNnXoLXZPf1GGhSIkbQ1Cc9AOpx/n7SQYNNVTfHIHh4="
|
||||
},
|
||||
"org/slf4j#slf4j-parent/1.7.25": {
|
||||
"pom": "sha256-GPXFISDbA26I1hNviDnIMtB0vdqVx1bG9CkknS21SsY="
|
||||
},
|
||||
"org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25.jar": {
|
||||
"asc": "sha256-BKW7pnBF865e25U5DhApCyET6bbeguvQzwxwcHbPCeI="
|
||||
},
|
||||
"org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25.pom": {
|
||||
"asc": "sha256-aZiuTbgrIvslBuWIqOBhSJKQhuk2sGcbXeKuR04sqws="
|
||||
},
|
||||
"org/slf4j/slf4j-parent/1.7.25/slf4j-parent-1.7.25.pom": {
|
||||
"asc": "sha256-BwwQsg8JhBbRGGrCjXUJdZtHcIjBm332csOEmX92IeU="
|
||||
},
|
||||
"org/sonatype/oss#oss-parent/7": {
|
||||
"pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ="
|
||||
},
|
||||
"org/unbescape#unbescape/1.1.6.RELEASE": {
|
||||
"jar": "sha256-WXz4fVsaTzhbnRzsl0t7SDq7PuhfxbP4tir45L7JXCw=",
|
||||
"pom": "sha256-AgOVYrsyfVQcDwUHZ+kYmPo4l0eSZojMITvRG8dRJ9E="
|
||||
},
|
||||
"org/unbescape/unbescape/1.1.6.RELEASE/unbescape-1.1.6.RELEASE.jar": {
|
||||
"asc": "sha256-qz5rvOGRW+6t/VyP982ODE4t6IBemafD8LBYvd7tVRU="
|
||||
},
|
||||
"org/unbescape/unbescape/1.1.6.RELEASE/unbescape-1.1.6.RELEASE.pom": {
|
||||
"asc": "sha256-WnZ7/qjsZQszhpIN2ZZ0ceoGqs1M7P78Y+aKREUuE5k="
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,34 +3,19 @@
|
||||
stdenv,
|
||||
fetchurl,
|
||||
fetchFromGitHub,
|
||||
jdk17_headless,
|
||||
jre17_minimal,
|
||||
gradle_7,
|
||||
jdk_headless,
|
||||
jre,
|
||||
gradle_8,
|
||||
bash,
|
||||
coreutils,
|
||||
substituteAll,
|
||||
nixosTests,
|
||||
fetchpatch,
|
||||
writeText,
|
||||
}:
|
||||
|
||||
let
|
||||
gradle = gradle_7;
|
||||
jdk = jdk17_headless;
|
||||
# Reduce closure size
|
||||
jre = jre17_minimal.override {
|
||||
modules = [
|
||||
"java.base"
|
||||
"java.logging"
|
||||
"java.naming"
|
||||
"java.sql"
|
||||
"java.desktop"
|
||||
"java.management"
|
||||
];
|
||||
jdk = jdk17_headless;
|
||||
};
|
||||
|
||||
version = "01497";
|
||||
gradle = gradle_8;
|
||||
jdk = jdk_headless;
|
||||
|
||||
freenet_ext = fetchurl {
|
||||
url = "https://github.com/freenet/fred/releases/download/build01495/freenet-ext.jar";
|
||||
@@ -48,31 +33,18 @@ let
|
||||
'';
|
||||
};
|
||||
|
||||
patches = [
|
||||
# gradle 7 support
|
||||
# https://github.com/freenet/fred/pull/827
|
||||
(fetchpatch {
|
||||
url = "https://github.com/freenet/fred/commit/8991303493f2c0d9933f645337f0a7a5a979e70a.patch";
|
||||
hash = "sha256-T1zymxRTADVhhwp2TyB+BC/J4gZsT/CUuMrT4COlpTY=";
|
||||
})
|
||||
];
|
||||
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "freenet";
|
||||
inherit version patches;
|
||||
version = "01499";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "freenet";
|
||||
repo = "fred";
|
||||
rev = "refs/tags/build${version}";
|
||||
hash = "sha256-pywNPekofF/QotNVF28McojqK7c1Zzucds5rWV0R7BQ=";
|
||||
hash = "sha256-L9vae7wB6Ow2O4JA7CG/XV/zI8OS9/Rg7in/TSatXxY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
rm gradle/verification-{keyring.keys,metadata.xml}
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
gradle
|
||||
jdk
|
||||
@@ -126,5 +98,6 @@ stdenv.mkDerivation rec {
|
||||
maintainers = with lib.maintainers; [ nagy ];
|
||||
platforms = with lib.platforms; linux;
|
||||
changelog = "https://github.com/freenet/fred/blob/build${version}/NEWS.md";
|
||||
mainProgram = "freenet";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
libftdi,
|
||||
libusb1,
|
||||
pkg-config,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
pname = "ftx-prog";
|
||||
version = "0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "richardeoin";
|
||||
repo = "ftx-prog";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-wBOzsJ1XIkswuwuCwGQk2Q+RUsGe5EOlbAhcf0R7rfc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
libftdi
|
||||
libusb1
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/bin
|
||||
mv ftx_prog $out/bin
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Command-line alternative to the FTDI FTProg utility for FTDI's FT-X series";
|
||||
mainProgram = "ftx_prog";
|
||||
homepage = "https://github.com/richardeoin/ftx-prog";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
maintainers = [ lib.maintainers.funkeleinhorn ];
|
||||
};
|
||||
})
|
||||
@@ -10,16 +10,18 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "fzf-make";
|
||||
version = "0.47.0";
|
||||
version = "0.52.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kyu08";
|
||||
repo = "fzf-make";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-EqxMsxQpcoPPvWzzl/1JcekLJljmxJcoubXgAMqMhXY=";
|
||||
hash = "sha256-KJdGUo7qSMIDJ8jvcBX/cla8pQkB/EGytIP0YzV/3fY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-GjOeiusc0zVEBOuEfsuy/MABDO1c5x+mA/twwm3yZF8=";
|
||||
cargoHash = "sha256-nrttuY9x61aE3RJOtbUWZbqOX6ZRyghQSruu5EdX470=";
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
|
||||
nativeBuildInputs = [ makeBinaryWrapper ];
|
||||
|
||||
@@ -31,7 +33,7 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
meta = {
|
||||
description = "Fuzzy finder for Makefile";
|
||||
homepage = "https://github.com/kyu08/fzf-make";
|
||||
inherit (src.meta) homepage;
|
||||
changelog = "https://github.com/kyu08/fzf-make/releases/tag/${src.rev}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ figsoda sigmanificient ];
|
||||
|
||||
@@ -0,0 +1,48 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchYarnDeps,
|
||||
yarnConfigHook,
|
||||
yarnInstallHook,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ghost-cli";
|
||||
version = "1.26.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TryGhost";
|
||||
repo = "Ghost-CLI";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-2zyRkPTQBzF+7nmlHPMi4S0BAdmUwIBkwD71y1y7Pn8=";
|
||||
};
|
||||
|
||||
yarnOfflineCache = fetchYarnDeps {
|
||||
yarnLock = finalAttrs.src + "/yarn.lock";
|
||||
hash = "sha256-No+Hkb2ivrCSd0S9L5QxZ8ReX9NANMRITKHFvjzRSuc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
yarnConfigHook
|
||||
yarnInstallHook
|
||||
];
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
doInstallCheck = true;
|
||||
versionCheckProgram = ''${placeholder "out"}/bin/ghost'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "CLI Tool for installing & updating Ghost";
|
||||
mainProgram = "ghost";
|
||||
homepage = "https://ghost.org/docs/ghost-cli/";
|
||||
changelog = "https://github.com/TryGhost/Ghost-CLI/blob/v${finalAttrs.version}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ cything ];
|
||||
};
|
||||
})
|
||||
@@ -157,8 +157,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
rmdir $out/share/vim
|
||||
ln -s $vim $out/share/vim-plugins
|
||||
|
||||
|
||||
remove-references-to -t ${finalAttrs.deps} $out/bin/ghostty
|
||||
remove-references-to -t ${finalAttrs.deps} $out/bin/.ghostty-wrapped
|
||||
'';
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user