Merge staging-next into staging
This commit is contained in:
commit
c796e255b3
|
@ -2909,6 +2909,12 @@
|
|||
githubId = 14790226;
|
||||
name = "Hubert Jasudowicz";
|
||||
};
|
||||
c-h-johnson = {
|
||||
name = "Charles Johnson";
|
||||
email = "charles@charlesjohnson.name";
|
||||
github = "c-h-johnson";
|
||||
githubId = 138403247;
|
||||
};
|
||||
chkno = {
|
||||
email = "scottworley@scottworley.com";
|
||||
github = "chkno";
|
||||
|
@ -6074,6 +6080,12 @@
|
|||
githubId = 25820499;
|
||||
name = "Roman Kretschmer";
|
||||
};
|
||||
goatchurchprime = {
|
||||
email = "julian@goatchurch.org.uk";
|
||||
github = "goatchurchprime";
|
||||
githubId = 677254;
|
||||
name = "Julian Todd";
|
||||
};
|
||||
gobidev = {
|
||||
email = "adrian.groh@t-online.de";
|
||||
github = "Gobidev";
|
||||
|
@ -7349,6 +7361,11 @@
|
|||
github = "jali-clarke";
|
||||
githubId = 17733984;
|
||||
};
|
||||
james-atkins = {
|
||||
name = "James Atkins";
|
||||
github = "james-atkins";
|
||||
githubId = 9221409;
|
||||
};
|
||||
jamiemagee = {
|
||||
email = "jamie.magee@gmail.com";
|
||||
github = "JamieMagee";
|
||||
|
@ -8090,6 +8107,12 @@
|
|||
email = "j.loos@posteo.net";
|
||||
githubId = 57965027;
|
||||
};
|
||||
josephst = {
|
||||
name = "Joseph Stahl";
|
||||
email = "hello@josephstahl.com";
|
||||
github = "josephst";
|
||||
githubId = 1269177;
|
||||
};
|
||||
joshniemela = {
|
||||
name = "Joshua Niemelä";
|
||||
email = "josh@jniemela.dk";
|
||||
|
@ -12051,6 +12074,12 @@
|
|||
githubId = 2946283;
|
||||
name = "Brian Cohen";
|
||||
};
|
||||
nova-madeline = {
|
||||
matrix = "@nova:tchncs.de";
|
||||
github = "nova-r";
|
||||
githubId = 126072875;
|
||||
name = "nova madeline";
|
||||
};
|
||||
novenary = {
|
||||
email = "streetwalkermc@gmail.com";
|
||||
github = "9ary";
|
||||
|
@ -12389,6 +12418,12 @@
|
|||
githubId = 75299;
|
||||
name = "Malcolm Matalka";
|
||||
};
|
||||
orichter = {
|
||||
email = "richter-oliver@gmx.net";
|
||||
github = "RichterOliver";
|
||||
githubId = 135209509;
|
||||
name = "Oliver Richter";
|
||||
};
|
||||
orivej = {
|
||||
email = "orivej@gmx.fr";
|
||||
github = "orivej";
|
||||
|
@ -16375,6 +16410,12 @@
|
|||
github = "thielema";
|
||||
githubId = 898989;
|
||||
};
|
||||
thillux = {
|
||||
name = "Markus Theil";
|
||||
email = "theil.markus@gmail.com";
|
||||
github = "thillux";
|
||||
githubId = 2171995;
|
||||
};
|
||||
thilobillerbeck = {
|
||||
name = "Thilo Billerbeck";
|
||||
email = "thilo.billerbeck@officerent.de";
|
||||
|
|
|
@ -80,6 +80,8 @@
|
|||
|
||||
- The Caddy module gained a new option named `services.caddy.enableReload` which is enabled by default. It allows reloading the service instead of restarting it, if only a config file has changed. This option must be disabled if you have turned off the [Caddy admin API](https://caddyserver.com/docs/caddyfile/options#admin). If you keep this option enabled, you should consider setting [`grace_period`](https://caddyserver.com/docs/caddyfile/options#grace-period) to a non-infinite value to prevent Caddy from delaying the reload indefinitely.
|
||||
|
||||
- mdraid support is now optional. This reduces initramfs size and prevents the potentially undesired automatic detection and activation of software RAID pools. It is disabled by default in new configurations (determined by `stateVersion`), but the appropriate settings will be generated by `nixos-generate-config` when installing to a software RAID device, so the standard installation procedure should be unaffected. If you have custom configs relying on mdraid, ensure that you use `stateVersion` correctly or set `boot.swraid.enable` manually.
|
||||
|
||||
## Other Notable Changes {#sec-release-23.11-notable-changes}
|
||||
|
||||
- The Cinnamon module now enables XDG desktop integration by default. If you are experiencing collisions related to xdg-desktop-portal-gtk you can safely remove `xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];` from your NixOS configuration.
|
||||
|
|
|
@ -381,6 +381,7 @@ sub in {
|
|||
|
||||
my $fileSystems;
|
||||
my %fsByDev;
|
||||
my $useSwraid = 0;
|
||||
foreach my $fs (read_file("/proc/self/mountinfo")) {
|
||||
chomp $fs;
|
||||
my @fields = split / /, $fs;
|
||||
|
@ -510,8 +511,8 @@ EOF
|
|||
# boot.initrd.luks.devices entry.
|
||||
if (-e $device) {
|
||||
my $deviceName = basename(abs_path($device));
|
||||
if (-e "/sys/class/block/$deviceName"
|
||||
&& read_file("/sys/class/block/$deviceName/dm/uuid", err_mode => 'quiet') =~ /^CRYPT-LUKS/)
|
||||
my $dmUuid = read_file("/sys/class/block/$deviceName/dm/uuid", err_mode => 'quiet');
|
||||
if ($dmUuid =~ /^CRYPT-LUKS/)
|
||||
{
|
||||
my @slaves = glob("/sys/class/block/$deviceName/slaves/*");
|
||||
if (scalar @slaves == 1) {
|
||||
|
@ -527,8 +528,14 @@ EOF
|
|||
}
|
||||
}
|
||||
}
|
||||
if (-e "/sys/class/block/$deviceName/md/uuid") {
|
||||
$useSwraid = 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
if ($useSwraid) {
|
||||
push @attrs, "boot.swraid.enable = true;\n\n";
|
||||
}
|
||||
|
||||
|
||||
# Generate the hardware configuration file.
|
||||
|
|
|
@ -1108,6 +1108,7 @@
|
|||
./services/security/clamav.nix
|
||||
./services/security/endlessh-go.nix
|
||||
./services/security/endlessh.nix
|
||||
./services/security/esdm.nix
|
||||
./services/security/fail2ban.nix
|
||||
./services/security/fprintd.nix
|
||||
./services/security/haka.nix
|
||||
|
|
|
@ -106,6 +106,8 @@ with lib;
|
|||
systemdStage1Network
|
||||
];
|
||||
|
||||
boot.swraid.enable = true;
|
||||
|
||||
# Show all debug messages from the kernel but don't log refused packets
|
||||
# because we have the firewall enabled. This makes installs from the
|
||||
# console less cumbersome if the machine has a public IP.
|
||||
|
|
|
@ -203,7 +203,7 @@ with lib;
|
|||
users = {
|
||||
users.${cfg.user} = {
|
||||
description = "Nullmailer relay-only mta user";
|
||||
group = cfg.group;
|
||||
inherit (cfg) group;
|
||||
isSystemUser = true;
|
||||
};
|
||||
|
||||
|
@ -211,10 +211,10 @@ with lib;
|
|||
};
|
||||
|
||||
systemd.tmpfiles.rules = [
|
||||
"d /var/spool/nullmailer - ${cfg.user} - - -"
|
||||
"d /var/spool/nullmailer/failed 750 ${cfg.user} - - -"
|
||||
"d /var/spool/nullmailer/queue 750 ${cfg.user} - - -"
|
||||
"d /var/spool/nullmailer/tmp 750 ${cfg.user} - - -"
|
||||
"d /var/spool/nullmailer - ${cfg.user} ${cfg.group} - -"
|
||||
"d /var/spool/nullmailer/failed 770 ${cfg.user} ${cfg.group} - -"
|
||||
"d /var/spool/nullmailer/queue 770 ${cfg.user} ${cfg.group} - -"
|
||||
"d /var/spool/nullmailer/tmp 770 ${cfg.user} ${cfg.group} - -"
|
||||
];
|
||||
|
||||
systemd.services.nullmailer = {
|
||||
|
@ -238,7 +238,7 @@ with lib;
|
|||
program = "sendmail";
|
||||
source = "${pkgs.nullmailer}/bin/sendmail";
|
||||
owner = cfg.user;
|
||||
group = cfg.group;
|
||||
inherit (cfg) group;
|
||||
setuid = true;
|
||||
setgid = true;
|
||||
};
|
||||
|
|
|
@ -4,7 +4,7 @@ with lib;
|
|||
|
||||
let
|
||||
|
||||
inherit (pkgs) cups cups-pk-helper cups-filters;
|
||||
inherit (pkgs) cups cups-pk-helper cups-filters xdg-utils;
|
||||
|
||||
cfg = config.services.printing;
|
||||
|
||||
|
@ -313,7 +313,9 @@ in
|
|||
description = "CUPS printing services";
|
||||
};
|
||||
|
||||
environment.systemPackages = [ cups.out ] ++ optional polkitEnabled cups-pk-helper;
|
||||
# We need xdg-open (part of xdg-utils) for the desktop-file to proper open the users default-browser when opening "Manage Printing"
|
||||
# https://github.com/NixOS/nixpkgs/pull/237994#issuecomment-1597510969
|
||||
environment.systemPackages = [ cups.out xdg-utils ] ++ optional polkitEnabled cups-pk-helper;
|
||||
environment.etc.cups.source = "/var/lib/cups";
|
||||
|
||||
services.dbus.packages = [ cups.out ] ++ optional polkitEnabled cups-pk-helper;
|
||||
|
|
102
nixos/modules/services/security/esdm.nix
Normal file
102
nixos/modules/services/security/esdm.nix
Normal file
|
@ -0,0 +1,102 @@
|
|||
{ lib, config, pkgs, ... }:
|
||||
|
||||
let
|
||||
cfg = config.services.esdm;
|
||||
in
|
||||
{
|
||||
options.services.esdm = {
|
||||
enable = lib.mkEnableOption (lib.mdDoc "ESDM service configuration");
|
||||
package = lib.mkPackageOptionMD pkgs "esdm" { };
|
||||
serverEnable = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = true;
|
||||
description = lib.mdDoc ''
|
||||
Enable option for ESDM server service. If serverEnable == false, then the esdm-server
|
||||
will not start. Also the subsequent services esdm-cuse-random, esdm-cuse-urandom
|
||||
and esdm-proc will not start as these have the entry Want=esdm-server.service.
|
||||
'';
|
||||
};
|
||||
cuseRandomEnable = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = true;
|
||||
description = lib.mdDoc ''
|
||||
Enable option for ESDM cuse-random service. Determines if the esdm-cuse-random.service
|
||||
is started.
|
||||
'';
|
||||
};
|
||||
cuseUrandomEnable = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = true;
|
||||
description = lib.mdDoc ''
|
||||
Enable option for ESDM cuse-urandom service. Determines if the esdm-cuse-urandom.service
|
||||
is started.
|
||||
'';
|
||||
};
|
||||
procEnable = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = true;
|
||||
description = lib.mdDoc ''
|
||||
Enable option for ESDM proc service. Determines if the esdm-proc.service
|
||||
is started.
|
||||
'';
|
||||
};
|
||||
verbose = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = lib.mdDoc ''
|
||||
Enable verbose ExecStart for ESDM. If verbose == true, then the corresponding "ExecStart"
|
||||
values of the 4 aforementioned services are overwritten with the option
|
||||
for the highest verbosity.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable (
|
||||
lib.mkMerge [
|
||||
({
|
||||
systemd.packages = [ cfg.package ];
|
||||
})
|
||||
# It is necessary to set those options for these services to be started by systemd in NixOS
|
||||
(lib.mkIf cfg.serverEnable {
|
||||
systemd.services."esdm-server".wantedBy = [ "basic.target" ];
|
||||
systemd.services."esdm-server".serviceConfig = lib.mkIf cfg.verbose {
|
||||
ExecStart = [
|
||||
" " # unset previous value defined in 'esdm-server.service'
|
||||
"${cfg.package}/bin/esdm-server -f -vvvvvv"
|
||||
];
|
||||
};
|
||||
})
|
||||
|
||||
(lib.mkIf cfg.cuseRandomEnable {
|
||||
systemd.services."esdm-cuse-random".wantedBy = [ "basic.target" ];
|
||||
systemd.services."esdm-cuse-random".serviceConfig = lib.mkIf cfg.verbose {
|
||||
ExecStart = [
|
||||
" " # unset previous value defined in 'esdm-cuse-random.service'
|
||||
"${cfg.package}/bin/esdm-cuse-random -f -v 6"
|
||||
];
|
||||
};
|
||||
})
|
||||
|
||||
(lib.mkIf cfg.cuseUrandomEnable {
|
||||
systemd.services."esdm-cuse-urandom".wantedBy = [ "basic.target" ];
|
||||
systemd.services."esdm-cuse-urandom".serviceConfig = lib.mkIf cfg.verbose {
|
||||
ExecStart = [
|
||||
" " # unset previous value defined in 'esdm-cuse-urandom.service'
|
||||
"${config.services.esdm.package}/bin/esdm-cuse-urandom -f -v 6"
|
||||
];
|
||||
};
|
||||
})
|
||||
|
||||
(lib.mkIf cfg.procEnable {
|
||||
systemd.services."esdm-proc".wantedBy = [ "basic.target" ];
|
||||
systemd.services."esdm-proc".serviceConfig = lib.mkIf cfg.verbose {
|
||||
ExecStart = [
|
||||
" " # unset previous value defined in 'esdm-proc.service'
|
||||
"${cfg.package}/bin/esdm-proc --relabel -f -o allow_other /proc/sys/kernel/random -v 6"
|
||||
];
|
||||
};
|
||||
})
|
||||
]);
|
||||
|
||||
meta.maintainers = with lib.maintainers; [ orichter thillux ];
|
||||
}
|
|
@ -7,7 +7,6 @@ let
|
|||
cfg = config.services.nexus;
|
||||
|
||||
in
|
||||
|
||||
{
|
||||
options = {
|
||||
services.nexus = {
|
||||
|
@ -20,6 +19,16 @@ in
|
|||
description = lib.mdDoc "Package which runs Nexus3";
|
||||
};
|
||||
|
||||
jdkPackage = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.openjdk8;
|
||||
defaultText = literalExample "pkgs.openjdk8";
|
||||
example = literalExample "pkgs.openjdk8";
|
||||
description = ''
|
||||
The JDK package to use.
|
||||
'';
|
||||
};
|
||||
|
||||
user = mkOption {
|
||||
type = types.str;
|
||||
default = "nexus";
|
||||
|
@ -123,6 +132,7 @@ in
|
|||
NEXUS_USER = cfg.user;
|
||||
NEXUS_HOME = cfg.home;
|
||||
|
||||
INSTALL4J_JAVA_HOME = "${cfg.jdkPackage}";
|
||||
VM_OPTS_FILE = pkgs.writeText "nexus.vmoptions" cfg.jvmOpts;
|
||||
};
|
||||
|
||||
|
|
|
@ -133,10 +133,6 @@ let
|
|||
copy_bin_and_libs ${getBin pkgs.lvm2}/bin/dmsetup
|
||||
copy_bin_and_libs ${getBin pkgs.lvm2}/bin/lvm
|
||||
|
||||
# Add RAID mdadm tool.
|
||||
copy_bin_and_libs ${pkgs.mdadm}/sbin/mdadm
|
||||
copy_bin_and_libs ${pkgs.mdadm}/sbin/mdmon
|
||||
|
||||
# Copy udev.
|
||||
copy_bin_and_libs ${udev}/bin/udevadm
|
||||
copy_bin_and_libs ${udev}/lib/systemd/systemd-sysctl
|
||||
|
@ -225,7 +221,6 @@ let
|
|||
$out/bin/udevadm --version
|
||||
$out/bin/dmsetup --version 2>&1 | tee -a log | grep -q "version:"
|
||||
LVM_SYSTEM_DIR=$out $out/bin/lvm version 2>&1 | tee -a log | grep -q "LVM"
|
||||
$out/bin/mdadm --version
|
||||
${optionalString config.services.multipath.enable ''
|
||||
($out/bin/multipath || true) 2>&1 | grep -q 'need to be root'
|
||||
($out/bin/multipathd || true) 2>&1 | grep -q 'need to be root'
|
||||
|
@ -354,9 +349,6 @@ let
|
|||
[ { object = bootStage1;
|
||||
symlink = "/init";
|
||||
}
|
||||
{ object = pkgs.writeText "mdadm.conf" config.boot.initrd.services.swraid.mdadmConf;
|
||||
symlink = "/etc/mdadm.conf";
|
||||
}
|
||||
{ object = pkgs.runCommand "initrd-kmod-blacklist-ubuntu" {
|
||||
src = "${pkgs.kmod-blacklist-ubuntu}/modprobe.conf";
|
||||
preferLocalBuild = true;
|
||||
|
@ -727,6 +719,6 @@ in
|
|||
};
|
||||
|
||||
imports = [
|
||||
(mkRenamedOptionModule [ "boot" "initrd" "mdadmConf" ] [ "boot" "initrd" "services" "swraid" "mdadmConf" ])
|
||||
(mkRenamedOptionModule [ "boot" "initrd" "mdadmConf" ] [ "boot" "swraid" "mdadmConf" ])
|
||||
];
|
||||
}
|
||||
|
|
|
@ -1,39 +1,62 @@
|
|||
{ config, pkgs, lib, ... }: let
|
||||
|
||||
cfg = config.boot.initrd.services.swraid;
|
||||
cfg = config.boot.swraid;
|
||||
|
||||
in {
|
||||
|
||||
options.boot.initrd.services.swraid = {
|
||||
options.boot.swraid = {
|
||||
enable = lib.mkEnableOption (lib.mdDoc "swraid support using mdadm") // {
|
||||
description = ''
|
||||
*This will only be used when systemd is used in stage 1.*
|
||||
description = lib.mdDoc ''
|
||||
Whether to enable support for Linux MD RAID arrays.
|
||||
|
||||
Whether to enable swraid support using mdadm.
|
||||
When this is enabled, mdadm will be added to the system path,
|
||||
and MD RAID arrays will be detected and activated
|
||||
automatically, both in stage-1 (initramfs) and in stage-2 (the
|
||||
final NixOS system).
|
||||
|
||||
This should be enabled if you want to be able to access and/or
|
||||
boot from MD RAID arrays. {command}`nixos-generate-config`
|
||||
should detect it correctly in the standard installation
|
||||
procedure.
|
||||
'';
|
||||
default = lib.versionOlder config.system.stateVersion "23.11";
|
||||
defaultText = lib.mdDoc "`true` if stateVersion is older than 23.11";
|
||||
};
|
||||
|
||||
mdadmConf = lib.mkOption {
|
||||
description = lib.mdDoc "Contents of {file}`/etc/mdadm.conf` in initrd.";
|
||||
description = lib.mdDoc "Contents of {file}`/etc/mdadm.conf`.";
|
||||
type = lib.types.lines;
|
||||
default = "";
|
||||
};
|
||||
};
|
||||
|
||||
config = {
|
||||
config = lib.mkIf cfg.enable {
|
||||
environment.systemPackages = [ pkgs.mdadm ];
|
||||
|
||||
services.udev.packages = [ pkgs.mdadm ];
|
||||
|
||||
systemd.packages = [ pkgs.mdadm ];
|
||||
|
||||
boot.initrd.availableKernelModules = lib.mkIf (config.boot.initrd.systemd.enable -> cfg.enable) [ "md_mod" "raid0" "raid1" "raid10" "raid456" ];
|
||||
boot.initrd = {
|
||||
availableKernelModules = [ "md_mod" "raid0" "raid1" "raid10" "raid456" ];
|
||||
|
||||
boot.initrd.extraUdevRulesCommands = lib.mkIf (!config.boot.initrd.systemd.enable) ''
|
||||
extraUdevRulesCommands = lib.mkIf (!config.boot.initrd.systemd.enable) ''
|
||||
cp -v ${pkgs.mdadm}/lib/udev/rules.d/*.rules $out/
|
||||
'';
|
||||
|
||||
boot.initrd.systemd = lib.mkIf cfg.enable {
|
||||
extraUtilsCommands = ''
|
||||
# Add RAID mdadm tool.
|
||||
copy_bin_and_libs ${pkgs.mdadm}/sbin/mdadm
|
||||
copy_bin_and_libs ${pkgs.mdadm}/sbin/mdmon
|
||||
'';
|
||||
|
||||
extraUtilsCommandsTest = ''
|
||||
$out/bin/mdadm --version
|
||||
'';
|
||||
|
||||
extraFiles."/etc/mdadm.conf".source = pkgs.writeText "mdadm.conf" config.boot.swraid.mdadmConf;
|
||||
|
||||
systemd = {
|
||||
contents."/etc/mdadm.conf" = lib.mkIf (cfg.mdadmConf != "") {
|
||||
text = cfg.mdadmConf;
|
||||
};
|
||||
|
@ -42,6 +65,7 @@ in {
|
|||
initrdBin = [ pkgs.mdadm ];
|
||||
};
|
||||
|
||||
boot.initrd.services.udev.packages = lib.mkIf cfg.enable [ pkgs.mdadm ];
|
||||
services.udev.packages = [ pkgs.mdadm ];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
simpleUefiGrubSpecialisation
|
||||
simpleUefiSystemdBoot
|
||||
stratisRoot
|
||||
# swraid
|
||||
swraid
|
||||
zfsroot
|
||||
;
|
||||
|
||||
|
|
|
@ -62,20 +62,20 @@ import ../make-test-python.nix ({ pkgs, lib, k3s, ... }:
|
|||
start_all()
|
||||
|
||||
machine.wait_for_unit("k3s")
|
||||
machine.succeed("k3s kubectl cluster-info")
|
||||
machine.fail("sudo -u noprivs k3s kubectl cluster-info")
|
||||
machine.succeed("kubectl cluster-info")
|
||||
machine.fail("sudo -u noprivs kubectl cluster-info")
|
||||
'' # Fix-Me: Tests fail for 'aarch64-linux' as: "CONFIG_CGROUP_FREEZER: missing (fail)"
|
||||
+ lib.optionalString (!pkgs.stdenv.isAarch64) ''machine.succeed("k3s check-config")'' + ''
|
||||
|
||||
machine.succeed(
|
||||
"${pauseImage} | k3s ctr image import -"
|
||||
"${pauseImage} | ctr image import -"
|
||||
)
|
||||
|
||||
# Also wait for our service account to show up; it takes a sec
|
||||
machine.wait_until_succeeds("k3s kubectl get serviceaccount default")
|
||||
machine.succeed("k3s kubectl apply -f ${testPodYaml}")
|
||||
machine.succeed("k3s kubectl wait --for 'condition=Ready' pod/test")
|
||||
machine.succeed("k3s kubectl delete -f ${testPodYaml}")
|
||||
machine.wait_until_succeeds("kubectl get serviceaccount default")
|
||||
machine.succeed("kubectl apply -f ${testPodYaml}")
|
||||
machine.succeed("kubectl wait --for 'condition=Ready' pod/test")
|
||||
machine.succeed("kubectl delete -f ${testPodYaml}")
|
||||
|
||||
# regression test for #176445
|
||||
machine.fail("journalctl -o cat -u k3s.service | grep 'ipset utility not found'")
|
||||
|
|
|
@ -14,17 +14,17 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: {
|
|||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
|
||||
environment.systemPackages = with pkgs; [ mdadm e2fsprogs ]; # for mdadm and mkfs.ext4
|
||||
boot.initrd = {
|
||||
systemd = {
|
||||
enable = true;
|
||||
emergencyAccess = true;
|
||||
};
|
||||
services.swraid = {
|
||||
boot.swraid = {
|
||||
enable = true;
|
||||
mdadmConf = ''
|
||||
ARRAY /dev/md0 devices=/dev/vdb,/dev/vdc
|
||||
'';
|
||||
};
|
||||
boot.initrd = {
|
||||
systemd = {
|
||||
enable = true;
|
||||
emergencyAccess = true;
|
||||
};
|
||||
kernelModules = [ "raid0" ];
|
||||
};
|
||||
|
||||
|
|
45
pkgs/applications/audio/master_me/default.nix
Normal file
45
pkgs/applications/audio/master_me/default.nix
Normal file
|
@ -0,0 +1,45 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, libGL
|
||||
, libX11
|
||||
, libXext
|
||||
, libXrandr
|
||||
, pkg-config
|
||||
, python3
|
||||
, Cocoa
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "master_me";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "trummerschlunk";
|
||||
repo = "master_me";
|
||||
rev = version;
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-FG3X1dOF9KRHHSnd5/zP+GrYCB2O0y+tnI5/l9tNhyE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ libGL python3 ]
|
||||
++ lib.optionals stdenv.isDarwin [ Cocoa ]
|
||||
++ lib.optionals stdenv.isLinux [ libX11 libXext libXrandr ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs ./dpf/utils/
|
||||
'';
|
||||
|
||||
makeFlags = [ "PREFIX=${placeholder "out"}" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/trummerschlunk/master_me";
|
||||
description = "automatic mastering plugin for live streaming, podcasts and internet radio";
|
||||
maintainers = with maintainers; [ magnetophon ];
|
||||
platforms = platforms.all;
|
||||
broken = stdenv.isDarwin; # error: no type or protocol named 'NSPasteboardType'
|
||||
license = licenses.gpl3Plus;
|
||||
};
|
||||
}
|
|
@ -20,9 +20,10 @@
|
|||
"231.9011.35": "https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip",
|
||||
"231.9161.29": "https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip",
|
||||
"231.9161.40": "https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip",
|
||||
"231.9161.41": "https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip",
|
||||
"231.9161.46": "https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip",
|
||||
"231.9161.47": "https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip",
|
||||
"231.9225.12": "https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip",
|
||||
"231.9225.15": "https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip",
|
||||
"231.9225.16": "https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip"
|
||||
},
|
||||
"name": "ideavim"
|
||||
|
@ -66,10 +67,11 @@
|
|||
"231.9011.35": null,
|
||||
"231.9161.29": "https://plugins.jetbrains.com/files/6981/351503/ini-231.9161.47.zip",
|
||||
"231.9161.40": "https://plugins.jetbrains.com/files/6981/351503/ini-231.9161.47.zip",
|
||||
"231.9161.41": "https://plugins.jetbrains.com/files/6981/351503/ini-231.9161.47.zip",
|
||||
"231.9161.46": "https://plugins.jetbrains.com/files/6981/351503/ini-231.9161.47.zip",
|
||||
"231.9161.47": "https://plugins.jetbrains.com/files/6981/351503/ini-231.9161.47.zip",
|
||||
"231.9225.16": "https://plugins.jetbrains.com/files/6981/359999/ini-231.9225.16.zip"
|
||||
"231.9225.12": "https://plugins.jetbrains.com/files/6981/360771/ini-231.9225.18.zip",
|
||||
"231.9225.15": "https://plugins.jetbrains.com/files/6981/360771/ini-231.9225.18.zip",
|
||||
"231.9225.16": "https://plugins.jetbrains.com/files/6981/360771/ini-231.9225.18.zip"
|
||||
},
|
||||
"name": "ini"
|
||||
},
|
||||
|
@ -129,9 +131,10 @@
|
|||
"231.9011.35": "https://plugins.jetbrains.com/files/8182/359429/intellij-rust-0.4.198.5409-231.zip",
|
||||
"231.9161.29": "https://plugins.jetbrains.com/files/8182/359429/intellij-rust-0.4.198.5409-231.zip",
|
||||
"231.9161.40": "https://plugins.jetbrains.com/files/8182/359429/intellij-rust-0.4.198.5409-231.zip",
|
||||
"231.9161.41": "https://plugins.jetbrains.com/files/8182/359429/intellij-rust-0.4.198.5409-231.zip",
|
||||
"231.9161.46": "https://plugins.jetbrains.com/files/8182/359429/intellij-rust-0.4.198.5409-231.zip",
|
||||
"231.9161.47": "https://plugins.jetbrains.com/files/8182/359429/intellij-rust-0.4.198.5409-231.zip",
|
||||
"231.9225.12": "https://plugins.jetbrains.com/files/8182/359429/intellij-rust-0.4.198.5409-231.zip",
|
||||
"231.9225.15": "https://plugins.jetbrains.com/files/8182/359429/intellij-rust-0.4.198.5409-231.zip",
|
||||
"231.9225.16": "https://plugins.jetbrains.com/files/8182/359429/intellij-rust-0.4.198.5409-231.zip"
|
||||
},
|
||||
"name": "rust"
|
||||
|
@ -156,9 +159,10 @@
|
|||
"231.9011.35": "https://plugins.jetbrains.com/files/8182/355173/intellij-rust-0.4.198.5444-231-beta.zip",
|
||||
"231.9161.29": "https://plugins.jetbrains.com/files/8182/355173/intellij-rust-0.4.198.5444-231-beta.zip",
|
||||
"231.9161.40": "https://plugins.jetbrains.com/files/8182/355173/intellij-rust-0.4.198.5444-231-beta.zip",
|
||||
"231.9161.41": "https://plugins.jetbrains.com/files/8182/355173/intellij-rust-0.4.198.5444-231-beta.zip",
|
||||
"231.9161.46": "https://plugins.jetbrains.com/files/8182/355173/intellij-rust-0.4.198.5444-231-beta.zip",
|
||||
"231.9161.47": "https://plugins.jetbrains.com/files/8182/355173/intellij-rust-0.4.198.5444-231-beta.zip",
|
||||
"231.9225.12": "https://plugins.jetbrains.com/files/8182/355173/intellij-rust-0.4.198.5444-231-beta.zip",
|
||||
"231.9225.15": "https://plugins.jetbrains.com/files/8182/355173/intellij-rust-0.4.198.5444-231-beta.zip",
|
||||
"231.9225.16": "https://plugins.jetbrains.com/files/8182/355173/intellij-rust-0.4.198.5444-231-beta.zip"
|
||||
},
|
||||
"name": "rust-beta"
|
||||
|
@ -175,8 +179,8 @@
|
|||
],
|
||||
"builds": {
|
||||
"231.9161.29": "https://plugins.jetbrains.com/files/8554/326468/featuresTrainer-231.8770.66.zip",
|
||||
"231.9161.40": "https://plugins.jetbrains.com/files/8554/326468/featuresTrainer-231.8770.66.zip",
|
||||
"231.9161.41": "https://plugins.jetbrains.com/files/8554/326468/featuresTrainer-231.8770.66.zip",
|
||||
"231.9225.12": "https://plugins.jetbrains.com/files/8554/326468/featuresTrainer-231.8770.66.zip",
|
||||
"231.9225.15": "https://plugins.jetbrains.com/files/8554/326468/featuresTrainer-231.8770.66.zip",
|
||||
"231.9225.16": "https://plugins.jetbrains.com/files/8554/326468/featuresTrainer-231.8770.66.zip"
|
||||
},
|
||||
"name": "ide-features-trainer"
|
||||
|
@ -201,9 +205,10 @@
|
|||
"231.9011.35": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip",
|
||||
"231.9161.29": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip",
|
||||
"231.9161.40": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip",
|
||||
"231.9161.41": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip",
|
||||
"231.9161.46": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip",
|
||||
"231.9161.47": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip",
|
||||
"231.9225.12": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip",
|
||||
"231.9225.15": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip",
|
||||
"231.9225.16": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip"
|
||||
},
|
||||
"name": "nixidea"
|
||||
|
@ -237,9 +242,10 @@
|
|||
"231.9011.35": "https://plugins.jetbrains.com/files/10037/358810/CSVEditor-3.2.1-231.zip",
|
||||
"231.9161.29": "https://plugins.jetbrains.com/files/10037/358810/CSVEditor-3.2.1-231.zip",
|
||||
"231.9161.40": "https://plugins.jetbrains.com/files/10037/358810/CSVEditor-3.2.1-231.zip",
|
||||
"231.9161.41": "https://plugins.jetbrains.com/files/10037/358810/CSVEditor-3.2.1-231.zip",
|
||||
"231.9161.46": "https://plugins.jetbrains.com/files/10037/358810/CSVEditor-3.2.1-231.zip",
|
||||
"231.9161.47": "https://plugins.jetbrains.com/files/10037/358810/CSVEditor-3.2.1-231.zip",
|
||||
"231.9225.12": "https://plugins.jetbrains.com/files/10037/358810/CSVEditor-3.2.1-231.zip",
|
||||
"231.9225.15": "https://plugins.jetbrains.com/files/10037/358810/CSVEditor-3.2.1-231.zip",
|
||||
"231.9225.16": "https://plugins.jetbrains.com/files/10037/358810/CSVEditor-3.2.1-231.zip"
|
||||
},
|
||||
"name": "csv-editor"
|
||||
|
@ -264,9 +270,10 @@
|
|||
"231.9011.35": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip",
|
||||
"231.9161.29": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip",
|
||||
"231.9161.40": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip",
|
||||
"231.9161.41": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip",
|
||||
"231.9161.46": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip",
|
||||
"231.9161.47": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip",
|
||||
"231.9225.12": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip",
|
||||
"231.9225.15": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip",
|
||||
"231.9225.16": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip"
|
||||
},
|
||||
"name": "eclipse-keymap"
|
||||
|
@ -291,9 +298,10 @@
|
|||
"231.9011.35": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip",
|
||||
"231.9161.29": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip",
|
||||
"231.9161.40": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip",
|
||||
"231.9161.41": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip",
|
||||
"231.9161.46": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip",
|
||||
"231.9161.47": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip",
|
||||
"231.9225.12": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip",
|
||||
"231.9225.15": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip",
|
||||
"231.9225.16": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip"
|
||||
},
|
||||
"name": "visual-studio-keymap"
|
||||
|
@ -318,9 +326,10 @@
|
|||
"231.9011.35": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
|
||||
"231.9161.29": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
|
||||
"231.9161.40": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
|
||||
"231.9161.41": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
|
||||
"231.9161.46": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
|
||||
"231.9161.47": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
|
||||
"231.9225.12": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
|
||||
"231.9225.15": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
|
||||
"231.9225.16": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar"
|
||||
},
|
||||
"name": "darcula-pitch-black"
|
||||
|
@ -341,14 +350,15 @@
|
|||
"webstorm"
|
||||
],
|
||||
"builds": {
|
||||
"223.8836.1185": "https://plugins.jetbrains.com/files/17718/351707/github-copilot-intellij-1.2.9.2684.zip",
|
||||
"231.9011.35": "https://plugins.jetbrains.com/files/17718/351707/github-copilot-intellij-1.2.9.2684.zip",
|
||||
"231.9161.29": "https://plugins.jetbrains.com/files/17718/351707/github-copilot-intellij-1.2.9.2684.zip",
|
||||
"231.9161.40": "https://plugins.jetbrains.com/files/17718/351707/github-copilot-intellij-1.2.9.2684.zip",
|
||||
"231.9161.41": "https://plugins.jetbrains.com/files/17718/351707/github-copilot-intellij-1.2.9.2684.zip",
|
||||
"231.9161.46": "https://plugins.jetbrains.com/files/17718/351707/github-copilot-intellij-1.2.9.2684.zip",
|
||||
"231.9161.47": "https://plugins.jetbrains.com/files/17718/351707/github-copilot-intellij-1.2.9.2684.zip",
|
||||
"231.9225.16": "https://plugins.jetbrains.com/files/17718/351707/github-copilot-intellij-1.2.9.2684.zip"
|
||||
"223.8836.1185": "https://plugins.jetbrains.com/files/17718/360520/github-copilot-intellij-1.2.13.2776.zip",
|
||||
"231.9011.35": "https://plugins.jetbrains.com/files/17718/360520/github-copilot-intellij-1.2.13.2776.zip",
|
||||
"231.9161.29": "https://plugins.jetbrains.com/files/17718/360520/github-copilot-intellij-1.2.13.2776.zip",
|
||||
"231.9161.40": "https://plugins.jetbrains.com/files/17718/360520/github-copilot-intellij-1.2.13.2776.zip",
|
||||
"231.9161.46": "https://plugins.jetbrains.com/files/17718/360520/github-copilot-intellij-1.2.13.2776.zip",
|
||||
"231.9161.47": "https://plugins.jetbrains.com/files/17718/360520/github-copilot-intellij-1.2.13.2776.zip",
|
||||
"231.9225.12": "https://plugins.jetbrains.com/files/17718/360520/github-copilot-intellij-1.2.13.2776.zip",
|
||||
"231.9225.15": "https://plugins.jetbrains.com/files/17718/360520/github-copilot-intellij-1.2.13.2776.zip",
|
||||
"231.9225.16": "https://plugins.jetbrains.com/files/17718/360520/github-copilot-intellij-1.2.13.2776.zip"
|
||||
},
|
||||
"name": "github-copilot"
|
||||
},
|
||||
|
@ -372,9 +382,10 @@
|
|||
"231.9011.35": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
|
||||
"231.9161.29": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
|
||||
"231.9161.40": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
|
||||
"231.9161.41": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
|
||||
"231.9161.46": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
|
||||
"231.9161.47": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
|
||||
"231.9225.12": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
|
||||
"231.9225.15": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
|
||||
"231.9225.16": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip"
|
||||
},
|
||||
"name": "netbeans-6-5-keymap"
|
||||
|
@ -390,12 +401,12 @@
|
|||
"https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar": "sha256-eXInfAqY3yEZRXCAuv3KGldM1pNKEioNwPB0rIGgJFw=",
|
||||
"https://plugins.jetbrains.com/files/164/275091/IdeaVim-2.1.0.zip": "sha256-2dM/r79XT+1MHDeRAUnZw6WO3dmw7MZfx9alHmBqMk0=",
|
||||
"https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip": "sha256-K4HQXGdvFhs7X25Kw+pljep/lqJ9lwewnGSEvbnNetE=",
|
||||
"https://plugins.jetbrains.com/files/17718/351707/github-copilot-intellij-1.2.9.2684.zip": "sha256-imh+3U+HWM9jia2HfRXInHl1pfw+T6D4ls3DGqbqbsw=",
|
||||
"https://plugins.jetbrains.com/files/17718/360520/github-copilot-intellij-1.2.13.2776.zip": "sha256-9KTWE7rudLZwxCEv5QNu/9rxA0o0GdQK4+oqkzeOtyA=",
|
||||
"https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip": "sha256-KrzZTKZMQqoEMw+vDUv2jjs0EX0leaPBkU8H/ecq/oI=",
|
||||
"https://plugins.jetbrains.com/files/631/360005/python-231.9225.16.zip": "sha256-vin0+O9f4rY3FYqztzdIlyal5bvrvrt8Q8neDrXRmsU=",
|
||||
"https://plugins.jetbrains.com/files/6954/357005/kotlin-plugin-231-1.9.0-release-358-IJ8770.65.zip": "sha256-v2EB05au8mkC5VnoEILLJ3tesEeCWCYSNJ9RzfJZA1o=",
|
||||
"https://plugins.jetbrains.com/files/6981/351503/ini-231.9161.47.zip": "sha256-oAgTPyTnfqEKjaGcK50k9O16hDY+A4lfL2l9IpGKyCY=",
|
||||
"https://plugins.jetbrains.com/files/6981/359999/ini-231.9225.16.zip": "sha256-4Ko7v1VOK+rcgCm0vrde33TSUx2PPv6HvJLNmvEWjFk=",
|
||||
"https://plugins.jetbrains.com/files/6981/360771/ini-231.9225.18.zip": "sha256-FHv/cELjKf3Jral2Cqc3QiE4bx1mm6jy42AsR27nt9g=",
|
||||
"https://plugins.jetbrains.com/files/7219/355564/Symfony_Plugin-2022.1.253.zip": "sha256-vE+fobPbtWlaSHGTLlbDcC6NkaJiA4Qp50h8flXHaJc=",
|
||||
"https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip": "sha256-hT5K4w4lhvNwDzDMDSvsIDGj9lyaRqglfOhlbNdqpWs=",
|
||||
"https://plugins.jetbrains.com/files/7322/326457/python-ce-231.8770.65.zip": "sha256-LjHpwdBtC4C9KXrHQ+EvmGL1A+Tfbqzc17Kf80SP/lE=",
|
||||
|
|
|
@ -19,10 +19,10 @@
|
|||
"dataspell": {
|
||||
"update-channel": "DataSpell RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/python/dataspell-{version}.tar.gz",
|
||||
"version": "2023.1.3",
|
||||
"sha256": "7c0a19d740e3be8307a4487427347e2d5a7d4ab12ec44f1866e8c5f08e97d323",
|
||||
"url": "https://download.jetbrains.com/python/dataspell-2023.1.3.tar.gz",
|
||||
"build_number": "231.9161.44"
|
||||
"version": "2023.1.4",
|
||||
"sha256": "07158e00ef81c58c9b295c1777635069777f5f3f16d593b14429673b9699cfff",
|
||||
"url": "https://download.jetbrains.com/python/dataspell-2023.1.4.tar.gz",
|
||||
"build_number": "231.9225.14"
|
||||
},
|
||||
"gateway": {
|
||||
"update-channel": "Gateway RELEASE",
|
||||
|
@ -76,18 +76,18 @@
|
|||
"pycharm-community": {
|
||||
"update-channel": "PyCharm RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.tar.gz",
|
||||
"version": "2023.1.3",
|
||||
"sha256": "40682c61bf21c66dd861ee47f12b6895a36d99b9ce676b13cb5dc7e5b4bd3f46",
|
||||
"url": "https://download.jetbrains.com/python/pycharm-community-2023.1.3.tar.gz",
|
||||
"build_number": "231.9161.41"
|
||||
"version": "2023.1.4",
|
||||
"sha256": "4def30bc442113605b907586ee087bc72e75fc63d826b9a9e16cd97dbb467309",
|
||||
"url": "https://download.jetbrains.com/python/pycharm-community-2023.1.4.tar.gz",
|
||||
"build_number": "231.9225.15"
|
||||
},
|
||||
"pycharm-professional": {
|
||||
"update-channel": "PyCharm RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.tar.gz",
|
||||
"version": "2023.1.3",
|
||||
"sha256": "4cdf85c01854d7f74c9fa9efda67453356f1120e49cc5aed1168f0f32d8ee016",
|
||||
"url": "https://download.jetbrains.com/python/pycharm-professional-2023.1.3.tar.gz",
|
||||
"build_number": "231.9161.41"
|
||||
"version": "2023.1.4",
|
||||
"sha256": "0f9beda16f7e90631e75954bf780669ab05621b69e9f91a9e41ed1ecd1ac26cf",
|
||||
"url": "https://download.jetbrains.com/python/pycharm-professional-2023.1.4.tar.gz",
|
||||
"build_number": "231.9225.15"
|
||||
},
|
||||
"rider": {
|
||||
"update-channel": "Rider RELEASE",
|
||||
|
@ -100,10 +100,10 @@
|
|||
"ruby-mine": {
|
||||
"update-channel": "RubyMine RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz",
|
||||
"version": "2023.1.3",
|
||||
"sha256": "0eda257d349b9e24ade016af94a2cbca669b719f0a79d5720dfc9a54c7415901",
|
||||
"url": "https://download.jetbrains.com/ruby/RubyMine-2023.1.3.tar.gz",
|
||||
"build_number": "231.9161.40"
|
||||
"version": "2023.1.4",
|
||||
"sha256": "b9b5d2a3c0c0517e1ef1363b2abe5ca41441343bc1c8999d1b8e6dff248027fb",
|
||||
"url": "https://download.jetbrains.com/ruby/RubyMine-2023.1.4.tar.gz",
|
||||
"build_number": "231.9225.12"
|
||||
},
|
||||
"webstorm": {
|
||||
"update-channel": "WebStorm RELEASE",
|
||||
|
@ -134,10 +134,10 @@
|
|||
"dataspell": {
|
||||
"update-channel": "DataSpell RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/python/dataspell-{version}.dmg",
|
||||
"version": "2023.1.3",
|
||||
"sha256": "5d57d35ea08bc3ef9519b9669771a6d36a22424298e05dc82b18df787b52c79c",
|
||||
"url": "https://download.jetbrains.com/python/dataspell-2023.1.3.dmg",
|
||||
"build_number": "231.9161.44"
|
||||
"version": "2023.1.4",
|
||||
"sha256": "c0c79501d88fc003707707b3410ab4378aaef44a9cebb220f5b1eaeb3db640e9",
|
||||
"url": "https://download.jetbrains.com/python/dataspell-2023.1.4.dmg",
|
||||
"build_number": "231.9225.14"
|
||||
},
|
||||
"gateway": {
|
||||
"update-channel": "Gateway RELEASE",
|
||||
|
@ -191,18 +191,18 @@
|
|||
"pycharm-community": {
|
||||
"update-channel": "PyCharm RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.dmg",
|
||||
"version": "2023.1.3",
|
||||
"sha256": "4e6ca940a47b8c5d93f6392339a0e9497f8b132bbb61d62bc5559fc62ddc9f73",
|
||||
"url": "https://download.jetbrains.com/python/pycharm-community-2023.1.3.dmg",
|
||||
"build_number": "231.9161.41"
|
||||
"version": "2023.1.4",
|
||||
"sha256": "8474b4efea07381d4847b183c26a1d7f4bb80807d34ad5cd058e643b7f930d28",
|
||||
"url": "https://download.jetbrains.com/python/pycharm-community-2023.1.4.dmg",
|
||||
"build_number": "231.9225.15"
|
||||
},
|
||||
"pycharm-professional": {
|
||||
"update-channel": "PyCharm RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.dmg",
|
||||
"version": "2023.1.3",
|
||||
"sha256": "70ee1bbdb2cb214be048174bba4b0f6ba969e0f257f74fb5adee951b517adb0e",
|
||||
"url": "https://download.jetbrains.com/python/pycharm-professional-2023.1.3.dmg",
|
||||
"build_number": "231.9161.41"
|
||||
"version": "2023.1.4",
|
||||
"sha256": "04945795cdee1fb36a5c19c2846203bcc4bccba8939f58dd1265651578f9c4c6",
|
||||
"url": "https://download.jetbrains.com/python/pycharm-professional-2023.1.4.dmg",
|
||||
"build_number": "231.9225.15"
|
||||
},
|
||||
"rider": {
|
||||
"update-channel": "Rider RELEASE",
|
||||
|
@ -215,10 +215,10 @@
|
|||
"ruby-mine": {
|
||||
"update-channel": "RubyMine RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg",
|
||||
"version": "2023.1.3",
|
||||
"sha256": "b6a92e6451d12c618c5489e554d06e24a0967edb6ebf194cf244b9e1f23d4ca5",
|
||||
"url": "https://download.jetbrains.com/ruby/RubyMine-2023.1.3.dmg",
|
||||
"build_number": "231.9161.40"
|
||||
"version": "2023.1.4",
|
||||
"sha256": "4ade59a9d04cc4b5e0a4ed62c2c60e8ddba9717ae91a3e8cf53363d8f0a41e29",
|
||||
"url": "https://download.jetbrains.com/ruby/RubyMine-2023.1.4.dmg",
|
||||
"build_number": "231.9225.12"
|
||||
},
|
||||
"webstorm": {
|
||||
"update-channel": "WebStorm RELEASE",
|
||||
|
@ -249,10 +249,10 @@
|
|||
"dataspell": {
|
||||
"update-channel": "DataSpell RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.dmg",
|
||||
"version": "2023.1.3",
|
||||
"sha256": "9dde75ec9fbccc9bfe7c390fd1f46a81fb153f226da7d3ca96bdeef5e60c51e1",
|
||||
"url": "https://download.jetbrains.com/python/dataspell-2023.1.3-aarch64.dmg",
|
||||
"build_number": "231.9161.44"
|
||||
"version": "2023.1.4",
|
||||
"sha256": "bd0166ea6dcc4de0115102af44da7a587f4bb00a60f9ff09b3da35f2b38370c3",
|
||||
"url": "https://download.jetbrains.com/python/dataspell-2023.1.4-aarch64.dmg",
|
||||
"build_number": "231.9225.14"
|
||||
},
|
||||
"gateway": {
|
||||
"update-channel": "Gateway RELEASE",
|
||||
|
@ -306,18 +306,18 @@
|
|||
"pycharm-community": {
|
||||
"update-channel": "PyCharm RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.dmg",
|
||||
"version": "2023.1.3",
|
||||
"sha256": "989112fe6aae4be2e84712fe1def61589865b57daf7c67d01f81e452b46de252",
|
||||
"url": "https://download.jetbrains.com/python/pycharm-community-2023.1.3-aarch64.dmg",
|
||||
"build_number": "231.9161.41"
|
||||
"version": "2023.1.4",
|
||||
"sha256": "34bd9ea7434e73d4552a90b2b15ae93b7f4ee8df23690d7b74862d50d85207bf",
|
||||
"url": "https://download.jetbrains.com/python/pycharm-community-2023.1.4-aarch64.dmg",
|
||||
"build_number": "231.9225.15"
|
||||
},
|
||||
"pycharm-professional": {
|
||||
"update-channel": "PyCharm RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.dmg",
|
||||
"version": "2023.1.3",
|
||||
"sha256": "fa2403fd138dc013929ebf0a1054f8a55639666f2d4e4b14fa6f904467e74ba0",
|
||||
"url": "https://download.jetbrains.com/python/pycharm-professional-2023.1.3-aarch64.dmg",
|
||||
"build_number": "231.9161.41"
|
||||
"version": "2023.1.4",
|
||||
"sha256": "7c86ed350d71b2fef5f1992a377e7fe161c38a3de91bc1f3bad0d9aafbcde6a8",
|
||||
"url": "https://download.jetbrains.com/python/pycharm-professional-2023.1.4-aarch64.dmg",
|
||||
"build_number": "231.9225.15"
|
||||
},
|
||||
"rider": {
|
||||
"update-channel": "Rider RELEASE",
|
||||
|
@ -330,10 +330,10 @@
|
|||
"ruby-mine": {
|
||||
"update-channel": "RubyMine RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg",
|
||||
"version": "2023.1.3",
|
||||
"sha256": "f367b80a7bfe5ceffee0af865a9722de195823b1049df3afc2301fc6ede66878",
|
||||
"url": "https://download.jetbrains.com/ruby/RubyMine-2023.1.3-aarch64.dmg",
|
||||
"build_number": "231.9161.40"
|
||||
"version": "2023.1.4",
|
||||
"sha256": "ddcb8bf654c24daa0365b9e734b9c6b6d0238303d0f8f540d6e1ce821539e59e",
|
||||
"url": "https://download.jetbrains.com/ruby/RubyMine-2023.1.4-aarch64.dmg",
|
||||
"build_number": "231.9225.12"
|
||||
},
|
||||
"webstorm": {
|
||||
"update-channel": "WebStorm RELEASE",
|
||||
|
|
|
@ -4,13 +4,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "orbiton";
|
||||
version = "2.62.5";
|
||||
version = "2.62.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xyproto";
|
||||
repo = "orbiton";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-g95cWzV2Hrm+0piCyHZQ4ky1k0aaFil9YJE9Hk5lfYE=";
|
||||
hash = "sha256-wSefvbpqxEbzgReOBPcot+VeXazwK/NPzh+wmmYhrls=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
@ -1,13 +1,13 @@
|
|||
{
|
||||
"version": "3.162.8",
|
||||
"version": "3.165.9",
|
||||
"deb": {
|
||||
"x86_64-linux": {
|
||||
"url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.162.8/standard-notes-3.162.8-linux-amd64.deb",
|
||||
"hash": "sha512-XxSz1ZXCVzNBqX5BQ4nytFla1igEttV/pQ40r3HW6BQfy6yprQqmQ94OMJSx7kpfeQpxnwBMOUsA58QM3W7y1w=="
|
||||
"url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.165.9/standard-notes-3.165.9-linux-amd64.deb",
|
||||
"hash": "sha512-DR2wxCi0RgEeAQWbegJv7Zhp6rtO2PWF7RceVNd2KBrLigsRZbRfLVsPLesprKexZoGIryhYvOksecpX51VdUA=="
|
||||
},
|
||||
"aarch64-linux": {
|
||||
"url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.162.8/standard-notes-3.162.8-linux-arm64.deb",
|
||||
"hash": "sha512-Y1+89UaPfB+UKiVg3JWo3zwH1rFnjdKuU1CBwIjMblzf1775gEMXicU0n+6FpWTphcVmEeah9VISoq0oBHNHtg=="
|
||||
"url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.165.9/standard-notes-3.165.9-linux-arm64.deb",
|
||||
"hash": "sha512-ACYzEHQgw4pPZNgOUSDihAFY1dJ91Tmw3y2Lf1iihiOVcGn4qt5XJS2BG0+/bEWZjp0iuBKsfrlfWfSi6c95Sg=="
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -173,24 +173,24 @@ final: prev:
|
|||
|
||||
LazyVim = buildVimPluginFrom2Nix {
|
||||
pname = "LazyVim";
|
||||
version = "2023-07-06";
|
||||
version = "2023-07-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "LazyVim";
|
||||
repo = "LazyVim";
|
||||
rev = "abea2807ce13c994d5697f0ff19d80f85f678b1b";
|
||||
sha256 = "0wiwh3kis2xs3z006b41c8d8ljl4id4l2hqp9cz2l8gw90g7vicb";
|
||||
rev = "a38bf3001dc5576110cb0bbcacc262526ddf7bb9";
|
||||
sha256 = "1ng6dcnyccs43ikwp1pf6df520iaqa952lszadxm60mha4m2490r";
|
||||
};
|
||||
meta.homepage = "https://github.com/LazyVim/LazyVim/";
|
||||
};
|
||||
|
||||
LeaderF = buildVimPluginFrom2Nix {
|
||||
pname = "LeaderF";
|
||||
version = "2023-07-10";
|
||||
version = "2023-07-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Yggdroot";
|
||||
repo = "LeaderF";
|
||||
rev = "92bbe71f0ffa1a1d8c6b871ae4841a1b9e3af079";
|
||||
sha256 = "131c7qcb3khlkp40kg3ii45ch1hf3cmfcfr56vi1fqm14h0aldib";
|
||||
rev = "49af82180b22c3c2ff8d9d1e82a7ab1486cd052b";
|
||||
sha256 = "14lq3yjvxdmpsxp1n1qkcb2nvl23q0r157vizr5kkgy00v194ifd";
|
||||
};
|
||||
meta.homepage = "https://github.com/Yggdroot/LeaderF/";
|
||||
};
|
||||
|
@ -305,12 +305,12 @@ final: prev:
|
|||
|
||||
SchemaStore-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "SchemaStore.nvim";
|
||||
version = "2023-07-07";
|
||||
version = "2023-07-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "b0o";
|
||||
repo = "SchemaStore.nvim";
|
||||
rev = "78c53f2ce05b7209bf5e2e2b2e25c72a3c1444b2";
|
||||
sha256 = "1y1aji722vvv8q5l27lk7ljqpby48nv6y0fq2vbwashvdhlc6imm";
|
||||
rev = "bdba0106f6e33fffb8e2ffea0162ce5565b18840";
|
||||
sha256 = "0z02xxgnfxcpwc39fwqc47wdphgbxlcasksfj1p8lgrmw1q0p0kn";
|
||||
};
|
||||
meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
|
||||
};
|
||||
|
@ -381,8 +381,8 @@ final: prev:
|
|||
src = fetchFromGitHub {
|
||||
owner = "SpaceVim";
|
||||
repo = "SpaceVim";
|
||||
rev = "eed6a4bea69aa7ff117957570cd0f739533e88af";
|
||||
sha256 = "12zf58va1jzi8iyfzxlv1sysykzf29zjijgd74a7gmiq050y2g06";
|
||||
rev = "69cddda85747b77608a8f7a86111e812409475a8";
|
||||
sha256 = "135c0ilpq83cgcsc0gknyazzfv2pl0ll8crpa8gaxlb5g9vh8r70";
|
||||
};
|
||||
meta.homepage = "https://github.com/SpaceVim/SpaceVim/";
|
||||
};
|
||||
|
@ -498,12 +498,12 @@ final: prev:
|
|||
|
||||
aerial-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "aerial.nvim";
|
||||
version = "2023-06-28";
|
||||
version = "2023-07-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "stevearc";
|
||||
repo = "aerial.nvim";
|
||||
rev = "79644dbedc189d79573b2a60e247989bbd8f16e7";
|
||||
sha256 = "0d4pbr9w4pxpcswhpfrcpl91y9m1rpc3q5yk75wc4js2nyk4raah";
|
||||
rev = "e22facd3a696f4690f888e16ddaba585c8173e4e";
|
||||
sha256 = "08zpnsvj1qbiz7c3n23hhbb7n24yzmamfajka2kyffl5fprgph0i";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
meta.homepage = "https://github.com/stevearc/aerial.nvim/";
|
||||
|
@ -1061,6 +1061,18 @@ final: prev:
|
|||
meta.homepage = "https://github.com/APZelos/blamer.nvim/";
|
||||
};
|
||||
|
||||
block-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "block.nvim";
|
||||
version = "2023-06-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "HampusHauffman";
|
||||
repo = "block.nvim";
|
||||
rev = "a7739f9703adf9e77b42a331d4998bd5c8cbf1e9";
|
||||
sha256 = "0wvkyczxjgi701bnhw5fxzwprgsx26nbq13mi3qqlyh42nhhm8zq";
|
||||
};
|
||||
meta.homepage = "https://github.com/HampusHauffman/block.nvim/";
|
||||
};
|
||||
|
||||
blueballs-neovim = buildVimPluginFrom2Nix {
|
||||
pname = "blueballs-neovim";
|
||||
version = "2021-11-28";
|
||||
|
@ -1147,12 +1159,12 @@ final: prev:
|
|||
|
||||
bufferline-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "bufferline.nvim";
|
||||
version = "2023-06-28";
|
||||
version = "2023-07-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "akinsho";
|
||||
repo = "bufferline.nvim";
|
||||
rev = "2f391fde91b9c3876eee359ee24cc352050e5e48";
|
||||
sha256 = "0qg2ia2a0rz8g419dmvyl2djrz3xp6ra01bq5gkpgyj8yrgdmr3v";
|
||||
rev = "cd27a52ecdfed7f14a41b61b7976f155e3d593c7";
|
||||
sha256 = "0fcabl395y2qhnnabhakdkhk9f18vh9wkx1pmsdvkizs0hnhxlx3";
|
||||
};
|
||||
meta.homepage = "https://github.com/akinsho/bufferline.nvim/";
|
||||
};
|
||||
|
@ -1999,12 +2011,12 @@ final: prev:
|
|||
|
||||
codeium-vim = buildVimPluginFrom2Nix {
|
||||
pname = "codeium.vim";
|
||||
version = "2023-07-08";
|
||||
version = "2023-07-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Exafunction";
|
||||
repo = "codeium.vim";
|
||||
rev = "276c424ac5c9e94117efb902d75a5580ce4ccc9a";
|
||||
sha256 = "1bqy6z6qph01f7afnzy01hkyl2669zv463zx1ygxbnljbvswzdvw";
|
||||
rev = "3803ab16cd1e3160edae55fc5dd5e78b1d71e5d4";
|
||||
sha256 = "09haj4j1d8gry6537g7mzllac2drwnb5kib6np4ml9sylr6x72lp";
|
||||
};
|
||||
meta.homepage = "https://github.com/Exafunction/codeium.vim/";
|
||||
};
|
||||
|
@ -2587,12 +2599,12 @@ final: prev:
|
|||
|
||||
denops-vim = buildVimPluginFrom2Nix {
|
||||
pname = "denops.vim";
|
||||
version = "2023-06-25";
|
||||
version = "2023-07-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "vim-denops";
|
||||
repo = "denops.vim";
|
||||
rev = "62b1d22b3e60fcc9e570a531a5af1e4b2393c15a";
|
||||
sha256 = "0bdm6ll1m8d1chmwqm4jj2c2qcq0bmrjvsfc4mw5i3158kf7pfws";
|
||||
rev = "fece0a2b24655e42a3fd10dbbf2962d39b381e90";
|
||||
sha256 = "12yj3wzz6qhf71zlmkxfxaqny4iyqp885iwhnr509cmcg0nynac8";
|
||||
};
|
||||
meta.homepage = "https://github.com/vim-denops/denops.vim/";
|
||||
};
|
||||
|
@ -2877,12 +2889,12 @@ final: prev:
|
|||
|
||||
dial-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "dial.nvim";
|
||||
version = "2023-06-12";
|
||||
version = "2023-07-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "monaqa";
|
||||
repo = "dial.nvim";
|
||||
rev = "b3916370c24c498117a4c790b2752c437dab661a";
|
||||
sha256 = "141ppws4f4gz90w07hpgs1h93d8v1fsi5kh032kgf65g9bawlri8";
|
||||
rev = "c6657df5453a6cbe4e8356e1675e9652cadc332f";
|
||||
sha256 = "1gz5zg7rfx1j468ysa5b5nnlnsj22pkkkhq4z0n63hp2s09ys2c3";
|
||||
};
|
||||
meta.homepage = "https://github.com/monaqa/dial.nvim/";
|
||||
};
|
||||
|
@ -2961,12 +2973,12 @@ final: prev:
|
|||
|
||||
dropbar-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "dropbar.nvim";
|
||||
version = "2023-07-09";
|
||||
version = "2023-07-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Bekaboo";
|
||||
repo = "dropbar.nvim";
|
||||
rev = "03bfd620f4d98a889bc7a0059ddb21dd24abdd7f";
|
||||
sha256 = "1lq5ap7izg3nrj8i2nh5hxgxmdfsv705b409ryd529dkx7klsdar";
|
||||
rev = "dd0a43d0bdd2918bef5ed7f42caacb1bbe5d7d92";
|
||||
sha256 = "0cwlwgi4s4iggss7d1jcn4jaw8idn60yrzpjxqm8h930aa6b2zks";
|
||||
};
|
||||
meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/";
|
||||
};
|
||||
|
@ -3528,12 +3540,12 @@ final: prev:
|
|||
|
||||
fzf-lua = buildVimPluginFrom2Nix {
|
||||
pname = "fzf-lua";
|
||||
version = "2023-07-08";
|
||||
version = "2023-07-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ibhagwan";
|
||||
repo = "fzf-lua";
|
||||
rev = "ea4c5e98d8797ff14f24350459aa29b0f800dad4";
|
||||
sha256 = "0jkiis5rn4zyybwb1gjcgssigdvksxxkv3a50yk3xisgrli2i51d";
|
||||
rev = "63bfdd54d1ba5af042a6be350aba4299b7a0f5a3";
|
||||
sha256 = "0l08xmgadwgjr37icv7cqxyfz8yb4fkb9hrv7760588yjkl6gdda";
|
||||
};
|
||||
meta.homepage = "https://github.com/ibhagwan/fzf-lua/";
|
||||
};
|
||||
|
@ -3696,12 +3708,12 @@ final: prev:
|
|||
|
||||
gitsigns-nvim = buildNeovimPlugin {
|
||||
pname = "gitsigns.nvim";
|
||||
version = "2023-07-04";
|
||||
version = "2023-07-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lewis6991";
|
||||
repo = "gitsigns.nvim";
|
||||
rev = "dc2962f7fce953a2a98e7c6d3d7fc4c1d1f66758";
|
||||
sha256 = "17rbsnfdrjfni1nc7say8yy9z1nc7agz8f5484wg3bhlbh28x28n";
|
||||
rev = "48c3ae8ec74cb83f9570ceb0c5ab8217db7a2220";
|
||||
sha256 = "0v0il2wwgca58gv4jl70gwimnh0qy8swmlxqaw0yl0yj68pgv6ba";
|
||||
};
|
||||
meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
|
||||
};
|
||||
|
@ -4583,12 +4595,12 @@ final: prev:
|
|||
|
||||
lazy-lsp-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "lazy-lsp.nvim";
|
||||
version = "2023-05-29";
|
||||
version = "2023-07-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "dundalek";
|
||||
repo = "lazy-lsp.nvim";
|
||||
rev = "cc9640662efcb99d869eaaec06c14f74d5135e04";
|
||||
sha256 = "0f52bficds6zmk4bl1bq3210zrqjb576fl8a41fb31psj2mas07n";
|
||||
rev = "c35cb31854f87aece550404103d6ca921b2689aa";
|
||||
sha256 = "0ilcg7z7f02y8a319ajsdi8vyvm3aby6hihxzaa06r2aqn1g4dwj";
|
||||
};
|
||||
meta.homepage = "https://github.com/dundalek/lazy-lsp.nvim/";
|
||||
};
|
||||
|
@ -4619,12 +4631,12 @@ final: prev:
|
|||
|
||||
lean-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "lean.nvim";
|
||||
version = "2023-07-07";
|
||||
version = "2023-07-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Julian";
|
||||
repo = "lean.nvim";
|
||||
rev = "e80616c64506a339500bf7480801fa50b3f1b450";
|
||||
sha256 = "1sz2zkl610lw03svcgv2widwyfvvqcww9qsvbn6fbjzwg5im6z3x";
|
||||
rev = "891294bb7b5e4068a954b29f93556c1acb05393d";
|
||||
sha256 = "1hx6shg720939zqdqh2f7liz6ais5wsch94xn230gcviqr06mjg8";
|
||||
};
|
||||
meta.homepage = "https://github.com/Julian/lean.nvim/";
|
||||
};
|
||||
|
@ -5122,12 +5134,12 @@ final: prev:
|
|||
|
||||
luasnip = buildVimPluginFrom2Nix {
|
||||
pname = "luasnip";
|
||||
version = "2023-07-05";
|
||||
version = "2023-07-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "l3mon4d3";
|
||||
repo = "luasnip";
|
||||
rev = "a658ae2906344a1d2b9c507738e585cf68e685c7";
|
||||
sha256 = "039l4v639iy7mh1wnwd7hbylq9dpa8i4icfb91r1q6ssff54mxjy";
|
||||
rev = "45a4e899ca8f54936fe32ead6bba65f2a8d42e12";
|
||||
sha256 = "00d3bdpx26n61yy3rq7z44wlpryiqpccjnv6kjrp9gjsydh4a471";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
meta.homepage = "https://github.com/l3mon4d3/luasnip/";
|
||||
|
@ -5219,12 +5231,12 @@ final: prev:
|
|||
|
||||
mason-lspconfig-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "mason-lspconfig.nvim";
|
||||
version = "2023-07-09";
|
||||
version = "2023-07-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "williamboman";
|
||||
repo = "mason-lspconfig.nvim";
|
||||
rev = "fa50cc2540210845fccc3c0b9762417189a563a2";
|
||||
sha256 = "088p71mfsnv99il8ahyl5x04rn8w4xg4vvylk67ic2ngki7f7d8d";
|
||||
rev = "796008869e67ef27a5aa5ac44c08ce2a60b89f55";
|
||||
sha256 = "1l8nkjdl4k66yas0wrzddk83k7z73kcylqb0cv7h2v7f2d2y79ng";
|
||||
};
|
||||
meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/";
|
||||
};
|
||||
|
@ -5327,12 +5339,12 @@ final: prev:
|
|||
|
||||
mini-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "mini.nvim";
|
||||
version = "2023-07-09";
|
||||
version = "2023-07-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "echasnovski";
|
||||
repo = "mini.nvim";
|
||||
rev = "760c1f3619418f769526884a3de47f0b76245887";
|
||||
sha256 = "01vqrf4j5jxfr1304hblgfsmzb1w6b4djxlqndsm6yad2xl8vivr";
|
||||
rev = "4766f80acf4df22385adb36bf3a166752848f179";
|
||||
sha256 = "0n2zx64489qgmrr2w1j83rpi9j759p4w6xqnga23sxbsxgvvj60r";
|
||||
};
|
||||
meta.homepage = "https://github.com/echasnovski/mini.nvim/";
|
||||
};
|
||||
|
@ -5723,12 +5735,12 @@ final: prev:
|
|||
|
||||
neodev-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "neodev.nvim";
|
||||
version = "2023-07-09";
|
||||
version = "2023-07-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "folke";
|
||||
repo = "neodev.nvim";
|
||||
rev = "a1c48c5761cc579927bfb09896c8bf37894b80e8";
|
||||
sha256 = "1hq1p1rwb0r44w86p4ljnwc410ly0d0c7l3ldxgddr2bp9jb3fm4";
|
||||
rev = "fed7f27480ac6bda777cb36f2d6737c8ccc580fe";
|
||||
sha256 = "19763byainb613r1xkk2grahbqxwvfiycg3ljz5cmmi9y82z7n2f";
|
||||
};
|
||||
meta.homepage = "https://github.com/folke/neodev.nvim/";
|
||||
};
|
||||
|
@ -6743,12 +6755,12 @@ final: prev:
|
|||
|
||||
nvim-gdb = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-gdb";
|
||||
version = "2023-07-03";
|
||||
version = "2023-07-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sakhnik";
|
||||
repo = "nvim-gdb";
|
||||
rev = "f69f3dcd1ebdcb39af156ee3833c5d6b9777eb31";
|
||||
sha256 = "15nv26nfxykg5jnqkbl4kq9rfa6lba687i8m31ir8hkgg9n57g43";
|
||||
rev = "48e18669eb7bb7d6e7cb3d86de1082924f5fddd2";
|
||||
sha256 = "1jmx7sr5am4xz2id93c1g6a4pnd0ni361469i15qj4n757n90f8r";
|
||||
};
|
||||
meta.homepage = "https://github.com/sakhnik/nvim-gdb/";
|
||||
};
|
||||
|
@ -6815,12 +6827,12 @@ final: prev:
|
|||
|
||||
nvim-jdtls = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-jdtls";
|
||||
version = "2023-07-09";
|
||||
version = "2023-07-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mfussenegger";
|
||||
repo = "nvim-jdtls";
|
||||
rev = "6e6352f671fca4bb31e7e2394c592e623120292e";
|
||||
sha256 = "05rg9d4p6fj9jxa705ln2k4xr4ichy098cqy3p062ckr7javpga0";
|
||||
rev = "96e3978c3fdae3950f6ccda548775e8b8952f74a";
|
||||
sha256 = "0rbbf8r06kc67xpf06qsshyj2f0xkspaxndv5afrxqcmiz1qlnhy";
|
||||
};
|
||||
meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/";
|
||||
};
|
||||
|
@ -6851,12 +6863,12 @@ final: prev:
|
|||
|
||||
nvim-lightbulb = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-lightbulb";
|
||||
version = "2023-07-08";
|
||||
version = "2023-07-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kosayoda";
|
||||
repo = "nvim-lightbulb";
|
||||
rev = "189c8ef70a44a23c6e9e1d0f95abcda2d07e109d";
|
||||
sha256 = "18l6pqkymqhm5rv27ngb874vy6lxr5lqrg0s2hszh2ixydq3r4w8";
|
||||
rev = "bb9ec720aa998252951627f811e8f39b76789e0a";
|
||||
sha256 = "03anzn14a8fc14wzv9m98f2flhn4lcn66g4c053r1bc9p54k21p0";
|
||||
};
|
||||
meta.homepage = "https://github.com/kosayoda/nvim-lightbulb/";
|
||||
};
|
||||
|
@ -7127,12 +7139,12 @@ final: prev:
|
|||
|
||||
nvim-scrollview = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-scrollview";
|
||||
version = "2023-07-10";
|
||||
version = "2023-07-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "dstein64";
|
||||
repo = "nvim-scrollview";
|
||||
rev = "8f51941e8bda2982497118dfa2a4dd9fc4a42e75";
|
||||
sha256 = "1pzvjhbvs7a9llzcmgz9ky3b0i96ffs5ca7rn6l9g84f4zhplm3r";
|
||||
rev = "1c559f44cbde8a3637a48b6b5f44e201aff4e1cf";
|
||||
sha256 = "1nybh0n5g2sz0n4j974i173zv5byqly5k26km88kygxa3dzlmqx8";
|
||||
};
|
||||
meta.homepage = "https://github.com/dstein64/nvim-scrollview/";
|
||||
};
|
||||
|
@ -7247,12 +7259,12 @@ final: prev:
|
|||
|
||||
nvim-treesitter = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-treesitter";
|
||||
version = "2023-07-09";
|
||||
version = "2023-07-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-treesitter";
|
||||
repo = "nvim-treesitter";
|
||||
rev = "572a15f171ce1a69ed91ea642ae77af5b5d295fb";
|
||||
sha256 = "1vndcc5bnbb4l68lk0pm6gray1f7jf9vxhpxh71mq2lzzpjah8v3";
|
||||
rev = "3af1220e18034eb2ce7d1c8e77055bc3bf3c1c36";
|
||||
sha256 = "0qbgh8hvnjb0dg8fqv9w5025sv2z8b9lwcgqpbdcsgqih2g6k84r";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
|
||||
};
|
||||
|
@ -8185,12 +8197,12 @@ final: prev:
|
|||
|
||||
rest-nvim = buildNeovimPlugin {
|
||||
pname = "rest.nvim";
|
||||
version = "2023-07-07";
|
||||
version = "2023-07-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "rest-nvim";
|
||||
repo = "rest.nvim";
|
||||
rev = "0d4b6176ce7fee2d33a716402d47d65a35acf173";
|
||||
sha256 = "05cd2gvfix5k6gxbgnnrgz1izq0g3xik0vjbk8n1qwf5xsd1l6g7";
|
||||
rev = "80283b7e384a533ff8296a97362f7b1a1c1af83f";
|
||||
sha256 = "0a6vjc2dsj724nxi8szhhqx178ghif08qgib4g8lrvlix1lw56a8";
|
||||
};
|
||||
meta.homepage = "https://github.com/rest-nvim/rest.nvim/";
|
||||
};
|
||||
|
@ -8269,12 +8281,12 @@ final: prev:
|
|||
|
||||
rust-tools-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "rust-tools.nvim";
|
||||
version = "2023-02-20";
|
||||
version = "2023-07-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "simrat39";
|
||||
repo = "rust-tools.nvim";
|
||||
rev = "71d2cf67b5ed120a0e31b2c8adb210dd2834242f";
|
||||
sha256 = "14vma4r8v20r2ddkhwxs5zhp5lcqa51sxayxdri1z21gvaykzs8a";
|
||||
rev = "0cc8adab23117783a0292a0c8a2fbed1005dc645";
|
||||
sha256 = "0643bwpsjqg36wqyvj7mlnlmasly7am4jjzaabkiqwlz307z5mwf";
|
||||
};
|
||||
meta.homepage = "https://github.com/simrat39/rust-tools.nvim/";
|
||||
};
|
||||
|
@ -8317,12 +8329,12 @@ final: prev:
|
|||
|
||||
satellite-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "satellite.nvim";
|
||||
version = "2023-07-07";
|
||||
version = "2023-07-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lewis6991";
|
||||
repo = "satellite.nvim";
|
||||
rev = "a414ee7b55c51a9bb8491b76e6f1d4782bae8712";
|
||||
sha256 = "1iqdgm7g3nilkxfrqnhwjz5gpsc18vvxp9i9yf876wzahbbvpfps";
|
||||
rev = "eda3a7014a948e36c330934c7d49c7d86b2fb71d";
|
||||
sha256 = "0rfasa1rzyrjid8nl0dzd7prj5ys0mg768znlsdhmn9wnh2lmnll";
|
||||
};
|
||||
meta.homepage = "https://github.com/lewis6991/satellite.nvim/";
|
||||
};
|
||||
|
@ -9668,12 +9680,12 @@ final: prev:
|
|||
|
||||
toggleterm-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "toggleterm.nvim";
|
||||
version = "2023-07-05";
|
||||
version = "2023-07-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "akinsho";
|
||||
repo = "toggleterm.nvim";
|
||||
rev = "2249e974faed67e795ffc2ca2be13b93c5d51938";
|
||||
sha256 = "0zdlrclaf45hhryixi6ivimbhgn6v62r6y25a3xikd8vzxaxa7y2";
|
||||
rev = "83aa231fa414a5dcb72aed97437446a6ca5a81f2";
|
||||
sha256 = "0dhbc9s9irzamlv7b8qdamixvh4nf1p7icszdbd8jwks9dfhm9mk";
|
||||
};
|
||||
meta.homepage = "https://github.com/akinsho/toggleterm.nvim/";
|
||||
};
|
||||
|
@ -9888,8 +9900,8 @@ final: prev:
|
|||
src = fetchFromGitHub {
|
||||
owner = "unisonweb";
|
||||
repo = "unison";
|
||||
rev = "ed45b8c1b9a9e5ada96bca4402be2b25c2290715";
|
||||
sha256 = "00k8fy6hdsv2wfyfsbms4hls3p3k9h9s8kpdvakfvcsml2ngihr7";
|
||||
rev = "2db2ff26f1537d75e9c20e594344c4ea8459d344";
|
||||
sha256 = "13xl7winslmalasc01x69zdnhr1q6amzg7808hmc97vj770y85rm";
|
||||
};
|
||||
meta.homepage = "https://github.com/unisonweb/unison/";
|
||||
};
|
||||
|
@ -12671,12 +12683,12 @@ final: prev:
|
|||
|
||||
vim-matchup = buildVimPluginFrom2Nix {
|
||||
pname = "vim-matchup";
|
||||
version = "2023-06-30";
|
||||
version = "2023-07-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "andymass";
|
||||
repo = "vim-matchup";
|
||||
rev = "61cef7921ecbb412f341a6d1a7f9ad1ca55243de";
|
||||
sha256 = "0jrrvx7a6v7gxkyvyrh9wkhaaqlvww90v2lijvxwgys9iy79c4nz";
|
||||
rev = "3c4ccc489002fe72b5d2e2ffc4b3b5a7d3ab65d8";
|
||||
sha256 = "0mpvqlk8a7vms2j29mpfpkqa1pxsncqr7flsg6q6z3cdqcrgh1j2";
|
||||
};
|
||||
meta.homepage = "https://github.com/andymass/vim-matchup/";
|
||||
};
|
||||
|
@ -14232,12 +14244,12 @@ final: prev:
|
|||
|
||||
vim-test = buildVimPluginFrom2Nix {
|
||||
pname = "vim-test";
|
||||
version = "2023-06-25";
|
||||
version = "2023-07-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "vim-test";
|
||||
repo = "vim-test";
|
||||
rev = "6fbfbfc434debf3d3e8676fad5041450615f2d5d";
|
||||
sha256 = "07ll9i820z3wn85xhym6d0v7iasgyiwg5gpqpyph7b640h02p6is";
|
||||
rev = "155342d6c8137a8a5dfbdbfca2de831643b2e006";
|
||||
sha256 = "147vrnwal7l306l1r9cyd2hrdams0ghzb1fyf9c7yfihak2ag2jg";
|
||||
};
|
||||
meta.homepage = "https://github.com/vim-test/vim-test/";
|
||||
};
|
||||
|
@ -15001,12 +15013,12 @@ final: prev:
|
|||
|
||||
vimwiki = buildVimPluginFrom2Nix {
|
||||
pname = "vimwiki";
|
||||
version = "2023-06-26";
|
||||
version = "2023-07-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "vimwiki";
|
||||
repo = "vimwiki";
|
||||
rev = "65b9f0e68b1c4b6c2023a02b22d11a178e13445e";
|
||||
sha256 = "13pfh3k25mfglwpadlf3d7f0bhmzyzx9qf9xa53m88cvmwd82acg";
|
||||
rev = "09804c2a5f1009fde29e32c5f3a6093e4684433a";
|
||||
sha256 = "0i0vwlidv1yv9qk74hi8ync128jrc3qigp8l6zgcm55di5nmw8zl";
|
||||
};
|
||||
meta.homepage = "https://github.com/vimwiki/vimwiki/";
|
||||
};
|
||||
|
@ -15422,12 +15434,12 @@ final: prev:
|
|||
|
||||
catppuccin-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "catppuccin-nvim";
|
||||
version = "2023-07-07";
|
||||
version = "2023-07-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "catppuccin";
|
||||
repo = "nvim";
|
||||
rev = "278bfeb61bd627dc2a8885180a0441a1ebe65a41";
|
||||
sha256 = "0kb5177zix86n6b8simqnkx35mpsrfpf8mppvn6iwvpl33f81q05";
|
||||
rev = "3ffd2f511f3dc6c01258923d7170ccaf1445634b";
|
||||
sha256 = "0ry208p1lib2rnmfcph1k29lvm6cccnjvbbzmwrhjkp97m54ricl";
|
||||
};
|
||||
meta.homepage = "https://github.com/catppuccin/nvim/";
|
||||
};
|
||||
|
@ -15482,12 +15494,12 @@ final: prev:
|
|||
|
||||
lspsaga-nvim-original = buildVimPluginFrom2Nix {
|
||||
pname = "lspsaga-nvim-original";
|
||||
version = "2023-07-10";
|
||||
version = "2023-07-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvimdev";
|
||||
repo = "lspsaga.nvim";
|
||||
rev = "8a05cb18092d49075cf533aaf17d312e2ad61d77";
|
||||
sha256 = "0413ylml6c4cqq3bqi6z94sb5axxinv9d32lrdvpmnjlbc1b4kzs";
|
||||
rev = "bed04d06547910b288f25c153b9bb181fecf52fa";
|
||||
sha256 = "1l8x8gp40kpz35rizr0lx003pdv7rv32gr5imvyhlcdvg88g72ls";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/";
|
||||
};
|
||||
|
@ -15518,12 +15530,12 @@ final: prev:
|
|||
|
||||
nvchad-extensions = buildVimPluginFrom2Nix {
|
||||
pname = "nvchad-extensions";
|
||||
version = "2023-06-11";
|
||||
version = "2023-07-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvchad";
|
||||
repo = "extensions";
|
||||
rev = "fda140ca8362f4ec38516701ed94561aa720f2b6";
|
||||
sha256 = "004yqdw1wjbpjk4hib13nky5q1hhcbw5dabccrifjka91av9riwl";
|
||||
rev = "0b8d75a10032d7f0cd0c6758e5f28195a0d62637";
|
||||
sha256 = "0b6jacncd3p5znxmwbivc05wbr8xc5pi9n69dvdzbsd9frickwp3";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvchad/extensions/";
|
||||
};
|
||||
|
|
|
@ -38,34 +38,34 @@
|
|||
};
|
||||
astro = buildGrammar {
|
||||
language = "astro";
|
||||
version = "0.0.0+rev=a4535d1";
|
||||
version = "0.0.0+rev=e122a8f";
|
||||
src = fetchFromGitHub {
|
||||
owner = "virchau13";
|
||||
repo = "tree-sitter-astro";
|
||||
rev = "a4535d1530558866a543c1660c90c57fbf2fd709";
|
||||
hash = "sha256-ZWpxKAyja6bW2kNxalHOL2E+WFbEKc40dMGrB1Ihs6I=";
|
||||
rev = "e122a8fcd07e808a7b873bfadc2667834067daf1";
|
||||
hash = "sha256-iCVRTX2fMW1g40rHcJEwwE+tfwun+reIaj5y4AFgmKk=";
|
||||
};
|
||||
meta.homepage = "https://github.com/virchau13/tree-sitter-astro";
|
||||
};
|
||||
awk = buildGrammar {
|
||||
language = "awk";
|
||||
version = "0.0.0+rev=476b1a0";
|
||||
version = "0.0.0+rev=7fef050";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Beaglefoot";
|
||||
repo = "tree-sitter-awk";
|
||||
rev = "476b1a0f3de58c31cde57317c744059ca6792e52";
|
||||
hash = "sha256-B3bJg/RaeNeKhfnkWYutQeBynYkdphtJoUA1OHehb/8=";
|
||||
rev = "7fef05082d7aeb4e9dc0d9dca2695056b28ce6a8";
|
||||
hash = "sha256-2GCcYUFFJT6hjKuAnPC99aSrbziJOVRE5d1TM8VfVrQ=";
|
||||
};
|
||||
meta.homepage = "https://github.com/Beaglefoot/tree-sitter-awk";
|
||||
};
|
||||
bash = buildGrammar {
|
||||
language = "bash";
|
||||
version = "0.0.0+rev=4936467";
|
||||
version = "0.0.0+rev=1b0321e";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-bash";
|
||||
rev = "493646764e7ad61ce63ce3b8c59ebeb37f71b841";
|
||||
hash = "sha256-gl5F3IeZa2VqyH/qFj8ey2pRbGq4X8DL5wiyvRrH56U=";
|
||||
rev = "1b0321ee85701d5036c334a6f04761cdc672e64c";
|
||||
hash = "sha256-ueZjazaqjbxqCM7mO8h9m0fJ6RUCaX4MuJx7StnPqyc=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-bash";
|
||||
};
|
||||
|
@ -126,12 +126,12 @@
|
|||
};
|
||||
c = buildGrammar {
|
||||
language = "c";
|
||||
version = "0.0.0+rev=84bdf40";
|
||||
version = "0.0.0+rev=a60f1dd";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-c";
|
||||
rev = "84bdf409067676dd5c003b2a7cb7760456e731bf";
|
||||
hash = "sha256-dm6Hn3KOCRLWRCUxg0tOOXKz2znOMIqlsHkFPFHlkh4=";
|
||||
rev = "a60f1ddef4702fc8a82a9bfc207d0cf453d748bb";
|
||||
hash = "sha256-7MNTbIQT+7ksV2vmrIZzBZM1BlCdGI7P0DYw0sP6hvU=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-c";
|
||||
};
|
||||
|
@ -269,12 +269,12 @@
|
|||
};
|
||||
css = buildGrammar {
|
||||
language = "css";
|
||||
version = "0.0.0+rev=769203d";
|
||||
version = "0.0.0+rev=5f2c94b";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-css";
|
||||
rev = "769203d0f9abe1a9a691ac2b9fe4bb4397a73c51";
|
||||
hash = "sha256-5Qti/bFac2A1PJxqZEOuSLK3GGKYwPDKAp3OOassBxU=";
|
||||
rev = "5f2c94b897601b4029fedcce7db4c6d76ce8a128";
|
||||
hash = "sha256-HBCxnetErHqhSJeEIHFTaSqt8aJgJ4+OOgw8p+NDVDo=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-css";
|
||||
};
|
||||
|
@ -843,12 +843,12 @@
|
|||
};
|
||||
html = buildGrammar {
|
||||
language = "html";
|
||||
version = "0.0.0+rev=d2592b0";
|
||||
version = "0.0.0+rev=e5d7d7d";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-html";
|
||||
rev = "d2592b006e5270a281c6bafdbcb3768cd97fa47a";
|
||||
hash = "sha256-COWv6rCcA2Km2N+D6kperFlmPr31AnWaPR6uMCWwFr4=";
|
||||
rev = "e5d7d7decbbdec5a4c90bbc69436b3828f5646e7";
|
||||
hash = "sha256-jNAPumz8JdrGwSMow1xZqz3n2CHj60qUaivhJ8LZDz4=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-html";
|
||||
};
|
||||
|
@ -874,6 +874,17 @@
|
|||
};
|
||||
meta.homepage = "https://github.com/rest-nvim/tree-sitter-http";
|
||||
};
|
||||
hurl = buildGrammar {
|
||||
language = "hurl";
|
||||
version = "0.0.0+rev=0eca909";
|
||||
src = fetchFromGitHub {
|
||||
owner = "pfeiferj";
|
||||
repo = "tree-sitter-hurl";
|
||||
rev = "0eca909c8338364992e04c4862ac6afc5342cbb8";
|
||||
hash = "sha256-6FiLZKnZ2DMS1Gcaelw5bJxflfZSyPzGV1pJfvO1pcM=";
|
||||
};
|
||||
meta.homepage = "https://github.com/pfeiferj/tree-sitter-hurl";
|
||||
};
|
||||
ini = buildGrammar {
|
||||
language = "ini";
|
||||
version = "0.0.0+rev=1a0ce07";
|
||||
|
@ -953,12 +964,12 @@
|
|||
};
|
||||
json = buildGrammar {
|
||||
language = "json";
|
||||
version = "0.0.0+rev=40a81c0";
|
||||
version = "0.0.0+rev=ca3f891";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-json";
|
||||
rev = "40a81c01a40ac48744e0c8ccabbaba1920441199";
|
||||
hash = "sha256-fZNftzNavJQPQE4S1VLhRyGQRoJgbWA5xTPa8ZI5UX4=";
|
||||
rev = "ca3f8919800e3c1ad4508de3bfd7b0b860ce434f";
|
||||
hash = "sha256-cyrea0Y13OVGkXbYE0Cwc7nUsDGEZyoQmPAS9wVuHw0=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-json";
|
||||
};
|
||||
|
@ -1264,47 +1275,47 @@
|
|||
};
|
||||
objc = buildGrammar {
|
||||
language = "objc";
|
||||
version = "0.0.0+rev=0612ff9";
|
||||
version = "0.0.0+rev=6d876af";
|
||||
src = fetchFromGitHub {
|
||||
owner = "amaanq";
|
||||
repo = "tree-sitter-objc";
|
||||
rev = "0612ff9874bf376db4ae92b9f46ddcd4bdec1342";
|
||||
hash = "sha256-t6+voOjZe2//bH80AIzzDi+giA8cT68PxvR9/SdshFI=";
|
||||
rev = "6d876afade2d5e70d394aaf994321c78297e3607";
|
||||
hash = "sha256-1LJ5pFslYqgPYoBptSw6SY7pt6syXJoxQUJ5KsybjSk=";
|
||||
};
|
||||
meta.homepage = "https://github.com/amaanq/tree-sitter-objc";
|
||||
};
|
||||
ocaml = buildGrammar {
|
||||
language = "ocaml";
|
||||
version = "0.0.0+rev=7a61e11";
|
||||
version = "0.0.0+rev=3ad4d79";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-ocaml";
|
||||
rev = "7a61e11f8e44b4edee23adb15a187c9dd2beecef";
|
||||
hash = "sha256-YW4JaTUkyUnj7X7bQ4hZqa1xjkn3pxSnwUZYkoQVJow=";
|
||||
rev = "3ad4d7988edf8b8a9780a1db7a5af657911dbfba";
|
||||
hash = "sha256-OOBrAiKdw9dCy5oLPDzta0gQEkeRxNrJWmZFlDoENjg=";
|
||||
};
|
||||
location = "ocaml";
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml";
|
||||
};
|
||||
ocaml_interface = buildGrammar {
|
||||
language = "ocaml_interface";
|
||||
version = "0.0.0+rev=7a61e11";
|
||||
version = "0.0.0+rev=3ad4d79";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-ocaml";
|
||||
rev = "7a61e11f8e44b4edee23adb15a187c9dd2beecef";
|
||||
hash = "sha256-YW4JaTUkyUnj7X7bQ4hZqa1xjkn3pxSnwUZYkoQVJow=";
|
||||
rev = "3ad4d7988edf8b8a9780a1db7a5af657911dbfba";
|
||||
hash = "sha256-OOBrAiKdw9dCy5oLPDzta0gQEkeRxNrJWmZFlDoENjg=";
|
||||
};
|
||||
location = "interface";
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml";
|
||||
};
|
||||
ocamllex = buildGrammar {
|
||||
language = "ocamllex";
|
||||
version = "0.0.0+rev=6211855";
|
||||
version = "0.0.0+rev=fab854a";
|
||||
src = fetchFromGitHub {
|
||||
owner = "atom-ocaml";
|
||||
repo = "tree-sitter-ocamllex";
|
||||
rev = "62118551bd9501b8253598b835cb4bef04b31e3d";
|
||||
hash = "sha256-oHniBpZj325U93vt4lgHPLqLxZj9YyKMwBdVQV59tZ8=";
|
||||
rev = "fab854a2de25b2284582bf7ed7f9970d19988c73";
|
||||
hash = "sha256-UmBTzWgjgp0EKAfZEY0uJhvYLHzeNtrMGEUPogx3Op8=";
|
||||
};
|
||||
generate = true;
|
||||
meta.homepage = "https://github.com/atom-ocaml/tree-sitter-ocamllex";
|
||||
|
@ -1377,12 +1388,12 @@
|
|||
};
|
||||
php = buildGrammar {
|
||||
language = "php";
|
||||
version = "0.0.0+rev=d38adb2";
|
||||
version = "0.0.0+rev=d43130f";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-php";
|
||||
rev = "d38adb26304d9b9d38e9a3b4aae0ec4b29bf9462";
|
||||
hash = "sha256-s+NoJefmr1gyyLZNX9jUxiJR61VXXa2MNuECn+t2JBA=";
|
||||
rev = "d43130fd1525301e9826f420c5393a4d169819fc";
|
||||
hash = "sha256-oHUfcuqtFFl+70/uJjE74J1JVV93G9++UaEIntOH5tM=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-php";
|
||||
};
|
||||
|
@ -1498,12 +1509,12 @@
|
|||
};
|
||||
python = buildGrammar {
|
||||
language = "python";
|
||||
version = "0.0.0+rev=36f9e33";
|
||||
version = "0.0.0+rev=db1d218";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-python";
|
||||
rev = "36f9e33d52b7572536ac1a8af8d7e78363ad52c3";
|
||||
hash = "sha256-pUxVuG1xjjXxVWfh6UPZ2WZ5jo3GXmWKrCHSiMnCM+M=";
|
||||
rev = "db1d218a4f8fb87145aabeb22ca3c35925c411fc";
|
||||
hash = "sha256-v0pWQzO8M9w0ngTUO5eGoTTcBbVu7tRgA993zGfoNwI=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-python";
|
||||
};
|
||||
|
@ -1751,12 +1762,12 @@
|
|||
};
|
||||
sql = buildGrammar {
|
||||
language = "sql";
|
||||
version = "0.0.0+rev=dd5fe77";
|
||||
version = "0.0.0+rev=e08036e";
|
||||
src = fetchFromGitHub {
|
||||
owner = "derekstride";
|
||||
repo = "tree-sitter-sql";
|
||||
rev = "dd5fe7713cec874506c6f75409ce03776748b146";
|
||||
hash = "sha256-CQ7k7o1iMaUjv/5C+eY2eLANZO7lJQPhXrGEKkykaiI=";
|
||||
rev = "e08036ee4928b32fbebe55ac9336f81b7389e107";
|
||||
hash = "sha256-x3vngL+36kO60eEFN0jvTzh9sCvsYvrzrvfMg08JL4w=";
|
||||
};
|
||||
meta.homepage = "https://github.com/derekstride/tree-sitter-sql";
|
||||
};
|
||||
|
@ -2121,12 +2132,12 @@
|
|||
};
|
||||
wing = buildGrammar {
|
||||
language = "wing";
|
||||
version = "0.0.0+rev=8b4843a";
|
||||
version = "0.0.0+rev=755aef4";
|
||||
src = fetchFromGitHub {
|
||||
owner = "winglang";
|
||||
repo = "wing";
|
||||
rev = "8b4843a1c432d42e00a28f7eafb81a9f591fecb3";
|
||||
hash = "sha256-hEV8avT3lr1fui1dyON6I2hQPU+Ox8h2h9adNeHdiFI=";
|
||||
rev = "755aef4e57da4a00da47e85b6aff976b007d500c";
|
||||
hash = "sha256-EbTNiwZwzPWxf8VNUWX82x/Jz4RFCE1LDuzXwYiYQLs=";
|
||||
};
|
||||
location = "libs/tree-sitter-wing";
|
||||
generate = true;
|
||||
|
|
|
@ -87,6 +87,7 @@ https://github.com/max397574/better-escape.nvim/,,
|
|||
https://github.com/LunarVim/bigfile.nvim/,,
|
||||
https://github.com/sblumentritt/bitbake.vim/,,
|
||||
https://github.com/APZelos/blamer.nvim/,HEAD,
|
||||
https://github.com/HampusHauffman/block.nvim/,HEAD,
|
||||
https://github.com/blueballs-theme/blueballs-neovim/,,
|
||||
https://github.com/nat-418/boole.nvim/,HEAD,
|
||||
https://github.com/turbio/bracey.vim/,,
|
||||
|
|
52
pkgs/applications/gis/tunnelx/default.nix
Normal file
52
pkgs/applications/gis/tunnelx/default.nix
Normal file
|
@ -0,0 +1,52 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, jdk
|
||||
, jre
|
||||
, survex
|
||||
, makeWrapper
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tunnelx";
|
||||
version = "2023-07-nix";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CaveSurveying";
|
||||
repo = "tunnelx";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-H6lHqc9on/pv/KihNcaHPwbWf4JXRkeRqNoYq6yVKqM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
jdk
|
||||
];
|
||||
|
||||
runtimeInputs = [
|
||||
survex
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
javac -d . src/*.java
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin $out/java
|
||||
cp -r symbols Tunnel tutorials $out/java
|
||||
makeWrapper ${jre}/bin/java $out/bin/tunnelx \
|
||||
--add-flags "-cp $out/java Tunnel.MainBox" \
|
||||
--set SURVEX_EXECUTABLE_DIR ${survex}/bin/ \
|
||||
--set TUNNEL_USER_DIR $out/java/
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A program for drawing cave surveys in 2D";
|
||||
homepage = "https://github.com/CaveSurveying/tunnelx/";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ goatchurchprime ];
|
||||
};
|
||||
})
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "hugo";
|
||||
version = "0.115.0";
|
||||
version = "0.115.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gohugoio";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-q8HN8OloZomg7znL6pnWJyZ1q/LT7qIb3Y/IYZas9j4=";
|
||||
hash = "sha256-MzGOBR++mnQd4CvBpPCibeimt05gsa3aHNK6FphBFGU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-1GGTK0t/DWXhnuvx6QQjLLoZA8bwVNE3lu7ut8FLHoM=";
|
||||
vendorHash = "sha256-BmMrdPr3sQI0Pw32iIIVmWy2qLlR7SHyKu7+PLplxkE=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
@ -1,27 +1,31 @@
|
|||
{ fetchFromGitHub, lib
|
||||
, wrapGAppsHook, intltool
|
||||
, python3Packages, gtk3, poppler_gi
|
||||
{ fetchFromGitHub
|
||||
, lib
|
||||
, wrapGAppsHook
|
||||
, python3Packages
|
||||
, gtk3
|
||||
, poppler_gi
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "pdfarranger";
|
||||
version = "1.9.2";
|
||||
version = "1.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-nZSP9JBbUPG9xk/ATXUYkjyP344m+e7RQS3BiFVzQf4=";
|
||||
hash = "sha256-tNLy3HeHh8nBtmfJS5XhKX+KhIBnuUV2C8LwQl3mQLU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
wrapGAppsHook intltool
|
||||
wrapGAppsHook
|
||||
] ++ (with python3Packages; [
|
||||
setuptools distutils_extra
|
||||
setuptools
|
||||
]);
|
||||
|
||||
buildInputs = [
|
||||
gtk3 poppler_gi
|
||||
gtk3
|
||||
poppler_gi
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
|
|
|
@ -13,16 +13,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "chart-testing";
|
||||
version = "3.8.0";
|
||||
version = "3.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "helm";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ccP3t+Q4aZviYw8by2JDiuKHt7o6EKFxBxlhEntmV5A=";
|
||||
hash = "sha256-H9Pw4HPffFmRJXGh+e2hcddYfhgmvnUOxezQ6Zc8NwY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-4x/8uDCfrERC+ww+iyP+dHIQ820IOARXj60KnjqeDkM=";
|
||||
vendorHash = "sha256-9XdLSTr9FKuatJzpWM8AwrPtYDS+LC14bpz6evvJRuQ=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pkg/config/config.go \
|
||||
|
|
|
@ -313,6 +313,9 @@ buildGoModule rec {
|
|||
wrapProgram $out/bin/k3s \
|
||||
--prefix PATH : ${lib.makeBinPath k3sRuntimeDeps} \
|
||||
--prefix PATH : "$out/bin"
|
||||
ln -s $out/bin/k3s $out/bin/kubectl
|
||||
ln -s $out/bin/k3s $out/bin/crictl
|
||||
ln -s $out/bin/k3s $out/bin/ctr
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
|
|
|
@ -317,6 +317,9 @@ buildGoModule rec {
|
|||
wrapProgram $out/bin/k3s \
|
||||
--prefix PATH : ${lib.makeBinPath k3sRuntimeDeps} \
|
||||
--prefix PATH : "$out/bin"
|
||||
ln -s $out/bin/k3s $out/bin/kubectl
|
||||
ln -s $out/bin/k3s $out/bin/crictl
|
||||
ln -s $out/bin/k3s $out/bin/ctr
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
|
|
|
@ -84,6 +84,10 @@ let
|
|||
homepage = "https://k3s.io";
|
||||
maintainers = with maintainers; [ euank mic92 yajo ];
|
||||
platforms = platforms.linux;
|
||||
|
||||
# resolves collisions with other installations of kubectl, crictl, ctr
|
||||
# prefer non-k3s versions
|
||||
priority = 5;
|
||||
};
|
||||
|
||||
# https://github.com/k3s-io/k3s/blob/5fb370e53e0014dc96183b8ecb2c25a61e891e76/scripts/build#L19-L40
|
||||
|
@ -325,6 +329,9 @@ buildGoModule rec {
|
|||
wrapProgram $out/bin/k3s \
|
||||
--prefix PATH : ${lib.makeBinPath k3sRuntimeDeps} \
|
||||
--prefix PATH : "$out/bin"
|
||||
ln -s $out/bin/k3s $out/bin/kubectl
|
||||
ln -s $out/bin/k3s $out/bin/crictl
|
||||
ln -s $out/bin/k3s $out/bin/ctr
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kubecm";
|
||||
version = "0.24.1";
|
||||
version = "0.25.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sunny0826";
|
||||
repo = "kubecm";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-njib9gfCay3DYRUBvc6Hi6khtzqU/Qit1/jBfISY3gI=";
|
||||
hash = "sha256-8Y8JChZxjbN/nOw2tzDfJvYSMAtAadf6QMsDFK4IIOg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-MIb4vJh2r5T3oJAtpoTd/yT3r+BXfxv0qxfRPcNMDko=";
|
||||
vendorHash = "sha256-HjMgXEDX9pDpK+1Hm0xI0wYRfpj7K6xkZJXCUBqbE3Y=";
|
||||
ldflags = [ "-s" "-w" "-X github.com/sunny0826/kubecm/version.Version=${version}"];
|
||||
|
||||
doCheck = false;
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openasar";
|
||||
version = "unstable-2023-05-01";
|
||||
version = "unstable-2023-07-07";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GooseMod";
|
||||
repo = "OpenAsar";
|
||||
rev = "a8b07392808032f95ac3a7c5856e76d2619c91ae";
|
||||
hash = "sha256-moHeSrWvVOb9+vNhC2YunjTC3Ojh10APt/tvG/AuNco=";
|
||||
rev = "5ac246dc92e9a2a9b314d899df728f37096c482b";
|
||||
hash = "sha256-ODeVru4LCSl3rIeJCdezAwqzKP6IRo5WDaaUymqEcBs=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -0,0 +1,47 @@
|
|||
{ lib
|
||||
, appimageTools
|
||||
, fetchurl
|
||||
, makeDesktopItem
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "hamsket";
|
||||
version = "0.6.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/TheGoddessInari/hamsket/releases/download/nightly/Hamsket-${version}.AppImage";
|
||||
sha256 = "sha256-r85ZwcalBd/nCIBxOaQk7XClxj7VZtxwky4eWWm2tZ8=";
|
||||
};
|
||||
|
||||
desktopItem = (makeDesktopItem {
|
||||
desktopName = "Hamsket";
|
||||
name = pname;
|
||||
exec = pname;
|
||||
icon = pname;
|
||||
categories = [ "Network" ];
|
||||
});
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
inherit pname version src;
|
||||
};
|
||||
|
||||
in
|
||||
appimageTools.wrapType2 {
|
||||
inherit pname version src;
|
||||
|
||||
extraInstallCommands = ''
|
||||
mkdir -p $out/share/applications $out/share/icons/hicolor/256x256/apps
|
||||
ln -sf hamsket-${version} $out/bin/${pname}
|
||||
install -Dm644 ${appimageContents}/usr/share/icons/hicolor/256x256/apps/hamsket*.png $out/share/icons/hicolor/256x256/apps/${pname}.png
|
||||
install -Dm644 ${desktopItem}/share/applications/* $out/share/applications
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "A free and open source messaging and emailing app that combines common web applications into one";
|
||||
homepage = "https://github.com/TheGoddessInari/hamsket";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ nova-madeline ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
}
|
|
@ -1,19 +1,39 @@
|
|||
{ lib, stdenv, fetchFromGitHub, htslib, zlib, bzip2, xz, ncurses, boost }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, boost
|
||||
, bzip2
|
||||
, htslib
|
||||
, llvmPackages
|
||||
, xz
|
||||
, zlib
|
||||
, delly
|
||||
, runCommand
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "delly";
|
||||
version = "1.1.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dellytools";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-/I//7MhsC/CcBeIJblzbjXp/yOSBm83KWJsrYpl6UJk=";
|
||||
repo = "delly";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-/I//7MhsC/CcBeIJblzbjXp/yOSBm83KWJsrYpl6UJk=";
|
||||
};
|
||||
|
||||
buildInputs = [ zlib htslib bzip2 xz ncurses boost ];
|
||||
buildInputs = [
|
||||
boost
|
||||
bzip2
|
||||
htslib
|
||||
xz
|
||||
zlib
|
||||
] ++ lib.optional stdenv.isDarwin llvmPackages.openmp;
|
||||
|
||||
EBROOTHTSLIB = htslib;
|
||||
makeFlags = [
|
||||
"EBROOTHTSLIB=${htslib}"
|
||||
"PARALLEL=1"
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
@ -23,11 +43,20 @@ stdenv.mkDerivation rec {
|
|||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
simple = runCommand "${finalAttrs.pname}-test" { } ''
|
||||
mkdir $out
|
||||
${lib.getExe delly} call -g ${delly.src}/example/ref.fa ${delly.src}/example/sr.bam > $out/sr.vcf
|
||||
${lib.getExe delly} lr -g ${delly.src}/example/ref.fa ${delly.src}/example/lr.bam > $out/lr.vcf
|
||||
${lib.getExe delly} cnv -g ${delly.src}/example/ref.fa -m ${delly.src}/example/map.fa.gz ${delly.src}/example/sr.bam > cnv.vcf
|
||||
'';
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Structural variant caller for mapped DNA sequenced data";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ scalavision ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
longDescription = ''
|
||||
Delly is an integrated structural variant (SV) prediction method
|
||||
that can discover, genotype and visualize deletions, tandem duplications,
|
||||
|
@ -37,4 +66,4 @@ stdenv.mkDerivation rec {
|
|||
genomic rearrangements throughout the genome.
|
||||
'';
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
@ -8,6 +8,7 @@
|
|||
, binutils
|
||||
, wrapQtAppsHook
|
||||
, openmodelica
|
||||
, openscenegraph
|
||||
, mkOpenModelicaDerivation
|
||||
}:
|
||||
with openmodelica;
|
||||
|
@ -19,7 +20,7 @@ mkOpenModelicaDerivation rec {
|
|||
|
||||
nativeBuildInputs = [ jre8 qmake qtbase qttools wrapQtAppsHook ];
|
||||
|
||||
buildInputs = [ qtwebkit qtxmlpatterns binutils ];
|
||||
buildInputs = [ qtwebkit openscenegraph qtxmlpatterns binutils ];
|
||||
|
||||
postPatch = ''
|
||||
sed -i ''$(find -name qmake.m4) -e '/^\s*LRELEASE=/ s|LRELEASE=.*$|LRELEASE=${lib.getDev qttools}/bin/lrelease|'
|
||||
|
|
|
@ -20,13 +20,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "obs-vkcapture";
|
||||
version = "1.3.3";
|
||||
version = "1.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nowrep";
|
||||
repo = finalAttrs.pname;
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-pvJzzDbsmsu46C8Jki+eMfCZLejkgvqns2hVNDtpSk0=";
|
||||
hash = "sha256-1M/lchsrHG01C18GXfiIcclovdHKHrHMVsPvIJ+oB+M=";
|
||||
};
|
||||
|
||||
cmakeFlags = lib.optionals stdenv.isi686 [
|
||||
|
|
|
@ -19,7 +19,7 @@ drv: lib.pipe drv
|
|||
(pkg: pkg.overrideAttrs (previousAttrs:
|
||||
lib.optionalAttrs (
|
||||
targetPlatform != hostPlatform &&
|
||||
enableShared &&
|
||||
(enableShared || targetPlatform.libc == "msvcrt") &&
|
||||
withoutTargetLibc
|
||||
) {
|
||||
makeFlags = [ "all-gcc" "all-target-libgcc" ];
|
||||
|
@ -40,6 +40,7 @@ lib.optional (lib.versionAtLeast version "11.0")
|
|||
else "${targetPlatform.config}/";
|
||||
|
||||
enableLibGccOutput =
|
||||
(!stdenv.targetPlatform.isWindows || (with stdenv; targetPlatform == hostPlatform)) &&
|
||||
!langJit &&
|
||||
!stdenv.hostPlatform.isDarwin &&
|
||||
enableShared
|
||||
|
|
|
@ -42,4 +42,8 @@ runCommand "dbus-1"
|
|||
--stringparam apparmor "$apparmor" \
|
||||
${./make-session-conf.xsl} ${dbus}/share/dbus-1/session.conf \
|
||||
> $out/session.conf
|
||||
|
||||
# check if files are empty or only contain space characters
|
||||
grep -q '[^[:space:]]' "$out/system.conf" || (echo "\"$out/system.conf\" was generated incorrectly and is empty, try building again." && exit 1)
|
||||
grep -q '[^[:space:]]' "$out/session.conf" || (echo "\"$out/session.conf\" was generated incorrectly and is empty, try building again." && exit 1)
|
||||
''
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
, fetchFromGitHub
|
||||
, bison
|
||||
, cmake
|
||||
, gtest
|
||||
, doxygen
|
||||
, graphviz
|
||||
, pkg-config
|
||||
|
@ -62,13 +63,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gdal";
|
||||
version = "3.6.4";
|
||||
version = "3.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OSGeo";
|
||||
repo = "gdal";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-pGdZmQBUuNCk9/scUvq4vduINu5gqtCRLaz7QE2e6WU=";
|
||||
hash = "sha256-hAuhftIuF9W0bQx73Mz8bAEegrX9g40ippqwv9mdstg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -88,6 +89,8 @@ stdenv.mkDerivation rec {
|
|||
"-DGEOTIFF_LIBRARY_RELEASE=${lib.getLib libgeotiff}/lib/libgeotiff${stdenv.hostPlatform.extensions.sharedLibrary}"
|
||||
"-DMYSQL_INCLUDE_DIR=${lib.getDev libmysqlclient}/include/mysql"
|
||||
"-DMYSQL_LIBRARY=${lib.getLib libmysqlclient}/lib/${lib.optionalString (libmysqlclient.pname != "mysql") "mysql/"}libmysqlclient${stdenv.hostPlatform.extensions.sharedLibrary}"
|
||||
] ++ lib.optionals doInstallCheck [
|
||||
"-DBUILD_TESTING=ON"
|
||||
] ++ lib.optionals (!stdenv.isDarwin) [
|
||||
"-DCMAKE_SKIP_BUILD_RPATH=ON" # without, libgdal.so can't find libmariadb.so
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
|
@ -138,6 +141,7 @@ stdenv.mkDerivation rec {
|
|||
libspatialite
|
||||
sqlite
|
||||
libtiff
|
||||
gtest
|
||||
] ++ lib.optionals useTiledb [
|
||||
tiledb
|
||||
] ++ [
|
||||
|
@ -163,14 +167,20 @@ stdenv.mkDerivation rec {
|
|||
# preCheck rather than preInstallCheck because this is what pytestCheckHook
|
||||
# calls (coming from the python world)
|
||||
preCheck = ''
|
||||
pushd ../autotest
|
||||
pushd autotest
|
||||
|
||||
export HOME=$(mktemp -d)
|
||||
export PYTHONPATH="$out/${python3.sitePackages}:$PYTHONPATH"
|
||||
export GDAL_DOWNLOAD_TEST_DATA=OFF
|
||||
# allows to skip tests that fail because of file handle leak
|
||||
# the issue was not investigated
|
||||
# https://github.com/OSGeo/gdal/blob/v3.7.0/autotest/gdrivers/bag.py#L61
|
||||
export BUILD_NAME=fedora
|
||||
'';
|
||||
nativeInstallCheckInputs = with python3.pkgs; [
|
||||
pytestCheckHook
|
||||
pytest-env
|
||||
filelock
|
||||
lxml
|
||||
];
|
||||
disabledTestPaths = [
|
||||
|
@ -200,7 +210,7 @@ stdenv.mkDerivation rec {
|
|||
"test_ogr_parquet_write_crs_without_id_in_datum_ensemble_members"
|
||||
];
|
||||
postCheck = ''
|
||||
popd # ../autotest
|
||||
popd # autotest
|
||||
'';
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
|
78
pkgs/development/libraries/libayatana-common/default.nix
Normal file
78
pkgs/development/libraries/libayatana-common/default.nix
Normal file
|
@ -0,0 +1,78 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, gitUpdater
|
||||
, testers
|
||||
, cmake
|
||||
, cmake-extras
|
||||
, glib
|
||||
, gobject-introspection
|
||||
, gtest
|
||||
, intltool
|
||||
, pkg-config
|
||||
, systemd
|
||||
, vala
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libayatana-common";
|
||||
version = "0.9.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AyatanaIndicators";
|
||||
repo = "libayatana-common";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-5cHFjBQ3NgNaoprPrFytnrwBRL7gDG7QZLWomgGBJMg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# Queries via pkg_get_variable, can't override prefix
|
||||
substituteInPlace data/CMakeLists.txt \
|
||||
--replace 'DESTINATION "''${SYSTEMD_USER_UNIT_DIR}"' 'DESTINATION "${placeholder "out"}/lib/systemd/user"'
|
||||
'';
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
gobject-introspection
|
||||
intltool
|
||||
pkg-config
|
||||
vala
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
cmake-extras
|
||||
glib
|
||||
systemd
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
gtest
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DENABLE_TESTS=${lib.boolToString finalAttrs.doCheck}"
|
||||
"-DENABLE_LOMIRI_FEATURES=OFF"
|
||||
"-DGSETTINGS_LOCALINSTALL=ON"
|
||||
"-DGSETTINGS_COMPILE=ON"
|
||||
];
|
||||
|
||||
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
|
||||
|
||||
passthru = {
|
||||
tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
|
||||
updateScript = gitUpdater { };
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Common functions for Ayatana System Indicators";
|
||||
homepage = "https://github.com/AyatanaIndicators/libayatana-common";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ OPNA2608 ];
|
||||
platforms = platforms.linux;
|
||||
pkgConfigModules = [
|
||||
"libayatana-common"
|
||||
];
|
||||
};
|
||||
})
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openxr-loader";
|
||||
version = "1.0.27";
|
||||
version = "1.0.28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KhronosGroup";
|
||||
repo = "OpenXR-SDK-Source";
|
||||
rev = "release-${version}";
|
||||
sha256 = "sha256-QvwSNuIph/ea3dAGQ0VhOiOmPmQtnqleCEebRpH2SgE=";
|
||||
sha256 = "sha256-rQ+Zkmvi4bWVp86KDPs7SLZ040stKUsC7Ycb9kltElk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake python3 pkg-config ];
|
||||
|
|
|
@ -32,12 +32,12 @@ buildPythonPackage rec {
|
|||
requests
|
||||
icalendar
|
||||
recurring-ical-events
|
||||
pytz
|
||||
tzlocal
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
tzlocal
|
||||
pytz
|
||||
];
|
||||
|
||||
# xandikos and radicale are only optional test dependencies, not available for python3
|
||||
|
|
97
pkgs/development/python-modules/coffea/default.nix
Normal file
97
pkgs/development/python-modules/coffea/default.nix
Normal file
|
@ -0,0 +1,97 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, hatchling
|
||||
, hatch-vcs
|
||||
, awkward
|
||||
, uproot
|
||||
, dask
|
||||
, dask-awkward
|
||||
, dask-histogram
|
||||
, correctionlib
|
||||
, pyarrow
|
||||
, fsspec
|
||||
, matplotlib
|
||||
, numba
|
||||
, numpy
|
||||
, scipy
|
||||
, tqdm
|
||||
, lz4
|
||||
, cloudpickle
|
||||
, toml
|
||||
, mplhep
|
||||
, packaging
|
||||
, pandas
|
||||
, hist
|
||||
, cachetools
|
||||
, distributed
|
||||
, pyinstrument
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "coffea";
|
||||
version = "2023.6.0.rc1";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CoffeaTeam";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-TEtQ2KnwcylQbprlRtgHv7HIFg7roDWD4TihrQE4icU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace "numba>=0.57.0" "numba"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
hatchling
|
||||
hatch-vcs
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
awkward
|
||||
uproot
|
||||
dask
|
||||
dask.optional-dependencies.array
|
||||
dask-awkward
|
||||
dask-histogram
|
||||
correctionlib
|
||||
pyarrow
|
||||
fsspec
|
||||
matplotlib
|
||||
numba
|
||||
numpy
|
||||
scipy
|
||||
tqdm
|
||||
lz4
|
||||
cloudpickle
|
||||
toml
|
||||
mplhep
|
||||
packaging
|
||||
pandas
|
||||
hist
|
||||
cachetools
|
||||
];
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
nativeCheckInputs = [
|
||||
distributed
|
||||
pyinstrument
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"coffea"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Basic tools and wrappers for enabling not-too-alien syntax when running columnar Collider HEP analysis";
|
||||
homepage = "https://github.com/CoffeaTeam/coffea";
|
||||
license = with licenses; [ bsd3 ];
|
||||
maintainers = with maintainers; [ veprbl ];
|
||||
};
|
||||
}
|
64
pkgs/development/python-modules/correctionlib/default.nix
Normal file
64
pkgs/development/python-modules/correctionlib/default.nix
Normal file
|
@ -0,0 +1,64 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, cmake
|
||||
, numpy
|
||||
, scikit-build
|
||||
, setuptools
|
||||
, setuptools-scm
|
||||
, pybind11
|
||||
, pydantic
|
||||
, pytestCheckHook
|
||||
, rich
|
||||
, scipy
|
||||
, zlib
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "correctionlib";
|
||||
version = "2.2.2";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-h3eggtPLSF/8ShQ5xzowZW1KSlcI/YBsPu3lsSyzHkw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
numpy
|
||||
scikit-build
|
||||
setuptools
|
||||
setuptools-scm
|
||||
pybind11
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
zlib
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pydantic
|
||||
rich
|
||||
];
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
scipy
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"correctionlib"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Provides a well-structured JSON data format for a wide variety of ad-hoc correction factors encountered in a typical HEP analysis";
|
||||
homepage = "https://cms-nanoaod.github.io/correctionlib/";
|
||||
license = with licenses; [ bsd3 ];
|
||||
maintainers = with maintainers; [ veprbl ];
|
||||
};
|
||||
}
|
49
pkgs/development/python-modules/dask-histogram/default.nix
Normal file
49
pkgs/development/python-modules/dask-histogram/default.nix
Normal file
|
@ -0,0 +1,49 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, boost-histogram
|
||||
, dask
|
||||
, hatchling
|
||||
, hatch-vcs
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dask-histogram";
|
||||
version = "2023.6.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dask-contrib";
|
||||
repo = "dask-histogram";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-9b2+vrUH8lZYsEbJg+GmY5zHZ+7PyA9NV2h5VAN0J1s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
hatchling
|
||||
hatch-vcs
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
boost-histogram
|
||||
dask
|
||||
];
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"dask_histogram"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Histograms with task scheduling";
|
||||
homepage = "https://dask-histogram.readthedocs.io/";
|
||||
license = with licenses; [ bsd3 ];
|
||||
maintainers = with maintainers; [ veprbl ];
|
||||
};
|
||||
}
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "denonavr";
|
||||
version = "0.11.2";
|
||||
version = "0.11.3";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
|||
owner = "ol-iver";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Sa5pfvSzshgwHh9LGWPBVIC7pXouZbTmSMYncT46phU=";
|
||||
hash = "sha256-QBy1nm09trAmL7KsPWgv5iMAOJ3Fkviug/o7a+tSSDA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -92,6 +92,9 @@ buildPythonPackage rec {
|
|||
"tests/test_cookies.py"
|
||||
];
|
||||
|
||||
# cherrypy does not support Python 3.11
|
||||
doCheck = pythonOlder "3.11";
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/jaraco/jaraco.net/blob/${src.rev}/CHANGES.rst";
|
||||
description = "Networking tools by jaraco";
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyunifiprotect";
|
||||
version = "4.10.4";
|
||||
version = "4.10.5";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
@ -40,7 +40,7 @@ buildPythonPackage rec {
|
|||
owner = "briis";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-8A/9yXqiFlR2fkpnTIXOoBbOCqxtC8uvGi05WU38PCU=";
|
||||
hash = "sha256-BrdffDuPTn/uFKT9F0pF1+0/MraIPRwsN64DdseQdQA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "rasterio";
|
||||
version = "1.3.7";
|
||||
version = "1.3.8";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -35,7 +35,7 @@ buildPythonPackage rec {
|
|||
owner = "rasterio";
|
||||
repo = "rasterio";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-6AtGRXGuAXMrePqS2lmNdOuPZi6LHuiWP2LJyxH3L3M=";
|
||||
hash = "sha256-8kPzUvTZ/jRDXlYMAZkG1xdLAQuzxnvHXBzwWizMOTo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
{ boto3
|
||||
, buildPythonPackage
|
||||
, crc32c
|
||||
, which
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, lib
|
||||
, matplotlib
|
||||
, moto
|
||||
|
@ -13,8 +13,10 @@
|
|||
, torch
|
||||
, six
|
||||
, soundfile
|
||||
, stdenv
|
||||
, tensorboard
|
||||
, torchvision
|
||||
, which
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
@ -29,12 +31,33 @@ buildPythonPackage rec {
|
|||
hash = "sha256-Np0Ibn51qL0ORwq1IY8lUle05MQDdb5XkI1uzGOKJno=";
|
||||
};
|
||||
|
||||
# apparently torch API changed a bit at 1.6
|
||||
postPatch = ''
|
||||
substituteInPlace tensorboardX/pytorch_graph.py --replace \
|
||||
"torch.onnx.set_training(model, False)" \
|
||||
"torch.onnx.select_model_mode_for_export(model, torch.onnx.TrainingMode.EVAL)"
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "fix-test-multiprocess-fork-on-darwin.patch";
|
||||
url = "https://github.com/lanpa/tensorboardX/commit/246a867237ff12893351b9275a1e297ee2861319.patch";
|
||||
hash = "sha256-ObUaIi1gFcGZAvDOEtZFd9TjZZUp3k89tYwmDQ5yOWg=";
|
||||
})
|
||||
# https://github.com/lanpa/tensorboardX/pull/706
|
||||
(fetchpatch {
|
||||
name = "fix-test-use-matplotlib-agg-backend.patch";
|
||||
url = "https://github.com/lanpa/tensorboardX/commit/751821c7af7f7f2cb724938e36fa04e814c0e4de.patch";
|
||||
hash = "sha256-Tu76ZRTh8fGj+/CzpqJO65hKrDFASbmzoLVIZ0kyLQA=";
|
||||
})
|
||||
# https://github.com/lanpa/tensorboardX/pull/707
|
||||
(fetchpatch {
|
||||
name = "fix-test-handle-numpy-float128-missing.patch";
|
||||
url = "https://github.com/lanpa/tensorboardX/commit/38f57ffc3b3dd91e76b13ec97404278065fbc782.patch";
|
||||
hash = "sha256-5Po41lHiO5hKi4ZtWR98/wwDe9HKZdADNTv40mgIEvk=";
|
||||
})
|
||||
# https://github.com/lanpa/tensorboardX/pull/708
|
||||
(fetchpatch {
|
||||
name = "fix-test-respect-tmpdir.patch";
|
||||
url = "https://github.com/lanpa/tensorboardX/commit/b0191d1cfb8a23def76e465d20fd59302c894f32.patch";
|
||||
hash = "sha256-6rSncJ16P1u70Cz9nObo8lMD7Go50BR3DZLgP4bODk4=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Version detection seems broken here, the version reported by python is
|
||||
# newer than the protobuf package itself.
|
||||
sed -i -e "s/'protobuf[^']*'/'protobuf'/" setup.py
|
||||
|
@ -71,6 +94,10 @@ buildPythonPackage rec {
|
|||
"test_TorchVis"
|
||||
# Requires network access (FileNotFoundError: [Errno 2] No such file or directory: 'wget')
|
||||
"test_onnx_graph"
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
# Fails with a mysterious error in pytorch:
|
||||
# RuntimeError: required keyword attribute 'name' has the wrong type
|
||||
"test_pytorch_graph"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
|
|
|
@ -16,6 +16,24 @@ crystal.buildCrystalPackage rec {
|
|||
url = "https://github.com/crystal-ameba/ameba/commit/c7f2cba409787a1928fbb54494b4645ec11005cc.patch";
|
||||
hash = "sha256-tYEPke6omMdCGG2llJGXDZ3jTO4YAqpknzTPi2576UI=";
|
||||
})
|
||||
(fetchpatch {
|
||||
# Fixes: Error: type must be Ameba::Severity, not (Ameba::Severity | Nil)
|
||||
name = "crystal-1.9-compatibility-1.patch";
|
||||
url = "https://github.com/crystal-ameba/ameba/commit/d0d8b18c8365fd956d1e65ae6051e83a5e129f18.patch";
|
||||
hash = "sha256-NmA3OoS5aOW+28TV/D/LUKEEu3lzHlcpolggHBB/wHE=";
|
||||
})
|
||||
(fetchpatch {
|
||||
# Ignore some failing lints on the Ameba codebase run during the check phase.
|
||||
name = "crystal-1.9-compatibility-2.patch";
|
||||
url = "https://github.com/crystal-ameba/ameba/commit/c9d25f3409e6a127bbd7188267810657a2c2924e.patch";
|
||||
hash = "sha256-JMKiO0izSXfgw7uM9XXQ0r/ntOwRnjzYeVHqVLAvLXo=";
|
||||
})
|
||||
(fetchpatch {
|
||||
# Fixes test failures due to Crystal compiler error messages changing.
|
||||
name = "crystal-1.9-compatibility-3.patch";
|
||||
url = "https://github.com/crystal-ameba/ameba/commit/db59b23f9bfcf53dbe53d2918bd9c3d79ac24bb6.patch";
|
||||
hash = "sha256-MKbEm9CR4+VzioCjcOFuFF0xnc1Ty0Ij4d3FcvQO6hY=";
|
||||
})
|
||||
];
|
||||
|
||||
format = "make";
|
||||
|
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "moon";
|
||||
version = "1.9.2";
|
||||
version = "1.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "moonrepo";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-f1pDY8CXsEYme7UoFdkpQ42FnZRKrwdDYEBS5uTha2E=";
|
||||
hash = "sha256-QwU7gzQUS+w2kSIhvTxTksJrNiVjaQ4M1CCfyc+3V7A=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Zwi5oU4XAssg62m3Mwx6elEgDpq4s/Ah1Ta6prs6Pz4=";
|
||||
cargoHash = "sha256-pVwarRhS+PGOeIV1jjWjOdXUc8fuEGRocd/hT0Y1yKQ=";
|
||||
|
||||
env = {
|
||||
RUSTFLAGS = "-C strip=symbols";
|
||||
|
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "jql";
|
||||
version = "7.0.0";
|
||||
version = "7.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yamafaktory";
|
||||
repo = pname;
|
||||
rev = "jql-v${version}";
|
||||
hash = "sha256-D1L7C7oKvKtsphqOTEuJ7i6/xTg2nN6VwcUjSFb3hz0=";
|
||||
hash = "sha256-JGD+E5QWrtRX047Nrufl+wQJnJXqKTZkXcU4/uXA6l0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-CHltLd7uj6ZFJ3uq+NRxOTLyMtkP9a+dAyhfBlqjoAY=";
|
||||
cargoHash = "sha256-t3QACjuHMpJULEpEcUPCAF27LIrjtn4i7Ud0DfDa0ek=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A JSON Query Language CLI tool built with Rust";
|
||||
|
|
|
@ -0,0 +1,28 @@
|
|||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "openscad-lsp";
|
||||
version = "1.2.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Leathong";
|
||||
repo = "openscad-LSP";
|
||||
rev = "dc1283df080b981f8da620744b0fb53b22f2eb84";
|
||||
hash = "sha256-IPTBWX0kKmusijg4xAvS1Ysi9WydFaUWx/BkZbMvgJk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-AQpjamyHienqB501lruxk56N6r8joocWrJ5srsm5baY=";
|
||||
|
||||
# no tests exist
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A LSP (Language Server Protocol) server for OpenSCAD";
|
||||
homepage = "https://github.com/Leathong/openscad-LSP";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ c-h-johnson ];
|
||||
};
|
||||
}
|
|
@ -45,7 +45,7 @@ mkYarnPackage rec {
|
|||
homepage = "https://github.com/fsouza/prettierd";
|
||||
license = licenses.isc;
|
||||
changelog = "https://github.com/fsouza/prettierd/blob/${src.rev}/CHANGELOG.md";
|
||||
platforms = platforms.linux;
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
maintainers = with maintainers; [ NotAShelf n3oney ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -2,20 +2,21 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-temp";
|
||||
version = "0.2.16";
|
||||
version = "0.2.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yozhgoor";
|
||||
repo = pname;
|
||||
repo = "cargo-temp";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-9rFczpVboJ+TPQzuegFj8RGYBel+4n5iY4B0sruK5wc=";
|
||||
hash = "sha256-nDUtmCbvWK6bdcKvlx3KYMy9w8IOLL6jMWOafX704eQ=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-uIgDs7dFJjZgOE/y3T11N3zl8AwRvIyJbIC7wD7Nr7Q=";
|
||||
cargoHash = "sha256-DxeZGQqi681JoCZo0Iq8+TgyF7a8No9Crm4NypUeDDA=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A CLI tool that allow you to create a temporary new Rust project using cargo with already installed dependencies";
|
||||
homepage = "https://github.com/yozhgoor/cargo-temp";
|
||||
changelog = "https://github.com/yozhgoor/cargo-temp/releases/tag/${src.rev}";
|
||||
license = with licenses; [ mit /* or */ asl20 ];
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
};
|
||||
|
|
|
@ -19,17 +19,17 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "aaaaxy";
|
||||
version = "1.4.18";
|
||||
version = "1.4.33";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "divVerent";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-g2xUBh0zRB+9awYEr15ay0k+EyAiWmGG5UfZatE24/8=";
|
||||
hash = "sha256-PE5TYzfO2/3DehCVmo9mNNXgghnNR02frqRe6I0EfFY=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
vendorHash = "sha256-9SeNXOl1wEcG/CtNuuYQ8Y5XEw2GYAIQ2lXk5lgXsN8=";
|
||||
vendorHash = "sha256-qnn+2aUpYQYg31p+rAHTGHgrwfEHRtZECOg9oIERrrc=";
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
|
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "minesweep-rs";
|
||||
version = "6.0.13";
|
||||
version = "6.0.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cpcloud";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-vr6tfwTIDuMyyeWTPeH71ECf4PqI2+5s1Lb45Cavr+4=";
|
||||
hash = "sha256-+2HwjdbjzhUQPcBMY2Km/cjGAw4TgjNpNMgtuxVUZD4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-KHmZ37wnz8Z2dz78tiovqhNIiPcb5WBzk9plPNM/gqU=";
|
||||
cargoHash = "sha256-Qip+Yc/i57BOaKBOC60j7TDM1rzIEivYFjsp+vQ3hS4=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Sweep some mines for fun, and probably not for profit";
|
||||
|
|
91
pkgs/misc/drivers/epsonscan2/build.patch
Normal file
91
pkgs/misc/drivers/epsonscan2/build.patch
Normal file
|
@ -0,0 +1,91 @@
|
|||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index a9daee7..7c6da08 100755
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -17,7 +17,6 @@
|
||||
# CMakeLists.txt -- template and derived ESC/I ESC/I-2 protocol commands
|
||||
|
||||
project (epsonscan2)
|
||||
-set (CMAKE_INSTALL_PREFIX "/usr")
|
||||
cmake_minimum_required (VERSION 2.8.12.2)
|
||||
|
||||
include(GNUInstallDirs)
|
||||
@@ -86,7 +85,6 @@ set(COMMON_ETC_PATH ${CMAKE_INSTALL_FULL_SYSCONFDIR})
|
||||
set(EPSON_WORK_PATH /tmp/epsonWork/)
|
||||
set(EPSON_SETTINGS_PATH $ENV{HOME}/.epsonscan2/)
|
||||
|
||||
-SET (CMAKE_INSTALL_PREFIX /usr)
|
||||
set(EPSON_INSTALL_PATH ${CMAKE_INSTALL_FULL_LIBDIR}/epsonscan2/)
|
||||
set(COMMON_SHARE_PATH ${CMAKE_INSTALL_FULL_DATAROOTDIR})
|
||||
|
||||
@@ -113,8 +111,8 @@ add_subdirectory(src)
|
||||
|
||||
install(DIRECTORY Resources DESTINATION ${EPSON_INSTALL_ROOT}${EPSON_INSTALL_PATH})
|
||||
|
||||
-install(FILES epsonscan2.rules DESTINATION ${EPSON_INSTALL_ROOT}/lib/udev/rules.d/ RENAME 60-epsonscan2.rules)
|
||||
-install(FILES epsonscan2 DESTINATION ${EPSON_INSTALL_ROOT}/etc/sane.d/dll.d)
|
||||
+install(FILES epsonscan2.rules DESTINATION ${EPSON_INSTALL_ROOT}${CMAKE_INSTALL_PREFIX}/lib/udev/rules.d/ RENAME 60-epsonscan2.rules)
|
||||
+install(FILES epsonscan2 DESTINATION ${EPSON_INSTALL_ROOT}${CMAKE_INSTALL_PREFIX}/etc/sane.d/dll.d)
|
||||
install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${EPSON_INSTALL_ROOT}${CMAKE_INSTALL_FULL_LIBDIR}/sane/)")
|
||||
install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ../epsonscan2/libsane-epsonscan2.so ${EPSON_INSTALL_ROOT}${CMAKE_INSTALL_FULL_LIBDIR}/sane/libsane-epsonscan2.so.1)")
|
||||
install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ../epsonscan2/libsane-epsonscan2.so ${EPSON_INSTALL_ROOT}${CMAKE_INSTALL_FULL_LIBDIR}/sane/libsane-epsonscan2.so.1.0.0)")
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index c884d83..5ddff0c 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -26,7 +26,9 @@ add_subdirectory(ES2Command/Linux)
|
||||
add_subdirectory(ES2FileFormat/Linux)
|
||||
add_subdirectory(Controller)
|
||||
add_subdirectory(SaneWrapper/Linux)
|
||||
+if (NOT DEFINED NO_GUI)
|
||||
add_subdirectory(Standalone)
|
||||
add_subdirectory(DetectAlert)
|
||||
+endif ()
|
||||
add_subdirectory(ScanSDK)
|
||||
|
||||
diff --git a/src/Controller/Src/Filter/GetOrientation.cpp b/src/Controller/Src/Filter/GetOrientation.cpp
|
||||
index 387561e..15448ad 100644
|
||||
--- a/src/Controller/Src/Filter/GetOrientation.cpp
|
||||
+++ b/src/Controller/Src/Filter/GetOrientation.cpp
|
||||
@@ -12,14 +12,7 @@ namespace epsonscan
|
||||
|
||||
static std::string GetExecPath()
|
||||
{
|
||||
-#ifdef AKBMODE
|
||||
- std::string strDst = "/usr/libexec/";
|
||||
- strDst = strDst + DRIVER_NAME;
|
||||
- strDst = strDst + "-ocr/ocr-engine-getrotate";
|
||||
- return strDst.c_str() ;
|
||||
-#else
|
||||
- return "/usr/libexec/epsonscan2-ocr/ocr-engine-getrotate" ;
|
||||
-#endif
|
||||
+ return "@OCR_ENGINE_GETROTATE@";
|
||||
}
|
||||
static const int kMaxBuf = 256;
|
||||
|
||||
diff --git a/src/Controller/Src/Scanner/Engine.cpp b/src/Controller/Src/Scanner/Engine.cpp
|
||||
index 9489d4b..670bad9 100644
|
||||
--- a/src/Controller/Src/Scanner/Engine.cpp
|
||||
+++ b/src/Controller/Src/Scanner/Engine.cpp
|
||||
@@ -263,8 +263,8 @@ SDIError Engine::Open()
|
||||
//kill es2netif
|
||||
//kill es2intif
|
||||
|
||||
- system("killall -9 -q es2netif > /dev/null");
|
||||
- system("killall -9 -q es2intif > /dev/null");
|
||||
+ system("@KILLALL@ -9 -q es2netif > /dev/null");
|
||||
+ system("@KILLALL@ -9 -q es2intif > /dev/null");
|
||||
|
||||
if (engine_) {
|
||||
return ExchangeError(engine_->Open());
|
||||
diff --git a/src/Standalone/CMakeLists.txt b/src/Standalone/CMakeLists.txt
|
||||
index eff3dd3..c2b3803 100644
|
||||
--- a/src/Standalone/CMakeLists.txt
|
||||
+++ b/src/Standalone/CMakeLists.txt
|
||||
@@ -167,5 +167,5 @@ target_link_libraries(es2standalone ${QT_LIBRARIES}
|
||||
)
|
||||
|
||||
QT5_USE_MODULES(es2standalone Widgets)
|
||||
-install(TARGETS es2standalone DESTINATION "${EPSON_INSTALL_ROOT}/usr/bin")
|
||||
+install(TARGETS es2standalone DESTINATION "${EPSON_INSTALL_ROOT}${CMAKE_INSTALL_FULL_BINDIR}")
|
||||
|
162
pkgs/misc/drivers/epsonscan2/default.nix
Normal file
162
pkgs/misc/drivers/epsonscan2/default.nix
Normal file
|
@ -0,0 +1,162 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, autoPatchelfHook
|
||||
, boost
|
||||
, cmake
|
||||
, copyDesktopItems
|
||||
, imagemagick
|
||||
, fetchpatch
|
||||
, fetchzip
|
||||
, killall
|
||||
, libjpeg
|
||||
, libpng
|
||||
, libtiff
|
||||
, libtool
|
||||
, libusb1
|
||||
, makeDesktopItem
|
||||
, qtbase
|
||||
, wrapQtAppsHook
|
||||
|
||||
, withGui ? true
|
||||
, withNonFreePlugins ? false
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "epsonscan2";
|
||||
description = "Epson Scan 2 scanner driver for many modern Epson scanners and multifunction printers";
|
||||
version = "6.7.61.0";
|
||||
|
||||
system = stdenv.hostPlatform.system;
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://download3.ebz.epson.net/dsc/f/03/00/14/53/67/1a6447b4acc5568dfd970feba0518fabea35bca2/epsonscan2-${version}-1.src.tar.gz";
|
||||
hash = "sha256-xwvdgmV6Mrs1RC18U2mA+HlTYybeYb0V5lz5hCvC7+8=";
|
||||
};
|
||||
bundle = {
|
||||
"i686-linux" = fetchzip {
|
||||
name = "${pname}-bundle";
|
||||
url = "https://download3.ebz.epson.net/dsc/f/03/00/14/53/69/3151031c0fb4deea3f48781fd051411b983ccee4/epsonscan2-bundle-${version}.i686.deb.tar.gz";
|
||||
hash = "sha256-nq3Nqunt8aMcCf7U7JBYrVscvrhhcwcn8RlhYXLmC2c=";
|
||||
};
|
||||
|
||||
"x86_64-linux" = fetchzip {
|
||||
name = "${pname}-bundle";
|
||||
url = "https://download3.ebz.epson.net/dsc/f/03/00/14/53/68/a5e06101ba3f328dd747888e3dddebbb677bb8c8/epsonscan2-bundle-${version}.x86_64.deb.tar.gz";
|
||||
hash = "sha256-cFx54CKkZtvhZ5ABuBwB8+IzhT2lu8D3+GZFaMuWf3Y=";
|
||||
};
|
||||
}."${system}" or (throw "Unsupported system: ${system}");
|
||||
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit pname src version;
|
||||
|
||||
patches = [
|
||||
./build.patch
|
||||
(fetchpatch {
|
||||
url = "https://github.com/flathub/net.epson.epsonscan2/raw/master/patches/epsonscan2-crash.patch";
|
||||
hash = "sha256-srMxlFfnZuJ3ed5veFcJIiZuW27F/3xOS0yr4ywn4FI=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://raw.githubusercontent.com/flathub/net.epson.epsonscan2/master/patches/epsonscan2-oob-container.patch";
|
||||
hash = "sha256-FhXZT0bIBYwdFow2USRJl8Q7j2eqpq98Hh0lHFQlUQY=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://raw.githubusercontent.com/flathub/net.epson.epsonscan2/master/patches/epsonscan2-xdg-open.patch";
|
||||
hash = "sha256-4ih3vZjPwWiiAxKfpLIwbbsk1K2oXSuxGbT5PVwfUsc=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/Controller/Src/Scanner/Engine.cpp \
|
||||
--replace '@KILLALL@' ${killall}/bin/killall
|
||||
|
||||
substituteInPlace src/Controller/Src/Filter/GetOrientation.cpp \
|
||||
--replace '@OCR_ENGINE_GETROTATE@' $out/libexec/epsonscan2-ocr/ocr-engine-getrotate
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
] ++ lib.optionals withGui [
|
||||
imagemagick # to make icons
|
||||
wrapQtAppsHook
|
||||
] ++ lib.optionals withNonFreePlugins [
|
||||
autoPatchelfHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
libjpeg
|
||||
libpng
|
||||
libtiff
|
||||
libusb1
|
||||
] ++ lib.optionals withGui [
|
||||
copyDesktopItems
|
||||
qtbase
|
||||
] ++ lib.optionals withNonFreePlugins [
|
||||
libtool.lib
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_BUILD_TYPE=Release"
|
||||
# The non-free (Debian) packages uses this directory structure so do the same when compiling
|
||||
# from source so we can easily merge them.
|
||||
"-DCMAKE_INSTALL_LIBDIR=lib/${system}-gnu"
|
||||
] ++ lib.optionals (!withGui) [
|
||||
"-DNO_GUI=ON"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
# But when we put all the libraries in lib/${system}-gnu, then SANE can't find the
|
||||
# required libraries so create a symlink to where it expects them to be.
|
||||
mkdir -p $out/lib/sane
|
||||
for file in $out/lib/${system}-gnu/sane/*.so.*; do
|
||||
ln -s $file $out/lib/sane/
|
||||
done
|
||||
'' + lib.optionalString withGui ''
|
||||
# The icon file extension is .ico but it's actually a png!
|
||||
mkdir -p $out/share/icons/hicolor/{48x48,128x128}/apps
|
||||
convert $src/Resources/Icons/escan2_app.ico -resize 48x48 $out/share/icons/hicolor/48x48/apps/epsonscan2.png
|
||||
convert $src/Resources/Icons/escan2_app.ico -resize 128x128 $out/share/icons/hicolor/128x128/apps/epsonscan2.png
|
||||
'' + lib.optionalString withNonFreePlugins ''
|
||||
ar xf ${bundle}/plugins/epsonscan2-non-free-plugin_*.deb
|
||||
tar Jxf data.tar.xz
|
||||
cp -r usr/* $out
|
||||
'';
|
||||
|
||||
desktopItems = lib.optionals withGui [
|
||||
(makeDesktopItem {
|
||||
name = pname;
|
||||
exec = "epsonscan2";
|
||||
icon = "epsonscan2";
|
||||
desktopName = "Epson Scan 2";
|
||||
genericName = "Epson Scan 2";
|
||||
comment = description;
|
||||
categories = [ "Graphics" "Scanning" ];
|
||||
})
|
||||
];
|
||||
|
||||
meta = {
|
||||
inherit description;
|
||||
longDescription = ''
|
||||
Epson Scan 2 scanner driver including optional non-free plugins such as OCR and network
|
||||
scanning.
|
||||
|
||||
To use the SANE backend:
|
||||
<literal>
|
||||
hardware.sane.extraBackends = [ pkgs.epsonscan2 ];
|
||||
</literal>
|
||||
|
||||
Overrides can be used to customise this package. For example, to enable non-free plugins and
|
||||
disable the Epson GUI:
|
||||
<literal>
|
||||
pkgs.epsonscan2.override { withNonFreePlugins = true; withGui = false; }
|
||||
</literal>
|
||||
'';
|
||||
homepage = "https://support.epson.net/linux/en/epsonscan2.php";
|
||||
platforms = [ "i686-linux" "x86_64-linux" ];
|
||||
sourceProvenance = with lib.sourceTypes; [ fromSource ] ++ lib.optionals withNonFreePlugins [ binaryNativeCode ];
|
||||
license = with lib.licenses; if withNonFreePlugins then unfree else lgpl21Plus;
|
||||
maintainers = with lib.maintainers; [ james-atkins ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
{ fetchurl, lib, stdenv, flex, bison, pkg-config, libmnl, libnfnetlink
|
||||
, libnetfilter_conntrack, libnetfilter_queue, libnetfilter_cttimeout
|
||||
, libnetfilter_cthelper, systemd
|
||||
, libtirpc
|
||||
, libnetfilter_cthelper, libtirpc
|
||||
, systemdSupport ? true, systemd
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -15,10 +15,16 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [
|
||||
libmnl libnfnetlink libnetfilter_conntrack libnetfilter_queue
|
||||
libnetfilter_cttimeout libnetfilter_cthelper systemd libtirpc
|
||||
libnetfilter_cttimeout libnetfilter_cthelper libtirpc
|
||||
] ++ lib.optionals systemdSupport [
|
||||
systemd
|
||||
];
|
||||
nativeBuildInputs = [ flex bison pkg-config ];
|
||||
|
||||
configureFlags = [
|
||||
(lib.enableFeature systemdSupport "systemd")
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://conntrack-tools.netfilter.org/";
|
||||
description = "Connection tracking userspace tools";
|
||||
|
|
87
pkgs/os-specific/linux/esdm/default.nix
Normal file
87
pkgs/os-specific/linux/esdm/default.nix
Normal file
|
@ -0,0 +1,87 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, protobufc
|
||||
, pkg-config
|
||||
, fuse3
|
||||
, meson
|
||||
, ninja
|
||||
, libselinux
|
||||
, jitterentropy
|
||||
# A more detailed explaination of the following meson build options can be found
|
||||
# in the source code of esdm.
|
||||
# A brief explanation is given:
|
||||
, selinux ? false # enable selinux support
|
||||
, drngHashDrbg ? true # set the default drng callback
|
||||
, drngChaCha20 ? false # set the default drng callback
|
||||
, ais2031 ? false # set the seeding strategy to be compliant with AIS 20/31
|
||||
, linuxDevFiles ? true # enable linux /dev/random and /dev/urandom support
|
||||
, linuxGetRandom ? true # enable linux getrandom support
|
||||
, esJitterRng ? true # enable support for the entropy source: jitter rng
|
||||
, esCPU ? true # enable support for the entropy source: cpu-based entropy
|
||||
, esKernel ? true # enable support for the entropy source: kernel-based entropy
|
||||
, esIRQ ? false # enable support for the entropy source: interrupt-based entropy
|
||||
, esSched ? false # enable support for the entropy source: scheduler-based entropy
|
||||
, esHwrand ? true # enable support for the entropy source: /dev/hwrng
|
||||
, hashSha512 ? false # set the conditioning hash: SHA2-512
|
||||
, hashSha3_512 ? true # set the conditioning hash: SHA3-512
|
||||
}:
|
||||
|
||||
assert drngHashDrbg != drngChaCha20;
|
||||
assert hashSha512 != hashSha3_512;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "esdm";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "smuellerDD";
|
||||
repo = "esdm";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-swBKVb5gnND76w2ULT+5hR/jVOqxEe4TAB1gyaLKE9Q=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "arm64.patch";
|
||||
url = "https://github.com/smuellerDD/esdm/commit/86b93a0ddf684448aba152c8f1b3baf40a6d41c0.patch";
|
||||
sha256 = "sha256-gjp13AEsDNj23fcGanAAn2KCbYKA0cphhf4mCxek9Yg=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ meson pkg-config ninja ];
|
||||
buildInputs = [ protobufc fuse3 jitterentropy ]
|
||||
++ lib.optional selinux libselinux;
|
||||
|
||||
mesonFlags = [
|
||||
(lib.mesonBool "b_lto" false)
|
||||
(lib.mesonBool "ais2031" ais2031)
|
||||
(lib.mesonEnable "linux-devfiles" linuxDevFiles)
|
||||
(lib.mesonEnable "linux-getrandom" linuxGetRandom)
|
||||
(lib.mesonEnable "es_jent" esJitterRng)
|
||||
(lib.mesonEnable "es_cpu" esCPU)
|
||||
(lib.mesonEnable "es_kernel" esKernel)
|
||||
(lib.mesonEnable "es_irq" esIRQ)
|
||||
(lib.mesonEnable "es_sched" esSched)
|
||||
(lib.mesonEnable "es_hwrand" esHwrand)
|
||||
(lib.mesonEnable "hash_sha512" hashSha512)
|
||||
(lib.mesonEnable "hash_sha3_512" hashSha3_512)
|
||||
(lib.mesonEnable "selinux" selinux)
|
||||
(lib.mesonEnable "drng_hash_drbg" drngHashDrbg)
|
||||
(lib.mesonEnable "drng_chacha20" drngChaCha20)
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
strictDeps = true;
|
||||
mesonBuildType = "release";
|
||||
|
||||
meta = {
|
||||
homepage = "https://www.chronox.de/esdm.html";
|
||||
description = "Entropy Source and DRNG Manager in user space";
|
||||
license = with lib.licenses; [ gpl2Only bsd3 ];
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ orichter thillux ];
|
||||
};
|
||||
}
|
|
@ -41,6 +41,13 @@ stdenvNoCC.mkDerivation {
|
|||
# See https://github.com/RPi-Distro/firmware-nonfree/issues/26
|
||||
ln -s "./cyfmac43455-sdio-standard.bin" "$out/lib/firmware/cypress/cyfmac43455-sdio.bin"
|
||||
|
||||
pushd $out/lib/firmware/brcm &>/dev/null
|
||||
# Symlinks for Zero 2W
|
||||
ln -s "./brcmfmac43436-sdio.bin" "$out/lib/firmware/brcm/brcmfmac43430b0-sdio.raspberrypi,model-zero-2-w.bin"
|
||||
ln -s "./brcmfmac43436-sdio.txt" "$out/lib/firmware/brcm/brcmfmac43430b0-sdio.raspberrypi,model-zero-2-w.txt"
|
||||
ln -s "./brcmfmac43436-sdio.clm_blob" "$out/lib/firmware/brcm/brcmfmac43430b0-sdio.clm_blob"
|
||||
popd &>/dev/null
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
|
|
@ -8,20 +8,20 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "awsbck";
|
||||
version = "0.3.2";
|
||||
version = "0.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "beeb";
|
||||
repo = "awsbck";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-4iFPHMCWKOfwqdjCLQqWHSs5SwXi+K2sQu75ecsolSs=";
|
||||
hash = "sha256-L5hQ6vwuC9HuAGD9mvS8BGkPV3Ry5jJgRUF4Qf7fqaM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
|
||||
|
||||
cargoSha256 = "sha256-GH7ybr9ncbcvtyYCmYrG1aSA3lc+qmqivAbNVVqpMPQ=";
|
||||
cargoSha256 = "sha256-VKm27IzCUv3e1Mapb46SBJqvEwifgGxaRX2uM9MTNnQ=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
@ -13,13 +13,13 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ibus-typing-booster";
|
||||
version = "2.22.5";
|
||||
version = "2.23.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mike-fabian";
|
||||
repo = "ibus-typing-booster";
|
||||
rev = version;
|
||||
hash = "sha256-PPpA4O/uMGfSr67CQGX0qxGtZjKKdE9V6kdKpVjgmrs=";
|
||||
hash = "sha256-zc5sG/av5mCG+dA1yPSUsoN6Hr4+hXt3FPeE1orc+Zg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook gobject-introspection ];
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, fetchpatch
|
||||
{ lib, stdenv, fetchurl
|
||||
, cmake, pkg-config, perl, go, python3
|
||||
, protobuf, zlib, gtest, brotli, lz4, zstd, libusb1, pcre2
|
||||
}:
|
||||
|
|
|
@ -7,7 +7,6 @@
|
|||
, gawk
|
||||
, gnugrep
|
||||
, gnum4
|
||||
, makeWrapper
|
||||
, pacman
|
||||
, util-linux
|
||||
, chrootPath ? [
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, lib, fetchFromGitHub, makeWrapper, installShellFiles, bash, coreutils, curl, git, writeScript }:
|
||||
{ stdenv, lib, fetchFromGitHub, makeWrapper, installShellFiles, bash, curl, git, writeScript }:
|
||||
|
||||
let
|
||||
asdfReshimFile = writeScript "asdf-reshim" ''
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, python3, bash }:
|
||||
{ lib, stdenv, fetchFromGitHub, python3 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "autojump";
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, stdenv, fetchurl, makeWrapper
|
||||
, ncurses, python3, perl, textual-window-manager
|
||||
, python3, perl, textual-window-manager
|
||||
, gettext, vim, bc, screen }:
|
||||
|
||||
let
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, rustPlatform
|
||||
, fetchCrate
|
||||
}:
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, fetchFromGitHub, perl, perlPackages, makeWrapper, }:
|
||||
{ lib, fetchFromGitHub, perl, perlPackages }:
|
||||
|
||||
perlPackages.buildPerlPackage rec {
|
||||
pname = "cope";
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, inkscape
|
||||
, meson
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, autoreconfHook, tzdata, fetchpatch }:
|
||||
{ lib, stdenv, fetchurl, autoreconfHook, tzdata }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.4.10";
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
{ lib
|
||||
, buildDotnetModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildDotnetModule rec {
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, resholve
|
||||
, substituteAll
|
||||
, bash
|
||||
, coreutils
|
||||
, goss
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, abootimg
|
||||
, acl
|
||||
, apksigcopier
|
||||
, apksigner
|
||||
, apktool
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchpatch
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, rustPlatform
|
||||
|
|
|
@ -1,10 +1,7 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, buildGoModule
|
||||
, runCommand
|
||||
, nix-update-script
|
||||
, fetchurl
|
||||
, testers
|
||||
, python3
|
||||
, curl
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
, unstableGitUpdater
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
stdenv.mkDerivation {
|
||||
pname = "edid-decode";
|
||||
version = "unstable-2022-12-14";
|
||||
|
||||
|
@ -34,4 +34,4 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
maintainers = with maintainers; [ Madouura ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
})
|
||||
}
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, fetchFromGitHub, fetchpatch, python3, openssl }:
|
||||
{ lib, fetchFromGitHub, fetchpatch, python3 }:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "esptool";
|
||||
|
|
|
@ -1,12 +1,11 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, ocamlPackages
|
||||
, fetchFromGitHub
|
||||
, makeWrapper
|
||||
, python3
|
||||
}:
|
||||
|
||||
ocamlPackages.buildDunePackage rec {
|
||||
ocamlPackages.buildDunePackage {
|
||||
pname = "flitter";
|
||||
# request to tag releases: https://github.com/alexozer/flitter/issues/34
|
||||
version = "unstable-2020-10-05";
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{ stdenv, fetchpatch, fetchFromGitHub, lib
|
||||
, cmake, perl, uthash, pkg-config, gettext
|
||||
{ stdenv, fetchFromGitHub, lib
|
||||
, cmake, uthash, pkg-config
|
||||
, python, freetype, zlib, glib, giflib, libpng, libjpeg, libtiff, libxml2, cairo, pango
|
||||
, readline, woff2, zeromq
|
||||
, withSpiro ? false, libspiro
|
||||
|
|
|
@ -4,7 +4,6 @@
|
|||
, bencoder
|
||||
, pyyaml
|
||||
, requests
|
||||
, setuptools
|
||||
}:
|
||||
buildPythonApplication rec {
|
||||
pname = "gazelle-origin";
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
, stdenv
|
||||
, fetchFromGitLab
|
||||
, wrapGAppsHook
|
||||
, makeWrapper
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, makeWrapper, ruby }:
|
||||
{ lib, stdenv, fetchFromGitHub, ruby }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "h";
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, rustPlatform, fetchFromGitHub, shared-mime-info, libiconv, installShellFiles }:
|
||||
{ lib, rustPlatform, fetchFromGitHub, shared-mime-info, libiconv, installShellFiles }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "handlr-regex";
|
||||
|
|
|
@ -1,10 +1,8 @@
|
|||
{ lib
|
||||
, bundlerApp
|
||||
, buildRubyGem
|
||||
, ruby
|
||||
}:
|
||||
|
||||
bundlerApp rec {
|
||||
bundlerApp {
|
||||
pname = "haste";
|
||||
gemdir = ./.;
|
||||
exes = [ "haste" ];
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
, jdk
|
||||
}:
|
||||
|
||||
let inherit (lib) optional optionals; in
|
||||
let inherit (lib) optional; in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.10.9";
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, ant, jdk, nettools, hdf4, hdf5, makeDesktopItem, copyDesktopItems }:
|
||||
{ lib, stdenv, fetchurl, ant, jdk, hdf4, hdf5, makeDesktopItem, copyDesktopItems }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "hdfview";
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, pkgs
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
mkDerivation, fetchurl, lib,
|
||||
extra-cmake-modules, kdoctools, wrapGAppsHook,
|
||||
extra-cmake-modules, kdoctools,
|
||||
kconfig, kcrash, kinit
|
||||
}:
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, substituteAll, makeWrapper, perl, procps, file, gnused, bash }:
|
||||
{ lib, stdenv, fetchFromGitHub, makeWrapper, perl, procps, file, gnused, bash }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lesspipe";
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
{ lib
|
||||
, fetchFromSourcehut
|
||||
, rustPlatform
|
||||
, installShellFiles
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, rustPlatform
|
||||
}:
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{ stdenv, lib, fetchFromGitHub, glib, readline
|
||||
, bison, flex, pkg-config, autoreconfHook, libxslt, makeWrapper
|
||||
, bison, flex, pkg-config, autoreconfHook
|
||||
, txt2man, which
|
||||
}:
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchCrate, rustPlatform }:
|
||||
{ lib, rustPlatform, fetchCrate }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "melody";
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, lib, python3, buildPythonApplication, fetchPypi, fusepy, pyserial }:
|
||||
{ stdenv, lib, buildPythonApplication, fetchPypi, fusepy, pyserial }:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "mpy-utils";
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, fetchpatch, ncurses, pkg-config, cmake }:
|
||||
{ lib, stdenv, fetchFromGitHub, ncurses, pkg-config, cmake }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "7.0.0";
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, lib, buildGoModule, fetchFromGitHub, fetchzip }:
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "mutagen-compose";
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue