Merge staging-next into staging
This commit is contained in:
github-actions[bot]
@@ -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"
|
||||
],
|
||||
|
||||
@@ -12221,6 +12221,12 @@
|
||||
githubId = 1903418;
|
||||
name = "Kovacsics Robert";
|
||||
};
|
||||
kpcyrd = {
|
||||
email = "git@rxv.cc";
|
||||
github = "kpcyrd";
|
||||
githubId = 7763184;
|
||||
name = "kpcyrd";
|
||||
};
|
||||
kquick = {
|
||||
email = "quick@sparq.org";
|
||||
github = "kquick";
|
||||
|
||||
@@ -141,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
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@@ -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 {};
|
||||
|
||||
+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;
|
||||
};
|
||||
};
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 = [
|
||||
|
||||
@@ -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) \
|
||||
|
||||
@@ -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}
|
||||
@@ -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=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -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 ];
|
||||
};
|
||||
})
|
||||
@@ -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"
|
||||
];
|
||||
|
||||
@@ -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 = ''
|
||||
|
||||
@@ -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 = [ ];
|
||||
};
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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 ];
|
||||
};
|
||||
})
|
||||
@@ -2,8 +2,6 @@
|
||||
lib,
|
||||
stdenv,
|
||||
cmake,
|
||||
darwin,
|
||||
fetchpatch,
|
||||
llvmPackages_17,
|
||||
fetchFromGitHub,
|
||||
mbedtls,
|
||||
@@ -30,8 +28,8 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "1.35.4";
|
||||
patterns_version = "1.35.4";
|
||||
version = "1.36.2";
|
||||
patterns_version = "1.36.2";
|
||||
|
||||
llvmPackages = llvmPackages_17;
|
||||
|
||||
@@ -46,7 +44,7 @@ let
|
||||
owner = "WerWolv";
|
||||
repo = "ImHex-Patterns";
|
||||
rev = "ImHex-v${patterns_version}";
|
||||
hash = "sha256-7ch2KXkbkdRAvo3HyErWcth3kG4bzYvp9I5GZSsb/BQ=";
|
||||
hash = "sha256-MKw9BsOhbaojmQGdl+Wkit/ot5Xsym+AvCTHY2vZHmY=";
|
||||
};
|
||||
|
||||
in
|
||||
@@ -60,57 +58,36 @@ stdenv'.mkDerivation (finalAttrs: {
|
||||
owner = "WerWolv";
|
||||
repo = "ImHex";
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
hash = "sha256-6QpmFkSMQpGlEzo7BHZn20c+q8CTDUB4yO87wMU5JT4=";
|
||||
hash = "sha256-e7ppx2MdtTPki/Q+1kWswHkFLNRcO0Y8+q9VzpgUoVE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/WerWolv/ImHex/pull/1910
|
||||
# during https://github.com/NixOS/nixpkgs/pull/330303 it was discovered that ImHex
|
||||
# would not build on Darwin x86-64
|
||||
# this temporary patch can be removed when the above PR is merged
|
||||
(fetchpatch {
|
||||
url = "https://github.com/WerWolv/ImHex/commit/69624a2661ea44db9fb8b81c3278ef69016ebfcf.patch";
|
||||
hash = "sha256-LcUCl8Rfz6cbhop2StksuViim2bH4ma3/8tGVKFdAgg=";
|
||||
})
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
llvmPackages.llvm
|
||||
python3
|
||||
perl
|
||||
pkg-config
|
||||
rsync
|
||||
makeWrapper
|
||||
] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
|
||||
|
||||
buildInputs = [
|
||||
capstone
|
||||
curl
|
||||
dbus
|
||||
file
|
||||
fmt
|
||||
glfw3
|
||||
gtk3
|
||||
jansson
|
||||
libGLU
|
||||
mbedtls
|
||||
nlohmann_json
|
||||
yara
|
||||
];
|
||||
|
||||
# Comment out fixup_bundle in PostprocessBundle.cmake as we are not building a standalone application
|
||||
postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
substituteInPlace cmake/modules/PostprocessBundle.cmake \
|
||||
--replace-fail "fixup_bundle" "#fixup_bundle"
|
||||
'';
|
||||
|
||||
nativeBuildInputs =
|
||||
[
|
||||
cmake
|
||||
llvmPackages.llvm
|
||||
python3
|
||||
perl
|
||||
pkg-config
|
||||
rsync
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ makeWrapper ];
|
||||
|
||||
buildInputs =
|
||||
[
|
||||
capstone
|
||||
curl
|
||||
dbus
|
||||
file
|
||||
fmt
|
||||
glfw3
|
||||
gtk3
|
||||
jansson
|
||||
libGLU
|
||||
mbedtls
|
||||
nlohmann_json
|
||||
yara
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
darwin.apple_sdk_11_0.frameworks.UniformTypeIdentifiers
|
||||
];
|
||||
|
||||
# autoPatchelfHook only searches for *.so and *.so.*, and won't find *.hexpluglib
|
||||
# however, we will append to RUNPATH ourselves
|
||||
autoPatchelfIgnoreMissingDeps = lib.optionals stdenv.hostPlatform.isLinux [ "*.hexpluglib" ];
|
||||
@@ -131,12 +108,20 @@ stdenv'.mkDerivation (finalAttrs: {
|
||||
(lib.cmakeBool "USE_SYSTEM_YARA" true)
|
||||
];
|
||||
|
||||
# Comment out fixup_bundle in PostprocessBundle.cmake as we are not building a standalone application
|
||||
postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
substituteInPlace cmake/modules/PostprocessBundle.cmake \
|
||||
--replace-fail "fixup_bundle" "#fixup_bundle"
|
||||
'';
|
||||
|
||||
# rsync is used here so we can not copy the _schema.json files
|
||||
postInstall =
|
||||
if stdenv.hostPlatform.isLinux then
|
||||
''
|
||||
mkdir -p $out/share/imhex
|
||||
rsync -av --exclude="*_schema.json" ${patterns_src}/{constants,encodings,includes,magic,nodes,patterns} $out/share/imhex
|
||||
# without this imhex is not able to find pattern files
|
||||
wrapProgram $out/bin/imhex --prefix XDG_DATA_DIRS : $out/share
|
||||
''
|
||||
else if stdenv.hostPlatform.isDarwin then
|
||||
''
|
||||
@@ -154,14 +139,14 @@ stdenv'.mkDerivation (finalAttrs: {
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Hex Editor for Reverse Engineers, Programmers and people who value their retinas when working at 3 AM";
|
||||
homepage = "https://github.com/WerWolv/ImHex";
|
||||
license = with licenses; [ gpl2Only ];
|
||||
maintainers = with maintainers; [
|
||||
license = with lib.licenses; [ gpl2Only ];
|
||||
maintainers = with lib.maintainers; [
|
||||
kashw2
|
||||
cafkafk
|
||||
];
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
platforms = with lib.platforms; linux ++ darwin;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -0,0 +1,91 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
intel-gmmlib,
|
||||
intel-graphics-compiler,
|
||||
level-zero,
|
||||
libva,
|
||||
gitUpdater,
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (lib) cmakeBool;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
# https://github.com/intel/compute-runtime/blob/master/LEGACY_PLATFORMS.md
|
||||
pname = "intel-compute-runtime-legacy1";
|
||||
version = "24.35.30872.32"; # 24.35.30872.x is the last series to support Gen8, Gen9 and Gen11 GPU support
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "compute-runtime";
|
||||
rev = version;
|
||||
hash = "sha256-POImMopbrhVXuSx2MQ9mwPNKQx7BljyikKhu6M4hZME=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
intel-gmmlib
|
||||
intel-graphics-compiler
|
||||
libva
|
||||
level-zero
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DSKIP_UNIT_TESTS=1"
|
||||
"-DIGC_DIR=${intel-graphics-compiler}"
|
||||
"-DOCL_ICD_VENDORDIR=${placeholder "out"}/etc/OpenCL/vendors"
|
||||
# The install script assumes this path is relative to CMAKE_INSTALL_PREFIX
|
||||
"-DCMAKE_INSTALL_LIBDIR=lib"
|
||||
(cmakeBool "NEO_LEGACY_PLATFORMS_SUPPORT" true)
|
||||
];
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"drivers"
|
||||
];
|
||||
|
||||
# causes redefinition of _FORTIFY_SOURCE
|
||||
hardeningDisable = [ "fortify3" ];
|
||||
|
||||
postInstall = ''
|
||||
# Avoid clash with intel-ocl
|
||||
mv $out/etc/OpenCL/vendors/intel.icd $out/etc/OpenCL/vendors/intel-neo.icd
|
||||
|
||||
mkdir -p $drivers/lib
|
||||
mv -t $drivers/lib $out/lib/libze_intel*
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
patchelf --set-rpath ${
|
||||
lib.makeLibraryPath [
|
||||
intel-gmmlib
|
||||
intel-graphics-compiler
|
||||
libva
|
||||
stdenv.cc.cc
|
||||
]
|
||||
} \
|
||||
$out/lib/intel-opencl/libigdrcl.so
|
||||
'';
|
||||
|
||||
passthru.updateScript = gitUpdater {
|
||||
rev-prefix = "24.35.30872.";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Intel Graphics Compute Runtime for OpenCL with support for Gen8, Gen9 and Gen11 GPUs.d";
|
||||
mainProgram = "ocloc";
|
||||
homepage = "https://github.com/intel/compute-runtime";
|
||||
changelog = "https://github.com/intel/compute-runtime/releases/tag/${version}";
|
||||
license = licenses.mit;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ fleaz ];
|
||||
};
|
||||
}
|
||||
@@ -7,15 +7,15 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "klog-rs";
|
||||
version = "0.3.1";
|
||||
version = "0.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tobifroe";
|
||||
repo = "klog";
|
||||
rev = version;
|
||||
hash = "sha256-E3oL6XAp9N0ptDTpGBd6pmg4DJx9GDJv3ZSbkc6at60=";
|
||||
hash = "sha256-E9sVFVb+wmhkdGmzkQQGhTh9+MExuq/ftfeI07f906o=";
|
||||
};
|
||||
cargoHash = "sha256-S2F9oVPZH52luSsFUlQCLANPJudjJvecv8S6BBUnC78=";
|
||||
cargoHash = "sha256-BpSLfJTsUpf64sXNgVxX7BtT65+qGVmmFG052sC7AOY=";
|
||||
checkFlags = [
|
||||
# this integration test depends on a running kubernetes cluster
|
||||
"--skip=k8s::tests::test_get_pod_list"
|
||||
|
||||
Generated
+96
-98
@@ -113,7 +113,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb"
|
||||
dependencies = [
|
||||
"quote",
|
||||
"syn 2.0.79",
|
||||
"syn 2.0.86",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -250,7 +250,7 @@ dependencies = [
|
||||
"actix-router",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.79",
|
||||
"syn 2.0.86",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -276,7 +276,7 @@ checksum = "b6ac1e58cded18cb28ddc17143c4dea5345b3ad575e14f32f66e4054a56eb271"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.79",
|
||||
"syn 2.0.86",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -360,9 +360,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "anstream"
|
||||
version = "0.6.15"
|
||||
version = "0.6.17"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
|
||||
checksum = "23a1e53f0f5d86382dafe1cf314783b2044280f406e7e1506368220ad11b1338"
|
||||
dependencies = [
|
||||
"anstyle",
|
||||
"anstyle-parse",
|
||||
@@ -375,43 +375,43 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "anstyle"
|
||||
version = "1.0.8"
|
||||
version = "1.0.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
|
||||
checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
|
||||
|
||||
[[package]]
|
||||
name = "anstyle-parse"
|
||||
version = "0.2.5"
|
||||
version = "0.2.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
|
||||
checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
|
||||
dependencies = [
|
||||
"utf8parse",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "anstyle-query"
|
||||
version = "1.1.1"
|
||||
version = "1.1.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
|
||||
checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
|
||||
dependencies = [
|
||||
"windows-sys 0.52.0",
|
||||
"windows-sys 0.59.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "anstyle-wincon"
|
||||
version = "3.0.4"
|
||||
version = "3.0.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
|
||||
checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125"
|
||||
dependencies = [
|
||||
"anstyle",
|
||||
"windows-sys 0.52.0",
|
||||
"windows-sys 0.59.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "anyhow"
|
||||
version = "1.0.89"
|
||||
version = "1.0.92"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6"
|
||||
checksum = "74f37166d7d48a0284b99dd824694c26119c700b53bf0d1540cdb147dbdaaf13"
|
||||
|
||||
[[package]]
|
||||
name = "arrayref"
|
||||
@@ -505,7 +505,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.79",
|
||||
"syn 2.0.86",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -516,7 +516,7 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.79",
|
||||
"syn 2.0.86",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -710,9 +710,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
|
||||
|
||||
[[package]]
|
||||
name = "bytes"
|
||||
version = "1.7.2"
|
||||
version = "1.8.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3"
|
||||
checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da"
|
||||
|
||||
[[package]]
|
||||
name = "bytestring"
|
||||
@@ -725,9 +725,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "cc"
|
||||
version = "1.1.30"
|
||||
version = "1.1.33"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b16803a61b81d9eabb7eae2588776c4c1e584b738ede45fdbb4c972cec1e9945"
|
||||
checksum = "e3788d6ac30243803df38a3e9991cf37e41210232916d41a8222ae378f912624"
|
||||
dependencies = [
|
||||
"jobserver",
|
||||
"libc",
|
||||
@@ -786,7 +786,7 @@ dependencies = [
|
||||
"heck 0.5.0",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.79",
|
||||
"syn 2.0.86",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -803,9 +803,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
|
||||
|
||||
[[package]]
|
||||
name = "colorchoice"
|
||||
version = "1.0.2"
|
||||
version = "1.0.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
|
||||
checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
|
||||
|
||||
[[package]]
|
||||
name = "combine"
|
||||
@@ -1158,7 +1158,7 @@ dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"rustc_version",
|
||||
"syn 2.0.79",
|
||||
"syn 2.0.86",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -1178,7 +1178,7 @@ checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.79",
|
||||
"syn 2.0.86",
|
||||
"unicode-xid",
|
||||
]
|
||||
|
||||
@@ -1245,7 +1245,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.79",
|
||||
"syn 2.0.86",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -1293,9 +1293,9 @@ checksum = "e079f19b08ca6239f47f8ba8509c11cf3ea30095831f7fed61441475edd8c449"
|
||||
|
||||
[[package]]
|
||||
name = "encoding_rs"
|
||||
version = "0.8.34"
|
||||
version = "0.8.35"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59"
|
||||
checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
]
|
||||
@@ -1422,9 +1422,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "flume"
|
||||
version = "0.11.0"
|
||||
version = "0.11.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181"
|
||||
checksum = "da0e4dd2a88388a1f4ccc7c9ce104604dab68d9f408dc34cd45823d5a9069095"
|
||||
dependencies = [
|
||||
"futures-core",
|
||||
"futures-sink",
|
||||
@@ -1540,7 +1540,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.79",
|
||||
"syn 2.0.86",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -2233,7 +2233,7 @@ checksum = "0122b7114117e64a63ac49f752a5ca4624d534c7b1c7de796ac196381cd2d947"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.79",
|
||||
"syn 2.0.86",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -2384,7 +2384,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "lber"
|
||||
version = "0.4.3"
|
||||
source = "git+https://github.com/inejge/ldap3/#5238c544aa0785b6999f20702131b9982e132e18"
|
||||
source = "git+https://github.com/inejge/ldap3/#ba38bc573d63b109b92dca80898633512d5c47df"
|
||||
dependencies = [
|
||||
"bytes",
|
||||
"nom",
|
||||
@@ -2464,15 +2464,15 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
version = "0.2.159"
|
||||
version = "0.2.161"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"
|
||||
checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"
|
||||
|
||||
[[package]]
|
||||
name = "libm"
|
||||
version = "0.2.8"
|
||||
version = "0.2.11"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
|
||||
checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa"
|
||||
|
||||
[[package]]
|
||||
name = "libsqlite3-sys"
|
||||
@@ -2499,7 +2499,7 @@ checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
|
||||
|
||||
[[package]]
|
||||
name = "lldap"
|
||||
version = "0.5.1-alpha"
|
||||
version = "0.6.1"
|
||||
dependencies = [
|
||||
"actix",
|
||||
"actix-files",
|
||||
@@ -2526,7 +2526,7 @@ dependencies = [
|
||||
"futures-util",
|
||||
"graphql_client 0.11.0",
|
||||
"hmac 0.12.1",
|
||||
"http 1.1.0",
|
||||
"http 0.2.12",
|
||||
"image",
|
||||
"itertools",
|
||||
"juniper",
|
||||
@@ -2575,7 +2575,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "lldap_app"
|
||||
version = "0.5.1-alpha"
|
||||
version = "0.6.1"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"base64 0.13.1",
|
||||
@@ -2606,7 +2606,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "lldap_auth"
|
||||
version = "0.4.0"
|
||||
version = "0.6.0"
|
||||
dependencies = [
|
||||
"chrono",
|
||||
"curve25519-dalek",
|
||||
@@ -2949,8 +2949,9 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
|
||||
|
||||
[[package]]
|
||||
name = "opaque-ke"
|
||||
version = "0.6.1"
|
||||
source = "git+https://github.com/nitnelave/opaque-ke/?branch=zeroize_1.5#2f7f3a694516a7d1be4182945bed3d910cad777a"
|
||||
version = "0.7.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "aadda6db12e367812aea6e025158bf7f334d21aae853f7c46e0a3bdde70a26f5"
|
||||
dependencies = [
|
||||
"base64 0.13.1",
|
||||
"curve25519-dalek",
|
||||
@@ -3016,7 +3017,7 @@ dependencies = [
|
||||
"proc-macro-error",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.79",
|
||||
"syn 2.0.86",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -3074,7 +3075,7 @@ dependencies = [
|
||||
"proc-macro2",
|
||||
"proc-macro2-diagnostics",
|
||||
"quote",
|
||||
"syn 2.0.79",
|
||||
"syn 2.0.86",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -3121,29 +3122,29 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
|
||||
|
||||
[[package]]
|
||||
name = "pin-project"
|
||||
version = "1.1.6"
|
||||
version = "1.1.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "baf123a161dde1e524adf36f90bc5d8d3462824a9c43553ad07a8183161189ec"
|
||||
checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95"
|
||||
dependencies = [
|
||||
"pin-project-internal",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "pin-project-internal"
|
||||
version = "1.1.6"
|
||||
version = "1.1.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a4502d8515ca9f32f1fb543d987f63d95a14934883db45bdb48060b6b69257f8"
|
||||
checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.79",
|
||||
"syn 2.0.86",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "pin-project-lite"
|
||||
version = "0.2.14"
|
||||
version = "0.2.15"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
|
||||
checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff"
|
||||
|
||||
[[package]]
|
||||
name = "pin-utils"
|
||||
@@ -3287,14 +3288,14 @@ dependencies = [
|
||||
"proc-macro-error-attr2",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.79",
|
||||
"syn 2.0.86",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro2"
|
||||
version = "1.0.88"
|
||||
version = "1.0.89"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7c3a7fc5db1e57d5a779a352c8cdb57b29aa4c40cc69c3a68a7fedc815fbf2f9"
|
||||
checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"
|
||||
dependencies = [
|
||||
"unicode-ident",
|
||||
]
|
||||
@@ -3307,7 +3308,7 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.79",
|
||||
"syn 2.0.86",
|
||||
"version_check",
|
||||
"yansi",
|
||||
]
|
||||
@@ -3409,9 +3410,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "regex"
|
||||
version = "1.11.0"
|
||||
version = "1.11.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8"
|
||||
checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
|
||||
dependencies = [
|
||||
"aho-corasick",
|
||||
"memchr",
|
||||
@@ -3616,9 +3617,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "rustix"
|
||||
version = "0.38.37"
|
||||
version = "0.38.38"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"
|
||||
checksum = "aa260229e6538e52293eeb577aabd09945a09d6d9cc0fc550ed7529056c2e32a"
|
||||
dependencies = [
|
||||
"bitflags 2.6.0",
|
||||
"errno",
|
||||
@@ -3745,7 +3746,7 @@ dependencies = [
|
||||
"proc-macro-error2",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.79",
|
||||
"syn 2.0.86",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -3782,7 +3783,7 @@ dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"sea-bae",
|
||||
"syn 2.0.79",
|
||||
"syn 2.0.86",
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
@@ -3852,9 +3853,9 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
|
||||
|
||||
[[package]]
|
||||
name = "serde"
|
||||
version = "1.0.210"
|
||||
version = "1.0.214"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
|
||||
checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5"
|
||||
dependencies = [
|
||||
"serde_derive",
|
||||
]
|
||||
@@ -3882,20 +3883,20 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "serde_derive"
|
||||
version = "1.0.210"
|
||||
version = "1.0.214"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
|
||||
checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.79",
|
||||
"syn 2.0.86",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_json"
|
||||
version = "1.0.128"
|
||||
version = "1.0.132"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
|
||||
checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03"
|
||||
dependencies = [
|
||||
"indexmap 2.6.0",
|
||||
"itoa",
|
||||
@@ -3946,7 +3947,7 @@ checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.79",
|
||||
"syn 2.0.86",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -4379,7 +4380,7 @@ dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"rustversion",
|
||||
"syn 2.0.79",
|
||||
"syn 2.0.86",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -4401,9 +4402,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "2.0.79"
|
||||
version = "2.0.86"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590"
|
||||
checksum = "e89275301d38033efb81a6e60e3497e734dfcc62571f2854bf4b16690398824c"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
@@ -4481,22 +4482,22 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "thiserror"
|
||||
version = "1.0.64"
|
||||
version = "1.0.66"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84"
|
||||
checksum = "5d171f59dbaa811dbbb1aee1e73db92ec2b122911a48e1390dfe327a821ddede"
|
||||
dependencies = [
|
||||
"thiserror-impl",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "thiserror-impl"
|
||||
version = "1.0.64"
|
||||
version = "1.0.66"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3"
|
||||
checksum = "b08be0f17bd307950653ce45db00cd31200d82b624b36e181337d9c7d92765b5"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.79",
|
||||
"syn 2.0.86",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -4557,9 +4558,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
|
||||
|
||||
[[package]]
|
||||
name = "tokio"
|
||||
version = "1.40.0"
|
||||
version = "1.41.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998"
|
||||
checksum = "145f3413504347a2be84393cc8a7d2fb4d863b375909ea59f2158261aa258bbb"
|
||||
dependencies = [
|
||||
"backtrace",
|
||||
"bytes",
|
||||
@@ -4581,7 +4582,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.79",
|
||||
"syn 2.0.86",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -4683,9 +4684,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tracing-actix-web"
|
||||
version = "0.7.13"
|
||||
version = "0.7.14"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "15bc0cd5f72e837e310f4d978a90abf202a7f7d8ef3272246bae381d0086d3bf"
|
||||
checksum = "6b87073920bcce23e9f5cb0d2671e9f01d6803bb5229c159b2f5ce6806d73ffc"
|
||||
dependencies = [
|
||||
"actix-web",
|
||||
"mutually_exclusive_features",
|
||||
@@ -4702,7 +4703,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.79",
|
||||
"syn 2.0.86",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -4781,12 +4782,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "unicase"
|
||||
version = "2.7.0"
|
||||
version = "2.8.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89"
|
||||
dependencies = [
|
||||
"version_check",
|
||||
]
|
||||
checksum = "7e51b68083f157f853b6379db119d1c1be0e6e4dec98101079dec41f6f5cf6df"
|
||||
|
||||
[[package]]
|
||||
name = "unicode-bidi"
|
||||
@@ -5046,7 +5044,7 @@ dependencies = [
|
||||
"once_cell",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.79",
|
||||
"syn 2.0.86",
|
||||
"wasm-bindgen-shared",
|
||||
]
|
||||
|
||||
@@ -5080,7 +5078,7 @@ checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.79",
|
||||
"syn 2.0.86",
|
||||
"wasm-bindgen-backend",
|
||||
"wasm-bindgen-shared",
|
||||
]
|
||||
@@ -5472,14 +5470,14 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.79",
|
||||
"syn 2.0.86",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "zeroize"
|
||||
version = "1.5.7"
|
||||
version = "1.8.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c394b5bd0c6f669e7275d9c20aa90ae064cb22e75a1cad54e1b34088034b149f"
|
||||
checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
|
||||
dependencies = [
|
||||
"zeroize_derive",
|
||||
]
|
||||
@@ -5492,7 +5490,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.79",
|
||||
"syn 2.0.86",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
||||
@@ -12,23 +12,22 @@
|
||||
|
||||
let
|
||||
|
||||
commonDerivationAttrs = {
|
||||
commonDerivationAttrs = rec {
|
||||
pname = "lldap";
|
||||
version = "0.5.1-unstable-2024-10-30";
|
||||
version = "0.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lldap";
|
||||
repo = "lldap";
|
||||
rev = "143eb70bee92e8225028ea00b69735a28e8c088d";
|
||||
hash = "sha256-6XGKz/OKHd80yX9a4rlvc9RZjBB6ao+jiO5Vlcc0ohE=";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-iQ+Vv9kx/pWHoa/WZChBK+FD2r1avzWWz57bnnzRjUg=";
|
||||
};
|
||||
|
||||
# `Cargo.lock` has git dependencies, meaning can't use `cargoHash`
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"lber-0.4.3" = "sha256-ff0C4uOAohbwHIFt6c0iGQwPDUTJhO3vHlSUDK/yEbY=";
|
||||
"opaque-ke-0.6.1" = "sha256-99gaDv7eIcYChmvOKQ4yXuaGVzo2Q6BcgSQOzsLF+fM=";
|
||||
"lber-0.4.3" = "sha256-smElQyP8aWlV+/GvaTAx+BJWRtzQuis4XOUCOgebEF4=";
|
||||
"yew_form-0.1.8" = "sha256-1n9C7NiFfTjbmc9B5bDEnz7ZpYJo9ZT8/dioRXJ65hc=";
|
||||
};
|
||||
};
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
{
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
pkgs,
|
||||
python3Packages,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "lparchive2epub";
|
||||
version = "1.2.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Arwalk";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-z8/cIevqPKo7Eukk4WVxgSjzO1EYUYWD8orAdUKR8z8=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [ poetry-core ];
|
||||
|
||||
dependencies = with python3Packages; [
|
||||
ebooklib
|
||||
beautifulsoup4
|
||||
tqdm
|
||||
aiohttp
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
python3Packages.pytestCheckHook
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Transform any LP from lparchive into an epub document";
|
||||
homepage = "https://github.com/Arwalk/lparchive2epub";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ nsnelson ];
|
||||
};
|
||||
}
|
||||
@@ -17,13 +17,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mpris-scrobbler";
|
||||
version = "0.5.3";
|
||||
version = "0.5.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mariusor";
|
||||
repo = "mpris-scrobbler";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-eeOhFkLyx+smZmKPTbVB1OiYkHdWk5v2rnOb9yCIuYE=";
|
||||
sha256 = "sha256-sU1koCWXECz3CpkOLPpzY/dMiSMOiZNoIvhIwERYH30=";
|
||||
};
|
||||
|
||||
postPatch =
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "netbird-dashboard";
|
||||
version = "2.7.0";
|
||||
version = "2.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netbirdio";
|
||||
repo = "dashboard";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-wvmwxWvRaSdDHe3cc22U1vLQGGONpjz2zR4vmvpThdo=";
|
||||
hash = "sha256-netq6VCZcGBj5jv+pekRTxd6s0Lr45yuqZThs0qoc64=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-A8wzM8gYxYHIhPwxZeIWkNwHJ3skSD7MyNA5qWmX0q8=";
|
||||
npmDepsHash = "sha256-MbVBeZWX9e4eLz2ZRG0qYr9oTkBGhFPJ5m/rVEfGLuc=";
|
||||
npmFlags = [ "--legacy-peer-deps" ];
|
||||
|
||||
installPhase = ''
|
||||
|
||||
+91
@@ -0,0 +1,91 @@
|
||||
#!/usr/bin/env bash
|
||||
# vim: set tabstop=2 shiftwidth=2 expandtab:
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
# Detect if iptables or nftables-based firewall is used.
|
||||
if [[ -e /etc/systemd/system/firewall.service ]]; then
|
||||
BACKEND=iptables
|
||||
elif [[ -e /etc/systemd/system/nftables.service ]]; then
|
||||
BACKEND=nftables
|
||||
else
|
||||
echo "nixos-firewall-tool: cannot detect firewall backend" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
ip46tables() {
|
||||
iptables -w "$@"
|
||||
ip6tables -w "$@"
|
||||
}
|
||||
|
||||
show_help() {
|
||||
echo "nixos-firewall-tool
|
||||
|
||||
A tool to temporarily manipulate the NixOS firewall
|
||||
|
||||
Open TCP port:
|
||||
nixos-firewall-tool open tcp 8888
|
||||
|
||||
Open UDP port:
|
||||
nixos-firewall-tool open udp 51820
|
||||
|
||||
Show all firewall rules:
|
||||
nixos-firewall-tool show
|
||||
|
||||
Reset firewall configuration to system settings:
|
||||
nixos-firewall-tool reset"
|
||||
}
|
||||
|
||||
if [[ -z ${1+x} ]]; then
|
||||
show_help
|
||||
exit 1
|
||||
fi
|
||||
|
||||
case $1 in
|
||||
"open")
|
||||
if [[ -z ${2+x} ]] || [[ -z ${3+x} ]]; then
|
||||
show_help
|
||||
exit 1
|
||||
fi
|
||||
|
||||
protocol="$2"
|
||||
port="$3"
|
||||
|
||||
case $BACKEND in
|
||||
iptables)
|
||||
ip46tables -I nixos-fw -p "$protocol" --dport "$port" -j nixos-fw-accept
|
||||
;;
|
||||
nftables)
|
||||
nft add element inet nixos-fw "temp-ports" "{ $protocol . $port }"
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
"show")
|
||||
case $BACKEND in
|
||||
iptables)
|
||||
ip46tables --numeric --list nixos-fw
|
||||
;;
|
||||
nftables)
|
||||
nft list table inet nixos-fw
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
"reset")
|
||||
case $BACKEND in
|
||||
iptables)
|
||||
systemctl restart firewall.service
|
||||
;;
|
||||
nftables)
|
||||
nft flush set inet nixos-fw "temp-ports"
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
-h|--help|help)
|
||||
show_help
|
||||
exit 0
|
||||
;;
|
||||
*)
|
||||
show_help
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
@@ -0,0 +1,17 @@
|
||||
.TH nixos-firewall-tool 1
|
||||
.SH NAME
|
||||
nixos-firewall-tool \- a tool to temporarily manipulate the NixOS firewall
|
||||
.SH SYNOPSIS
|
||||
nixos-firewall-tool \fIsubcommand\fR
|
||||
|
||||
Open TCP port:
|
||||
nixos-firewall-tool open tcp 8888
|
||||
|
||||
Open UDP port:
|
||||
nixos-firewall-tool open udp 51820
|
||||
|
||||
Show all firewall rules:
|
||||
nixos-firewall-tool show
|
||||
|
||||
Reset firewall configuration to system settings:
|
||||
nixos-firewall-tool reset
|
||||
@@ -0,0 +1,20 @@
|
||||
_nixos_firewall_tool() {
|
||||
case "${COMP_CWORD}" in
|
||||
1)
|
||||
COMPREPLY=($(compgen -W "open show reset" -- "${COMP_WORDS[1]}"))
|
||||
;;
|
||||
2)
|
||||
case "${COMP_WORDS[1]}" in
|
||||
"open")
|
||||
COMPREPLY=($(compgen -W "tcp udp" -- "${COMP_WORDS[2]}"))
|
||||
;;
|
||||
*)
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
*)
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
complete -F _nixos_firewall_tool nixos-firewall-tool
|
||||
@@ -0,0 +1,5 @@
|
||||
complete -c nixos-firewall-tool -f
|
||||
complete -c nixos-firewall-tool -k -a reset -d 'Reset firewall configuration to system settings' -n "__fish_is_first_token"
|
||||
complete -c nixos-firewall-tool -k -a show -d 'Show all firewall rules' -n "__fish_is_first_token"
|
||||
complete -c nixos-firewall-tool -k -a open -d 'Open a port temporarily' -n "__fish_is_first_token"
|
||||
complete -c nixos-firewall-tool -k -a "tcp udp" -n "__fish_seen_subcommand_from open && __fish_is_nth_token 2"
|
||||
@@ -1,85 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
# Detect if iptables or nftables-based firewall is used.
|
||||
if [[ -e /etc/systemd/system/firewall.service ]]; then
|
||||
BACKEND=iptables
|
||||
elif [[ -e /etc/systemd/system/nftables.service ]]; then
|
||||
BACKEND=nftables
|
||||
else
|
||||
echo "nixos-firewall-tool: cannot detect firewall backend" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
ip46tables() {
|
||||
iptables -w "$@"
|
||||
ip6tables -w "$@"
|
||||
}
|
||||
|
||||
show_help() {
|
||||
echo "nixos-firewall-tool"
|
||||
echo ""
|
||||
echo "Can temporarily manipulate the NixOS firewall"
|
||||
echo ""
|
||||
echo "Open TCP port:"
|
||||
echo " nixos-firewall-tool open tcp 8888"
|
||||
echo ""
|
||||
echo "Show all firewall rules:"
|
||||
echo " nixos-firewall-tool show"
|
||||
echo ""
|
||||
echo "Open UDP port:"
|
||||
echo " nixos-firewall-tool open udp 51820"
|
||||
echo ""
|
||||
echo "Reset firewall configuration to system settings:"
|
||||
echo " nixos-firewall-tool reset"
|
||||
}
|
||||
|
||||
if [[ -z ${1+x} ]]; then
|
||||
show_help
|
||||
exit 1
|
||||
fi
|
||||
|
||||
case $1 in
|
||||
"open")
|
||||
protocol="$2"
|
||||
port="$3"
|
||||
|
||||
case $BACKEND in
|
||||
iptables)
|
||||
ip46tables -I nixos-fw -p "$protocol" --dport "$port" -j nixos-fw-accept
|
||||
;;
|
||||
nftables)
|
||||
nft add element inet nixos-fw "temp-ports" "{ $protocol . $port }"
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
"show")
|
||||
case $BACKEND in
|
||||
iptables)
|
||||
ip46tables --numeric --list nixos-fw
|
||||
;;
|
||||
nftables)
|
||||
nft list table inet nixos-fw
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
"reset")
|
||||
case $BACKEND in
|
||||
iptables)
|
||||
systemctl restart firewall.service
|
||||
;;
|
||||
nftables)
|
||||
nft flush set inet nixos-fw "temp-ports"
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
-h|--help|help)
|
||||
show_help
|
||||
exit 0
|
||||
;;
|
||||
*)
|
||||
show_help
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
@@ -1,17 +1,47 @@
|
||||
{ writeShellApplication, lib }:
|
||||
{
|
||||
stdenvNoCC,
|
||||
lib,
|
||||
bash,
|
||||
installShellFiles,
|
||||
shellcheck-minimal,
|
||||
}:
|
||||
|
||||
writeShellApplication {
|
||||
stdenvNoCC.mkDerivation {
|
||||
name = "nixos-firewall-tool";
|
||||
|
||||
text = builtins.readFile ./nixos-firewall-tool.sh;
|
||||
src = builtins.filterSource (name: _: !(lib.hasSuffix ".nix" name)) ./.;
|
||||
|
||||
strictDeps = true;
|
||||
buildInputs = [ bash ];
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs --host nixos-firewall-tool
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
installBin nixos-firewall-tool
|
||||
installManPage nixos-firewall-tool.1
|
||||
installShellCompletion nixos-firewall-tool.{bash,fish}
|
||||
'';
|
||||
|
||||
# Skip shellcheck if GHC is not available, see writeShellApplication.
|
||||
doCheck =
|
||||
lib.meta.availableOn stdenvNoCC.buildPlatform shellcheck-minimal.compiler
|
||||
&& (builtins.tryEval shellcheck-minimal.compiler.outPath).success;
|
||||
checkPhase = ''
|
||||
${lib.getExe shellcheck-minimal} nixos-firewall-tool
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Temporarily manipulate the NixOS firewall";
|
||||
description = "A tool to temporarily manipulate the NixOS firewall";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [
|
||||
clerie
|
||||
rvfg
|
||||
garyguo
|
||||
];
|
||||
platforms = platforms.linux;
|
||||
mainProgram = "nixos-firewall-tool";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -10,11 +10,11 @@
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nzbhydra2";
|
||||
version = "7.10.2";
|
||||
version = "7.11.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/theotherp/nzbhydra2/releases/download/v${version}/nzbhydra2-${version}-generic.zip";
|
||||
hash = "sha256-MyhIirrqyv+S1qHrZ0h69Yhvu5tJQNQLs2Pqopy3kuM=";
|
||||
hash = "sha256-vFPpBM438TU9kthrt80soNki0T34j6EktWYhvIJNhWw=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
diff --git a/src/appearance.c b/src/appearance.c
|
||||
index 4fb3f0c..7ae9cab 100644
|
||||
--- a/src/appearance.c
|
||||
+++ b/src/appearance.c
|
||||
@@ -20,6 +20,7 @@
|
||||
#include "main.h"
|
||||
#include "tree.h"
|
||||
#include "preview_update.h"
|
||||
+#include <ctype.h>
|
||||
|
||||
static gboolean mapping = FALSE;
|
||||
|
||||
diff --git a/src/desktops.h b/src/desktops.h
|
||||
index 1ba3e36..968595e 100644
|
||||
--- a/src/desktops.h
|
||||
+++ b/src/desktops.h
|
||||
@@ -22,6 +22,7 @@
|
||||
|
||||
#include <gtk/gtk.h>
|
||||
|
||||
+void desktops_setup_tab();
|
||||
void desktops_setup_num(GtkWidget *w);
|
||||
void desktops_setup_names(GtkWidget *w);
|
||||
|
||||
diff --git a/src/main.c b/src/main.c
|
||||
index d7e3446..fdfae54 100644
|
||||
--- a/src/main.c
|
||||
+++ b/src/main.c
|
||||
@@ -28,6 +28,8 @@
|
||||
#include "dock.h"
|
||||
#include "preview_update.h"
|
||||
#include "gettext.h"
|
||||
+#include "desktops.h"
|
||||
+#include "moveresize.h"
|
||||
|
||||
#include <gdk/gdkx.h>
|
||||
#define SN_API_NOT_YET_FROZEN
|
||||
@@ -23,6 +23,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-qwm66VA/ueRMFtSUcrmuObNkz+KYgWRnmR7TnQwpxiE=";
|
||||
};
|
||||
|
||||
patches = [ ./fix-implicit-declarations.patch ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
@@ -38,8 +40,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
openbox
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace configure.ac --replace 2.0.4 ${finalAttrs.version}
|
||||
substituteInPlace configure.ac --replace-fail 2.0.4 ${finalAttrs.version}
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -0,0 +1,36 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
}:
|
||||
|
||||
buildGoModule {
|
||||
pname = "primitive";
|
||||
version = "0-unstable-2020-05-04";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fogleman";
|
||||
repo = "primitive";
|
||||
rev = "0373c216458be1c4b40655b796a3aefedf8b7d23";
|
||||
hash = "sha256-stKb3tPP/pgHTfdyTmWwVj/hLjOHtFpvJxXgBhhWgPQ=";
|
||||
};
|
||||
vendorHash = "sha256-I3rhP87QJJxNM9D7JYo3BjG/1PhsDWbnK/NJTf4aqmI=";
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "add-modules.patch";
|
||||
url = "https://github.com/regularpoe/primitive/commit/2fa9b9f575ac2602e771c5263747bdbb48e9810b.patch";
|
||||
hash = "sha256-TX3dGqVuY+qLh9EBg7oNVYWhGuETZHJdjPTroCDyZ74=";
|
||||
})
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Reproducing images with geometric primitives";
|
||||
homepage = "https://github.com/fogleman/primitive";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ stunkymonkey ];
|
||||
mainProgram = "primitive";
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
@@ -32,10 +32,10 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "3.0.0";
|
||||
version = "3.0.1";
|
||||
webUiStatic = fetchurl {
|
||||
url = "https://github.com/prometheus/prometheus/releases/download/v${version}/prometheus-web-ui-${version}.tar.gz";
|
||||
hash = "sha256-a3xyStDsutLjYIEm7t3WilmvO36eMHvd4pOtZYYsJCM=";
|
||||
hash = "sha256-MP7B7gVRQnspXLLNmPH8t3DYKbsQkDV9hPJYbM2rB9M=";
|
||||
};
|
||||
in
|
||||
buildGoModule rec {
|
||||
@@ -52,7 +52,7 @@ buildGoModule rec {
|
||||
owner = "prometheus";
|
||||
repo = "prometheus";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-IMYDtAb2ojzZLBqRJkMcB8yFpmmJPwbbyAxFfbCikkA=";
|
||||
hash = "sha256-dN6ckW451G45ZO7baY7H4qEf88ZDeISZwZ3uwWPZsW8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-c96YnWPLH/tbGRb2Zlqrl3PXSZvI+NeYTGlef6REAOw=";
|
||||
|
||||
@@ -12,18 +12,19 @@
|
||||
pkg-config,
|
||||
autoreconfHook,
|
||||
libiconv,
|
||||
fetchpatch,
|
||||
enableCredssp ? (!stdenv.hostPlatform.isDarwin),
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "rdesktop";
|
||||
version = "1.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1s6k1jwd28y38ymk3lfv76ch4arpfwrbdhpkbnwwy3fc4617gb78";
|
||||
owner = "rdesktop";
|
||||
repo = "rdesktop";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-6Kx3giHMDc+5XfPCtjJ3NysCmTnb0TGrR8Mj0bgM0+g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -48,6 +49,18 @@ stdenv.mkDerivation (rec {
|
||||
"--disable-smartcard"
|
||||
] ++ lib.optional (!enableCredssp) "--disable-credssp";
|
||||
|
||||
patches = [
|
||||
./rdesktop-configure-c99.patch
|
||||
(fetchpatch {
|
||||
url = "https://github.com/rdesktop/rdesktop/commit/105c8cb69facf26238cd48f14ca9dbc0ff6be6bd.patch";
|
||||
hash = "sha256-3/y7JaKDyULhlzwP3bsA8kOq7g4AvWUi50gxkCZ8sbU=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/rdesktop/rdesktop/commit/53ba87dc174175e98332e22355ad8662c02880d6.patch";
|
||||
hash = "sha256-ORGHdabSu9kVkNovweqFVS53dx6NbiryPlgi6Qp83BA=";
|
||||
})
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Open source client for Windows Terminal Services";
|
||||
mainProgram = "rdesktop";
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
Avoid spurious implicit int/implicit function declaration errors in the
|
||||
statvfs64 check (which still fails on Fedora; statvfs is used instead).
|
||||
|
||||
Submitted upstream: <https://github.com/rdesktop/rdesktop/pull/407>
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 1ab12a83b01f8a47..b5092b0f8cab520f 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -668,12 +668,13 @@ if test $space = no; then
|
||||
# SVR4
|
||||
AC_CACHE_CHECK([statvfs64 function (SVR4)], fu_cv_sys_stat_statvfs64,
|
||||
[AC_TRY_RUN([
|
||||
+#include <stdlib.h>
|
||||
#if defined(HAVE_UNISTD_H)
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
#include <sys/types.h>
|
||||
#include <sys/statvfs.h>
|
||||
- main ()
|
||||
+ int main (void)
|
||||
{
|
||||
struct statvfs64 fsd;
|
||||
exit (statvfs64 (".", &fsd));
|
||||
@@ -6,11 +6,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "sil-abyssinica";
|
||||
version = "2.201";
|
||||
version = "2.300";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://software.sil.org/downloads/r/abyssinica/AbyssinicaSIL-${version}.zip";
|
||||
hash = "sha256-DJWp3T9uBLnztSq9r5YCSWaBjIK/0Aljg1IiU0FLrdE=";
|
||||
hash = "sha256-3msQRxoIV1K8mjZr7xXKW54fELjNhteXZ5qg6t5+Vcg=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -6,11 +6,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "sil-padauk";
|
||||
version = "5.001";
|
||||
version = "5.100";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://software.sil.org/downloads/r/padauk/Padauk-${version}.zip";
|
||||
hash = "sha256-rLzuDUd+idjTN0xQxblXQ9V2rQtJPN2EtWGmTRY1R7U=";
|
||||
hash = "sha256-Y4ZcxbPcgF349wDuT352xqaJji+FMfBH6P7WSWOw2iI=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -6,25 +6,24 @@
|
||||
}:
|
||||
|
||||
let
|
||||
python = (
|
||||
python3.withPackages (
|
||||
ps: with ps; [
|
||||
pyside6
|
||||
py65
|
||||
qdarkstyle
|
||||
]
|
||||
)
|
||||
python = python3.withPackages (
|
||||
ps: with ps; [
|
||||
pyside6
|
||||
py65
|
||||
qdarkstyle
|
||||
]
|
||||
);
|
||||
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "smb3-foundry";
|
||||
version = "1.3.1";
|
||||
version = "1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mchlnix";
|
||||
repo = "SMB3-Foundry";
|
||||
rev = "refs/tags/${finalAttrs.version}";
|
||||
hash = "sha256-8cf7VhvC372Cqi94n2FSHcoCGblpZoZvBXcXq5jU6CY=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-9pztxzgdPqrTNUMtD9boxtqb32LCsGMoa/bBq5GSJ1I=";
|
||||
};
|
||||
|
||||
buildInputs = [ python ];
|
||||
@@ -42,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/mchlnix/SMB3-Foundry/releases/tag/${finalAttrs.version}";
|
||||
changelog = "https://github.com/mchlnix/SMB3-Foundry/releases/tag/${finalAttrs.src.tag}";
|
||||
description = "Modern Super Mario Bros. 3 Level Editor";
|
||||
homepage = "https://github.com/mchlnix/SMB3-Foundry";
|
||||
license = lib.licenses.gpl3Only;
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
android-tools,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "spytrap-adb";
|
||||
version = "0.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "spytrap-org";
|
||||
repo = "spytrap-adb";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-CL+MxSzHpOq2MXmsaa9sipQZ06Kkzy4r1eFjUrPSj1E=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Utg3ds0nGAUjBfuEjGfkohkmssKIZT1NiH9hiFnW4ps=";
|
||||
|
||||
env.SPYTRAP_ADB_BINARY = lib.getExe' android-tools "adb";
|
||||
|
||||
meta = {
|
||||
description = "Test a phone for stalkerware using adb and usb debugging to scan for suspicious apps and configuration";
|
||||
homepage = "https://github.com/spytrap-org/spytrap-adb";
|
||||
changelog = "https://github.com/spytrap-org/spytrap-adb/releases/tag/v${version}";
|
||||
mainProgram = "spytrap-adb";
|
||||
license = with lib.licenses; [ gpl3Plus ];
|
||||
maintainers = with lib.maintainers; [ kpcyrd ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
@@ -6,18 +6,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "storj-uplink";
|
||||
version = "1.119.3";
|
||||
version = "1.119.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "storj";
|
||||
repo = "storj";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-O+DCMgrhlunqetL2GYbNSuSbfcyYNNP3kf9bL6P3uHQ=";
|
||||
hash = "sha256-7SlKUqniRgQfmrBEVnvn7KDa9/QmMmYb7NMrNABGSiU=";
|
||||
};
|
||||
|
||||
subPackages = [ "cmd/uplink" ];
|
||||
|
||||
vendorHash = "sha256-DgW1RCyTDfbc7BiMeMVMWY1gHNdxiLxojAn0NGNeWqA=";
|
||||
vendorHash = "sha256-eYFdoc5gtY7u9LFT7EAnooxrOC1y9fIA0ESTP+rPpCc=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
|
||||
src = fetchFromGitLab {
|
||||
owner = "nick87720z";
|
||||
repo = "tint2";
|
||||
rev = version;
|
||||
tag = version;
|
||||
hash = "sha256-9sEe/Gnj+FWLPbWBtfL1YlNNC12j7/KjQ40xdkaFJVQ=";
|
||||
};
|
||||
|
||||
@@ -45,6 +45,9 @@ stdenv.mkDerivation rec {
|
||||
})
|
||||
];
|
||||
|
||||
# Fix build with gcc14
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=incompatible-pointer-types";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
cmake
|
||||
|
||||
@@ -156,11 +156,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "wavebox";
|
||||
version = "10.131.16-2";
|
||||
version = "10.131.18-2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.wavebox.app/stable/linux/deb/amd64/wavebox_${finalAttrs.version}_amd64.deb";
|
||||
hash = "sha256-/wnFG+GKV7/f1PBZu7LSZhV9oxUCJCJoNycq/4ONAzQ=";
|
||||
hash = "sha256-aJp2Dr5q9gZhrDUWbztImhW8G79gDNl1J7gqWqicGPQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,9 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
darwin,
|
||||
testers,
|
||||
weaver,
|
||||
}:
|
||||
@@ -21,10 +19,6 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
cargoHash = "sha256-r7l6/xeClphOI9kz/r36P0tTNHmSTKDhRL6KTVZNmvk=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (
|
||||
with darwin.apple_sdk_11_0.frameworks; [ SystemConfiguration ]
|
||||
);
|
||||
|
||||
checkFlags = [
|
||||
# Skip tests requiring network
|
||||
"--skip=test_cli_interface"
|
||||
|
||||
@@ -12,13 +12,13 @@ let
|
||||
in
|
||||
buildDotnetModule (finalAttrs: {
|
||||
pname = "yafc-ce";
|
||||
version = "2.3.1";
|
||||
version = "2.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "shpaass";
|
||||
repo = "yafc-ce";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-t/st/s0zJRNP1Cbjo4aw02jKvuHkMh3jGmiMziMrez8=";
|
||||
hash = "sha256-Tx9C7xhmfUfHAbrVKtGQ0lO+UZvzErndswFoBnWVzEw=";
|
||||
};
|
||||
|
||||
projectFile = [ "Yafc/Yafc.csproj" ];
|
||||
|
||||
@@ -3,44 +3,20 @@
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
replaceVars,
|
||||
fetchpatch,
|
||||
gitstatus,
|
||||
bash,
|
||||
}:
|
||||
|
||||
let
|
||||
# match gitstatus version with given `gitstatus_version`:
|
||||
# https://github.com/romkatv/powerlevel10k/blob/master/gitstatus/build.info
|
||||
gitstatus' = gitstatus.overrideAttrs (oldAtttrs: rec {
|
||||
version = "1.5.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "romkatv";
|
||||
repo = "gitstatus";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-mVfB3HWjvk4X8bmLEC/U8SKBRytTh/gjjuReqzN5qTk=";
|
||||
};
|
||||
|
||||
patches = (oldAtttrs.patches or [ ]) ++ [
|
||||
# remove when bumped to 1.5.5
|
||||
(fetchpatch {
|
||||
url = "https://github.com/romkatv/gitstatus/commit/62177e89b2b04baf242cd1526cc2661041dda0fb.patch";
|
||||
sha256 = "sha256-DSRYRV89MLR/Eh4MFsXpDKH1xJiAWyJgSqmfjDTXhtU=";
|
||||
name = "drop-Werror.patch";
|
||||
})
|
||||
];
|
||||
|
||||
});
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "powerlevel10k";
|
||||
version = "1.20.0";
|
||||
version = "1.20.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "romkatv";
|
||||
repo = "powerlevel10k";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ES5vJXHjAKw/VHjWs8Au/3R+/aotSbY7PWnWAMzCR8E=";
|
||||
# upstream doesn't seem to use tags anymore
|
||||
rev = "5e26473457d819fe148f7fff32db1082dae72012";
|
||||
hash = "sha256-/+FEkgBR6EOTaCAc15vYGWNih2QZkN27ae6LMXlXZU4=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
@@ -48,7 +24,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
patches = [
|
||||
(replaceVars ./gitstatusd.patch {
|
||||
gitstatusdPath = "${gitstatus'}/bin/gitstatusd";
|
||||
gitstatusdPath = "${gitstatus}/bin/gitstatusd";
|
||||
})
|
||||
];
|
||||
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rakudo";
|
||||
version = "2024.06";
|
||||
version = "2024.12";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "rakudo";
|
||||
repo = "rakudo";
|
||||
rev = version;
|
||||
hash = "sha256-6XWfM7KJB+lMf/YFLaQ71DMa8owZtjjuMEyWY++CJnM=";
|
||||
hash = "sha256-R4D+Hh3M1373MQBLX2TY8nq+so4S6DP5RM5XR+Zr95Y=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "moarvm";
|
||||
version = "2024.06";
|
||||
version = "2024.12";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "moarvm";
|
||||
repo = "moarvm";
|
||||
rev = version;
|
||||
hash = "sha256-y+xtJ4YbzPr1168tu+148Co7Ke/iC68aOQBwTINlp2Y=";
|
||||
hash = "sha256-CP8zYs4y2pT2keIxqE7yFy+N9aR3fidkwRXAe5blWAo=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nqp";
|
||||
version = "2024.06";
|
||||
version = "2024.12";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "raku";
|
||||
repo = "nqp";
|
||||
rev = version;
|
||||
hash = "sha256-FqZPUtzlS+ZSlyuCFMWHofLXPuXCWAT6Oak0g3o8cgM=";
|
||||
hash = "sha256-TjN7uH5cJzZ49KbxOYDCj2tYk6ORZWZn7ruTIn4Hgzc=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -212,7 +212,7 @@ stdenv.mkDerivation {
|
||||
})
|
||||
]
|
||||
++ lib.optional (lib.versionAtLeast version "1.81" && stdenv.cc.isClang) ./fix-clang-target.patch
|
||||
++ lib.optional (lib.versionAtLeast version "1.86") [
|
||||
++ lib.optional (lib.versionAtLeast version "1.86" && lib.versionOlder version "1.87") [
|
||||
# Backport fix for NumPy 2 support.
|
||||
(fetchpatch {
|
||||
name = "boost-numpy-2-compatibility.patch";
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "KDDockWidgets";
|
||||
version = "2.2.0";
|
||||
version = "2.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KDAB";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-BqgoCFEIy9E1GPPwLQrJcAHysm4R2JpCevCnWO8tEYk=";
|
||||
sha256 = "sha256-DxRySKhQ15OpstjCO6FJ9edV7z8/rECN2+o5T63vFzQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -27,7 +27,9 @@ stdenv.mkDerivation rec {
|
||||
|
||||
propagatedBuildInputs = [ libusb-compat-0_1 ];
|
||||
|
||||
configureFlags = lib.optional (!stdenv.hostPlatform.isDarwin) "--with-async-mode";
|
||||
configureFlags = [
|
||||
"ac_cv_prog_HAVELIBUSB=${lib.getExe' (lib.getDev libusb-compat-0_1) "libusb-config"}"
|
||||
] ++ lib.optional (!stdenv.hostPlatform.isDarwin) "--with-async-mode";
|
||||
|
||||
# allow async mode. from ubuntu. see:
|
||||
# https://bazaar.launchpad.net/~ubuntu-branches/ubuntu/trusty/libftdi/trusty/view/head:/debian/patches/04_async_mode.diff
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nghttp3";
|
||||
version = "1.6.0";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ngtcp2";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-5QsJLN79SkbrCfIGfeJ91AUEf9/V6BWkNE60wOkxdow=";
|
||||
hash = "sha256-GLYZv5i/hqK5L65uKv0wFBO/5sCVvM/wr4qWyCQKvQQ=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sundials";
|
||||
version = "7.2.0";
|
||||
version = "7.2.1";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/LLNL/sundials/releases/download/v${version}/sundials-${version}.tar.gz";
|
||||
hash = "sha256-XGwKZqfifEW/tXsn91eUY4Vahfw5dv7R1cndiNwa46s=";
|
||||
hash = "sha256-N4Hj983zcsoS9/vmT1Yai5pQe4qLLE1s4o2OTfS+++o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -77,6 +77,7 @@ mapAliases {
|
||||
inherit (pkgs) coc-pyright; # added 2024-07-14
|
||||
coc-metals = throw "coc-metals was removed because it was deprecated upstream. vimPlugins.nvim-metals is its official replacement."; # Added 2024-10-16
|
||||
coc-python = throw "coc-python was removed because it was abandoned upstream on 2020-12-24. Upstream now recommends using coc-pyright or coc-jedi instead."; # added 2024-10-15
|
||||
inherit (pkgs) coc-toml;
|
||||
coc-tslint = throw "coc-tslint was removed because it was deprecated upstream; coc-eslint offers comparable features for eslint, which replaced tslint"; # Added 2024-10-18
|
||||
coc-tslint-plugin = throw "coc-tslint-plugin was removed because it was deprecated upstream; coc-eslint offers comparable features for eslint, which replaced tslint"; # Added 2024-10-18
|
||||
coinmon = throw "coinmon was removed since it was abandoned upstream"; # added 2024-03-19
|
||||
|
||||
@@ -58,7 +58,6 @@
|
||||
, "coc-sqlfluff"
|
||||
, "coc-tabnine"
|
||||
, "coc-texlab"
|
||||
, "coc-toml"
|
||||
, "coc-tsserver"
|
||||
, "coc-ultisnips"
|
||||
, "coc-vetur"
|
||||
|
||||
-28
@@ -59455,34 +59455,6 @@ in
|
||||
bypassCache = true;
|
||||
reconstructLock = true;
|
||||
};
|
||||
coc-toml = nodeEnv.buildNodePackage {
|
||||
name = "coc-toml";
|
||||
packageName = "coc-toml";
|
||||
version = "1.2.5";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/coc-toml/-/coc-toml-1.2.5.tgz";
|
||||
sha512 = "8ypH+v7PkGfYTfg/7QoUGrpgSidzxwr2uvuTXR3FgzWrLT9OQOvlocH9KfCRsP8IIAbCuMOa/OpStN+pNwO6Ug==";
|
||||
};
|
||||
dependencies = [
|
||||
sources."@taplo/lsp-0.2.4"
|
||||
sources."encoding-0.1.13"
|
||||
sources."iconv-lite-0.6.3"
|
||||
sources."node-fetch-2.7.0"
|
||||
sources."safer-buffer-2.1.2"
|
||||
sources."tr46-0.0.3"
|
||||
sources."webidl-conversions-3.0.1"
|
||||
sources."whatwg-url-5.0.0"
|
||||
];
|
||||
buildInputs = globalBuildInputs;
|
||||
meta = {
|
||||
description = "toml extension for coc.nvim";
|
||||
homepage = "https://github.com/kkiyama117/coc-toml#readme";
|
||||
license = "MIT";
|
||||
};
|
||||
production = true;
|
||||
bypassCache = true;
|
||||
reconstructLock = true;
|
||||
};
|
||||
coc-tsserver = nodeEnv.buildNodePackage {
|
||||
name = "coc-tsserver";
|
||||
packageName = "coc-tsserver";
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-kasa";
|
||||
version = "0.8.1";
|
||||
version = "0.9.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -32,7 +32,7 @@ buildPythonPackage rec {
|
||||
owner = "python-kasa";
|
||||
repo = "python-kasa";
|
||||
tag = version;
|
||||
hash = "sha256-4P66mFaDg7A9FHqWRUN5NV7nQhMTu3gU+gR2tHWHalU=";
|
||||
hash = "sha256-xbyDiTnEeC/d2dpAxj/5tB27hFC3bKEO5JsUC1jmh18=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
@@ -6,8 +6,8 @@
|
||||
{
|
||||
environment.systemPackages = [ (pkgs.python3.withPackages (ps: [ ps.soundcard ])) ];
|
||||
|
||||
hardware.pulseaudio.enable = true;
|
||||
hardware.pulseaudio.systemWide = true;
|
||||
services.pulseaudio.enable = true;
|
||||
services.pulseaudio.systemWide = true;
|
||||
|
||||
virtualisation.qemu.options = [
|
||||
"-device virtio-sound-pci,audiodev=my_audiodev"
|
||||
|
||||
@@ -55,7 +55,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "twisted";
|
||||
version = "24.10.0";
|
||||
version = "24.11.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@@ -63,7 +63,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "tar.gz";
|
||||
hash = "sha256-ApUSmWcllf6g9w+i1fe149VoNhV+2miFmmrWSS02dW4=";
|
||||
hash = "sha256-aV0FVtXsV53MRk0oVrY0iA7RMZ9FsQ0ZBD8rV+sBFbU=";
|
||||
};
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "snac2";
|
||||
version = "2.66";
|
||||
version = "2.67";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "grunfink";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-JArXXuWS60tXShYD4bKwHRPlbLRALZTnwn3iYBhhD2s=";
|
||||
hash = "sha256-40jYkFLdEmvOUK5+Ep91NY8JVfw3OTIh0wEffjRC9wY=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
Reference in New Issue
Block a user