Merge master into staging-next
This commit is contained in:
@@ -212,13 +212,25 @@ rec {
|
||||
else if rebuildCount <= 500 then
|
||||
[ "101-500" ]
|
||||
else if rebuildCount <= 1000 then
|
||||
[ "501-1000" ]
|
||||
[
|
||||
"501-1000"
|
||||
"501+"
|
||||
]
|
||||
else if rebuildCount <= 2500 then
|
||||
[ "1001-2500" ]
|
||||
[
|
||||
"1001-2500"
|
||||
"501+"
|
||||
]
|
||||
else if rebuildCount <= 5000 then
|
||||
[ "2501-5000" ]
|
||||
[
|
||||
"2501-5000"
|
||||
"501+"
|
||||
]
|
||||
else
|
||||
[ "5001+" ];
|
||||
[
|
||||
"5001+"
|
||||
"501+"
|
||||
];
|
||||
in
|
||||
lib.forEach numbers (number: "10.rebuild-${kernel}: ${number}")
|
||||
) rebuildCountByKernel
|
||||
|
||||
@@ -110,7 +110,7 @@ stdenvNoCC.mkDerivation (
|
||||
shell =
|
||||
let
|
||||
devmode' = devmode.override {
|
||||
buildArgs = "./.";
|
||||
buildArgs = toString ../.;
|
||||
open = "/share/doc/nixpkgs/manual.html";
|
||||
};
|
||||
nixos-render-docs-redirects' = writeShellScriptBin "redirects" "${lib.getExe nixos-render-docs-redirects} --file ${toString ../redirects.json} $@";
|
||||
|
||||
@@ -226,6 +226,8 @@
|
||||
|
||||
- `racket_7_9` has been removed, as it is insecure. It is recommended to use Racket 8 instead.
|
||||
|
||||
- `services.mongodb.initialRootPassword` has been replaced with the more secure option [`services.mongodb.initialRootPasswordFile`](#opt-services.mongodb.initialRootPasswordFile)
|
||||
|
||||
- `rofi` has been updated from 1.7.5 to 1.7.6 which introduces some breaking changes to binary plugins, and also contains a lot of new features and bug fixes. This is highlighted because the patch version bump does not indicate the volume of changes by itself. See the [upstream release notes](https://github.com/davatorium/rofi/releases/tag/1.7.6) for the full list of changes.
|
||||
|
||||
- `ente-auth` now uses the name `enteauth` for its binary. The previous name was `ente_auth`.
|
||||
@@ -386,6 +388,8 @@
|
||||
|
||||
- GOverlay has been updated to 1.2, please check the [upstream changelog](https://github.com/benjamimgois/goverlay/releases) for more details.
|
||||
|
||||
- [`services.mongodb`](#opt-services.mongodb.enable) is now compatible with the `mongodb-ce` binary package. To make use of it, set [`services.mongodb.package`](#opt-services.mongodb.package) to `pkgs.mongodb-ce`.
|
||||
|
||||
- [`services.jupyter`](#opt-services.jupyter.enable) is now compatible with `Jupyter Notebook 7`. See [the migration guide](https://jupyter-notebook.readthedocs.io/en/latest/migrate_to_notebook7.html) for details.
|
||||
|
||||
- `networking.wireguard` now has an optional networkd backend. It is enabled by default when `networking.useNetworkd` is enabled, and it can be enabled alongside scripted networking with `networking.wireguard.useNetworkd`. Some `networking.wireguard` options have slightly different behavior with the networkd and script-based backends, documented in each option.
|
||||
@@ -398,6 +402,8 @@
|
||||
|
||||
- `bind.cacheNetworks` now only controls access for recursive queries, where it previously controlled access for all queries.
|
||||
|
||||
- [`services.mongodb.enableAuth`](#opt-services.mongodb.enableAuth) now uses the newer [mongosh](https://github.com/mongodb-js/mongosh) shell instead of the legacy shell to configure the initial superuser. You can configure the mongosh package to use through the [`services.mongodb.mongoshPackage`](#opt-services.mongodb.mongoshPackage) option.
|
||||
|
||||
- The paperless module now has an option for regular automatic export of
|
||||
documents data using the integrated document exporter.
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@ let
|
||||
common = import ./common.nix;
|
||||
inherit (common) outputPath indexPath;
|
||||
devmode = pkgs.devmode.override {
|
||||
buildArgs = "../../release.nix -A manualHTML.${builtins.currentSystem}";
|
||||
buildArgs = ''${toString ../../release.nix} -A manualHTML.${builtins.currentSystem}'';
|
||||
open = "/${outputPath}/${indexPath}";
|
||||
};
|
||||
nixos-render-docs-redirects = pkgs.writeShellScriptBin "redirects" "${pkgs.lib.getExe pkgs.nixos-render-docs-redirects} --file ${toString ./redirects.json} $@";
|
||||
|
||||
@@ -10,6 +10,8 @@ let
|
||||
|
||||
mongodb = cfg.package;
|
||||
|
||||
mongoshExe = lib.getExe cfg.mongoshPackage;
|
||||
|
||||
mongoCnf =
|
||||
cfg:
|
||||
pkgs.writeText "mongodb.conf" ''
|
||||
@@ -25,6 +27,13 @@ let
|
||||
in
|
||||
|
||||
{
|
||||
imports = [
|
||||
(lib.mkRemovedOptionModule [
|
||||
"services"
|
||||
"mongodb"
|
||||
"initialRootPassword"
|
||||
] "Use services.mongodb.initialRootPasswordFile to securely provide the initial root password.")
|
||||
];
|
||||
|
||||
###### interface
|
||||
|
||||
@@ -34,7 +43,11 @@ in
|
||||
|
||||
enable = lib.mkEnableOption "the MongoDB server";
|
||||
|
||||
package = lib.mkPackageOption pkgs "mongodb" { };
|
||||
package = lib.mkPackageOption pkgs "mongodb" {
|
||||
example = "pkgs.mongodb-ce";
|
||||
};
|
||||
|
||||
mongoshPackage = lib.mkPackageOption pkgs "mongosh" { };
|
||||
|
||||
user = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
@@ -60,10 +73,10 @@ in
|
||||
description = "Enable client authentication. Creates a default superuser with username root!";
|
||||
};
|
||||
|
||||
initialRootPassword = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.str;
|
||||
initialRootPasswordFile = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.path;
|
||||
default = null;
|
||||
description = "Password for the root user if auth is enabled.";
|
||||
description = "Path to the file containing the password for the root user if auth is enabled.";
|
||||
};
|
||||
|
||||
dbpath = lib.mkOption {
|
||||
@@ -112,8 +125,8 @@ in
|
||||
config = lib.mkIf config.services.mongodb.enable {
|
||||
assertions = [
|
||||
{
|
||||
assertion = !cfg.enableAuth || cfg.initialRootPassword != null;
|
||||
message = "`enableAuth` requires `initialRootPassword` to be set.";
|
||||
assertion = !cfg.enableAuth || cfg.initialRootPasswordFile != null;
|
||||
message = "`enableAuth` requires `initialRootPasswordFile` to be set.";
|
||||
}
|
||||
];
|
||||
|
||||
@@ -125,8 +138,6 @@ in
|
||||
};
|
||||
users.groups.mongodb = lib.mkIf (cfg.user == "mongodb") { };
|
||||
|
||||
environment.systemPackages = [ mongodb ];
|
||||
|
||||
systemd.services.mongodb = {
|
||||
description = "MongoDB server";
|
||||
|
||||
@@ -164,14 +175,15 @@ in
|
||||
if ! test -e "${cfg.dbpath}/.auth_setup_complete"; then
|
||||
systemd-run --unit=mongodb-for-setup --uid=${cfg.user} ${mongodb}/bin/mongod --config ${mongoCnf cfg_}
|
||||
# wait for mongodb
|
||||
while ! ${mongodb}/bin/mongo --eval "db.version()" > /dev/null 2>&1; do sleep 0.1; done
|
||||
while ! ${mongoshExe} --eval "db.version()" > /dev/null 2>&1; do sleep 0.1; done
|
||||
|
||||
${mongodb}/bin/mongo <<EOF
|
||||
use admin
|
||||
initialRootPassword=$(<${cfg.initialRootPasswordFile})
|
||||
${mongoshExe} <<EOF
|
||||
use admin;
|
||||
db.createUser(
|
||||
{
|
||||
user: "root",
|
||||
pwd: "${cfg.initialRootPassword}",
|
||||
pwd: "$initialRootPassword",
|
||||
roles: [
|
||||
{ role: "userAdminAnyDatabase", db: "admin" },
|
||||
{ role: "dbAdminAnyDatabase", db: "admin" },
|
||||
@@ -187,7 +199,8 @@ in
|
||||
postStart = ''
|
||||
if test -e "${cfg.dbpath}/.first_startup"; then
|
||||
${lib.optionalString (cfg.initialScript != null) ''
|
||||
${mongodb}/bin/mongo ${lib.optionalString (cfg.enableAuth) "-u root -p ${cfg.initialRootPassword}"} admin "${cfg.initialScript}"
|
||||
initialRootPassword=$(<${cfg.initialRootPasswordFile})
|
||||
${mongoshExe} ${lib.optionalString (cfg.enableAuth) "-u root -p $initialRootPassword"} admin "${cfg.initialScript}"
|
||||
''}
|
||||
rm -f "${cfg.dbpath}/.first_startup"
|
||||
fi
|
||||
|
||||
@@ -275,18 +275,13 @@ in
|
||||
serviceConfig = {
|
||||
DynamicUser = true;
|
||||
User = "wyoming-faster-whisper";
|
||||
StateDirectory = [
|
||||
"wyoming/faster-whisper"
|
||||
"wyoming/faster-whisper/models"
|
||||
];
|
||||
StateDirectory = [ "wyoming/faster-whisper" ];
|
||||
# https://github.com/home-assistant/addons/blob/master/whisper/rootfs/etc/s6-overlay/s6-rc.d/whisper/run
|
||||
ExecStart = escapeSystemdExecArgs (
|
||||
[
|
||||
(lib.getExe cfg.package)
|
||||
"--data-dir"
|
||||
"/var/lib/wyoming/faster-whisper"
|
||||
"--download-dir"
|
||||
"/var/lib/wyoming/faster-whisper/models"
|
||||
"--uri"
|
||||
options.uri
|
||||
"--device"
|
||||
|
||||
@@ -126,22 +126,14 @@ in
|
||||
"--trigger-level"
|
||||
cfg.triggerLevel
|
||||
]
|
||||
++ concatMap (
|
||||
model:
|
||||
[
|
||||
"--preload-model"
|
||||
model
|
||||
]
|
||||
cfg.preloadModels
|
||||
)
|
||||
++ concatMap (
|
||||
dir:
|
||||
[
|
||||
"--custom-model-dir"
|
||||
(toString dir)
|
||||
]
|
||||
cfg.customModelsDirectories
|
||||
)
|
||||
++ (concatMap (model: [
|
||||
"--preload-model"
|
||||
model
|
||||
]) cfg.preloadModels)
|
||||
++ (concatMap (dir: [
|
||||
"--custom-model-dir"
|
||||
(toString dir)
|
||||
]) cfg.customModelsDirectories)
|
||||
++ cfg.extraArgs
|
||||
);
|
||||
CapabilityBoundingSet = "";
|
||||
|
||||
@@ -136,18 +136,13 @@ in
|
||||
serviceConfig = {
|
||||
DynamicUser = true;
|
||||
User = "wyoming-piper";
|
||||
StateDirectory = [
|
||||
"wyoming/piper"
|
||||
"wyoming/piper/models"
|
||||
];
|
||||
StateDirectory = [ "wyoming/piper" ];
|
||||
# https://github.com/home-assistant/addons/blob/master/piper/rootfs/etc/s6-overlay/s6-rc.d/piper/run
|
||||
ExecStart = escapeSystemdExecArgs (
|
||||
[
|
||||
(lib.getExe cfg.package)
|
||||
"--data-dir"
|
||||
"/var/lib/wyoming/piper"
|
||||
"--download-dir"
|
||||
"/var/lib/wyoming/piper/models"
|
||||
"--uri"
|
||||
options.uri
|
||||
"--piper"
|
||||
|
||||
@@ -48,6 +48,13 @@ let
|
||||
defaultUser = "netdata";
|
||||
|
||||
isThereAnyWireGuardTunnels = config.networking.wireguard.enable || lib.any (c: lib.hasAttrByPath [ "netdevConfig" "Kind" ] c && c.netdevConfig.Kind == "wireguard") (builtins.attrValues config.systemd.network.netdevs);
|
||||
|
||||
extraNdsudoPathsEnv = pkgs.buildEnv {
|
||||
name = "netdata-ndsudo-env";
|
||||
paths = cfg.extraNdsudoPackages;
|
||||
pathsToLink = [ "/bin" ];
|
||||
};
|
||||
|
||||
in {
|
||||
options = {
|
||||
services.netdata = {
|
||||
@@ -131,6 +138,27 @@ in {
|
||||
'';
|
||||
};
|
||||
|
||||
extraNdsudoPackages = lib.mkOption {
|
||||
type = lib.types.listOf lib.types.package;
|
||||
default = [ ];
|
||||
description = ''
|
||||
Extra packages to add to `PATH` to make available to `ndsudo`.
|
||||
::: {.warning}
|
||||
`ndsudo` has SUID privileges, be careful what packages you list here.
|
||||
:::
|
||||
|
||||
::: {.note}
|
||||
`cfg.package` must be built with `withNdsudo = true`
|
||||
:::
|
||||
'';
|
||||
example = ''
|
||||
[
|
||||
pkgs.smartmontools
|
||||
pkgs.nvme-cli
|
||||
]
|
||||
'';
|
||||
};
|
||||
|
||||
config = lib.mkOption {
|
||||
type = lib.types.attrsOf lib.types.attrs;
|
||||
default = {};
|
||||
@@ -221,6 +249,31 @@ in {
|
||||
environment.etc."netdata/netdata.conf".source = configFile;
|
||||
environment.etc."netdata/conf.d".source = configDirectory;
|
||||
|
||||
|
||||
systemd.tmpfiles.settings = lib.mkIf cfg.package.withNdsudo {
|
||||
"95-netdata-ndsudo" = {
|
||||
"/var/lib/netdata/ndsudo" = {
|
||||
"d" = {
|
||||
mode = "0550";
|
||||
user = cfg.user;
|
||||
group = cfg.group;
|
||||
};
|
||||
};
|
||||
|
||||
"/var/lib/netdata/ndsudo/ndsudo" = {
|
||||
"L+" = {
|
||||
argument = "/run/wrappers/bin/ndsudo";
|
||||
};
|
||||
};
|
||||
|
||||
"/var/lib/netdata/ndsudo/runtime-dependencies" = {
|
||||
"L+" = {
|
||||
argument = "${extraNdsudoPathsEnv}/bin";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
systemd.services.netdata = {
|
||||
description = "Real time performance monitoring";
|
||||
after = [ "network.target" "suid-sgid-wrappers.service" ];
|
||||
@@ -394,6 +447,14 @@ in {
|
||||
group = cfg.group;
|
||||
permissions = "u+rx,g+x,o-rwx";
|
||||
};
|
||||
} // lib.optionalAttrs (cfg.package.withNdsudo) {
|
||||
"ndsudo" = {
|
||||
source = "${cfg.package}/libexec/netdata/plugins.d/ndsudo.org";
|
||||
setuid = true;
|
||||
owner = "root";
|
||||
group = cfg.group;
|
||||
permissions = "u+rx,g+x,o-rwx";
|
||||
};
|
||||
};
|
||||
|
||||
security.pam.loginLimits = [
|
||||
|
||||
@@ -622,7 +622,11 @@ in {
|
||||
monado = handleTest ./monado.nix {};
|
||||
monetdb = handleTest ./monetdb.nix {};
|
||||
monica = handleTest ./web-apps/monica.nix {};
|
||||
mongodb = handleTest ./mongodb.nix {};
|
||||
mongodb = runTest ./mongodb.nix;
|
||||
mongodb-ce = runTest ({ config, ... }: {
|
||||
imports = [ ./mongodb.nix ];
|
||||
defaults.services.mongodb.package = config.node.pkgs.mongodb-ce;
|
||||
});
|
||||
moodle = handleTest ./moodle.nix {};
|
||||
moonraker = handleTest ./moonraker.nix {};
|
||||
mopidy = handleTest ./mopidy.nix {};
|
||||
|
||||
+33
-55
@@ -1,59 +1,37 @@
|
||||
# This test start mongodb, runs a query using mongo shell
|
||||
# This test starts mongodb and runs a query using mongo shell
|
||||
{ config, lib, ... }:
|
||||
let
|
||||
# required for test execution on darwin
|
||||
pkgs = config.node.pkgs;
|
||||
testQuery = pkgs.writeScript "nixtest.js" ''
|
||||
db.greetings.insertOne({ "greeting": "hello" });
|
||||
print(db.greetings.findOne().greeting);
|
||||
'';
|
||||
mongoshExe = lib.getExe pkgs.mongosh;
|
||||
in
|
||||
{
|
||||
name = "mongodb";
|
||||
meta.maintainers = with pkgs.lib.maintainers; [
|
||||
bluescreen303
|
||||
offline
|
||||
phile314
|
||||
niklaskorz
|
||||
];
|
||||
|
||||
import ./make-test-python.nix (
|
||||
{ pkgs, ... }:
|
||||
let
|
||||
testQuery = pkgs.writeScript "nixtest.js" ''
|
||||
db.greetings.insert({ "greeting": "hello" });
|
||||
print(db.greetings.findOne().greeting);
|
||||
'';
|
||||
nodes.mongodb = {
|
||||
services.mongodb.enable = true;
|
||||
};
|
||||
|
||||
runMongoDBTest = pkg: ''
|
||||
node.execute("(rm -rf data || true) && mkdir data")
|
||||
node.execute(
|
||||
"${pkg}/bin/mongod --fork --logpath logs --dbpath data"
|
||||
)
|
||||
node.wait_for_open_port(27017)
|
||||
testScript = ''
|
||||
start_all()
|
||||
|
||||
assert "hello" in node.succeed(
|
||||
"${pkg}/bin/mongo ${testQuery}"
|
||||
)
|
||||
with subtest("start mongodb"):
|
||||
mongodb.wait_for_unit("mongodb.service")
|
||||
mongodb.wait_for_open_port(27017)
|
||||
|
||||
node.execute(
|
||||
"${pkg}/bin/mongod --shutdown --dbpath data"
|
||||
)
|
||||
node.wait_for_closed_port(27017)
|
||||
'';
|
||||
|
||||
in
|
||||
{
|
||||
name = "mongodb";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [
|
||||
bluescreen303
|
||||
offline
|
||||
phile314
|
||||
];
|
||||
};
|
||||
|
||||
nodes = {
|
||||
node =
|
||||
{ ... }:
|
||||
{
|
||||
environment.systemPackages = with pkgs; [
|
||||
# remember to update mongodb.passthru.tests if you change this
|
||||
mongodb-7_0
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
testScript =
|
||||
''
|
||||
node.start()
|
||||
''
|
||||
+ runMongoDBTest pkgs.mongodb-7_0
|
||||
+ ''
|
||||
node.shutdown()
|
||||
'';
|
||||
}
|
||||
)
|
||||
with subtest("insert and find a document"):
|
||||
result = mongodb.succeed("${mongoshExe} ${testQuery}")
|
||||
print("Test output:", result)
|
||||
assert result.strip() == "hello"
|
||||
'';
|
||||
}
|
||||
|
||||
+66
-68
@@ -12,80 +12,78 @@ import ./make-test-python.nix (
|
||||
# Found 1 error in 1 file (checked 1 source file)
|
||||
skipTypeCheck = true;
|
||||
|
||||
nodes.machine =
|
||||
{ config, ... }:
|
||||
{
|
||||
# Automatically login on tty1 as a normal user:
|
||||
imports = [ ./common/user-account.nix ];
|
||||
services.getty.autologinUser = "alice";
|
||||
nodes.machine = {
|
||||
# Automatically login on tty1 as a normal user:
|
||||
imports = [ ./common/user-account.nix ];
|
||||
services.getty.autologinUser = "alice";
|
||||
|
||||
environment = {
|
||||
# For glinfo and wayland-info:
|
||||
systemPackages = with pkgs; [
|
||||
mesa-demos
|
||||
wayland-utils
|
||||
alacritty
|
||||
];
|
||||
# Use a fixed SWAYSOCK path (for swaymsg):
|
||||
variables = {
|
||||
"SWAYSOCK" = "/tmp/sway-ipc.sock";
|
||||
# TODO: Investigate if we can get hardware acceleration to work (via
|
||||
# virtio-gpu and Virgil). We currently have to use the Pixman software
|
||||
# renderer since the GLES2 renderer doesn't work inside the VM (even
|
||||
# with WLR_RENDERER_ALLOW_SOFTWARE):
|
||||
# "WLR_RENDERER_ALLOW_SOFTWARE" = "1";
|
||||
"WLR_RENDERER" = "pixman";
|
||||
};
|
||||
# For convenience:
|
||||
shellAliases = {
|
||||
test-x11 = "glinfo | tee /tmp/test-x11.out && touch /tmp/test-x11-exit-ok";
|
||||
test-wayland = "wayland-info | tee /tmp/test-wayland.out && touch /tmp/test-wayland-exit-ok";
|
||||
};
|
||||
|
||||
# To help with OCR:
|
||||
etc."xdg/foot/foot.ini".text = lib.generators.toINI { } {
|
||||
main = {
|
||||
font = "inconsolata:size=14";
|
||||
};
|
||||
colors = rec {
|
||||
foreground = "000000";
|
||||
background = "ffffff";
|
||||
regular2 = foreground;
|
||||
};
|
||||
};
|
||||
|
||||
etc."gpg-agent.conf".text = ''
|
||||
pinentry-timeout 86400
|
||||
'';
|
||||
environment = {
|
||||
# For glinfo and wayland-info:
|
||||
systemPackages = with pkgs; [
|
||||
mesa-demos
|
||||
wayland-utils
|
||||
alacritty
|
||||
];
|
||||
# Use a fixed SWAYSOCK path (for swaymsg):
|
||||
variables = {
|
||||
"SWAYSOCK" = "/tmp/sway-ipc.sock";
|
||||
# TODO: Investigate if we can get hardware acceleration to work (via
|
||||
# virtio-gpu and Virgil). We currently have to use the Pixman software
|
||||
# renderer since the GLES2 renderer doesn't work inside the VM (even
|
||||
# with WLR_RENDERER_ALLOW_SOFTWARE):
|
||||
# "WLR_RENDERER_ALLOW_SOFTWARE" = "1";
|
||||
"WLR_RENDERER" = "pixman";
|
||||
};
|
||||
# For convenience:
|
||||
shellAliases = {
|
||||
test-x11 = "glinfo | tee /tmp/test-x11.out && touch /tmp/test-x11-exit-ok";
|
||||
test-wayland = "wayland-info | tee /tmp/test-wayland.out && touch /tmp/test-wayland-exit-ok";
|
||||
};
|
||||
|
||||
fonts.packages = [ pkgs.inconsolata ];
|
||||
# To help with OCR:
|
||||
etc."xdg/foot/foot.ini".text = lib.generators.toINI { } {
|
||||
main = {
|
||||
font = "inconsolata:size=14";
|
||||
};
|
||||
colors = rec {
|
||||
foreground = "000000";
|
||||
background = "ffffff";
|
||||
regular2 = foreground;
|
||||
};
|
||||
};
|
||||
|
||||
# Automatically configure and start Sway when logging in on tty1:
|
||||
programs.bash.loginShellInit = ''
|
||||
if [ "$(tty)" = "/dev/tty1" ]; then
|
||||
set -e
|
||||
|
||||
mkdir -p ~/.config/sway
|
||||
sed s/Mod4/Mod1/ /etc/sway/config > ~/.config/sway/config
|
||||
|
||||
sway --validate
|
||||
sway && touch /tmp/sway-exit-ok
|
||||
fi
|
||||
etc."gpg-agent.conf".text = ''
|
||||
pinentry-timeout 86400
|
||||
'';
|
||||
|
||||
programs.sway = {
|
||||
enable = true;
|
||||
package = pkgs.swayfx.override { isNixOS = true; };
|
||||
};
|
||||
|
||||
# To test pinentry via gpg-agent:
|
||||
programs.gnupg.agent.enable = true;
|
||||
|
||||
# Need to switch to a different GPU driver than the default one (-vga std) so that Sway can launch:
|
||||
virtualisation.qemu.options = [ "-vga none -device virtio-gpu-pci" ];
|
||||
};
|
||||
|
||||
fonts.packages = [ pkgs.inconsolata ];
|
||||
|
||||
# Automatically configure and start Sway when logging in on tty1:
|
||||
programs.bash.loginShellInit = ''
|
||||
if [ "$(tty)" = "/dev/tty1" ]; then
|
||||
set -e
|
||||
|
||||
mkdir -p ~/.config/sway
|
||||
sed s/Mod4/Mod1/ /etc/sway/config > ~/.config/sway/config
|
||||
|
||||
sway --validate
|
||||
sway && touch /tmp/sway-exit-ok
|
||||
fi
|
||||
'';
|
||||
|
||||
programs.sway = {
|
||||
enable = true;
|
||||
package = pkgs.swayfx.override { isNixOS = true; };
|
||||
};
|
||||
|
||||
# To test pinentry via gpg-agent:
|
||||
programs.gnupg.agent.enable = true;
|
||||
|
||||
# Need to switch to a different GPU driver than the default one (-vga std) so that Sway can launch:
|
||||
virtualisation.qemu.options = [ "-vga none -device virtio-gpu-pci" ];
|
||||
};
|
||||
|
||||
testScript =
|
||||
{ nodes, ... }:
|
||||
''
|
||||
@@ -194,7 +192,7 @@ import ./make-test-python.nix (
|
||||
swaymsg("exec swaylock")
|
||||
machine.wait_until_succeeds("pgrep -x swaylock")
|
||||
machine.sleep(3)
|
||||
machine.send_chars("${nodes.machine.config.users.users.alice.password}")
|
||||
machine.send_chars("${nodes.machine.users.users.alice.password}")
|
||||
machine.send_key("ret")
|
||||
machine.wait_until_fails("pgrep -x swaylock")
|
||||
|
||||
|
||||
@@ -30,7 +30,22 @@ pythonPackages.buildPythonApplication rec {
|
||||
gst-plugins-base
|
||||
gst-plugins-good
|
||||
gst-plugins-ugly
|
||||
gst-plugins-rs
|
||||
# Required patches for the Spotify plugin (https://github.com/mopidy/mopidy-spotify/releases/tag/v5.0.0a3)
|
||||
(gst-plugins-rs.overrideAttrs (
|
||||
newAttrs: oldAttrs: {
|
||||
cargoDeps = oldAttrs.cargoDeps.overrideAttrs (oldAttrs': {
|
||||
vendorStaging = oldAttrs'.vendorStaging.overrideAttrs {
|
||||
inherit (newAttrs) patches;
|
||||
outputHash = "sha256-CegT8h+CJ6axipAD6E9drtrPJ9izRy/UCW14rbva5XA=";
|
||||
};
|
||||
});
|
||||
|
||||
# https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/1801/
|
||||
patches = oldAttrs.patches or [ ] ++ [
|
||||
./spotify-access-token-auth.patch
|
||||
];
|
||||
}
|
||||
))
|
||||
pipewire
|
||||
];
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -8,14 +8,14 @@
|
||||
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
pname = "mopidy-spotify";
|
||||
version = "5.0.0a2";
|
||||
version = "5.0.0a3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mopidy";
|
||||
repo = "mopidy-spotify";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-QeABG9rQKJ8sIoK38R74N0s5rRG+zws7AZR0xPysdcY=";
|
||||
hash = "sha256-pM+kqeWYiPXv9DZDBTgwiEwC6Sbqv6uz5vJ5odcixOw=";
|
||||
};
|
||||
|
||||
build-system = [ pythonPackages.setuptools ];
|
||||
|
||||
@@ -82,14 +82,14 @@ let
|
||||
];
|
||||
in
|
||||
mkDerivation rec {
|
||||
version = "3.34.14";
|
||||
version = "3.34.15";
|
||||
pname = "qgis-ltr-unwrapped";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qgis";
|
||||
repo = "QGIS";
|
||||
rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";
|
||||
hash = "sha256-4nptnzAvLOC8R1sqfdHJ4YYtotwcOARbu9fe4YKwIVM=";
|
||||
hash = "sha256-TFnlQIizI+8CZgNpwkuipSCNT3OYIaOeoz6kIGcSYL4=";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
||||
@@ -80,14 +80,14 @@ let
|
||||
urllib3
|
||||
];
|
||||
in mkDerivation rec {
|
||||
version = "3.40.2";
|
||||
version = "3.40.3";
|
||||
pname = "qgis-unwrapped";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qgis";
|
||||
repo = "QGIS";
|
||||
rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";
|
||||
hash = "sha256-8bcCpNgw4FV++qye8G3QXA3k0QCgqByODzPUTw0VX/E=";
|
||||
hash = "sha256-AUDohf71NIuEjFrzRQ8QsdvmEjYsZK9aI4j0msVJgcQ=";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
||||
@@ -126,11 +126,11 @@
|
||||
"vendorHash": "sha256-P7ykNhpFoPTINX3eo61/x/9Ts2Z9dscY/P5fQNRsmVo="
|
||||
},
|
||||
"azuread": {
|
||||
"hash": "sha256-m4ZzZFlcMBAfGN7tHjeYACMwxaG6rpUO4MPVMqjD7Hk=",
|
||||
"hash": "sha256-UV6jgVS8tzWiEBC/C/U7/2bGZ1sqk2MnS8xNRBuL+C8=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/azuread",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-azuread",
|
||||
"rev": "v3.0.2",
|
||||
"rev": "v3.1.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
@@ -180,13 +180,13 @@
|
||||
"vendorHash": "sha256-iNY6Jz/SKOLynx33smDFbg371Wa31CouNtrOuV7lkcw="
|
||||
},
|
||||
"bitwarden": {
|
||||
"hash": "sha256-zvl9B1RhViJ83/7i9ab1KvQc9Yfpzq3c1JIz+bzwVmM=",
|
||||
"hash": "sha256-A8x17x4BrtLXvJa/px/ktuhCyXxMZHhyCARxGiDMGTw=",
|
||||
"homepage": "https://registry.terraform.io/providers/maxlaverse/bitwarden",
|
||||
"owner": "maxlaverse",
|
||||
"repo": "terraform-provider-bitwarden",
|
||||
"rev": "v0.12.1",
|
||||
"rev": "v0.13.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-9k3+Qyural6S9xbqZ/NHXPFoo9cgLklIScTEBLuB0kA="
|
||||
"vendorHash": "sha256-whXQejYaYH4bMpIKVphfdfcB/V9ZW+O7CHjcGCnWFco="
|
||||
},
|
||||
"brightbox": {
|
||||
"hash": "sha256-pwFbCP+qDL/4IUfbPRCkddkbsEEeAu7Wp12/mDL0ABA=",
|
||||
@@ -480,20 +480,20 @@
|
||||
"vendorHash": "sha256-EiTWJ4bw8IwsRTD9Lt28Up2DXH0oVneO2IaO8VqWtkw="
|
||||
},
|
||||
"gitea": {
|
||||
"hash": "sha256-cIbDYFc6q6GMoQH9bqEA/LqC3MczAM7mewhYRRYQcy0=",
|
||||
"hash": "sha256-pbh3ADR77iVwHQ3e7krSUU+rNfhdA8zYnxLbTdnRfaU=",
|
||||
"homepage": "https://registry.terraform.io/providers/go-gitea/gitea",
|
||||
"owner": "go-gitea",
|
||||
"repo": "terraform-provider-gitea",
|
||||
"rev": "v0.5.1",
|
||||
"rev": "v0.6.0",
|
||||
"spdx": "MIT",
|
||||
"vendorHash": "sha256-7gA6KoP7NwjwItigBUeCg9AYQ/MggkOHOe/bH7Tf/xA="
|
||||
"vendorHash": "sha256-d8XoZzo2XS/wAPvdODAfK31qT1c+EoTbWlzzgYPiwq4="
|
||||
},
|
||||
"github": {
|
||||
"hash": "sha256-curdrL2vQ0bnD3ci3ZH1GYNz9JO8ycKaZstK+v//b28=",
|
||||
"hash": "sha256-RD2yGXClIYBa+Gs0IunPXKm0f0d1iFCVZSKUzXhlJyc=",
|
||||
"homepage": "https://registry.terraform.io/providers/integrations/github",
|
||||
"owner": "integrations",
|
||||
"repo": "terraform-provider-github",
|
||||
"rev": "v6.4.0",
|
||||
"rev": "v6.5.0",
|
||||
"spdx": "MIT",
|
||||
"vendorHash": null
|
||||
},
|
||||
@@ -750,20 +750,20 @@
|
||||
"vendorHash": "sha256-Q9LdhokZol1jhSfQVIRvPe1XrE8nVvc22aWHt7wkcHY="
|
||||
},
|
||||
"linode": {
|
||||
"hash": "sha256-lM0haU3tLbKaW+EJNMZp9ms/nTH3xEdhBAiIjFSUZ7s=",
|
||||
"hash": "sha256-qyHRGkhwq9YS/mYLFMXEkEdNtH3yfCrXIP4q/QdOzcY=",
|
||||
"homepage": "https://registry.terraform.io/providers/linode/linode",
|
||||
"owner": "linode",
|
||||
"repo": "terraform-provider-linode",
|
||||
"rev": "v2.31.1",
|
||||
"rev": "v2.32.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-WCD51W44xN+Qgojbcjrj3f9bUsVLN4itsY7ZBEen0YQ="
|
||||
"vendorHash": "sha256-1wwePyqy6ZLc3ZN0M2zZ6sxhVGZl7gWATv1xvcHBqB4="
|
||||
},
|
||||
"linuxbox": {
|
||||
"hash": "sha256-+8Wyrb/AjzpfhDK42ze0HBIAdGvtJUFEIpYZs7uOym4=",
|
||||
"hash": "sha256-svQRz1/PdVLpHoxOam1sfRTwHqgqs4ohJQs3IPMMAM4=",
|
||||
"homepage": "https://registry.terraform.io/providers/numtide/linuxbox",
|
||||
"owner": "numtide",
|
||||
"repo": "terraform-provider-linuxbox",
|
||||
"rev": "v0.5.6",
|
||||
"rev": "v0.5.8",
|
||||
"spdx": "BSD-3-Clause",
|
||||
"vendorHash": "sha256-GxMCY/udIy3c7zLeNeghXtfCUw4+Ll83L/40N4/yVh8="
|
||||
},
|
||||
@@ -985,11 +985,11 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"pagerduty": {
|
||||
"hash": "sha256-C0Ded8XrPh+yeN+0SvrOPaKONTWvvj4J15xsaXgsri4=",
|
||||
"hash": "sha256-r0F+WSEY7j2AesQ0sDixOe9uKD0hOIdSzDYEhC8yEDA=",
|
||||
"homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty",
|
||||
"owner": "PagerDuty",
|
||||
"repo": "terraform-provider-pagerduty",
|
||||
"rev": "v3.18.3",
|
||||
"rev": "v3.19.2",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
@@ -1111,13 +1111,13 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"selectel": {
|
||||
"hash": "sha256-Wd9HX3Tvoi84t3NulTQlOWWvbsMPNC0mn1yEDmlmnb8=",
|
||||
"hash": "sha256-bXPH/1fEuGehOOSTXsR/yi0BiR8zneIc2KUqOEoG5Qw=",
|
||||
"homepage": "https://registry.terraform.io/providers/selectel/selectel",
|
||||
"owner": "selectel",
|
||||
"repo": "terraform-provider-selectel",
|
||||
"rev": "v6.0.1",
|
||||
"rev": "v6.1.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-JytWDb7d2RW/fp5rptAzmfTTuytZ+lp6cB05ol9mhhM="
|
||||
"vendorHash": "sha256-LRs2zI5L5qdWiM8VexQPkP8SjrO/sVEj/MOX+n4NKSc="
|
||||
},
|
||||
"sentry": {
|
||||
"hash": "sha256-2JfzteVripOz96bAtQXC32wi8dWUQw8bry0HllNRQRA=",
|
||||
@@ -1138,13 +1138,13 @@
|
||||
"vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0="
|
||||
},
|
||||
"signalfx": {
|
||||
"hash": "sha256-qZHbeQDbyahUuYLhWFqBogG+w2pI1XAUdPvcNTngQUw=",
|
||||
"hash": "sha256-C8LyILuqT15NqqzBrj09N+Nx9KMhE/oBPfXtc8gPfns=",
|
||||
"homepage": "https://registry.terraform.io/providers/splunk-terraform/signalfx",
|
||||
"owner": "splunk-terraform",
|
||||
"repo": "terraform-provider-signalfx",
|
||||
"rev": "v9.5.0",
|
||||
"rev": "v9.6.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-EnEfch59DIBzK8fmhZ1mvTSxPSjtxMTAOUMeocHgA8I="
|
||||
"vendorHash": "sha256-ijq03YXHiSKOgjG9gbyNHPUsYlYHi9nY4pmhMxM5CrI="
|
||||
},
|
||||
"skytap": {
|
||||
"hash": "sha256-JII4czazo6Di2sad1uFHMKDO2gWgZlQE8l/+IRYHQHU=",
|
||||
@@ -1183,11 +1183,11 @@
|
||||
"vendorHash": "sha256-YFV+qXD78eajSeagJPgPu+qIktx1Vh/ZT0fUPOBuZyo="
|
||||
},
|
||||
"spacelift": {
|
||||
"hash": "sha256-RWrhVeXPEgFYFGh34vFargTrZH+3CxY36+i0lmFSjXg=",
|
||||
"hash": "sha256-qa+mBk57B2lauJI8k6t4BLksyKVM9tXKQOzo0ky/gAQ=",
|
||||
"homepage": "https://registry.terraform.io/providers/spacelift-io/spacelift",
|
||||
"owner": "spacelift-io",
|
||||
"repo": "terraform-provider-spacelift",
|
||||
"rev": "v1.19.0",
|
||||
"rev": "v1.19.1",
|
||||
"spdx": "MIT",
|
||||
"vendorHash": "sha256-c3R/7k7y7XS2Qli00nSj7gh/3Mj88PY4WybBTq/+pPs="
|
||||
},
|
||||
@@ -1355,13 +1355,13 @@
|
||||
"vendorHash": "sha256-Dxd/2TjxPoa+JcHlmmcoPx2wegZJzhbI1abNmF4wDik="
|
||||
},
|
||||
"vault": {
|
||||
"hash": "sha256-vMt7FyNY+Tv7C+YT4h6BOn4EDU5ypOHQvtW0VtQiifg=",
|
||||
"hash": "sha256-6xS+d1oDaRz6UVyK9Z3h4LPo2jZ0iVwzfVw1e6PHnDc=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/vault",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-vault",
|
||||
"rev": "v4.5.0",
|
||||
"rev": "v4.6.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-tg1LBq8K8loMkPUXPMEi9Y4Epg0ZfpaYADfWLaZ2k3U="
|
||||
"vendorHash": "sha256-H53MSJVW5hmG16VmTrHsSnphsgp8DG9B/Ur3SGDhSxE="
|
||||
},
|
||||
"vcd": {
|
||||
"hash": "sha256-W+ffIT70IaePg3xfOaQgCjPTWTN3iSAYwkf+s+zkB84=",
|
||||
@@ -1373,13 +1373,13 @@
|
||||
"vendorHash": "sha256-eCIJ2w8DjmUCGp0VbliLaQ6C29mJhl6Spya06Xyiqd4="
|
||||
},
|
||||
"venafi": {
|
||||
"hash": "sha256-9Nn2dFF9W8STQoRXFNiXYCrHEWiirNvOAAS1f1brutw=",
|
||||
"hash": "sha256-/fRqTu/M3OHR5v7pWAE04ijq70F7MxRILP1Ab2hw7gs=",
|
||||
"homepage": "https://registry.terraform.io/providers/Venafi/venafi",
|
||||
"owner": "Venafi",
|
||||
"repo": "terraform-provider-venafi",
|
||||
"rev": "v0.21.1",
|
||||
"rev": "v0.21.2",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-xZTd/L5ZRTRuDsdyNZEZPmlOu9nUIAE5W1UG94aOS/o="
|
||||
"vendorHash": "sha256-kZ0JLjAYu3b01zHfp+VWTZ8sUCivfaS1Ld2/SDMOrks="
|
||||
},
|
||||
"vinyldns": {
|
||||
"hash": "sha256-ow+o9fRw/t2i4N65zuVFbfPb68ZUcJfNB5ARYqRTsIs=",
|
||||
@@ -1418,13 +1418,13 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"vsphere": {
|
||||
"hash": "sha256-7tLqWVJL5G+OMtGVNkpfJZ6xfZ8hJy6gsitUVd0NHGc=",
|
||||
"hash": "sha256-8xJOuafposGNtFw6ZMfrmoGOp67rubOdrLDR9DFRxdg=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/vsphere",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-vsphere",
|
||||
"rev": "v2.10.0",
|
||||
"rev": "v2.11.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-kjS1YYMoE5IBeKWXnxzO3nFp6NpBEwUCaTzO0VSBDLA="
|
||||
"vendorHash": "sha256-nQM1RcdgndUwHJWAspu/INFSXBoXJgAFBZR1x2txCkE="
|
||||
},
|
||||
"vultr": {
|
||||
"hash": "sha256-vgeTK5fGHYzHCBdxq1JN9agK6+jYGkCkFnAWrkIz/gM=",
|
||||
|
||||
@@ -9,32 +9,32 @@ let
|
||||
versions =
|
||||
if stdenv.hostPlatform.isLinux then
|
||||
{
|
||||
stable = "0.0.80";
|
||||
ptb = "0.0.126";
|
||||
canary = "0.0.569";
|
||||
stable = "0.0.81";
|
||||
ptb = "0.0.127";
|
||||
canary = "0.0.574";
|
||||
development = "0.0.67";
|
||||
}
|
||||
else
|
||||
{
|
||||
stable = "0.0.332";
|
||||
ptb = "0.0.156";
|
||||
canary = "0.0.681";
|
||||
development = "0.0.76";
|
||||
stable = "0.0.333";
|
||||
ptb = "0.0.157";
|
||||
canary = "0.0.686";
|
||||
development = "0.0.78";
|
||||
};
|
||||
version = versions.${branch};
|
||||
srcs = rec {
|
||||
x86_64-linux = {
|
||||
stable = fetchurl {
|
||||
url = "https://stable.dl2.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
|
||||
hash = "sha256-oamuF2LcdBC2HUzB08lTlxvrXjE6YFBXwLJDrmYKRXM=";
|
||||
hash = "sha256-V3xaBbCZX1TUaXxLbMOhJ8VFKMZBfCR/w5ajrAvu2kQ=";
|
||||
};
|
||||
ptb = fetchurl {
|
||||
url = "https://ptb.dl2.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
|
||||
hash = "sha256-4OvGEeOP4i4j7WwMjnnSvaNQ2e5RZ0EMF797xoIsWMY=";
|
||||
hash = "sha256-mgR2MDQ3ZtgBltQPOxT6773aNUx5hH2P6LvFJFEuUts=";
|
||||
};
|
||||
canary = fetchurl {
|
||||
url = "https://canary.dl2.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
|
||||
hash = "sha256-akbcAPuxF1pl4u2Cw/I7rlv8WVDsIZDPPpGRUt1qQvA=";
|
||||
hash = "sha256-pZdHl7U3aNmxe6PtaK7JbQ7XdAPtlTAUuGcBRFkQI3s=";
|
||||
};
|
||||
development = fetchurl {
|
||||
url = "https://development.dl2.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz";
|
||||
@@ -44,19 +44,19 @@ let
|
||||
x86_64-darwin = {
|
||||
stable = fetchurl {
|
||||
url = "https://stable.dl2.discordapp.net/apps/osx/${version}/Discord.dmg";
|
||||
hash = "sha256-ZIAFYbC4rRjb9Lz3E50TfR0Lgdmg0MZllxy+vk36Eg8=";
|
||||
hash = "sha256-ebPbTIiaZ2hMoJdVCax0hT2bLUFLj5fuIf2e74qLHns=";
|
||||
};
|
||||
ptb = fetchurl {
|
||||
url = "https://ptb.dl2.discordapp.net/apps/osx/${version}/DiscordPTB.dmg";
|
||||
hash = "sha256-Uluw2l/yAFzy4uMzp9ugFri8Psl7hy50H7QHag+St10=";
|
||||
hash = "sha256-bZ9LVthjBib/yRfDTIXBNKDulWhW35HOdSDyEyjyLyA=";
|
||||
};
|
||||
canary = fetchurl {
|
||||
url = "https://canary.dl2.discordapp.net/apps/osx/${version}/DiscordCanary.dmg";
|
||||
hash = "sha256-OmN8g5Skg/KmdO8sv8iOhbZOFU/XUyUqvSthEam6RNE=";
|
||||
hash = "sha256-F3vLcLjNhYRGnOyuNziwtbBNxiUKgw6wZaa1LbVF5PU=";
|
||||
};
|
||||
development = fetchurl {
|
||||
url = "https://development.dl2.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg";
|
||||
hash = "sha256-GyHOJcxWoKdFJ5/oca5JFwu5OdGGykR4OXGMaa3XfiY=";
|
||||
hash = "sha256-SkPMUbRiY5C4sHHcnpneibG8kazHfJ3ohT1h0jbx4F8=";
|
||||
};
|
||||
};
|
||||
aarch64-darwin = x86_64-darwin;
|
||||
|
||||
+2
-2
@@ -46,14 +46,14 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "telegram-desktop-unwrapped";
|
||||
version = "5.10.3";
|
||||
version = "5.10.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "telegramdesktop";
|
||||
repo = "tdesktop";
|
||||
rev = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-AsxCDh/pneRHVuGtlqFYD6c9pezmKo/wrMU4RPtWlXA=";
|
||||
hash = "sha256-3v9B4tdD9oNyQ96t21VRmV43Ib7l6ki8DlFXmbk7DJw=";
|
||||
};
|
||||
|
||||
postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
|
||||
@@ -11,25 +11,29 @@
|
||||
glib,
|
||||
libxml2,
|
||||
coreutils,
|
||||
sqlite,
|
||||
}:
|
||||
let
|
||||
pname = "blast-bin";
|
||||
version = "2.14.1";
|
||||
version = "2.16.0";
|
||||
|
||||
srcs = rec {
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/${version}/ncbi-blast-${version}+-x64-linux.tar.gz";
|
||||
hash = "sha256-OO8MNOk6k0J9FlAGyCOhP+hirEIT6lL+rIInB8dQWEU=";
|
||||
hash = "sha256-sLEwmMkB0jsyStFwDnRxu3QIp/f1F9dNX6rXEb526PQ=";
|
||||
};
|
||||
aarch64-linux = fetchurl {
|
||||
url = "https://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/${version}/ncbi-blast-${version}+-aarch64-linux.tar.gz";
|
||||
hash = "sha256-JlOyoxZQBbvUcHIMv5muTuGQgrh2uom3rzDurhHQ+FM=";
|
||||
hash = "sha256-1EeiMu08R9Glq8qRky4OTT5lQPLJcM7iaqUrmUOS4MI=";
|
||||
};
|
||||
x86_64-darwin = fetchurl {
|
||||
url = "https://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/${version}/ncbi-blast-${version}+-x64-macosx.tar.gz";
|
||||
hash = "sha256-eMfuwMCD6VlDgeshLslDhYBBp0YOpL+6q/zSchR0bAs=";
|
||||
hash = "sha256-fu4edyD12q8G452ckrEl2Qct5+uB9JnABd7bCLkyMkw=";
|
||||
};
|
||||
aarch64-darwin = fetchurl {
|
||||
url = "https://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/${version}/ncbi-blast-${version}+-aarch64-macosx.tar.gz";
|
||||
hash = "sha256-6NpPNLBCHaBRscLZ5fjh5Dv3bjjPk2Gh2+L7xEtiJNs=";
|
||||
};
|
||||
aarch64-darwin = x86_64-darwin;
|
||||
};
|
||||
src = srcs.${stdenv.hostPlatform.system};
|
||||
in
|
||||
@@ -48,6 +52,7 @@ stdenv.mkDerivation {
|
||||
bzip2
|
||||
glib
|
||||
libxml2
|
||||
sqlite
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "git-stack";
|
||||
version = "0.10.17";
|
||||
version = "0.10.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gitext-rs";
|
||||
repo = "git-stack";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-foItJSZ6jsLuWkO/c1Ejb45dSdzZ/ripieyVIYsEyy0=";
|
||||
hash = "sha256-iFoxYq4NHC/K0ruPDXHfayZDglebBJE00V57HUH9Y84=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-MEhUmy4ijR/zHm/qMt4PqNGYnCfIgjNaL9SlMmXCMmc=";
|
||||
cargoHash = "sha256-kX0eOqp3emGEYZPIzkP62WpfH8mTxMi7zB+nwtpSFuk=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
Security
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
{
|
||||
buildLua,
|
||||
curl,
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
nix-update-script,
|
||||
}:
|
||||
buildLua (finalAttrs: {
|
||||
pname = "twitch-chat";
|
||||
version = "0-unstable-2024-06-23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CrendKing";
|
||||
repo = "mpv-twitch-chat";
|
||||
rev = "bb0c2e84675f4f1e0c221c8e1d3516b60242b985";
|
||||
hash = "sha256-WyNPUiAs5U/vrjNbAgyqkfoxh9rabLmuZ1zG5uZYxaw=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -D main.lua $out/share/mpv/scripts/twitch-chat.lua
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.extraWrapperArgs = [
|
||||
"--prefix"
|
||||
"PATH"
|
||||
":"
|
||||
(lib.makeBinPath [ curl ])
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [ "--version=branch" ];
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Show Twitch chat messages as subtitles when watching Twitch VOD with mpv.";
|
||||
homepage = "https://github.com/CrendKing/mpv-twitch-chat";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.naho ];
|
||||
};
|
||||
})
|
||||
@@ -0,0 +1,31 @@
|
||||
diff --git a/plugins/LinuxVST/CMakeLists.txt b/plugins/LinuxVST/CMakeLists.txt
|
||||
index f43ea128..b87a5c03 100755
|
||||
--- a/plugins/LinuxVST/CMakeLists.txt
|
||||
+++ b/plugins/LinuxVST/CMakeLists.txt
|
||||
@@ -2,11 +2,24 @@ cmake_minimum_required(VERSION 3.9)
|
||||
project(airwindows_ports)
|
||||
|
||||
set(CMAKE_CXX_STANDARD 14)
|
||||
-add_compile_options(-O2 -D__cdecl=)
|
||||
+add_compile_options(-D__cdecl=)
|
||||
+
|
||||
+set(VST2_SDK_PATH "${PROJECT_SOURCE_DIR}/include/vstsdk" CACHE STRING "VST2 SDK Path")
|
||||
+
|
||||
+set(VSTSDK_ROOT
|
||||
+ "${VST2_SDK_PATH}"
|
||||
+ "${VST2_SDK_PATH}/pluginterfaces/vst2.x/"
|
||||
+ "${VST2_SDK_PATH}/public.sdk/source/vst2.x/"
|
||||
+)
|
||||
+
|
||||
+set(VSTSDK_SOURCES
|
||||
+ "${VST2_SDK_PATH}/public.sdk/source/vst2.x/audioeffectx.cpp"
|
||||
+ "${VST2_SDK_PATH}/public.sdk/source/vst2.x/audioeffect.cpp"
|
||||
+ "${VST2_SDK_PATH}/public.sdk/source/vst2.x/vstplugmain.cpp"
|
||||
+)
|
||||
|
||||
include(Helpers.cmake)
|
||||
|
||||
-add_subdirectory(include/vstsdk)
|
||||
add_airwindows_plugin(Acceleration)
|
||||
add_airwindows_plugin(Acceleration2)
|
||||
add_airwindows_plugin(ADClip7)
|
||||
@@ -0,0 +1,89 @@
|
||||
{
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchzip,
|
||||
lib,
|
||||
cmake,
|
||||
nix-update-script,
|
||||
}:
|
||||
let
|
||||
# adapted from oxefmsynth
|
||||
vst-sdk = stdenv.mkDerivation {
|
||||
dontConfigure = true;
|
||||
dontPatch = true;
|
||||
dontBuild = true;
|
||||
dontStrip = true;
|
||||
dontPatchELF = true;
|
||||
|
||||
name = "vstsdk3610_11_06_2018_build_37";
|
||||
src = fetchzip {
|
||||
url = "https://web.archive.org/web/20181016150224if_/https://download.steinberg.net/sdk_downloads/vstsdk3610_11_06_2018_build_37.zip";
|
||||
sha256 = "0da16iwac590wphz2sm5afrfj42jrsnkr1bxcy93lj7a369ildkj";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
cp -r VST2_SDK $out
|
||||
'';
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "airwindows";
|
||||
version = "0-unstable-2025-01-06";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "airwindows";
|
||||
repo = "airwindows";
|
||||
rev = "0ca33035253b9fc0c6c876592d9e5ff3a654cd10";
|
||||
hash = "sha256-+AyB6y179BRWTvflA9Ld5utpF2scSJDszkGa8BCvPdM=";
|
||||
};
|
||||
|
||||
# we patch helpers because honestly im spooked out by where those variables
|
||||
# came from.
|
||||
prePatch = ''
|
||||
mkdir -p plugins/LinuxVST/include
|
||||
ln -s ${vst-sdk.out} plugins/LinuxVST/include/vstsdk
|
||||
'';
|
||||
|
||||
patches = [
|
||||
./cmakelists-and-helper.patch
|
||||
];
|
||||
|
||||
# we are building for linux, so we go to linux
|
||||
preConfigure = ''
|
||||
cd plugins/LinuxVST
|
||||
'';
|
||||
|
||||
cmakeBuildType = "Release";
|
||||
|
||||
cmakeFlags = [ ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
vst-sdk
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/lib/vst/airwindows
|
||||
find "$PWD" -type f -name "*.so" -exec install -Dm755 {} $out/lib/vst/airwindows \;
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
|
||||
|
||||
meta = {
|
||||
description = "All Airwindows VST Plugins";
|
||||
homepage = "https://airwindows.com/";
|
||||
platforms = lib.platforms.linux;
|
||||
license = [
|
||||
lib.licenses.mit
|
||||
lib.licenses.unfree
|
||||
];
|
||||
maintainers = [ lib.maintainers.l1npengtul ];
|
||||
};
|
||||
}
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (self: {
|
||||
pname = "alacritty-theme";
|
||||
version = "0-unstable-2025-01-03";
|
||||
version = "0-unstable-2025-01-21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alacritty";
|
||||
repo = "alacritty-theme";
|
||||
rev = "aff9d111d43e1ad5c22d4e27fc1c98176e849fb9";
|
||||
hash = "sha256-GxCdyBihypHKkPlCVGiTAD4dP3ggkSyQSNS5AKUhSVo=";
|
||||
rev = "69d07c3bc280add63906a1cebf6be326687bc9eb";
|
||||
hash = "sha256-G8sUu8GD44uqUyQ7sZrgrGxC4IOfhSn++WIc+U67zL0=";
|
||||
sparseCheckout = [ "themes" ];
|
||||
};
|
||||
|
||||
|
||||
@@ -5,16 +5,16 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "alpaca-proxy";
|
||||
version = "2.0.9";
|
||||
version = "2.0.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "samuong";
|
||||
repo = "alpaca";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Rf8//4FeruVZZ//uba80z20XGUxycwF91Aa09fosRXI=";
|
||||
hash = "sha256-1CMuZl1bVlofogPwA2wRuQPlXNE2EM1B8rDDDaJGq64=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-JEiHgyPJvWmtPf8R4aX/qlevfZRdKajre324UsgRm5Y=";
|
||||
vendorHash = "sha256-N9qpyCQg6H1v/JGJ2wCxDX+ZTM9x6/BM6wQ26xC+dlE=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -11,11 +11,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "betterdisplay";
|
||||
version = "3.3.0";
|
||||
version = "3.3.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/waydabber/BetterDisplay/releases/download/v${finalAttrs.version}/BetterDisplay-v${finalAttrs.version}.dmg";
|
||||
hash = "sha256-A0kh3XNdl5kJ32Kxwb0PAgxfGJR+EZEoaP+gspRJEcU=";
|
||||
hash = "sha256-4hS+F9cPgQ6HEzX7RkikANyJqc2bMAhKCYlL1lmka54=";
|
||||
};
|
||||
|
||||
dontPatch = true;
|
||||
|
||||
@@ -3,13 +3,10 @@
|
||||
buildNpmPackage,
|
||||
cargo,
|
||||
copyDesktopItems,
|
||||
electron_32,
|
||||
electron_33,
|
||||
fetchFromGitHub,
|
||||
glib,
|
||||
gnome-keyring,
|
||||
gtk3,
|
||||
jq,
|
||||
libsecret,
|
||||
makeDesktopItem,
|
||||
makeWrapper,
|
||||
napi-rs-cli,
|
||||
@@ -26,7 +23,7 @@
|
||||
let
|
||||
description = "Secure and free password manager for all of your devices";
|
||||
icon = "bitwarden";
|
||||
electron = electron_32;
|
||||
electron = electron_33;
|
||||
|
||||
bitwardenDesktopNativeArch =
|
||||
{
|
||||
@@ -39,13 +36,13 @@ let
|
||||
in
|
||||
buildNpmPackage rec {
|
||||
pname = "bitwarden-desktop";
|
||||
version = "2024.12.1";
|
||||
version = "2025.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bitwarden";
|
||||
repo = "clients";
|
||||
rev = "desktop-v${version}";
|
||||
hash = "sha256-nmQUfVhSJrnYWbxjNk0r6vEtPqA8kksEX5gUmpeKe6M=";
|
||||
hash = "sha256-0NXrTBkCyo9Hw+fyFTfXfa1efBlaM6xWd9Uvsbathpw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -70,7 +67,7 @@ buildNpmPackage rec {
|
||||
"--legacy-peer-deps"
|
||||
];
|
||||
npmWorkspace = "apps/desktop";
|
||||
npmDepsHash = "sha256-5rOA7xtw2jqjoLxEl4lsLWpv32/TYmEaK+UN7R8EoJc=";
|
||||
npmDepsHash = "sha256-DDsPkvLGOhjmdYEOmhZfe4XHGFyowvWO24YcCA5griM=";
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit pname version src;
|
||||
@@ -82,7 +79,7 @@ buildNpmPackage rec {
|
||||
) patches;
|
||||
patchFlags = [ "-p4" ];
|
||||
sourceRoot = "${src.name}/${cargoRoot}";
|
||||
hash = "sha256-Fh6pbmFof/qIhVETtBA1fGlC45fuu1n7g9hosvmfHZc=";
|
||||
hash = "sha256-IL8+n+rhRbvRO1jxJSy9PjUMb/tI4S/gzpUNOojBPWk=";
|
||||
};
|
||||
cargoRoot = "apps/desktop/desktop_native";
|
||||
|
||||
@@ -100,12 +97,6 @@ buildNpmPackage rec {
|
||||
rustPlatform.cargoSetupHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
gtk3
|
||||
libsecret
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
if [[ $(jq --raw-output '.devDependencies.electron' < package.json | grep -E --only-matching '^[0-9]+') != ${lib.escapeShellArg (lib.versions.major electron.version)} ]]; then
|
||||
echo 'ERROR: electron version mismatch'
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "bngblaster";
|
||||
version = "0.9.14";
|
||||
version = "0.9.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rtbrick";
|
||||
repo = "bngblaster";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-vToKrP/T3qVb9UylNyZRvP+kWoizIjjXTbVlNebKG/M=";
|
||||
hash = "sha256-HqwyqUkLYoXTjx01pB8sL3hBXwLqe441M+LTqBhaZ58=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -12,16 +12,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-binstall";
|
||||
version = "1.10.19";
|
||||
version = "1.10.22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cargo-bins";
|
||||
repo = "cargo-binstall";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-dKQRXEZfvONaWocvoaEQtENAyNvIUaqomckaSj7bUtM=";
|
||||
hash = "sha256-b2Cn5FWXmI5ij98A8Y0KUm8LGB73Ho2UzhrOd+7eCEg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-gN6aNPV6K8BUTUvTTKtTu54JFLwL1XSA0rA4EyKdovc=";
|
||||
cargoHash = "sha256-LbfgOfd6ubAWP6l5gi5Xd737LxgymlDS2+qdhr+FJPE=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-modules";
|
||||
version = "0.21.1";
|
||||
version = "0.21.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "regexident";
|
||||
repo = "cargo-modules";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-QVG/N+t6fify6I9uvLAqWLagmEnhd5i5Iz9HWdysmzk=";
|
||||
hash = "sha256-mrl1I1dmf2WqtUbBsUq3kgqPwc4S/EaYRc/B9hpEo90=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-9SzM9jkAcnRctNedImoH+32hVAtPAkXLzxgmOo3Dcxc=";
|
||||
cargoHash = "sha256-6vmd7yQcDf1keu6uPKJFRMpt3ZgRe1M3AfUZjf1KBIk=";
|
||||
|
||||
checkFlags = [
|
||||
"--skip=cfg_test::with_tests::smoke"
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "circup";
|
||||
version = "2.1.0";
|
||||
version = "2.1.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "adafruit";
|
||||
repo = "circup";
|
||||
tag = version;
|
||||
hash = "sha256-4jmqS/XMB8t7aMfHriipi+VnCbZqrqjt21K5ktes2ec=";
|
||||
hash = "sha256-G2c2Psd5cyjKkpqYQOLVWSeLIWdoxYm45KLT0q7cTzQ=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "semver" ];
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "clapboard";
|
||||
version = "1.0.0";
|
||||
version = "1.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bjesus";
|
||||
repo = "clapboard";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-dXlUOIYgptYqUIIC7batc0TVQeP89i8vizwYSIUlzGA=";
|
||||
hash = "sha256-TM07BcluIh+MEcVg1ApZu85rj36ZBUfn125A0eALNMo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Ll2fpH0v3ZWizrl6Mip0gaPCHlQAdddh9F9bNXveb/0=";
|
||||
cargoHash = "sha256-Oz/UWN/Ck4uxGQjnaE9KB70AElCjqjJaZLGU71nh6N8=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Wayland clipboard manager that will make you clap";
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "codeql";
|
||||
version = "2.20.1";
|
||||
version = "2.20.2";
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";
|
||||
hash = "sha256-9BNp4PxRL9YbzQ/AeW6EFk6xv1XmwDwxZgu3DL79H8w=";
|
||||
hash = "sha256-t2CT2bseVlVVt5h5j9r9usdr7za2ki+qYSsm5wG7kk8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
Generated
+28
-33
@@ -1,73 +1,73 @@
|
||||
[
|
||||
{
|
||||
"pname": "Boogie",
|
||||
"version": "3.1.3",
|
||||
"hash": "sha256-0XQcD1ImPNPXQ43fTkahC3qr2zUvHNdmgw0tmYE+7Hc="
|
||||
"version": "3.2.5",
|
||||
"hash": "sha256-/ZbKajyZuBV3zyh7JfwBfrcxaRpIkUfWGOjxB1qExX8="
|
||||
},
|
||||
{
|
||||
"pname": "Boogie.AbstractInterpretation",
|
||||
"version": "3.2.3",
|
||||
"hash": "sha256-SwJ5D3tOU+qcyQdNITIM15ujMEC++aXHOsUSovWbsC4="
|
||||
"version": "3.4.3",
|
||||
"hash": "sha256-s3cykv7AMeC+UhmYzGdM75/3/7CxX4h292DGTE9Yd4U="
|
||||
},
|
||||
{
|
||||
"pname": "Boogie.BaseTypes",
|
||||
"version": "3.2.3",
|
||||
"hash": "sha256-cIUdpGGjMKn70Z0nD8rvva8UbFSoLDUrBprC+TMG/EA="
|
||||
"version": "3.4.3",
|
||||
"hash": "sha256-vSjGt+GKK2oGNY9ZJTvDT8A/H+eCbm1D+CppoKIWW88="
|
||||
},
|
||||
{
|
||||
"pname": "Boogie.CodeContractsExtender",
|
||||
"version": "3.2.3",
|
||||
"hash": "sha256-L+phJ66oHNINliPkabU3vO4Vl9Lkv+nug+DWC8VmFlc="
|
||||
"version": "3.4.3",
|
||||
"hash": "sha256-mb8RXgKJCutupsg/oFxMENlltn5nmjt7bXAodN6t9dA="
|
||||
},
|
||||
{
|
||||
"pname": "Boogie.Concurrency",
|
||||
"version": "3.2.3",
|
||||
"hash": "sha256-w+5B+uyfKCf8j8hP0G/SSPUd2lT2T8A4Lkg0tsxniBg="
|
||||
"version": "3.4.3",
|
||||
"hash": "sha256-piDvI01lZb23LkL/NX+NDnGVnHn1q4B/YoS7FrcQZ+M="
|
||||
},
|
||||
{
|
||||
"pname": "Boogie.Core",
|
||||
"version": "3.2.3",
|
||||
"hash": "sha256-qqoeLAdpRRaTISdgxyE3iFqhrmezxISaE5bm02rXVyE="
|
||||
"version": "3.4.3",
|
||||
"hash": "sha256-EUckeyktsBHLVCQlf9CQtx3vmgts2zpVcS0NiVw6WlY="
|
||||
},
|
||||
{
|
||||
"pname": "Boogie.ExecutionEngine",
|
||||
"version": "3.2.3",
|
||||
"hash": "sha256-8EKwiBnoMFGxeK2+IuG5p6BtnPlR0CCekXi4PBFLEbU="
|
||||
"version": "3.4.3",
|
||||
"hash": "sha256-+57PiqmW9CJuHYoAt6hMuWOveZpZTztwUrzzQsajo2A="
|
||||
},
|
||||
{
|
||||
"pname": "Boogie.Graph",
|
||||
"version": "3.2.3",
|
||||
"hash": "sha256-7XjrCHSnvEL7eMmma2vKA7r8YGJe8Oo4E8U9Wja/al0="
|
||||
"version": "3.4.3",
|
||||
"hash": "sha256-eWn8EWUlWZQ2U06anUBaPfdBNzqK5xP7xdntSB7F3mw="
|
||||
},
|
||||
{
|
||||
"pname": "Boogie.Houdini",
|
||||
"version": "3.2.3",
|
||||
"hash": "sha256-g7i0yF/89IWXElTi0onOgvPaesqlPGl3qINMCePHGA8="
|
||||
"version": "3.4.3",
|
||||
"hash": "sha256-BJLTqC2ih5XHLCmzf/4TKUZCpUCf6PmBTujIIRykLcc="
|
||||
},
|
||||
{
|
||||
"pname": "Boogie.Model",
|
||||
"version": "3.2.3",
|
||||
"hash": "sha256-gRMZQQFMjQEQasg3A3iZ9/0KUWCxAoUPiHPZHbWXUs4="
|
||||
"version": "3.4.3",
|
||||
"hash": "sha256-3CrdoCM85IkZ7E8gTdmUspmUFbYpBu1PmbF4a2U7I8E="
|
||||
},
|
||||
{
|
||||
"pname": "Boogie.Provers.LeanAuto",
|
||||
"version": "3.2.3",
|
||||
"hash": "sha256-kMLvTTnvKWjggSby7D4jkaRmdvvOum0ZlfM6yU2760Q="
|
||||
"version": "3.4.3",
|
||||
"hash": "sha256-GJY7XUBFhL6N7U8QJmvCc7G8k3pV8LfyMhDev37GmFc="
|
||||
},
|
||||
{
|
||||
"pname": "Boogie.Provers.SMTLib",
|
||||
"version": "3.2.3",
|
||||
"hash": "sha256-SCfEJCRueTE66ZZbHX8FHpD50SrBDQne8725uiKjbvM="
|
||||
"version": "3.4.3",
|
||||
"hash": "sha256-llI/WhQsM8KygDB/OYY5yc8U9SN3rd3NCkWFsB3yCDM="
|
||||
},
|
||||
{
|
||||
"pname": "Boogie.VCExpr",
|
||||
"version": "3.2.3",
|
||||
"hash": "sha256-U6Rc5P0dUtNZ1IGDBU4hggwreVxSZqu6cZSKcWLpq/o="
|
||||
"version": "3.4.3",
|
||||
"hash": "sha256-muY74ki4Cq8JoA4tGUxxWPNAlGhAq4dtGTSoCxNQZm0="
|
||||
},
|
||||
{
|
||||
"pname": "Boogie.VCGeneration",
|
||||
"version": "3.2.3",
|
||||
"hash": "sha256-snbFiueD508B1GLqIC8cQdT9jW2jkRyhmYxPTlfnyrQ="
|
||||
"version": "3.4.3",
|
||||
"hash": "sha256-ngZtONjWgr0BbQcGNl5uynY5Ac6JRDZujgUNQJgvhJg="
|
||||
},
|
||||
{
|
||||
"pname": "CocoR",
|
||||
@@ -739,11 +739,6 @@
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="
|
||||
},
|
||||
{
|
||||
"pname": "System.Runtime.Handles",
|
||||
"version": "4.0.1",
|
||||
"hash": "sha256-j2QgVO9ZOjv7D1het98CoFpjoYgxjupuIhuBUmLLH7w="
|
||||
},
|
||||
{
|
||||
"pname": "System.Runtime.Handles",
|
||||
"version": "4.3.0",
|
||||
|
||||
@@ -38,19 +38,18 @@ let
|
||||
in
|
||||
buildDotnetModule rec {
|
||||
pname = "Dafny";
|
||||
version = "4.8.0";
|
||||
version = "4.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dafny-lang";
|
||||
repo = "dafny";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-x/fX4o+R72Pl02u1Zsr80Rh/4Wb/aKw90fhAGmsfFUI=";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-fCBaOF1mDrqJaUiATZAhzLjlK3NGVFnxdOwgHbOkkgY=";
|
||||
};
|
||||
|
||||
postPatch =
|
||||
let
|
||||
# This file wasn't updated between 4.6.0 and 4.7.0.
|
||||
runtimeJarVersion = "4.6.0";
|
||||
runtimeJarVersion = "4.9.1";
|
||||
in
|
||||
''
|
||||
cp ${writeScript "fake-gradlew-for-dafny" ''
|
||||
|
||||
@@ -13,7 +13,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
inherit pname;
|
||||
version = "24.3.2";
|
||||
version = "24.3.3";
|
||||
|
||||
src =
|
||||
let
|
||||
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
in
|
||||
fetchurl {
|
||||
url = "https://www.dbvis.com/product_download/dbvis-${finalAttrs.version}/media/dbvis_linux_${underscoreVersion}.tar.gz";
|
||||
hash = "sha256-oZxOGudRGFfbVz7n5eeKxr/7lxUhYAHjD0wsHw6G8OI=";
|
||||
hash = "sha256-RDmakZJ7mjTzx4QaKwT6H25dDvQANbLhd2+f8EYbmDA=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -19,17 +19,17 @@
|
||||
|
||||
let
|
||||
deltachat-rpc-server' = deltachat-rpc-server.overrideAttrs rec {
|
||||
version = "1.152.1";
|
||||
version = "1.154.3";
|
||||
src = fetchFromGitHub {
|
||||
owner = "deltachat";
|
||||
repo = "deltachat-core-rust";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-ty2pZWMZ5ZFwwpLm22ChxVAf2cqmIimk8BWvMBqzmks=";
|
||||
hash = "sha256-SjNFgvg6sHW40v13OuR3BL3+JdDxntDCKtbe/C/04as=";
|
||||
};
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
pname = "deltachat-core-rust";
|
||||
inherit version src;
|
||||
hash = "sha256-wbk4/yhhIRPD3x8ghAwJ0lQy0k8GQopTBBT1a021FRo=";
|
||||
hash = "sha256-kbSRGuyCJlTxzKr/C+MLczqT7WNTqZ2/Z42psbBFW+w=";
|
||||
};
|
||||
};
|
||||
electron = electron_32;
|
||||
@@ -37,18 +37,18 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "deltachat-desktop";
|
||||
version = "1.50.1";
|
||||
version = "1.52.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deltachat";
|
||||
repo = "deltachat-desktop";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-G/qBGyx+vxkJvwmBYG5kpx01OO0C9dPji0Cafna9pyw=";
|
||||
hash = "sha256-yKIGgeUjfpw0MMCnrD2TYrACfb/V6681IukZZY8feZc=";
|
||||
};
|
||||
|
||||
pnpmDeps = pnpm.fetchDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-UwfblmCkJOuy2Et5Rjm8ONWLbDmLppazqIk2+rV2RJU=";
|
||||
hash = "sha256-YgHJN0LNgXoDCLqOw891CD23kpQ0wCnKFp5WccTHHw8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -10,14 +10,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "epson-inkjet-printer-escpr2";
|
||||
version = "1.2.24";
|
||||
version = "1.2.25";
|
||||
|
||||
src = fetchurl {
|
||||
# To find the most recent version go to
|
||||
# https://support.epson.net/linux/Printer/LSB_distribution_pages/en/escpr2.php
|
||||
# and retreive the download link for source package for x86 CPU
|
||||
url = "https://download3.ebz.epson.net/dsc/f/03/00/16/58/53/436aba09336f96ed31378f90848be6588a177439/epson-inkjet-printer-escpr2-1.2.24-1.src.rpm";
|
||||
sha256 = "sha256-SI5vXdpxRu6/QdAMdgNpqgcTqyHntiS0zo38XPd4Xtg=";
|
||||
url = "https://download3.ebz.epson.net/dsc/f/03/00/16/60/34/8e2b40dc2a02ae67c82b2c55786159f07edf3f5a/epson-inkjet-printer-escpr2-1.2.25-1.src.rpm";
|
||||
sha256 = "sha256-rhNv6Ak83KG5SmdVUyu/2UXTB0BTj4yDyKRO++9q8WY=";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
|
||||
# Fixes "implicit declaration of function" errors
|
||||
# source of patch: https://aur.archlinux.org/packages/epson-inkjet-printer-escpr2
|
||||
(fetchurl {
|
||||
url = "https://aur.archlinux.org/cgit/aur.git/plain/bug_x86_64.patch?h=epson-inkjet-printer-escpr2";
|
||||
url = "https://aur.archlinux.org/cgit/aur.git/plain/bug_x86_64.patch?h=epson-inkjet-printer-escpr2&id=575d1b959063044f233cca099caceec8e6d5c02f";
|
||||
sha256 = "sha256-G6/3oj25FUT+xv9aJ7qP5PBZWLfy+V8MCHUYucDhtzM=";
|
||||
})
|
||||
];
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "epubcheck";
|
||||
version = "5.2.0";
|
||||
version = "5.2.1";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/w3c/epubcheck/releases/download/v${version}/epubcheck-${version}.zip";
|
||||
sha256 = "sha256-7Vfbs0lqrm/YDSfvMxaQu9IsYx1PugpbsDYLU2fIC6U=";
|
||||
sha256 = "sha256-BL+DNd6QeAx4MATaXVX/4mtalY7jzAdYeUsPktPp4UA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -29,13 +29,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "font-manager";
|
||||
version = "0.9.0";
|
||||
version = "0.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FontManager";
|
||||
repo = "font-manager";
|
||||
rev = version;
|
||||
hash = "sha256-nUFxjqUiL8zLfPJrLM1aQ/SZ2x6CYFKFJI1W/eXlrV8=";
|
||||
hash = "sha256-x7ZRC/xwF6Y2BhbtApVZ4hPZGNGaJiilqpxLyax9r2g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "git-repo";
|
||||
version = "2.50.1";
|
||||
version = "2.51";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "android";
|
||||
repo = "tools_repo";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-HJdXdFaC8yFef2gMJpSfZ2TDxEZkZLWZcum41dfG/DQ=";
|
||||
hash = "sha256-A0mLb3QYI3Eapv5xBMPHcoiaR9np8dx5EAQKXIlhYBg=";
|
||||
};
|
||||
|
||||
# Fix 'NameError: name 'ssl' is not defined'
|
||||
|
||||
+8
-13
@@ -1,14 +1,10 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
, libiconv
|
||||
, Security
|
||||
, pkg-config
|
||||
, openssl
|
||||
, nix-update-script
|
||||
, testers
|
||||
, git-workspace
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
pkg-config,
|
||||
openssl,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
@@ -26,8 +22,7 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [ openssl ]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Security ];
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gitleaks";
|
||||
version = "8.23.1";
|
||||
version = "8.23.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zricethezav";
|
||||
repo = "gitleaks";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-gz/2DwkvSY6vOKW1ttJcLjjtii0jWIdQC1/xzU5vCRA=";
|
||||
hash = "sha256-lwjGoDMNRgYDHI+8IjOD8sWJMUgv/Bg3pUzrUrcYiR4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-hq3v//fhCUOvKPBZ/+YrLIc4nDLxR9Yc+MeIXY7TArA=";
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchurl,
|
||||
buildPackages,
|
||||
cimg,
|
||||
cmake,
|
||||
common-updater-scripts,
|
||||
@@ -96,6 +97,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace "LD_LIBRARY_PATH" "DYLD_LIBRARY_PATH"
|
||||
''
|
||||
+ lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
substituteInPlace CMakeLists.txt --replace-fail \
|
||||
'LD_LIBRARY_PATH=''${GMIC_BINARIES_PATH} ''${GMIC_BINARIES_PATH}/gmic' \
|
||||
'${lib.getExe buildPackages.gmic}'
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
|
||||
@@ -11,12 +11,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "grpc_cli";
|
||||
version = "1.69.0";
|
||||
version = "1.70.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "grpc";
|
||||
repo = "grpc";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-rRiPUcr6of/sjqB+qr7eOkKVFGTnu8UjluULmcn8df4=";
|
||||
hash = "sha256-kJhGAhqu25Q2g6BWkVGp6nGYrWdBnMhoMu6e7ifNbgk=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -8,10 +8,10 @@
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "halo";
|
||||
version = "2.20.13";
|
||||
version = "2.20.14";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/halo-dev/halo/releases/download/v${version}/halo-${version}.jar";
|
||||
hash = "sha256-BcI5LHAKDpd68w/D7TKOS3ChthsiWislm3yKyd0cSkM=";
|
||||
hash = "sha256-42prPQTrjTgfHiwcpIKHpuiQLw4xhZ3wK1PkVLaC4OQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -28,13 +28,13 @@
|
||||
|
||||
gcc14Stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hyprlock";
|
||||
version = "0.6.1";
|
||||
version = "0.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hyprwm";
|
||||
repo = "hyprlock";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-lT6f/5NB73xj9cVesi2SNsL5jVciwZJp8QRohiv+3Hk=";
|
||||
hash = "sha256-PotjNmR69yAEZP/Dn4lB0p7sHBjAPclNDbc5WkBZx4s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
lib,
|
||||
gcc14Stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch2,
|
||||
cmake,
|
||||
cairo,
|
||||
expat,
|
||||
@@ -33,24 +32,15 @@
|
||||
|
||||
gcc14Stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hyprpaper";
|
||||
version = "0.7.3";
|
||||
version = "0.7.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hyprwm";
|
||||
repo = "hyprpaper";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-IRZ5NrKFwBVueYrZYUQfpTwp2rZHgAkPwgvdnfVBF8E=";
|
||||
hash = "sha256-pmkJCzjflvsOytiu2mgn2wfSeyL6mTfoi214T4A2OZQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# FIXME: remove in next release
|
||||
(fetchpatch2 {
|
||||
name = "fix-hypr-wayland-scanner-0.4.4-build.patch";
|
||||
url = "https://github.com/hyprwm/hyprpaper/commit/505e447b6c48e6b49f3aecf5da276f3cc5780054.patch?full_index=1";
|
||||
hash = "sha256-Vk2P2O4XQiCYqV0KbK/ADe8KPmaTs3Mg7JRJ3cGW9lM=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "ipatool";
|
||||
version = "2.1.4";
|
||||
version = "2.1.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "majd";
|
||||
repo = "ipatool";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-e+gkr8i6dVfxyBM5Vi2YpW4eQ4LE2vhgQadLAFeHK4Q=";
|
||||
hash = "sha256-HniMGlT4RaX7OGcQ6z8Ms6O78dWN4iK+ODzmYfxFNPw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-aVMWXlHMGdbApKLhuZZpaAYY5QpMMgXc/6f9r79/dTw=";
|
||||
vendorHash = "sha256-/uB4mviMaPyYX59XrRqigOI0YK3necdRC2ZPErai1NU=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "7.0.2-8";
|
||||
version = "7.0.2-9";
|
||||
in
|
||||
|
||||
(ffmpeg_7-full.override {
|
||||
@@ -14,7 +14,7 @@ in
|
||||
owner = "jellyfin";
|
||||
repo = "jellyfin-ffmpeg";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-gpbMVVMV1ywbSb6A3IGFS/vnBk9EXTNzaW1r8Ygo1RY=";
|
||||
hash = "sha256-zaBu/hhFIMjneb7yUzToaJJAaSptxLld8zOvfGckHLY=";
|
||||
};
|
||||
}).overrideAttrs (old: {
|
||||
pname = "jellyfin-ffmpeg";
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "jjui";
|
||||
version = "0.1";
|
||||
version = "0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "idursun";
|
||||
repo = "jjui";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-MdSzY2JWL34qB13mX4FWG/4wzl30FmATYQ09N1v5Isc=";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-V2HwVpZ7K7mYoZECOc+dfXuvBlRsN5OgRHasdpX+kFw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-pzbOFXSlEebc4fCyNyQSdeVqar+HfEjsSyJo+mHkQeg=";
|
||||
|
||||
@@ -33,11 +33,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "knot-dns";
|
||||
version = "3.4.3";
|
||||
version = "3.4.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
|
||||
sha256 = "sha256-+xU/B4BfRnnoNvFDp09c0gSuccOsvqerBe+OASxukFw=";
|
||||
sha256 = "sha256-59nW3pfyG/M+kHvZhqQDgCXzlIea8KX9GXhyA6w7ITE=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -9,18 +9,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubescape";
|
||||
version = "3.0.23";
|
||||
version = "3.0.24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubescape";
|
||||
repo = "kubescape";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-LC5m+r38mm5c8dmlo4+E5eWlfF0xJIglTcGpvY3EDOg=";
|
||||
hash = "sha256-gzwdDUYOHZnd9mMHmuW9q1xhxWjpk5u/yoxdJkSNrVA=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-J8+GyOgzR2MkJSskM7lzloyKw/JywCT38WFnosg6ACM=";
|
||||
vendorHash = "sha256-GL5V3f2hiTzNDhBKyvyT8BlbRCaPSJXLy/+xiYjhsvw=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "ldeep";
|
||||
version = "1.0.79";
|
||||
version = "1.0.81";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "franc-pentest";
|
||||
repo = "ldeep";
|
||||
tag = version;
|
||||
hash = "sha256-tq5M1YOTiXHdv8dTw2acnBzz0lZu6TtZFEi9rC1Sx14=";
|
||||
hash = "sha256-IpqQNZJ6+aBhwLds0CmKKC/JM5VoU4uFz9x4E5JHa1k=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@@ -1,26 +1,58 @@
|
||||
{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, which, gnuplot
|
||||
, giflib, libjpeg, libpng, libtiff, libwebp, openjpeg, zlib
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
autoreconfHook,
|
||||
pkg-config,
|
||||
which,
|
||||
gnuplot,
|
||||
giflib,
|
||||
libjpeg,
|
||||
libpng,
|
||||
libtiff,
|
||||
libwebp,
|
||||
openjpeg,
|
||||
zlib,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "leptonica";
|
||||
version = "1.84.1";
|
||||
version = "1.85.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/DanBloomberg/${pname}/releases/download/${version}/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-Kz4SVLHMo4HnfIGbWcqZd0/0NTAgm5rrUR4dRliKZPY=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "DanBloomBerg";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-meiSi0qL4i/KCMe5wsRK1/mbuRLHUb55DDOnxkrXZSs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
buildInputs = [ giflib libjpeg libpng libtiff libwebp openjpeg zlib ];
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
];
|
||||
buildInputs = [
|
||||
giflib
|
||||
libjpeg
|
||||
libpng
|
||||
libtiff
|
||||
libwebp
|
||||
openjpeg
|
||||
zlib
|
||||
];
|
||||
enableParallelBuilding = true;
|
||||
|
||||
nativeCheckInputs = [ which gnuplot ];
|
||||
nativeCheckInputs = [
|
||||
which
|
||||
gnuplot
|
||||
];
|
||||
|
||||
# Fails on pngio_reg for unknown reason
|
||||
doCheck = false; # !stdenv.hostPlatform.isDarwin;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
meta = {
|
||||
maintainers = with lib.maintainers; [ patrickdag ];
|
||||
description = "Image processing and analysis library";
|
||||
homepage = "http://www.leptonica.org/";
|
||||
license = lib.licenses.bsd2; # http://www.leptonica.org/about-the-license.html
|
||||
|
||||
@@ -20,13 +20,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libdeltachat";
|
||||
version = "1.154.3";
|
||||
version = "1.155.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deltachat";
|
||||
repo = "deltachat-core-rust";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-SjNFgvg6sHW40v13OuR3BL3+JdDxntDCKtbe/C/04as=";
|
||||
hash = "sha256-gmlIhB0Vou0fYXORAs01o87m6BtyJokvJQWYqCWY11I=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
pname = "deltachat-core-rust";
|
||||
inherit version src;
|
||||
hash = "sha256-kbSRGuyCJlTxzKr/C+MLczqT7WNTqZ2/Z42psbBFW+w=";
|
||||
hash = "sha256-R7LWMUIxSVYdxkA1GBmXyh5FS9I4i4YjOgR8CX6whpw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -24,13 +24,14 @@ stdenv.mkDerivation rec {
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
libtool
|
||||
buildInputs = [
|
||||
libtommath
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace makefile.shared --replace "LIBTOOL:=glibtool" "LIBTOOL:=libtool"
|
||||
substituteInPlace makefile.shared \
|
||||
--replace-fail "LIBTOOL:=glibtool" "LIBTOOL:=libtool" \
|
||||
--replace-fail libtool "${lib.getExe libtool}"
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
libarchive,
|
||||
libcpr,
|
||||
libloot,
|
||||
lz4,
|
||||
pugixml,
|
||||
|
||||
libsForQt5,
|
||||
@@ -20,13 +21,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "limo";
|
||||
version = "1.0.11";
|
||||
version = "1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "limo-app";
|
||||
repo = "limo";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-KQD7U9sHHsxKIzMbrYqhTBUfFZpsoqiSxz5zMNIxU4o=";
|
||||
hash = "sha256-fzqIZ/BqOpPjo18qi4VidGg1ruhQLqfwoA/hidGPEao=";
|
||||
};
|
||||
|
||||
patches = lib.optionals (!withUnrar) [
|
||||
@@ -48,6 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libarchive
|
||||
libcpr
|
||||
libloot
|
||||
lz4
|
||||
pugixml
|
||||
|
||||
libsForQt5.qtbase
|
||||
@@ -61,6 +63,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
cmakeFlags =
|
||||
[
|
||||
(lib.cmakeFeature "LIMO_INSTALL_PREFIX" (placeholder "out"))
|
||||
]
|
||||
++ lib.optionals (withUnrar) [
|
||||
(lib.cmakeBool "USE_SYSTEM_LIBUNRAR" true)
|
||||
]
|
||||
++ lib.optionals (!withUnrar) [
|
||||
|
||||
@@ -82,13 +82,13 @@ let
|
||||
in
|
||||
effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "llama-cpp";
|
||||
version = "4529";
|
||||
version = "4546";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ggerganov";
|
||||
repo = "llama.cpp";
|
||||
tag = "b${finalAttrs.version}";
|
||||
hash = "sha256-YqXL6nxUQrF/RI9GEzlBo6iiaLFYba0cXsVVqM/aGTw=";
|
||||
hash = "sha256-NUt6Q372jsCzcSAEqe2VZB2ZUpGSZyrvr0wyqrBYoOY=";
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
git -C "$out" rev-parse --short HEAD > $out/COMMIT
|
||||
|
||||
@@ -6,11 +6,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "lxgw-neoxihei";
|
||||
version = "1.211";
|
||||
version = "1.212";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf";
|
||||
hash = "sha256-w3Rk0NDYXPzzg1JGsC6zIvr0SiM3ZzHHW9NwHNAhnaM=";
|
||||
hash = "sha256-g64kMY/9kHSlUH2rvDxKy4nmS+TH//SNJfCnQXHC4Q8=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@@ -23,13 +23,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "marktext";
|
||||
version = "0.17.1-unstable-2024-06-10";
|
||||
version = "0.17.0-unstable-2024-06-10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "marktext";
|
||||
repo = "marktext";
|
||||
rev = "cd8452979bf2441f8064968ab1f9ae28302c9d75";
|
||||
hash = "sha256-6oD9Bp0XonhNHWA8JajyWdNkAXpX4GoKPpdLzpvr+jM=";
|
||||
rev = "11c8cc1e1929a7975df39fa5f4503130fef53547";
|
||||
hash = "sha256-5PIOTg4/RBave/b3CArQSLvmA64ME9++3O1JT4lgKm0=";
|
||||
postFetch = ''
|
||||
cd $out
|
||||
patch -p1 < ${./0001-update-electron.patch}
|
||||
|
||||
@@ -10,11 +10,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "matomo";
|
||||
version = "5.2.1";
|
||||
version = "5.2.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://builds.matomo.org/matomo-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-5glMwwIG0Uo8bu904u40FUa+yaUlrQe1nUCkv9/ATks=";
|
||||
hash = "sha256-ZEwz/KKZZwTFsKfwR0iKZM1ta4CUXJsWgBXika+pjb0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -16,6 +16,8 @@
|
||||
usage,
|
||||
mise,
|
||||
testers,
|
||||
runCommand,
|
||||
jq,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
@@ -89,7 +91,30 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
tests.version = testers.testVersion { package = mise; };
|
||||
tests = {
|
||||
version = testers.testVersion { package = mise; };
|
||||
usageCompat =
|
||||
# should not crash
|
||||
runCommand "mise-usage-compatibility"
|
||||
{
|
||||
nativeBuildInputs = [
|
||||
mise
|
||||
usage
|
||||
jq
|
||||
];
|
||||
}
|
||||
''
|
||||
export HOME=$(mktemp -d)
|
||||
|
||||
spec="$(mise usage)"
|
||||
for shl in bash fish zsh; do
|
||||
echo "testing $shl"
|
||||
usage complete-word --shell $shl --spec "$spec"
|
||||
done
|
||||
|
||||
touch $out
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
autoPatchelfHook,
|
||||
curl,
|
||||
openssl,
|
||||
testers,
|
||||
mongodb-ce,
|
||||
versionCheckHook,
|
||||
writeShellApplication,
|
||||
jq,
|
||||
nix-update,
|
||||
gitMinimal,
|
||||
pup,
|
||||
nixosTests,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -63,6 +63,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
versionCheckProgram = "${placeholder "out"}/bin/mongod";
|
||||
versionCheckProgramArg = [ "--version" ];
|
||||
doInstallCheck = true;
|
||||
|
||||
passthru = {
|
||||
|
||||
updateScript =
|
||||
@@ -102,9 +107,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
command = lib.getExe script;
|
||||
};
|
||||
|
||||
tests.version = testers.testVersion {
|
||||
package = mongodb-ce;
|
||||
command = "mongod --version";
|
||||
tests = {
|
||||
inherit (nixosTests) mongodb-ce;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
lib,
|
||||
fetchurl,
|
||||
stdenv,
|
||||
_7zz,
|
||||
undmg,
|
||||
}:
|
||||
|
||||
# This cannot be built from source due to the problematic nature of XCode - so
|
||||
@@ -10,18 +10,23 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "MonitorControl";
|
||||
version = "4.2.0";
|
||||
version = "4.3.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/MonitorControl/${pname}/releases/download/v${version}/MonitorControl.${version}.dmg";
|
||||
sha256 = "Q96uK6wVe1D2uLvWL+pFR6LcmrU7cgmr2Y5tPvvTDgI=";
|
||||
hash = "sha256-myx3adoU3FYYrs6LFRSiXtwSsoaujjQ/PYgAF/Xuk2g=";
|
||||
};
|
||||
|
||||
# MonitorControl.${version}.dmg is APFS formatted, unpack with 7zz
|
||||
nativeBuildInputs = [ _7zz ];
|
||||
nativeBuildInputs = [ undmg ];
|
||||
|
||||
sourceRoot = "MonitorControl.app";
|
||||
|
||||
unpackCmd = ''
|
||||
runHook preUnpack
|
||||
undmg $src
|
||||
runHook postUnpack
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p "$out/Applications/MonitorControl.app"
|
||||
cp -R . "$out/Applications/MonitorControl.app"
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
let
|
||||
pname = "mov-cli";
|
||||
version = "4.4.15";
|
||||
version = "4.4.16";
|
||||
in
|
||||
python3.pkgs.buildPythonPackage {
|
||||
inherit pname version;
|
||||
@@ -19,7 +19,7 @@ python3.pkgs.buildPythonPackage {
|
||||
owner = "mov-cli";
|
||||
repo = "mov-cli";
|
||||
tag = version;
|
||||
hash = "sha256-mHtKQtLhHYwd2GEA0rCZQ4C/DEgsc6Rk7ZLpXFyW5d8=";
|
||||
hash = "sha256-hOnbBXzg9S0pqEcdXVrdG+P9tLqE8NC++ppOwqd+y+M=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
||||
@@ -4,18 +4,19 @@
|
||||
pkg-config,
|
||||
libsodium,
|
||||
buildGoModule,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "museum";
|
||||
version = "0.9.53";
|
||||
version = "0.9.81";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ente-io";
|
||||
repo = "ente";
|
||||
sparseCheckout = [ "server" ];
|
||||
rev = "photos-v${version}";
|
||||
hash = "sha256-aczWqK6Zymvl46fHN6QXT0f5V2lpC+8kpSbEoTiP+7k=";
|
||||
hash = "sha256-4vX3UWbYYCjNxtSNUAE9hg9NokeJFPTjLvHYTkQlB0w=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Vz9AodHoClSmo51ExdOS4bWH13i1Sug++LQMIsZY2xY=";
|
||||
@@ -40,6 +41,13 @@ buildGoModule rec {
|
||||
$out/share/museum
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [
|
||||
"--version-regex"
|
||||
"photos-v(.*)"
|
||||
];
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "API server for ente.io";
|
||||
homepage = "https://github.com/ente-io/ente/tree/main/server";
|
||||
|
||||
@@ -502,6 +502,9 @@ def execute(argv: list[str]) -> None:
|
||||
specialisation=args.specialisation,
|
||||
install_bootloader=args.install_bootloader,
|
||||
)
|
||||
print_result("Done. The new configuration is", path_to_config)
|
||||
case Action.BUILD:
|
||||
print_result("Done. The new configuration is", path_to_config)
|
||||
case Action.BUILD_VM | Action.BUILD_VM_WITH_BOOTLOADER:
|
||||
# If you get `not-found`, please open an issue
|
||||
vm_path = next(path_to_config.glob("bin/run-*-vm"), "not-found")
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "nwg-dock";
|
||||
version = "0.4.2";
|
||||
version = "0.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nwg-piotr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-9s0kweFBxzNYZOqIGG/hPF1DsECm7N0dhgRlc7DGUOc=";
|
||||
sha256 = "sha256-Ymk4lpX8RAxWot7U+cFtu1eJd6VHP+JS1I2vF0V1T70=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-iR+ytThRwmCvFEMcpSELPRwiramN5jPXAjaJtda4pOw=";
|
||||
|
||||
@@ -91,7 +91,6 @@ stdenv.mkDerivation {
|
||||
mainProgram = "odin";
|
||||
maintainers = with lib.maintainers; [
|
||||
astavie
|
||||
znaniye
|
||||
];
|
||||
platforms = lib.platforms.unix;
|
||||
broken = stdenv.hostPlatform.isMusl;
|
||||
|
||||
@@ -52,7 +52,6 @@ stdenv.mkDerivation {
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
astavie
|
||||
znaniye
|
||||
];
|
||||
mainProgram = "ols";
|
||||
};
|
||||
|
||||
@@ -7,19 +7,19 @@
|
||||
}:
|
||||
let
|
||||
pname = "open-webui";
|
||||
version = "0.5.6";
|
||||
version = "0.5.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-webui";
|
||||
repo = "open-webui";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-9HRUFG8knKJx5Fr0uxLPMwhhbNnQ7CSywla8LGZu8l4=";
|
||||
hash = "sha256-spdwd3ffibmHb9LDgK1EkpUAK6OsD9d6gocrbEx/CrE=";
|
||||
};
|
||||
|
||||
frontend = buildNpmPackage {
|
||||
inherit pname version src;
|
||||
|
||||
npmDepsHash = "sha256-copQjrFgVJ6gZ8BwPiIsHEKSZDEiuVU3qygmPFv5Y1A=";
|
||||
npmDepsHash = "sha256-9wu5SWtom/pZrFRP8rrsZMoGEnN4MVAlkyeydr0Fslo=";
|
||||
|
||||
# Disabling `pyodide:fetch` as it downloads packages during `buildPhase`
|
||||
# Until this is solved, running python packages from the browser will not work.
|
||||
|
||||
@@ -8,19 +8,19 @@
|
||||
|
||||
let
|
||||
pname = "pinact";
|
||||
version = "1.1.2";
|
||||
version = "1.2.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "suzuki-shunsuke";
|
||||
repo = "pinact";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-QBWxs0YRTWItJ1aTG33Z6vK8/vaZBTuZAVPYqD6dIvE=";
|
||||
hash = "sha256-OmWt4EyUHZyQDIj1Uro+bnC29MNi6wlXO2ksRP84F2U=";
|
||||
};
|
||||
mainProgram = "pinact";
|
||||
in
|
||||
buildGoModule {
|
||||
inherit pname version src;
|
||||
|
||||
vendorHash = "sha256-Y44nJv0eWM0xO+lB56OBcEe/CCipPj8Ptg7WuJ2Vszo=";
|
||||
vendorHash = "sha256-sZv91EYksNmMhWbT/5PUQTM2gND/8b4ORVfMNtlAI2A=";
|
||||
|
||||
env.CGO_ENABLED = 0;
|
||||
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "pkgsite";
|
||||
version = "0-unstable-2025-01-08";
|
||||
version = "0-unstable-2025-01-21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "golang";
|
||||
repo = "pkgsite";
|
||||
rev = "840de57bb85975c3c0bcb24ba00fee86ef8c0748";
|
||||
hash = "sha256-TNnZG9Q3RmB5TfHDqPCHfChsdkZ6FOErbzo47cRXhTw=";
|
||||
rev = "ce52a304a0f4dccd8ae7abfdd3712c9dae7b4f34";
|
||||
hash = "sha256-6fZr9mi6SGIe7AUNv6cS6R+kBNjFbPfdamnpGclimWQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Z+Ji3RO2zn5vn9DXOAxyeI4OZXGOfyVdfdIsNyJHZpE=";
|
||||
|
||||
@@ -15,6 +15,7 @@
|
||||
musl,
|
||||
nss,
|
||||
patchelf,
|
||||
openssl,
|
||||
stdenv,
|
||||
xorg,
|
||||
}:
|
||||
@@ -48,6 +49,7 @@ stdenv.mkDerivation {
|
||||
musl
|
||||
nss
|
||||
stdenv.cc.cc
|
||||
openssl
|
||||
xorg.libX11
|
||||
xorg.libXcomposite
|
||||
xorg.libXdamage
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "qrcp";
|
||||
version = "0.11.3";
|
||||
version = "0.11.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "claudiodangelis";
|
||||
repo = "qrcp";
|
||||
rev = version;
|
||||
hash = "sha256-MmWBcDtZUDX5IV7XXifBp7KfeRh+0qU4vdfCoMv/UNk=";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Ueow5lFnLLeJxk1+hcH4bhwrNu17pgJ50CXd2Adswvg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-lqGPPyoSO12MyeYIuYcqDVHukj7oR3zmHgsS6SxY3yo=";
|
||||
vendorHash = "sha256-0x35Ds3v5youpSBapgkP8R7YW3FuninFM5pyd2PJRP4=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@@ -54,6 +54,7 @@ buildFHSEnv rec {
|
||||
xorg.libSM
|
||||
xorg.libXau
|
||||
xorg.libXdmcp
|
||||
xorg.libXScrnSaver
|
||||
libudev0-shim
|
||||
bzip2
|
||||
brotli
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rasm";
|
||||
version = "2.3.0";
|
||||
version = "2.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "EdouardBERGE";
|
||||
repo = "rasm";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-xDiGVPXi12P2YzSESO4I4WGeQgWU9UPhJbenoN8sADc=";
|
||||
hash = "sha256-vuOI29VMTBWIyP7jRIwYbXKWf9ijg8HqLhMEj1R9iQQ=";
|
||||
};
|
||||
|
||||
# by default the EXEC variable contains `rasm.exe`
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "reindeer";
|
||||
version = "2025.01.06.00";
|
||||
version = "2025.01.20.00";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebookincubator";
|
||||
repo = "reindeer";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-3Wa10eLlvOXw8DZAwQiCTGFOcUEsHvYhl6OTEYsCdZ8=";
|
||||
hash = "sha256-dmx9FPgyVz5s32peKTg4xA72JD7X2R9ks8HSna3msmA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-UI70YLTR/+fKh+4wD2hZJyuzN4ZNUCkrhyf9CRepetA=";
|
||||
cargoHash = "sha256-cZ4Xs2EdajbGLE5c+KzUGH94dJvHpHRDyCISFm/B7qc=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@@ -7,11 +7,11 @@
|
||||
renode.overrideAttrs (
|
||||
finalAttrs: _: {
|
||||
pname = "renode-unstable";
|
||||
version = "1.15.3+20250109git606a24e00";
|
||||
version = "1.15.3+20250121git0a17b4a64";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://builds.renode.io/renode-${finalAttrs.version}.linux-dotnet.tar.gz";
|
||||
hash = "sha256-ZA52irUSACBBLkJ1o75SHVFIxlaNQV25VTcUfjv6bPk=";
|
||||
hash = "sha256-8RQaupK2mk79JQK4wLknuE9KLPF7tkrIjptwLr9VH1c=";
|
||||
};
|
||||
|
||||
passthru.updateScript =
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
runCommandLocal,
|
||||
}:
|
||||
let
|
||||
version = "6.6";
|
||||
version = "6.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "retrospy";
|
||||
repo = "RetroSpy";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-vYhFpmP9CmZz/lqNwNAvpf7pQnhKR/pdetPJqorUtMY=";
|
||||
hash = "sha256-L16LezV9z7pCRcXKv+KfGTCbCQfBd3y3dUidNeJUznQ=";
|
||||
};
|
||||
|
||||
executables = [
|
||||
@@ -76,5 +76,6 @@ buildDotnetModule {
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = [ lib.maintainers.naxdy ];
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "RetroSpy";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
diff --git a/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/Program.cs b/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/Program.cs
|
||||
index 5c80f55e9dd..17373f36ebf 100644
|
||||
--- a/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/Program.cs
|
||||
+++ b/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/Program.cs
|
||||
@@ -97,7 +97,7 @@ static async Task RunAsync(ServerConfiguration serverConfiguration, Cancellation
|
||||
var assemblyLoader = new CustomExportAssemblyLoader(extensionManager, loggerFactory);
|
||||
var typeRefResolver = new ExtensionTypeRefResolver(assemblyLoader, loggerFactory);
|
||||
|
||||
- var cacheDirectory = Path.Combine(Path.GetDirectoryName(typeof(Program).Assembly.Location)!, "cache");
|
||||
+ var cacheDirectory = Path.Combine(Environment.GetEnvironmentVariable("XDG_CACHE_HOME") ?? Path.Combine(Environment.GetEnvironmentVariable("HOME")!, ".cache"), "roslyn");
|
||||
|
||||
using var exportProvider = await ExportProviderBuilder.CreateExportProviderAsync(extensionManager, assemblyLoader, serverConfiguration.DevKitDependencyPath, cacheDirectory, loggerFactory);
|
||||
|
||||
@@ -50,9 +50,14 @@ buildDotnetModule rec {
|
||||
|
||||
nativeBuildInputs = [ jq ];
|
||||
|
||||
# until upstream updates net6.0 here:
|
||||
# https://github.com/dotnet/roslyn/blob/6cc106c0eaa9b0ae070dba3138a23aeab9b50c13/eng/targets/TargetFrameworks.props#L20
|
||||
patches = [ ./force-sdk_8_0.patch ];
|
||||
patches = [
|
||||
# until upstream updates net6.0 here:
|
||||
# https://github.com/dotnet/roslyn/blob/6cc106c0eaa9b0ae070dba3138a23aeab9b50c13/eng/targets/TargetFrameworks.props#L20
|
||||
./force-sdk_8_0.patch
|
||||
# until made configurable/and or different location
|
||||
# https://github.com/dotnet/roslyn/issues/76892
|
||||
./cachedirectory.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Upstream uses rollForward = latestPatch, which pins to an *exact* .NET SDK version.
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "routinator";
|
||||
version = "0.14.0";
|
||||
version = "0.14.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NLnetLabs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-SUcAhXIPgYGFkUIgSrUJrxwWQvkkmWG/d12hv8+PQI0=";
|
||||
hash = "sha256-6wYNuGSB55ozzPEbptfEEp/euzh/IRfNrdREWF0xGTU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-1JxAbQPCQqDVry3wGIdY4q18rzCXlJ7Dnc8LIvhkW1g=";
|
||||
cargoHash = "sha256-2fyfiwShxsz61nFTNfzjrbClnzIgjQP+kGHgZSB534I=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (
|
||||
with darwin.apple_sdk.frameworks;
|
||||
|
||||
@@ -28,13 +28,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "shader-slang";
|
||||
version = "2025.3";
|
||||
version = "2025.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "shader-slang";
|
||||
repo = "slang";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-kEW36pAo10xm3qY47hXTAjiXF74qa5rfDlQ6/gcGHqs=";
|
||||
hash = "sha256-YOZukHgXTgKyTp2b3Z0hwkipCwAkNoFlgVZfDlq1lz8=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -22,13 +22,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "shaka-packager";
|
||||
version = "3.4.1";
|
||||
version = "3.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "shaka-project";
|
||||
repo = "shaka-packager";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-xXKgL8sUP+meFXV9S/i7dao7BIkIx+e/ujjpew7xGL0=";
|
||||
hash = "sha256-Syty10LHGIlP5Jw+UneQMN+wBz/ggvV0xV8+3ThU8SM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -16,13 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "showmethekey";
|
||||
version = "1.18.0";
|
||||
version = "1.18.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AlynxZhou";
|
||||
repo = "showmethekey";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-D8eh0Wun3bm5k2kuCgaEAR33O6i4aowifd1b0tSWV64=";
|
||||
hash = "sha256-/pfXAn6dWFIHsP1VBj+Cf989RuVzv4IbSClbJEvGstI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "skim";
|
||||
version = "0.15.7";
|
||||
version = "0.16.0";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -24,14 +24,14 @@ rustPlatform.buildRustPackage rec {
|
||||
owner = "skim-rs";
|
||||
repo = "skim";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-vUKHyrvCGtRKziUqgIbgVP7YdH+UW3PFBECV/mo5RxY=";
|
||||
hash = "sha256-6enC7LjhYuHQ2XyjcsuEDM0r3qMWE9MUuDvYGMswmOc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -i -e "s|expand('<sfile>:h:h')|'$out'|" plugin/skim.vim
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-/tfbhNlpx96jlzUYwbucXi+pk1IE2jqxgWYjNU+4mHg=";
|
||||
cargoHash = "sha256-3IAft5ZP9da62SIBg2SmikirCAUgicmFUmkcI6yeWV8=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "snapraid";
|
||||
version = "12.3";
|
||||
version = "12.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "amadvance";
|
||||
repo = "snapraid";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-pkLooA3JZV/rPlE5+JeJN1QW2xAdNu7c/iFFtT4M4vc=";
|
||||
hash = "sha256-7guTRH9AZCsQYyWLpws19/sEe9GVFop21GYPzXCK6Fg=";
|
||||
};
|
||||
|
||||
VERSION = version;
|
||||
|
||||
@@ -0,0 +1,171 @@
|
||||
{
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
cmake,
|
||||
pkg-config,
|
||||
alsa-lib,
|
||||
copyDesktopItems,
|
||||
makeDesktopItem,
|
||||
xorg,
|
||||
freetype,
|
||||
expat,
|
||||
libGL,
|
||||
libjack2,
|
||||
curl,
|
||||
webkitgtk_4_0,
|
||||
libsysprof-capture,
|
||||
pcre2,
|
||||
util-linux,
|
||||
libselinux,
|
||||
libsepol,
|
||||
libthai,
|
||||
libxkbcommon,
|
||||
libdatrie,
|
||||
libepoxy,
|
||||
libsoup_2_4,
|
||||
lerc,
|
||||
sqlite,
|
||||
ninja,
|
||||
# Disable VST building by default, since NixOS doesn't have a VST license
|
||||
enableVST2 ? false,
|
||||
}:
|
||||
stdenv.mkDerivation {
|
||||
pname = "socalabs-sid";
|
||||
version = "1.1.0";
|
||||
|
||||
src =
|
||||
(fetchFromGitHub {
|
||||
owner = "FigBug";
|
||||
repo = "SID";
|
||||
rev = "bb826fdea39da0804c53d81d35bea29aeff4436d";
|
||||
hash = "sha256-6IStysItOS7EltTCqdyo9vrsnSA1YYoN4y8Bjv1fhNk=";
|
||||
fetchSubmodules = true;
|
||||
}).overrideAttrs
|
||||
(_: {
|
||||
GIT_CONFIG_COUNT = 1;
|
||||
GIT_CONFIG_KEY_0 = "url.https://github.com/.insteadOf";
|
||||
GIT_CONFIG_VALUE_0 = "git@github.com:";
|
||||
});
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
type = "Application";
|
||||
name = "socalabs-sid";
|
||||
desktopName = "Socalabs SID";
|
||||
comment = "Socalabs Commodore 64 SID Emulation Plugin (Standalone)";
|
||||
icon = "SID";
|
||||
exec = "SID";
|
||||
categories = [
|
||||
"Audio"
|
||||
"AudioVideo"
|
||||
];
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
copyDesktopItems
|
||||
ninja
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
xorg.libX11
|
||||
xorg.libXcomposite
|
||||
xorg.libXcursor
|
||||
xorg.libXinerama
|
||||
xorg.libXrandr
|
||||
xorg.libXtst
|
||||
xorg.libXdmcp
|
||||
xorg.xvfb
|
||||
libGL
|
||||
libjack2
|
||||
libsysprof-capture
|
||||
libselinux
|
||||
libsepol
|
||||
libthai
|
||||
libxkbcommon
|
||||
libdatrie
|
||||
libepoxy
|
||||
libsoup_2_4
|
||||
lerc
|
||||
freetype
|
||||
curl
|
||||
webkitgtk_4_0
|
||||
pcre2
|
||||
util-linux
|
||||
sqlite
|
||||
expat
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "JUCE_COPY_PLUGIN_AFTER_BUILD" false)
|
||||
"--preset ninja-gcc"
|
||||
];
|
||||
|
||||
patchPhase = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail 'FORMATS Standalone VST VST3 AU LV2' 'FORMATS Standalone ${lib.optionalString enableVST2 "VST"} VST3 LV2'
|
||||
|
||||
# we need to patch JUCE itself to enable jack MIDI support
|
||||
# please https://github.com/juce-framework/JUCE/issues/952
|
||||
# TODO: remove when juce updates :D
|
||||
substituteInPlace modules/juce/modules/juce_audio_devices/native/juce_Midi_linux.cpp \
|
||||
--replace-fail "port = client.createPort (portName, forInput, false);" "port = client.createPort (portName, forInput, true);"
|
||||
'';
|
||||
|
||||
cmakeBuildType = "Release";
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
preBuild = ''
|
||||
# build takes 10 years without this set
|
||||
HOME=(mktemp -d)
|
||||
|
||||
cd ../Builds/ninja-gcc
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/lib/vst3 $out/lib/lv2 $out/bin
|
||||
|
||||
${lib.optionalString enableVST2 ''
|
||||
mkdir -p $out/lib/vst
|
||||
cp -r SID_artefacts/Release/VST/libSID.so $out/lib/vst
|
||||
''}
|
||||
|
||||
cp -r SID_artefacts/Release/LV2/SID.lv2 $out/lib/lv2
|
||||
cp -r SID_artefacts/Release/VST3/SID.vst3 $out/lib/vst3
|
||||
|
||||
install -Dm755 SID_artefacts/Release/Standalone/SID $out/bin
|
||||
|
||||
install -Dm444 $src/plugin/Resources/icon.png $out/share/pixmaps/SID.png
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
NIX_LDFLAGS = (
|
||||
toString [
|
||||
"-lX11"
|
||||
"-lXext"
|
||||
"-lXcomposite"
|
||||
"-lXcursor"
|
||||
"-lXinerama"
|
||||
"-lXrandr"
|
||||
"-lXtst"
|
||||
"-lXdmcp"
|
||||
]
|
||||
);
|
||||
|
||||
meta = {
|
||||
description = "Socalabs Commodore 64 SID Emulation Plugin";
|
||||
homepage = "https://socalabs.com/synths/commodore-64-sid/";
|
||||
mainProgram = "SID";
|
||||
platforms = lib.platforms.linux;
|
||||
license = [ lib.licenses.gpl3 ] ++ lib.optional enableVST2 lib.licenses.unfree;
|
||||
maintainers = [ lib.maintainers.l1npengtul ];
|
||||
};
|
||||
}
|
||||
@@ -12,7 +12,7 @@
|
||||
polkit,
|
||||
}:
|
||||
let
|
||||
version = "0.1.0";
|
||||
version = "0.1.1";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "soteria";
|
||||
@@ -22,10 +22,10 @@ rustPlatform.buildRustPackage {
|
||||
owner = "imvaskel";
|
||||
repo = "soteria";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-lhS+37DqSgZrgrYgKGUpKMC22Qjdq9LPNS5k/dqvkRY=";
|
||||
hash = "sha256-CinJEzH4GsCAzU8FiInulPHLm73KI4nLlAcskkjgeJM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-NMSGSqdCu/kW6vv8+C7UC6oitZqlTklO1sRKDcc1T9o=";
|
||||
cargoHash = "sha256-vv7gK0ZfwO2AHXXQcXfkne9wZl+8JH9h8vELdRjg8WM=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
versionCheckHook,
|
||||
stalwart-mail,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "stalwart-cli";
|
||||
version = stalwart-mail.version;
|
||||
src = stalwart-mail.src;
|
||||
|
||||
buildAndTestSubdir = "crates/cli";
|
||||
cargoHash = "sha256-9gqk26qCic1N8LHXLX3fWyk/oQr3QifbmPzAEWL6ZHo=";
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
versionCheckProgramArg = [ "--version" ];
|
||||
|
||||
meta = {
|
||||
description = "Stalwart Mail Server CLI";
|
||||
homepage = "https://github.com/stalwartlabs/mail-server";
|
||||
changelog = "https://github.com/stalwartlabs/mail-server/blob/v${version}/CHANGELOG.md";
|
||||
license = lib.licenses.agpl3Only;
|
||||
mainProgram = "stalwart-cli";
|
||||
maintainers = with lib.maintainers; [
|
||||
giomf
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "steampipe";
|
||||
version = "1.0.1";
|
||||
version = "1.0.2";
|
||||
|
||||
env.CGO_ENABLED = 0;
|
||||
|
||||
@@ -19,10 +19,10 @@ buildGoModule rec {
|
||||
owner = "turbot";
|
||||
repo = "steampipe";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-9Tlc6BlfSQyAmmk/G6TdWB0kWpbwzGWOPNNNgI3tYPM=";
|
||||
hash = "sha256-qQAPOvBELJWnDLsxaqbLooPNwXFe+NoR2F9kT5rjv64=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-+y9OX/ywS/0AXCnVHf4VisTegFamt3sT/m43yVhbCNc=";
|
||||
vendorHash = "sha256-/8MDRlPR53MTMtW/VF6XsJ2NdV4NLDF8aukx7Rm/D7A=";
|
||||
proxyVendor = true;
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
gitUpdater,
|
||||
nix-update-script,
|
||||
autoreconfHook,
|
||||
pkg-config,
|
||||
pandoc,
|
||||
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
|
||||
installShellCompletion --bash bash-completion/stenc
|
||||
'';
|
||||
|
||||
passthru.updateScript = gitUpdater { };
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "SCSI Tape Encryption Manager";
|
||||
|
||||
@@ -11,11 +11,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "strace";
|
||||
version = "6.12";
|
||||
version = "6.13";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-xH2pO+RbYFX03HQdfyDvr1DKEBYKWxAMEJspT9nAvf4=";
|
||||
hash = "sha256-4gna8O4DjKWtzEwnfpJztNUfRqL/htpXXTZ0KsNQihc=";
|
||||
};
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
@@ -5,14 +5,14 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "stylance-cli";
|
||||
version = "0.5.3";
|
||||
version = "0.5.4";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-YN7Y8dxwpZel1SeEgyckh4ZPuRqcAsNvc/fGRgvzeDw=";
|
||||
hash = "sha256-Xh0xqD0B4uKu5uoEWNe0pf+ExhaqPBgsR1OEfKe0TvA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-VKfQzsTTKIbh+X0suXyUXDsd8sDSRsc5SnO8qxcxGPQ=";
|
||||
cargoHash = "sha256-am2vQ+PeJPU2ojeZm/AzXJxjP3aUkXnlmgcG9i8sv9g=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library and cli tool for working with scoped CSS in rust";
|
||||
|
||||
@@ -140,6 +140,7 @@ stdenv'.mkDerivation rec {
|
||||
]
|
||||
++ lib.optionals cudaSupport [
|
||||
cudaPackages.cudatoolkit
|
||||
cudaPackages.cuda_cudart
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isx86_64 [
|
||||
intel-media-sdk
|
||||
|
||||
@@ -33,6 +33,7 @@
|
||||
enableXWayland ? true,
|
||||
systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd,
|
||||
trayEnabled ? systemdSupport,
|
||||
fetchpatch2,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -57,6 +58,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
[
|
||||
./load-configuration-from-etc.patch
|
||||
|
||||
(fetchpatch2 {
|
||||
# fix missing switch statement for newer libinput
|
||||
url = "https://github.com/swaywm/sway/pull/8470.patch?full_index=1";
|
||||
hash = "sha256-UTZ2DNEsGi5RYrgZThHkYz3AnnIl/KxieinA1WUZRq4=";
|
||||
})
|
||||
|
||||
(substituteAll {
|
||||
src = ./fix-paths.patch;
|
||||
inherit swaybg;
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user