Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: - pkgs/development/libraries/science/astronomy/cfitsio/default.nix
This commit is contained in:
Martin Weinelt
commit
167f6dfee4
5
.github/CODEOWNERS
vendored
5
.github/CODEOWNERS
vendored
@ -231,11 +231,6 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
|
||||
# VsCode Extensions
|
||||
/pkgs/applications/editors/vscode/extensions @jonringer
|
||||
|
||||
# Prometheus exporter modules and tests
|
||||
/nixos/modules/services/monitoring/prometheus/exporters.nix @WilliButz
|
||||
/nixos/modules/services/monitoring/prometheus/exporters.xml @WilliButz
|
||||
/nixos/tests/prometheus-exporters.nix @WilliButz
|
||||
|
||||
# PHP interpreter, packages, extensions, tests and documentation
|
||||
/doc/languages-frameworks/php.section.md @aanderse @drupol @etu @globin @ma27 @talyz
|
||||
/nixos/tests/php @aanderse @drupol @etu @globin @ma27 @talyz
|
||||
|
||||
@ -1,24 +1,12 @@
|
||||
# Contributing to this documentation {#chap-contributing}
|
||||
|
||||
The sources of the Nixpkgs manual are in the [doc](https://github.com/NixOS/nixpkgs/tree/master/doc) subdirectory of the Nixpkgs repository. The manual is still partially written in DocBook but it is progressively being converted to [Markdown](#sec-contributing-markup).
|
||||
The sources of the Nixpkgs manual are in the [doc](https://github.com/NixOS/nixpkgs/tree/master/doc) subdirectory of the Nixpkgs repository.
|
||||
|
||||
You can quickly check your edits with `make`:
|
||||
You can quickly check your edits with `nix-build`:
|
||||
|
||||
```ShellSession
|
||||
$ cd /path/to/nixpkgs/doc
|
||||
$ nix-shell
|
||||
[nix-shell]$ make
|
||||
```
|
||||
|
||||
If you experience problems, run `make debug` to help understand the docbook errors.
|
||||
|
||||
After making modifications to the manual, it's important to build it before committing. You can do that as follows:
|
||||
|
||||
```ShellSession
|
||||
$ cd /path/to/nixpkgs/doc
|
||||
$ nix-shell
|
||||
[nix-shell]$ make clean
|
||||
[nix-shell]$ nix-build .
|
||||
$ cd /path/to/nixpkgs
|
||||
$ nix-build doc
|
||||
```
|
||||
|
||||
If the build succeeds, the manual will be in `./result/share/doc/nixpkgs/manual.html`.
|
||||
@ -122,5 +110,3 @@ Additional syntax extensions are available, all of which can be used in NixOS op
|
||||
>
|
||||
> watermelon
|
||||
> : green fruit with red flesh
|
||||
|
||||
For contributing to the legacy parts, please see [DocBook: The Definitive Guide](https://tdg.docbook.org/) or the [DocBook rocks! primer](https://web.archive.org/web/20200816233747/https://docbook.rocks/).
|
||||
|
||||
@ -9667,6 +9667,12 @@
|
||||
fingerprint = "1763 9903 2D7C 5B82 5D5A 0EAD A2BC 3C6F 1435 1991";
|
||||
}];
|
||||
};
|
||||
locochoco = {
|
||||
email = "contact@locochoco.dev";
|
||||
github = "loco-choco";
|
||||
githubId = 58634087;
|
||||
name = "Ivan Pancheniak";
|
||||
};
|
||||
lodi = {
|
||||
email = "anthony.lodi@gmail.com";
|
||||
github = "lodi";
|
||||
@ -18358,6 +18364,12 @@
|
||||
github = "ymeister";
|
||||
githubId = 47071325;
|
||||
};
|
||||
yoavlavi = {
|
||||
email = "yoav@yoavlavi.com";
|
||||
github = "yoav-lavi";
|
||||
githubId = 14347895;
|
||||
name = "Yoav Lavi";
|
||||
};
|
||||
yochai = {
|
||||
email = "yochai@titat.info";
|
||||
github = "yochai";
|
||||
|
||||
@ -411,6 +411,14 @@ with lib.maintainers; {
|
||||
shortName = "Jitsi";
|
||||
};
|
||||
|
||||
jupyter = {
|
||||
members = [
|
||||
natsukium
|
||||
];
|
||||
scope = "Maintain Jupyter and related packages.";
|
||||
shortName = "Jupyter";
|
||||
};
|
||||
|
||||
kubernetes = {
|
||||
members = [
|
||||
johanot
|
||||
|
||||
@ -12,12 +12,34 @@ in
|
||||
i18n.inputMethod.fcitx5 = {
|
||||
addons = mkOption {
|
||||
type = with types; listOf package;
|
||||
default = [];
|
||||
default = [ ];
|
||||
example = literalExpression "with pkgs; [ fcitx5-rime ]";
|
||||
description = lib.mdDoc ''
|
||||
Enabled Fcitx5 addons.
|
||||
'';
|
||||
};
|
||||
quickPhrase = mkOption {
|
||||
type = with types; attrsOf string;
|
||||
default = { };
|
||||
example = literalExpression ''
|
||||
{
|
||||
smile = "（・∀・）";
|
||||
angry = "(￣ー￣)";
|
||||
}
|
||||
'';
|
||||
description = lib.mdDoc "Quick phrases.";
|
||||
};
|
||||
quickPhraseFiles = mkOption {
|
||||
type = with types; attrsOf path;
|
||||
default = { };
|
||||
example = literalExpression ''
|
||||
{
|
||||
words = ./words.mb;
|
||||
numbers = ./numbers.mb;
|
||||
}
|
||||
'';
|
||||
description = lib.mdDoc "Quick phrase files.";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@ -30,6 +52,16 @@ in
|
||||
config = mkIf (im.enabled == "fcitx5") {
|
||||
i18n.inputMethod.package = fcitx5Package;
|
||||
|
||||
i18n.inputMethod.fcitx5.addons = lib.optionals (cfg.quickPhrase != { }) [
|
||||
(pkgs.writeTextDir "share/fcitx5/data/QuickPhrase.mb"
|
||||
(lib.concatStringsSep "\n"
|
||||
(lib.mapAttrsToList (name: value: "${name} ${value}") cfg.quickPhrase)))
|
||||
] ++ lib.optionals (cfg.quickPhraseFiles != { }) [
|
||||
(pkgs.linkFarm "quickPhraseFiles" (lib.mapAttrs'
|
||||
(name: value: lib.nameValuePair ("share/fcitx5/data/quickphrase.d/${name}.mb") value)
|
||||
cfg.quickPhraseFiles))
|
||||
];
|
||||
|
||||
environment.variables = {
|
||||
GTK_IM_MODULE = "fcitx";
|
||||
QT_IM_MODULE = "fcitx";
|
||||
|
||||
@ -31,6 +31,7 @@ in
|
||||
type = types.package;
|
||||
default = pkgs.boinc;
|
||||
defaultText = literalExpression "pkgs.boinc";
|
||||
example = literalExpression "pkgs.boinc-headless";
|
||||
description = lib.mdDoc ''
|
||||
Which BOINC package to use.
|
||||
'';
|
||||
|
||||
@ -261,23 +261,6 @@ let
|
||||
|
||||
${proxyCachePathConfig}
|
||||
|
||||
${optionalString cfg.statusPage ''
|
||||
server {
|
||||
listen ${toString cfg.defaultHTTPListenPort};
|
||||
${optionalString enableIPv6 "listen [::]:${toString cfg.defaultHTTPListenPort};" }
|
||||
|
||||
server_name localhost;
|
||||
|
||||
location /nginx_status {
|
||||
stub_status on;
|
||||
access_log off;
|
||||
allow 127.0.0.1;
|
||||
${optionalString enableIPv6 "allow ::1;"}
|
||||
deny all;
|
||||
}
|
||||
}
|
||||
''}
|
||||
|
||||
${vhosts}
|
||||
|
||||
${cfg.appendHttpConfig}
|
||||
@ -1177,6 +1160,21 @@ in
|
||||
services.nginx.additionalModules = optional cfg.recommendedBrotliSettings pkgs.nginxModules.brotli
|
||||
++ lib.optional cfg.recommendedZstdSettings pkgs.nginxModules.zstd;
|
||||
|
||||
services.nginx.virtualHosts.localhost = mkIf cfg.statusPage {
|
||||
listenAddresses = lib.mkDefault ([
|
||||
"0.0.0.0"
|
||||
] ++ lib.optional enableIPv6 "[::]");
|
||||
locations."/nginx_status" = {
|
||||
extraConfig = ''
|
||||
stub_status on;
|
||||
access_log off;
|
||||
allow 127.0.0.1;
|
||||
${optionalString enableIPv6 "allow ::1;"}
|
||||
deny all;
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
systemd.services.nginx = {
|
||||
description = "Nginx Web Server";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
||||
@ -597,6 +597,11 @@ in
|
||||
# drop-in in /etc, it does apply.
|
||||
overrideStrategy = "asDropin";
|
||||
};
|
||||
systemd.services."systemd-mkswap@" = {
|
||||
restartIfChanged = false;
|
||||
path = [ pkgs.util-linux ];
|
||||
overrideStrategy = "asDropin";
|
||||
};
|
||||
systemd.services.systemd-random-seed.restartIfChanged = false;
|
||||
systemd.services.systemd-remount-fs.restartIfChanged = false;
|
||||
systemd.services.systemd-update-utmp.restartIfChanged = false;
|
||||
|
||||
@ -30,7 +30,11 @@ in {
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
systemd.shutdownRamfs.contents."/shutdown".source = "${config.systemd.package}/lib/systemd/systemd-shutdown";
|
||||
systemd.shutdownRamfs.contents = {
|
||||
"/shutdown".source = "${config.systemd.package}/lib/systemd/systemd-shutdown";
|
||||
"/etc/initrd-release".source = config.environment.etc.os-release.source;
|
||||
"/etc/os-release".source = config.environment.etc.os-release.source;
|
||||
};
|
||||
systemd.shutdownRamfs.storePaths = [pkgs.runtimeShell "${pkgs.coreutils}/bin"];
|
||||
|
||||
systemd.mounts = [{
|
||||
|
||||
@ -535,11 +535,12 @@ in {
|
||||
nginx-http3 = handleTest ./nginx-http3.nix {};
|
||||
nginx-modsecurity = handleTest ./nginx-modsecurity.nix {};
|
||||
nginx-njs = handleTest ./nginx-njs.nix {};
|
||||
nginx-proxyprotocol = handleTest ./nginx-proxyprotocol {};
|
||||
nginx-pubhtml = handleTest ./nginx-pubhtml.nix {};
|
||||
nginx-sandbox = handleTestOn ["x86_64-linux"] ./nginx-sandbox.nix {};
|
||||
nginx-sso = handleTest ./nginx-sso.nix {};
|
||||
nginx-status-page = handleTest ./nginx-status-page.nix {};
|
||||
nginx-variants = handleTest ./nginx-variants.nix {};
|
||||
nginx-proxyprotocol = handleTest ./nginx-proxyprotocol {};
|
||||
nifi = handleTestOn ["x86_64-linux"] ./web-apps/nifi.nix {};
|
||||
nitter = handleTest ./nitter.nix {};
|
||||
nix-ld = handleTest ./nix-ld.nix {};
|
||||
|
||||
@ -8,128 +8,48 @@
|
||||
|
||||
with import ../lib/testing-python.nix { inherit system pkgs; };
|
||||
|
||||
let
|
||||
# System configuration of the installed system, which is used for the actual
|
||||
# hibernate testing.
|
||||
installedConfig = with pkgs.lib; {
|
||||
imports = [
|
||||
../modules/testing/test-instrumentation.nix
|
||||
../modules/profiles/qemu-guest.nix
|
||||
../modules/profiles/minimal.nix
|
||||
];
|
||||
|
||||
hardware.enableAllFirmware = mkForce false;
|
||||
documentation.nixos.enable = false;
|
||||
boot.loader.grub.device = "/dev/vda";
|
||||
|
||||
systemd.services.backdoor.conflicts = [ "sleep.target" ];
|
||||
|
||||
powerManagement.resumeCommands = "systemctl --no-block restart backdoor.service";
|
||||
|
||||
fileSystems."/" = {
|
||||
device = "/dev/vda2";
|
||||
fsType = "ext3";
|
||||
};
|
||||
swapDevices = mkOverride 0 [ { device = "/dev/vda1"; } ];
|
||||
boot.resumeDevice = mkIf systemdStage1 "/dev/vda1";
|
||||
boot.initrd.systemd = mkIf systemdStage1 {
|
||||
enable = true;
|
||||
emergencyAccess = true;
|
||||
};
|
||||
};
|
||||
installedSystem = (import ../lib/eval-config.nix {
|
||||
inherit system;
|
||||
modules = [ installedConfig ];
|
||||
}).config.system.build.toplevel;
|
||||
in makeTest {
|
||||
makeTest {
|
||||
name = "hibernate";
|
||||
|
||||
nodes = {
|
||||
# System configuration used for installing the installedConfig from above.
|
||||
machine = { config, lib, pkgs, ... }: {
|
||||
imports = [
|
||||
../modules/profiles/installation-device.nix
|
||||
../modules/profiles/base.nix
|
||||
./common/auto-format-root-device.nix
|
||||
];
|
||||
|
||||
nix.settings = {
|
||||
substituters = lib.mkForce [];
|
||||
hashed-mirrors = null;
|
||||
connect-timeout = 1;
|
||||
};
|
||||
systemd.services.backdoor.conflicts = [ "sleep.target" ];
|
||||
powerManagement.resumeCommands = "systemctl --no-block restart backdoor.service";
|
||||
|
||||
virtualisation.diskSize = 8 * 1024;
|
||||
virtualisation.emptyDiskImages = [
|
||||
# Small root disk for installer
|
||||
512
|
||||
];
|
||||
virtualisation.rootDevice = "/dev/vdb";
|
||||
virtualisation.emptyDiskImages = [ (2 * config.virtualisation.memorySize) ];
|
||||
virtualisation.useNixStoreImage = true;
|
||||
|
||||
swapDevices = lib.mkOverride 0 [ { device = "/dev/vdc"; options = [ "x-systemd.makefs" ]; } ];
|
||||
boot.resumeDevice = "/dev/vdc";
|
||||
boot.initrd.systemd.enable = systemdStage1;
|
||||
};
|
||||
};
|
||||
|
||||
# 9P doesn't support reconnection to virtio transport after a hibernation.
|
||||
# Therefore, machine just hangs on any Nix store access.
|
||||
# To avoid this, we install NixOS onto a temporary disk with everything we need
|
||||
# included into the store.
|
||||
testScript = ''
|
||||
# Drop in file that checks if we un-hibernated properly (and not booted fresh)
|
||||
machine.wait_for_unit("default.target")
|
||||
machine.succeed(
|
||||
"mkdir /run/test",
|
||||
"mount -t ramfs -o size=1m ramfs /run/test",
|
||||
"echo not persisted to disk > /run/test/suspended",
|
||||
)
|
||||
|
||||
testScript =
|
||||
''
|
||||
def create_named_machine(name):
|
||||
machine = create_machine(
|
||||
{
|
||||
"qemuFlags": "-cpu max ${
|
||||
if system == "x86_64-linux" then "-m 1024"
|
||||
else "-m 768 -enable-kvm -machine virt,gic-version=host"}",
|
||||
"hdaInterface": "virtio",
|
||||
"hda": "vm-state-machine/machine.qcow2",
|
||||
"name": name,
|
||||
}
|
||||
)
|
||||
driver.machines.append(machine)
|
||||
return machine
|
||||
# Hibernate machine
|
||||
machine.execute("systemctl hibernate >&2 &", check_return=False)
|
||||
machine.wait_for_shutdown()
|
||||
|
||||
# Restore machine from hibernation, validate our ramfs file is there.
|
||||
machine.start()
|
||||
machine.succeed("grep 'not persisted to disk' /run/test/suspended")
|
||||
|
||||
# Install NixOS
|
||||
machine.start()
|
||||
machine.succeed(
|
||||
# Partition /dev/vda
|
||||
"flock /dev/vda parted --script /dev/vda -- mklabel msdos"
|
||||
+ " mkpart primary linux-swap 1M 1024M"
|
||||
+ " mkpart primary ext2 1024M -1s",
|
||||
"udevadm settle",
|
||||
"mkfs.ext3 -L nixos /dev/vda2",
|
||||
"mount LABEL=nixos /mnt",
|
||||
"mkswap /dev/vda1 -L swap",
|
||||
# Install onto /mnt
|
||||
"nix-store --load-db < ${pkgs.closureInfo {rootPaths = [installedSystem];}}/registration",
|
||||
"nixos-install --root /mnt --system ${installedSystem} --no-root-passwd --no-channel-copy >&2",
|
||||
)
|
||||
machine.shutdown()
|
||||
|
||||
# Start up
|
||||
hibernate = create_named_machine("hibernate")
|
||||
|
||||
# Drop in file that checks if we un-hibernated properly (and not booted fresh)
|
||||
hibernate.succeed(
|
||||
"mkdir /run/test",
|
||||
"mount -t ramfs -o size=1m ramfs /run/test",
|
||||
"echo not persisted to disk > /run/test/suspended",
|
||||
)
|
||||
|
||||
# Hibernate machine
|
||||
hibernate.execute("systemctl hibernate >&2 &", check_return=False)
|
||||
hibernate.wait_for_shutdown()
|
||||
|
||||
# Restore machine from hibernation, validate our ramfs file is there.
|
||||
resume = create_named_machine("resume")
|
||||
resume.start()
|
||||
resume.succeed("grep 'not persisted to disk' /run/test/suspended")
|
||||
|
||||
# Ensure we don't restore from hibernation when booting again
|
||||
resume.crash()
|
||||
resume.wait_for_unit("default.target")
|
||||
resume.fail("grep 'not persisted to disk' /run/test/suspended")
|
||||
'';
|
||||
# Ensure we don't restore from hibernation when booting again
|
||||
machine.crash()
|
||||
machine.wait_for_unit("default.target")
|
||||
machine.fail("grep 'not persisted to disk' /run/test/suspended")
|
||||
'';
|
||||
|
||||
}
|
||||
|
||||
72
nixos/tests/nginx-status-page.nix
Normal file
72
nixos/tests/nginx-status-page.nix
Normal file
@ -0,0 +1,72 @@
|
||||
import ./make-test-python.nix ({ pkgs, ... }: {
|
||||
name = "nginx-status-page";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ h7x4 ];
|
||||
};
|
||||
|
||||
nodes = {
|
||||
webserver = { ... }: {
|
||||
virtualisation.vlans = [ 1 ];
|
||||
|
||||
networking = {
|
||||
useNetworkd = true;
|
||||
useDHCP = false;
|
||||
firewall.enable = false;
|
||||
};
|
||||
|
||||
systemd.network.networks."01-eth1" = {
|
||||
name = "eth1";
|
||||
networkConfig.Address = "10.0.0.1/24";
|
||||
};
|
||||
|
||||
services.nginx = {
|
||||
enable = true;
|
||||
statusPage = true;
|
||||
virtualHosts."localhost".locations."/index.html".return = "200 'hello world\n'";
|
||||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [ curl ];
|
||||
};
|
||||
|
||||
client = { ... }: {
|
||||
virtualisation.vlans = [ 1 ];
|
||||
|
||||
networking = {
|
||||
useNetworkd = true;
|
||||
useDHCP = false;
|
||||
firewall.enable = false;
|
||||
};
|
||||
|
||||
systemd.network.networks."01-eth1" = {
|
||||
name = "eth1";
|
||||
networkConfig.Address = "10.0.0.2/24";
|
||||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [ curl ];
|
||||
};
|
||||
};
|
||||
|
||||
testScript = { nodes, ... }: ''
|
||||
start_all()
|
||||
|
||||
webserver.wait_for_unit("nginx")
|
||||
webserver.wait_for_open_port(80)
|
||||
|
||||
def expect_http_code(node, code, url):
|
||||
http_code = node.succeed(f"curl -w '%{{http_code}}' '{url}'")
|
||||
assert http_code.split("\n")[-1].strip() == code, \
|
||||
f"expected {code} but got following response:\n{http_code}"
|
||||
|
||||
with subtest("localhost can access status page"):
|
||||
expect_http_code(webserver, "200", "http://localhost/nginx_status")
|
||||
|
||||
with subtest("localhost can access other page"):
|
||||
expect_http_code(webserver, "200", "http://localhost/index.html")
|
||||
|
||||
with subtest("client can not access status page"):
|
||||
expect_http_code(client, "403", "http://10.0.0.1/nginx_status")
|
||||
|
||||
with subtest("client can access other page"):
|
||||
expect_http_code(client, "200", "http://10.0.0.1/index.html")
|
||||
'';
|
||||
})
|
||||
@ -22,6 +22,6 @@ in {
|
||||
machine.wait_for_console_text("Unmounting '/oldroot'")
|
||||
machine.wait_for_console_text("${msg}")
|
||||
# Don't try to sync filesystems
|
||||
machine.booted = False
|
||||
machine.wait_for_shutdown()
|
||||
'';
|
||||
})
|
||||
|
||||
39
pkgs/applications/audio/feishin/darwin.nix
Normal file
39
pkgs/applications/audio/feishin/darwin.nix
Normal file
@ -0,0 +1,39 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, mpv
|
||||
, electron_24
|
||||
, makeDesktopItem
|
||||
, makeWrapper
|
||||
, pname
|
||||
, appname
|
||||
, version
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/jeffvli/feishin/releases/download/v${version}/${appname}-${version}-mac-x64.zip"
|
||||
hash = "sha256-WzU/Yd3cNMIpmkKWC29mQlviYXiYV5k8+80iyzilPGc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper unzip ];
|
||||
|
||||
# Installs mpv as a requirement
|
||||
propagatedBuildInputs = [ mpv ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/{Applications/${appname}.app,bin}
|
||||
cp -R . $out/Applications/${appname}.app
|
||||
makeWrapper $out/Applications/${appname}.app/Contents/MacOS/${appname} $out/bin/${pname}
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
shellHook = ''
|
||||
set -x
|
||||
export LD_LIBRARY_PATH=${mpv}/lib
|
||||
set +x
|
||||
'';
|
||||
}
|
||||
26
pkgs/applications/audio/feishin/default.nix
Normal file
26
pkgs/applications/audio/feishin/default.nix
Normal file
@ -0,0 +1,26 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, callPackage
|
||||
, ...
|
||||
}@args:
|
||||
|
||||
let
|
||||
extraArgs = removeAttrs args [ "callPackage" ];
|
||||
|
||||
pname = "feishin";
|
||||
version = "0.2.0";
|
||||
appname = "Feishin";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Full-featured Subsonic/Jellyfin compatible desktop music player";
|
||||
homepage = "https://github.com/jeffvli/feishin";
|
||||
changelog = "https://github.com/jeffvli/feishin/releases/tag/v${version}";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.mit;
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
|
||||
maintainers = with maintainers; [ onny ];
|
||||
};
|
||||
|
||||
in if stdenv.isDarwin
|
||||
then callPackage ./darwin.nix (extraArgs // { inherit pname appname version meta; })
|
||||
else callPackage ./linux.nix (extraArgs // { inherit pname appname version meta; })
|
||||
71
pkgs/applications/audio/feishin/linux.nix
Normal file
71
pkgs/applications/audio/feishin/linux.nix
Normal file
@ -0,0 +1,71 @@
|
||||
{ stdenv
|
||||
, meta
|
||||
, lib
|
||||
, fetchurl
|
||||
, mpv
|
||||
, graphicsmagick
|
||||
, electron_24
|
||||
, makeDesktopItem
|
||||
, makeWrapper
|
||||
, pname
|
||||
, appname
|
||||
, version
|
||||
}:
|
||||
|
||||
let
|
||||
icon = fetchurl {
|
||||
url =
|
||||
"https://github.com/jeffvli/feishin/raw/development/assets/icons/1024x1024.png";
|
||||
sha256 = "sha256-8Qigt1CNMa3SDVK2cdqWJuMSl19yfy6nPQfME4qA48I=";
|
||||
};
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "feishin";
|
||||
desktopName = "Feishin";
|
||||
comment = "Full-featured Subsonic/Jellyfin compatible desktop music player";
|
||||
icon = "feishin";
|
||||
exec = "feishin %u";
|
||||
categories = [ "Audio" ];
|
||||
mimeTypes = [ "x-scheme-handler/feishin" ];
|
||||
};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/jeffvli/feishin/releases/download/v${version}/${appname}-${version}-linux-x64.tar.xz";
|
||||
hash = "sha256-o+fEjdG2iN84FEchyAKWZCpsrqDm1K1k+Q2K+cwYBZE=";
|
||||
};
|
||||
|
||||
|
||||
nativeBuildInputs = [ makeWrapper graphicsmagick ];
|
||||
|
||||
# Installs mpv as a requirement
|
||||
propagatedBuildInputs = [ mpv ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin
|
||||
mkdir -p $out/share
|
||||
cp -r resources $out/share/${pname}/
|
||||
cp -r locales $out/share/${pname}/
|
||||
|
||||
makeWrapper ${electron_24}/bin/electron $out/bin/${pname} \
|
||||
--add-flags $out/share/${pname}/app.asar
|
||||
install -m 444 -D "${desktopItem}/share/applications/"* \
|
||||
-t $out/share/applications/
|
||||
for size in 16 24 32 48 64 128 256 512; do
|
||||
mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps
|
||||
gm convert -resize "$size"x"$size" ${icon} $out/share/icons/hicolor/"$size"x"$size"/apps/${appname}.png
|
||||
done
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
shellHook = ''
|
||||
set -x
|
||||
export LD_LIBRARY_PATH=${mpv}/lib
|
||||
set +x
|
||||
'';
|
||||
}
|
||||
@ -18,16 +18,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ludusavi";
|
||||
version = "0.19.0";
|
||||
version = "0.20.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mtkennerly";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-1Na+xGcb15/ZRbuy96qJwPg6Zo7FsGwCUXD3XgzWXo0=";
|
||||
hash = "sha256-6wwBXgR0jutkM3L7Ihi4qryuOeBRItQTyKn2lNcvfdQ=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-JjeOODm5xsRM5cJgCDb89cN60SuEeDzTVe6siKVDdcU=";
|
||||
cargoSha256 = "sha256-9ksstWNqc2Rq5fdb4/LLHGMUXQgri9BAo2LlkFl3Irg=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "btcpayserver";
|
||||
version = "1.10.3";
|
||||
version = "1.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-a2+Rh+Pxy4pCU9eo4L3986+yVvjrNZY2bFQiUpVuYqM=";
|
||||
sha256 = "sha256-kTX/VBEdyyfw0G0x3GnqvqJ9GvRoqYuVHdihTAbhHg0=";
|
||||
};
|
||||
|
||||
projectFile = "BTCPayServer/BTCPayServer.csproj";
|
||||
|
||||
@ -8,9 +8,9 @@
|
||||
(fetchNuGet { pname = "AWSSDK.S3"; version = "3.3.110.10"; sha256 = "1lf1hfbx792dpa1hxgn0a0jrrvldd16hgbxx229dk2qcz5qlnc38"; })
|
||||
(fetchNuGet { pname = "BIP78.Sender"; version = "0.2.2"; sha256 = "12pm2s35c0qzc06099q2z1pxwq94rq85n74yz8fs8gwvm2ksgp4p"; })
|
||||
(fetchNuGet { pname = "BTCPayServer.Hwi"; version = "2.0.2"; sha256 = "0lh3n1qncqs4kbrmx65xs271f0d9c7irrs9qnsa9q51cbbqbljh9"; })
|
||||
(fetchNuGet { pname = "BTCPayServer.Lightning.All"; version = "1.4.28"; sha256 = "1zwixvm22nh76ril7w2rkwdvikm76b822iscscpyp6nrfl8mzqi0"; })
|
||||
(fetchNuGet { pname = "BTCPayServer.Lightning.All"; version = "1.4.29"; sha256 = "1kd07n0l0h6cmfxb5mdkawjsbmjynz2dknnj8c22wvk1jchif956"; })
|
||||
(fetchNuGet { pname = "BTCPayServer.Lightning.Charge"; version = "1.3.20"; sha256 = "0nk82hkgs67mxfxkgbav8yxxd79m0xyqaan7vay00gg33pjqdjvj"; })
|
||||
(fetchNuGet { pname = "BTCPayServer.Lightning.CLightning"; version = "1.3.27"; sha256 = "14bgi3p31v8ypf1lqnc5xkpzfd2cj5a23v2wv1m38jl6ng2v6vqp"; })
|
||||
(fetchNuGet { pname = "BTCPayServer.Lightning.CLightning"; version = "1.3.28"; sha256 = "05jkdds1g0xfvf8spakwbyndz8an2kadwybg6dwz6q5rlk0aj7m8"; })
|
||||
(fetchNuGet { pname = "BTCPayServer.Lightning.Common"; version = "1.3.16"; sha256 = "1g37736b4k0ncpyy2qycbk4l85fqvgwac3k98nbdj0dvhfghp1dn"; })
|
||||
(fetchNuGet { pname = "BTCPayServer.Lightning.Common"; version = "1.3.21"; sha256 = "042xwfsxd30zgwiz0w14ynb755w5sldkplxgw1fkw68lrz66x5s4"; })
|
||||
(fetchNuGet { pname = "BTCPayServer.Lightning.Eclair"; version = "1.3.20"; sha256 = "093w82mcxxxbvx66j0sp3lsfm2bkbi3igm80iz9zdghy85845kc9"; })
|
||||
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "greetd";
|
||||
version = "0.8.0";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~kennylevinsen";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-20D6HanUeAc0S9czkNJFmhsrfEqodpafkHsmwKccrHQ=";
|
||||
sha256 = "sha256-w68iKabVVIHB+ujCd5q+L4T6+Tfqedou3wXOuMGi6aw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-8nMQ81Y0DnPs9WmxNASlcjTEVw5lh+nZtZ7vmmBCu2g=";
|
||||
cargoHash = "sha256-vn1ih4YXsltR1zdy7BzS3CSJO9Uewx/654lRTSkWV0k=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
scdoc
|
||||
|
||||
@ -10,16 +10,16 @@ let
|
||||
inherit tiling_wm;
|
||||
};
|
||||
stableVersion = {
|
||||
version = "2022.2.1.20"; # "Android Studio Flamingo (2022.2.1) Patch 2"
|
||||
sha256Hash = "sha256-X+ZuH4cHKfQtfvOF0kLk+QjQ5AR3pTEparczHEUk+uY=";
|
||||
version = "2022.3.1.18"; # "Android Studio Giraffe (2022.3.1)"
|
||||
sha256Hash = "sha256-JCFeEySmrJEYELLMGvstc1z3Rd+8BpGKQrjW+8a/dDM=";
|
||||
};
|
||||
betaVersion = {
|
||||
version = "2022.3.1.16"; # "Android Studio Giraffe (2022.3.1) Beta 5"
|
||||
sha256Hash = "sha256-D+Hoa50fzvtO0/6DsExmGSDzcgDIT2Bg+HvI6mCle14=";
|
||||
version = "2022.3.1.17"; # "Android Studio Giraffe (2022.3.1) RC 1"
|
||||
sha256Hash = "sha256-Bpur9ytiwa0udiyYVxlfLT4M+ZcO5atQUQg/ForATP4=";
|
||||
};
|
||||
latestVersion = {
|
||||
version = "2023.1.1.12"; # Android Studio Hedgehog (2023.1.1) Canary 12
|
||||
sha256Hash = "sha256-/BKtjX3O6PCqtzVfVMPICcip6tf6W/JV5UzWgON+kZY=";
|
||||
version = "2023.1.1.14"; # Android Studio Hedgehog (2023.1.1) Canary 14
|
||||
sha256Hash = "sha256-MgZDUpRyM0XDfgqfYjtJJyG2CBaNB06PgtoJltDwNwk=";
|
||||
};
|
||||
in {
|
||||
# Attributes are named by their corresponding release channels
|
||||
|
||||
@ -1 +1 @@
|
||||
{:deps {clojupyter/clojupyter {:mvn/version "0.3.3"}}}
|
||||
{:deps {clojupyter/clojupyter {:mvn/version "0.3.6"}}}
|
||||
|
||||
@ -31,8 +31,8 @@
|
||||
inherit repos;
|
||||
artifactId = "data.json";
|
||||
groupId = "org.clojure";
|
||||
sha512 = "b767973db8b5b36aeb5c55f082e020a5c3f657bee1eede018e68ccaa2c535005759bc8a162fce7bb63eee1c14c6f29ec1c6080978a08817189864cbd40f154fa";
|
||||
version = "2.3.1";
|
||||
sha512 = "04b7c0c90cb26d643a0b3e7e1ffa2d2d423e977c1454ee5ea7c2e75547ecbc113838df17b797902a975f5ea2184a81a45b605a4d82970805e2bbb02feebc578d";
|
||||
version = "2.4.0";
|
||||
};
|
||||
}
|
||||
|
||||
@ -42,8 +42,8 @@
|
||||
inherit repos;
|
||||
artifactId = "clojure";
|
||||
groupId = "org.clojure";
|
||||
sha512 = "f28178179483531862afae13e246386f8fda081afa523d3c4ea3a083ab607d23575d38ecb9ec0ee7f4d65cbe39a119f680e6de4669bc9cf593aa92be0c61562b";
|
||||
version = "1.10.1";
|
||||
sha512 = "1925300a0fe4cc9fc3985910bb04ae65a19ce274dacc5ec76e708cfa87a7952a0a77282b083d0aebb2206afff619af73a57f0d661a3423601586f0829cc7956b";
|
||||
version = "1.11.1";
|
||||
};
|
||||
}
|
||||
|
||||
@ -64,8 +64,8 @@
|
||||
inherit repos;
|
||||
artifactId = "clojupyter";
|
||||
groupId = "clojupyter";
|
||||
sha512 = "d030ae69cdadecbcec9a052e4ad91ba4f47cdc4bb3fb780317f337af62d8c34d12ef05d132d6c9a4ce790008c979919c22162432c1b9bcf4e0a470020d585dbe";
|
||||
version = "0.3.3";
|
||||
sha512 = "9a4f001cbde7a4de2d27859b25e508ba649225acf9dabad4c1c274e86674e0dcde250a49cacd0767bb99f5b15a61e2f1c829fb2fe7b7dfc4b87681b7ae0b04ae";
|
||||
version = "0.3.6";
|
||||
};
|
||||
}
|
||||
|
||||
@ -86,8 +86,8 @@
|
||||
inherit repos;
|
||||
artifactId = "tools.analyzer";
|
||||
groupId = "org.clojure";
|
||||
sha512 = "e02d7baec926e0e0a7d9c71f09fee627fbde59ae7f3cbd4abcdf0533c8a87fba8c7cf4503df34bf33777063f4b6353a022552fd003fdbea9fad5752d53609bb8";
|
||||
version = "1.0.0";
|
||||
sha512 = "c51752a714848247b05c6f98b54276b4fe8fd44b3d970070b0f30cd755ac6656030fd8943a1ffd08279af8eeff160365be47791e48f05ac9cc2488b6e2dfe504";
|
||||
version = "1.1.0";
|
||||
};
|
||||
}
|
||||
|
||||
@ -130,8 +130,8 @@
|
||||
inherit repos;
|
||||
artifactId = "core.specs.alpha";
|
||||
groupId = "org.clojure";
|
||||
sha512 = "348c0ea0911bc0dcb08655e61b97ba040649b4b46c32a62aa84d0c29c245a8af5c16d44a4fa5455d6ab076f4bb5bbbe1ad3064a7befe583f13aeb9e32a169bf4";
|
||||
version = "0.2.44";
|
||||
sha512 = "f521f95b362a47bb35f7c85528c34537f905fb3dd24f2284201e445635a0df701b35d8419d53c6507cc78d3717c1f83cda35ea4c82abd8943cd2ab3de3fcad70";
|
||||
version = "0.2.62";
|
||||
};
|
||||
}
|
||||
|
||||
@ -152,8 +152,8 @@
|
||||
inherit repos;
|
||||
artifactId = "jeromq";
|
||||
groupId = "org.zeromq";
|
||||
sha512 = "0965b82a10136a656dfe48268008536a57b26be9190ff2f3d5dbf3fa298e21bc754e70b1e7fae1aca782d25c397c9ce8fa3832783665391142b31dc4a1bd0233";
|
||||
version = "0.5.1";
|
||||
sha512 = "bd502d345926160b1a09e45f60eb81254dc67d6d9d7b79e025c08018dd16a18d32ff85b2440c352d530e61c96cd3b2d88fee2a8a912b436015ed31039e308ff4";
|
||||
version = "0.5.2";
|
||||
};
|
||||
}
|
||||
|
||||
@ -163,8 +163,8 @@
|
||||
inherit repos;
|
||||
artifactId = "spec.alpha";
|
||||
groupId = "org.clojure";
|
||||
sha512 = "18c97fb2b74c0bc2ff4f6dc722a3edec539f882ee85d0addf22bbf7e6fe02605d63f40c2b8a2905868ccd6f96cfc36a65f5fb70ddac31c6ec93da228a456edbd";
|
||||
version = "0.2.176";
|
||||
sha512 = "ddfe4fa84622abd8ac56e2aa565a56e6bdc0bf330f377ff3e269ddc241bb9dbcac332c13502dfd4c09c2c08fe24d8d2e8cf3d04a1bc819ca5657b4e41feaa7c2";
|
||||
version = "0.3.218";
|
||||
};
|
||||
}
|
||||
|
||||
@ -174,8 +174,8 @@
|
||||
inherit repos;
|
||||
artifactId = "pandect";
|
||||
groupId = "pandect";
|
||||
sha512 = "8c265289f46a94cf2400f05223cdd3f9faee9a39e6ed5a55a3e89b09334a61e928c0f27e2db834edf3b544e2148a511bccf1ef73132bd9263659bed381abb59a";
|
||||
version = "0.6.1";
|
||||
sha512 = "6179967af34e1abbe0dda2bd0961f101d016df6b1ce5bf4bb823794b07ee551d245d09e957a9c47bc3a15d306cca80ad1b9b11be99e1b3feb245c26e1b9154a3";
|
||||
version = "1.0.2";
|
||||
};
|
||||
}
|
||||
|
||||
@ -185,8 +185,8 @@
|
||||
inherit repos;
|
||||
artifactId = "tools.cli";
|
||||
groupId = "org.clojure";
|
||||
sha512 = "9baf3fafe2e92b846404ef1bd897a4a335fe4bc1f78a2408ee93c09dc960a630f58a0e863b2d299624783f2851bb5d83f93fa627276d28d66c92764c46f27efe";
|
||||
version = "0.4.2";
|
||||
sha512 = "1d88aa03eb6a664bf2c0ce22c45e7296d54d716e29b11904115be80ea1661623cf3e81fc222d164047058239010eb678af92ffedc7c3006475cceb59f3b21265";
|
||||
version = "1.0.206";
|
||||
};
|
||||
}
|
||||
|
||||
@ -196,8 +196,8 @@
|
||||
inherit repos;
|
||||
artifactId = "encore";
|
||||
groupId = "com.taoensso";
|
||||
sha512 = "bb9510a88bca86f9cfc4a2e5c8a85782bc71d961a0a639735edafb61df130422488ee40d1db4cb6ad961e40acdb07259052937391c32f1e54c71f09dd63d33e5";
|
||||
version = "3.12.1";
|
||||
sha512 = "43dbec081c4ad7b21526371bc78844877d50dd08580c4c039c4dac7e854247a6b145bda835460863fa91d270e81783ddcdad3aaa1a902575be5b21ac0a95c7d0";
|
||||
version = "3.21.0";
|
||||
};
|
||||
}
|
||||
|
||||
@ -218,8 +218,8 @@
|
||||
inherit repos;
|
||||
artifactId = "jcl-over-slf4j";
|
||||
groupId = "org.slf4j";
|
||||
sha512 = "d9c08c3e4cb18b2d69ba8bcd4bbf3955dbc287e20141d244486f6237c36e8e2cf86ae48c295b5dd579219b5c7b1197658153f10fce73d155a4a1d4e6c7943952";
|
||||
version = "1.7.22";
|
||||
sha512 = "17aca766b01f136d39bda982a6046d01d296ee076d9628e9776256bd931bbd88437377d5f1cc196d75bd7fa1672dd131311dbf567b4c3a618dd538a6905fbb64";
|
||||
version = "2.0.3";
|
||||
};
|
||||
}
|
||||
|
||||
@ -229,8 +229,8 @@
|
||||
inherit repos;
|
||||
artifactId = "tools.analyzer.jvm";
|
||||
groupId = "org.clojure";
|
||||
sha512 = "ce9c7b51fa61c12c539f3c5c1c7fa1caf123497553d4e566c13895312faad2d2657fe6e54fe88110a6c87accb10c4c3b6ccfa87a035a7321da6c859da1d192d0";
|
||||
version = "1.1.0";
|
||||
sha512 = "36ad50a7a79c47dea16032fc4b927bd7b56b8bedcbd20cc9c1b9c85edede3a455369b8806509b56a48457dcd32e1f708f74228bce2b4492bd6ff6fc4f1219d56";
|
||||
version = "1.2.2";
|
||||
};
|
||||
}
|
||||
|
||||
@ -251,19 +251,8 @@
|
||||
inherit repos;
|
||||
artifactId = "pedestal.log";
|
||||
groupId = "io.pedestal";
|
||||
sha512 = "f6c4d8e1b202af9ef7950ec6d02b96f0e598e8d1f9ffffe8e5650e8ffdebd6c4919166aa83e34f47407870473024d28e7a49a2a0ad2b9af221514e42c518baae";
|
||||
version = "0.5.7";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
name = "org.clojure/tools.macro";
|
||||
path = pkgs.fetchMavenArtifact {
|
||||
inherit repos;
|
||||
artifactId = "tools.macro";
|
||||
groupId = "org.clojure";
|
||||
sha512 = "18fb889ec7f0c8f23084f01587582be3c1baaa475249c40cfa8edc78c75079807ed49f2fb714a5c79b16bcf233142abcf571b12fff4e29cd78850c0016d6b4b9";
|
||||
version = "0.1.1";
|
||||
sha512 = "229c6c73dc7ec39aee15f54ce81cf2b33301e444241f2dff2066b4c10ff47968f3caa95a8a918601e8f3e7563b34da6925e533615e7ce8b1f39bdb97ca082757";
|
||||
version = "0.5.10";
|
||||
};
|
||||
}
|
||||
|
||||
@ -273,19 +262,8 @@
|
||||
inherit repos;
|
||||
artifactId = "jackson-dataformat-cbor";
|
||||
groupId = "com.fasterxml.jackson.dataformat";
|
||||
sha512 = "575a00fec1760571403aaadbe0aa6c74f8bb01f40feae00741df6604e7c2bf199ac739a789bbd5d83af75ec6d9fcc55f5a1515b05aef33e0d3cc3046acad9e89";
|
||||
version = "2.10.2";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
name = "org.flatland/useful";
|
||||
path = pkgs.fetchMavenArtifact {
|
||||
inherit repos;
|
||||
artifactId = "useful";
|
||||
groupId = "org.flatland";
|
||||
sha512 = "b97c92692e36be3e4bdfe4a6b1f1ecb2729c960c25884d1cb12218d0b807789dc37120022b4dd0fd5daba1dd16f892ac134576f84ef301c23525ba55cb041e2d";
|
||||
version = "0.11.6";
|
||||
sha512 = "b6e16c43fb3e71f82f8e7dc558f53cbcc8fea31efa59f40d22220f6e40167cf32c150efa18a81f839008d6a042e201bf17d8fd52a4fecbe8f356454f2d6a6170";
|
||||
version = "2.13.3";
|
||||
};
|
||||
}
|
||||
|
||||
@ -339,8 +317,8 @@
|
||||
inherit repos;
|
||||
artifactId = "pretty";
|
||||
groupId = "io.aviso";
|
||||
sha512 = "512454e5296c54e2d2f3ddb3122e99edae3286b7e7f9a63dd453c96225b6aa5d0fb0972d58d7dac434b297f47a1f27d1b2021c126064af020f0c3040097226d6";
|
||||
version = "0.1.37";
|
||||
sha512 = "416433ae5c5773a3a12e7cff3f75a43f1a2d3f4454aad04d065c1e4e13627130f289dbb41355a5665236082b6535939fc4c40a2fddcc22a40d0d4ba290544bfb";
|
||||
version = "1.1.1";
|
||||
};
|
||||
}
|
||||
|
||||
@ -350,8 +328,8 @@
|
||||
inherit repos;
|
||||
artifactId = "rewrite-clj";
|
||||
groupId = "rewrite-clj";
|
||||
sha512 = "14018072e5c9466e8cafc08d68633f0d0a410ceb6631bd48cf7d67056e5bc972618f1b3f80ba00c4fdf88ad884fe58b636945ec6f053cbe14aee61ef173e12d3";
|
||||
version = "0.6.1";
|
||||
sha512 = "04850f7b29be722be6c01760705be43e1b5b93315baa096925ceac94835b58702913c45c8166dadf193fb8f5150ff2c5539ae3ec85c37331727e5d0accfefcca";
|
||||
version = "1.1.45";
|
||||
};
|
||||
}
|
||||
|
||||
@ -394,8 +372,8 @@
|
||||
inherit repos;
|
||||
artifactId = "ordered";
|
||||
groupId = "org.flatland";
|
||||
sha512 = "16ba9c232cefcf363c603af95343db3f86538e3829dce9fba9adce48c3bf2e80c24e4e30a4583750d124aeb9f1031cdbe93d08796366484495b1b22857de3045";
|
||||
version = "1.5.7";
|
||||
sha512 = "849f115d8dc22122577bb6c2af383663488a84125303ba90559f4f5d8538693a5797d95aca608e6844413b925ea6e12112f0cf2d3dcacfcc603b50d749f7a25e";
|
||||
version = "1.15.10";
|
||||
};
|
||||
}
|
||||
|
||||
@ -427,8 +405,8 @@
|
||||
inherit repos;
|
||||
artifactId = "jackson-core";
|
||||
groupId = "com.fasterxml.jackson.core";
|
||||
sha512 = "5055943790cea2c3abbacbe91e63634e6d2e977cd59b08ce102c0ee7d859995eb5d150d530da3848235b2b1b751a8df55cff2c33d43da695659248187ddf1bff";
|
||||
version = "2.10.2";
|
||||
sha512 = "d5337db908b2c56dcb911e3d1a5f671456c13f254fe8d2a620823bc15b2db6aaa8325a86b436b5d181f2584b533158fd14d140b98305ac252f8dfd9a627da859";
|
||||
version = "2.13.3";
|
||||
};
|
||||
}
|
||||
|
||||
@ -438,8 +416,8 @@
|
||||
inherit repos;
|
||||
artifactId = "snakeyaml";
|
||||
groupId = "org.yaml";
|
||||
sha512 = "b7ef491ded21c61260d6ad68b1541d0c753f01f3f065b66a31c8e4d8f5f6b5eff31e82a7cc68562567811cc0d540c980e8a42714574f50e7713b4799192f50f9";
|
||||
version = "1.19";
|
||||
sha512 = "4322e41c6fc5114521da21787ab313fa74bf8449ab0c23ec830627b8121504f70d4522e880aec64df227164729d40b2fbd9670e3a046dd5a5aabc1f71e91c16c";
|
||||
version = "1.25";
|
||||
};
|
||||
}
|
||||
|
||||
@ -449,8 +427,8 @@
|
||||
inherit repos;
|
||||
artifactId = "asm";
|
||||
groupId = "org.ow2.asm";
|
||||
sha512 = "40614e658138f2eb95bc26999545f996794c622c4d68efb9e10093743504c4b58bf22590767bc6bd93b77cdfb202c507144ba867bbc8b54d74fe7621cbc55e3a";
|
||||
version = "5.2";
|
||||
sha512 = "876eac7406e60ab8b9bd6cd3c221960eaa53febea176a88ae02f4fa92dbcfe80a3c764ba390d96b909c87269a30a69b1ee037a4c642c2f535df4ea2e0dd499f2";
|
||||
version = "9.2";
|
||||
};
|
||||
}
|
||||
|
||||
@ -460,8 +438,8 @@
|
||||
inherit repos;
|
||||
artifactId = "jul-to-slf4j";
|
||||
groupId = "org.slf4j";
|
||||
sha512 = "e76ee7ee3e1852be55c18ccb7a8f4a7005807da3cbd97f4b4895632fee92cc64785491d4f6384ae4ebd0f73a1ee4893dc1adf7119da056300f21eb2e7d3f233f";
|
||||
version = "1.7.14";
|
||||
sha512 = "152f153c42e5f69c95e3caeed5ab519e975d7ad79ac0199f31699646299b7ddab58068d5964fbd2170eed29966c3d8d1b00b0a1a4a6f698f9a9eb9c9b9d30dcb";
|
||||
version = "2.0.3";
|
||||
};
|
||||
}
|
||||
|
||||
@ -482,8 +460,8 @@
|
||||
inherit repos;
|
||||
artifactId = "pedestal.interceptor";
|
||||
groupId = "io.pedestal";
|
||||
sha512 = "9767bb8df4ec3d1ee1468c22afd64adc689bb0ae15e98dfc04ef98e65f237f67ded3ade9c1514d2e44e1dd56dbff6cafbc9795a5c57e166cb924f43175c3be83";
|
||||
version = "0.5.7";
|
||||
sha512 = "b6d99300e2c656fc63841449067d74893c63f884d282ff1af40510e5e53baac0f17ac869212e0023dc01d3766248ce28e93e32a57239926254e3af0240c82178";
|
||||
version = "0.5.10";
|
||||
};
|
||||
}
|
||||
|
||||
@ -504,19 +482,8 @@
|
||||
inherit repos;
|
||||
artifactId = "omniconf";
|
||||
groupId = "com.grammarly";
|
||||
sha512 = "f9b162b98676cb5073310309aac9678725cb4a7eec3fe00803b21ce4abcea3cc1c41df5e970105ed18352619dfab40c0736ae78e9206165f17b0094107b2594b";
|
||||
version = "0.3.2";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
name = "clj-tuple/clj-tuple";
|
||||
path = pkgs.fetchMavenArtifact {
|
||||
inherit repos;
|
||||
artifactId = "clj-tuple";
|
||||
groupId = "clj-tuple";
|
||||
sha512 = "dd626944d0aba679a21b164ed0c77ea84449359361496cba810f83b9fdeab751e5889963888098ce4bf8afa112dbda0a46ed60348a9c01ad36a2e255deb7ab6d";
|
||||
version = "0.2.2";
|
||||
sha512 = "2b13138090c9706af014b7d22b316af5300f41bfc70ee1f604ee6d817f70ca6227951f673231830c81888db2c50533f9c53de3e314d725a60b8eee99718655af";
|
||||
version = "0.4.3";
|
||||
};
|
||||
}
|
||||
|
||||
@ -537,8 +504,8 @@
|
||||
inherit repos;
|
||||
artifactId = "zprint";
|
||||
groupId = "zprint";
|
||||
sha512 = "379b6f9228ec0b5ae1a24b0cce4c41e273534b456cf356ac67b7f72a7506345eddf7f7ac75c2c200864d5372c1fb0331d2b31bc22a21c496cafdfe839241e9f9";
|
||||
version = "0.4.15";
|
||||
sha512 = "2f29288a1d9dd7e76689b32616049af8ebc0e98f0994f1eae1c8e6e725084df23de11a4d6231d2712167ef4adfdfffe494cea2c11b6e752f81acd641381516eb";
|
||||
version = "1.2.4";
|
||||
};
|
||||
}
|
||||
|
||||
@ -625,8 +592,8 @@
|
||||
inherit repos;
|
||||
artifactId = "slf4j-timbre";
|
||||
groupId = "com.fzakaria";
|
||||
sha512 = "93ecc0e133a3f02f521cac125fd8842f94f2c284000b6b9f1cda7ef2841567bd674facea1f8c4e32da2321f414c1f2590ac58abf37f23347f6f551fcd9039339";
|
||||
version = "0.3.14";
|
||||
sha512 = "9a25ed545a7dac8fb74096ed531fa4362989a1ed68350e63f403a871fdf19ab582c6f2c1c8e08978a431d8da31d8226bf34f1d0263ac5f6a14955ff56fdf9e17";
|
||||
version = "0.3.21";
|
||||
};
|
||||
}
|
||||
|
||||
@ -636,8 +603,8 @@
|
||||
inherit repos;
|
||||
artifactId = "clojure.java-time";
|
||||
groupId = "clojure.java-time";
|
||||
sha512 = "a7111b5c78d7f920d74793d410f81c9ca3c9a8c4d652f132be55eb15f6d03a413cee1ae46bad6d3189c045d422a33c7320fbd02055c351779c379f75db48cbbd";
|
||||
version = "0.3.2";
|
||||
sha512 = "cd27eddad69554fcc443603bb69ab7dbe5d4cc937080f4b4d1ef3590e855faef2366dda77724da6c9b8941c340f8b5c5cb1345855f946718bd3ceb9c124a226a";
|
||||
version = "1.1.0";
|
||||
};
|
||||
}
|
||||
|
||||
@ -663,14 +630,25 @@
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
name = "borkdude/edamame";
|
||||
path = pkgs.fetchMavenArtifact {
|
||||
inherit repos;
|
||||
artifactId = "edamame";
|
||||
groupId = "borkdude";
|
||||
sha512 = "5f5f36a85521464e97c0ada94581b37d7ffc7d1b9adaf7b3b509447bc0d6cedf339f12ae75d6bf679b69f9e1b582d0ee1a995bfd039657b17ec9a85516700fbe";
|
||||
version = "0.0.19";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
name = "com.taoensso/timbre";
|
||||
path = pkgs.fetchMavenArtifact {
|
||||
inherit repos;
|
||||
artifactId = "timbre";
|
||||
groupId = "com.taoensso";
|
||||
sha512 = "2570f1d59d98034d8425598ab676f4c1e17f9da9926def2e142296377ddccf0fe3a894ba023114d614ca728c77c11d50927a709bfa896e9c5cce0854be31e32d";
|
||||
version = "5.1.2";
|
||||
sha512 = "8c88eea8f0a94a3fc14f450a03e76ce0573d31f6c301252d3f9afc177f87a03326966197e8508e766f3caab61ef356142c6dc002e07ed09771f341dd6b290edf";
|
||||
version = "5.2.1";
|
||||
};
|
||||
}
|
||||
|
||||
@ -680,8 +658,8 @@
|
||||
inherit repos;
|
||||
artifactId = "java.jdbc";
|
||||
groupId = "org.clojure";
|
||||
sha512 = "50c263853f0b88d4b46746bf8f5efb8536f38dde2a08c26e5d26c2bd3bd851c0c0f0814d7899019c3879de2667b3b432a23de091bd8f8cea3e28bd00f0b715cb";
|
||||
version = "0.7.9";
|
||||
sha512 = "19e37ee3a16ccfdeb299e72ee0ae64a557b20296dd9461bf2288d0507e1d915ad6fcc56e4aadd712340f5c21e2c764ed7d4ad074eb8e4c82dc6ba5fe96111930";
|
||||
version = "0.7.12";
|
||||
};
|
||||
}
|
||||
|
||||
@ -768,8 +746,8 @@
|
||||
inherit repos;
|
||||
artifactId = "cheshire";
|
||||
groupId = "cheshire";
|
||||
sha512 = "5b2a339f8d90951a80105729a080b841e0de671f576bfa164a78bccc08691d548cff6a7124224444f7b3a267c9aca69c18e347657f1d66e407167c9b5b8b52cb";
|
||||
version = "5.10.0";
|
||||
sha512 = "2262573047d194bba28b3d2ca4b00b12f8171d6f8f7f5449df35f10ab1ef5902a9ba2f9937399d6e4b54a78bda919fa205a22a44cde998019bc0cfc508e90f29";
|
||||
version = "5.11.0";
|
||||
};
|
||||
}
|
||||
|
||||
@ -801,8 +779,8 @@
|
||||
inherit repos;
|
||||
artifactId = "tools.reader";
|
||||
groupId = "org.clojure";
|
||||
sha512 = "03677c7eb85d294f878f13066bbd841e788ec1267285690e65c2eb342b02aecd028679509b7f1d192cf5631b0839a92abfe36e93237bf5e2544c14e6cebe7452";
|
||||
version = "1.3.3";
|
||||
sha512 = "3481259c7a1eac719db2921e60173686726a0c2b65879d51a64d516a37f6120db8ffbb74b8bd273404285d7b25143ab5c7ced37e7c0eaf4ab1e44586ccd3c651";
|
||||
version = "1.3.6";
|
||||
};
|
||||
}
|
||||
|
||||
@ -817,6 +795,17 @@
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
name = "org.babashka/sci";
|
||||
path = pkgs.fetchMavenArtifact {
|
||||
inherit repos;
|
||||
artifactId = "sci";
|
||||
groupId = "org.babashka";
|
||||
sha512 = "2897029dba4917facf93935229f1288d9e90973e8dbc8ff84448335452815274c23371ab643c35df0b1854ff6de1574c37880267fd0edd900039f5a1678d73c5";
|
||||
version = "0.3.4";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
name = "io.opentracing/opentracing-util";
|
||||
path = pkgs.fetchMavenArtifact {
|
||||
@ -845,8 +834,8 @@
|
||||
inherit repos;
|
||||
artifactId = "nrepl";
|
||||
groupId = "nrepl";
|
||||
sha512 = "663906ff1c8768c4a73fa9f32619da4c244cc86c93d86e8439eb8de81c79486be5a04140c1df6199ba475b3a3e7fd36304faef8b330672dd644945820cc6eb67";
|
||||
version = "0.8.3";
|
||||
sha512 = "92534555cc5fa45e8990b8566996fe784df368849e0938fbc7a89909ccbb62dd7d4fca9b7aa3c615702ec30f9962a460c500f6b60abc72661c5f4c66414fc395";
|
||||
version = "1.0.0";
|
||||
};
|
||||
}
|
||||
|
||||
@ -867,8 +856,8 @@
|
||||
inherit repos;
|
||||
artifactId = "sqlite-jdbc";
|
||||
groupId = "org.xerial";
|
||||
sha512 = "efd1ea26d7f4f9bc66bf0d5f80234a0c535829bd498e4c5a0cab42873b58ac69133497d8c45689a1d3a39e657a2d0474d6b930c7bc415dd623801ee4a7354ffb";
|
||||
version = "3.25.2";
|
||||
sha512 = "f4c27027fe3cb7914aaf155a1afaa0c8b455e5d142b4e5f31d87bfe619c9949e1981ba7eed1f7a8a3cd27edba1321cc4cd74cf4321ae800e8a911b4d94e03930";
|
||||
version = "3.39.3.0";
|
||||
};
|
||||
}
|
||||
|
||||
@ -889,8 +878,8 @@
|
||||
inherit repos;
|
||||
artifactId = "slf4j-api";
|
||||
groupId = "org.slf4j";
|
||||
sha512 = "a944468440a883bb3bde1f78d39abe43a90b6091fd9f1a70430ac10ea91b308b2ef035e4836d68ba97afdba2b04f62edece204278aaa416276a5f8596f8688af";
|
||||
version = "1.7.26";
|
||||
sha512 = "cf50d5cc86404fefa49730da36147db5f6d65c8b06163bbf62311e6874c20ca46db02ab6bda27c9c1485a5c57fe63b89fd3000b8d838c429240ee95734f5901e";
|
||||
version = "2.0.3";
|
||||
};
|
||||
}
|
||||
|
||||
@ -911,8 +900,8 @@
|
||||
inherit repos;
|
||||
artifactId = "test.check";
|
||||
groupId = "org.clojure";
|
||||
sha512 = "ba7b5c915c1e7bd5e9e398f8cd9d74340ca3c4846483bae8f2191e40ea42bdd4d8019ec108c2bd64451f418abebed2258cf0ee5be597cc0bc8a02d772c6385ed";
|
||||
version = "0.10.0-RC1";
|
||||
sha512 = "b8d7a330b0b5514cd6a00c4382052fab51c3c9d3bc53133f8506791fa670e7c5ecd65094977ea5ced91f59623b0abd1ab8feeec96d63c5c6e459b265a655c577";
|
||||
version = "1.1.1";
|
||||
};
|
||||
}
|
||||
|
||||
@ -944,8 +933,8 @@
|
||||
inherit repos;
|
||||
artifactId = "yaml";
|
||||
groupId = "io.forward";
|
||||
sha512 = "561cfe0e92689b95008948a0a8aa839b9932ffd13791fdbd9ce55e0b0e3c895be6441ccd050b62ff671c747373fcba1199246c8bfb4206cb05584d06dea99b7c";
|
||||
version = "1.0.9";
|
||||
sha512 = "e2d3b7aea260346a1db44bcc3c363877d0ff2b327c4fd287759782949b1a498bc8019f06ddabee84443b96b07ea4765443f8190e04f5f903de049e2cc0fd63e9";
|
||||
version = "1.0.11";
|
||||
};
|
||||
}
|
||||
|
||||
@ -966,19 +955,8 @@
|
||||
inherit repos;
|
||||
artifactId = "core.memoize";
|
||||
groupId = "org.clojure";
|
||||
sha512 = "37308fcbbe64d0a2802917ef5a589075f81086d63e08c71a9a1b648b73dd362e5bdc8f756084fde1f4b1964ba82a6dc06b2119460281b7949a271d82e6a47a7e";
|
||||
version = "1.0.236";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
name = "camel-snake-kebab/camel-snake-kebab";
|
||||
path = pkgs.fetchMavenArtifact {
|
||||
inherit repos;
|
||||
artifactId = "camel-snake-kebab";
|
||||
groupId = "camel-snake-kebab";
|
||||
sha512 = "3108a207378e8b6199ae6c71517fcc65dde97d2bab67d533a618c7ff50ea8b849ead3880857d00629d6c269499384b564ed43b631e6b06f283af94e8cae89144";
|
||||
version = "0.4.0";
|
||||
sha512 = "67196537084b7cc34a01454d2a3b72de3fddce081b72d7a6dc1592d269a6c2728b79630bd2d52c1bf2d2f903c12add6f23df954c02ef8237f240d7394ccc3dde";
|
||||
version = "1.0.253";
|
||||
};
|
||||
}
|
||||
|
||||
@ -1010,8 +988,19 @@
|
||||
inherit repos;
|
||||
artifactId = "data.priority-map";
|
||||
groupId = "org.clojure";
|
||||
sha512 = "fb2d703468fb6d5f28c38f25e8e7acdaf02d2fa1ac23c14a9ff065873e88c9b74e155e73e5069436d674d7ef8547f01bc9777b7ae3b9dcde67cbd327d4a20c06";
|
||||
version = "1.0.0";
|
||||
sha512 = "bb8bc5dbfd3738c36b99a51880ac3f1381d6564e67601549ef5e7ae2b900e53cdcdfb8d0fa4bf32fb8ebc4de89d954bfa3ab7e8a1122bc34ee5073c7c707ac13";
|
||||
version = "1.1.0";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
name = "borkdude/sci.impl.reflector";
|
||||
path = pkgs.fetchMavenArtifact {
|
||||
inherit repos;
|
||||
artifactId = "sci.impl.reflector";
|
||||
groupId = "borkdude";
|
||||
sha512 = "c747fd347e6aba9578d105298b7c7402f53e8639d5c8e6dc83b127f3c413feeb1b9dead7405ac2c4345f02290902e8a2affbec749474481e9c9f19b3d049f18f";
|
||||
version = "0.0.1";
|
||||
};
|
||||
}
|
||||
|
||||
@ -1032,8 +1021,8 @@
|
||||
inherit repos;
|
||||
artifactId = "log4j-over-slf4j";
|
||||
groupId = "org.slf4j";
|
||||
sha512 = "d0a13ae82823b921b308c897ec9a11ef86cb1b52dd81343f856224c65851f70eae0890a88550daa3a4ed57e7e2c150018a3cdc2345924a4e489a88827fc639b6";
|
||||
version = "1.7.14";
|
||||
sha512 = "a1f90d8ea338660cc0e38073752cf32e46a042bc408477d841ba7ad69ad0d066bbbf9d4c399a34352d620ba9d2402c7a51574a88f314ddcc796c35adc99c37f4";
|
||||
version = "2.0.3";
|
||||
};
|
||||
}
|
||||
|
||||
@ -1043,19 +1032,8 @@
|
||||
inherit repos;
|
||||
artifactId = "core.cache";
|
||||
groupId = "org.clojure";
|
||||
sha512 = "6e4e126f23b20120c50a4dbefbe1b3b9bd98f0a7b8fa83affa267ff7f0de09542d2727243859a1ea346bda5b782d4ae0110f6c2b169c298261707a1fdadaedb0";
|
||||
version = "1.0.207";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
name = "rewrite-cljs/rewrite-cljs";
|
||||
path = pkgs.fetchMavenArtifact {
|
||||
inherit repos;
|
||||
artifactId = "rewrite-cljs";
|
||||
groupId = "rewrite-cljs";
|
||||
sha512 = "d87c07d510247e1b13dcb505436b3a43d8bb9a4bfebbd2ae0430249d2c8a859032affe2b2a4cda8f987e983f584fd999a3f9b87944d44b8837cdf4e2560c5ab9";
|
||||
version = "0.4.4";
|
||||
sha512 = "0a07ceffc2fa3a536b23773eefc7ef5e1108913b93c3a5416116a6566de76dd5c218f3fb0cc19415cbaa8843838de310b76282f20bf1fc3467006c9ec373667e";
|
||||
version = "1.0.225";
|
||||
};
|
||||
}
|
||||
|
||||
@ -1065,8 +1043,8 @@
|
||||
inherit repos;
|
||||
artifactId = "core.async";
|
||||
groupId = "org.clojure";
|
||||
sha512 = "7c8640769a68256f5cf131ed2436713c3c63bba2c4167f3593a1671ef65931d67b9b43eccfa6e5a20467ca7c6f5efd9cbf58d6c14e035757714f71220a754d0b";
|
||||
version = "1.3.618";
|
||||
sha512 = "160a77da25382d7c257eee56cfe83538620576a331e025a2d672fc26d9f04e606666032395f3c2e26247c782544816a5862348f3a921b1ffffcd309c62ac64f5";
|
||||
version = "1.5.648";
|
||||
};
|
||||
}
|
||||
|
||||
@ -1076,8 +1054,8 @@
|
||||
inherit repos;
|
||||
artifactId = "jackson-dataformat-smile";
|
||||
groupId = "com.fasterxml.jackson.dataformat";
|
||||
sha512 = "8998346f7039df868f3387d219efa0c04fc022a948d098296f3d7ac3f7a9a82bde6ec4a8f83b11994ad50318b5aca37781faacb1f20a65ba2ecc6d6d6eb9468e";
|
||||
version = "2.10.2";
|
||||
sha512 = "4c1566aa4fac309de8fba08ea355165cf2a888b7bcec98e7035ac8acd7315e340415a10b8deec6497fc4eea5ba9319fc989676170d8c4c0d0bbc3d4f3cc4d681";
|
||||
version = "2.13.3";
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@ -15,11 +15,11 @@ let
|
||||
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
x86_64-linux = "1sfy6rcrayx661m96pyh96caycf6banjs5ksib48qsl6hxp76ks0";
|
||||
x86_64-darwin = "0xkzvi7y45rxwnjxplg6wfs4994n6vdfqk6q7wjr96fgiymbpg5y";
|
||||
aarch64-linux = "09qlmqnvq1bcal56kingn6wkzg83dhxkkj2p3gqlikz6s5klqrql";
|
||||
aarch64-darwin = "17giphsqkxdfrz68vxkic84q4hn94plgr1lh72vy0q5pz5bbcpy2";
|
||||
armv7l-linux = "1cp739i5002j2kmdh3rhh7p88gyvjrfwcr430g5dvhdp7mgkbwn1";
|
||||
x86_64-linux = "0dynpi8l2102z8kbzgdm8qwbpzm7jxjqvz8a3x0vsikxbfwhsdmy";
|
||||
x86_64-darwin = "1z3vzwgcjj57xrw8mklhsdr8n9214rb4vj6jfnqv5nxpdgx4dw55";
|
||||
aarch64-linux = "0jiwp6i9q8c87pfkhvj45viqi2m5x5aq94skrvxa8wjbkyafvm1d";
|
||||
aarch64-darwin = "1as6zfrv2jymxspmc3m453vs61b7y1lh5qh34xr0ps8c4h6dbjas";
|
||||
armv7l-linux = "17yd3bb4z99q4r0d91grifrbr50wln1fkz0bjp4s4snqnj9q9gfk";
|
||||
}.${system} or throwSystem;
|
||||
|
||||
sourceRoot = lib.optionalString (!stdenv.isDarwin) ".";
|
||||
@ -29,7 +29,7 @@ in
|
||||
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.80.1.23194";
|
||||
version = "1.80.2.23209";
|
||||
pname = "vscodium";
|
||||
|
||||
executableName = "codium";
|
||||
|
||||
@ -1,62 +0,0 @@
|
||||
From 9866ce8f538e1ab1f0902408b7575013b768f365 Mon Sep 17 00:00:00 2001
|
||||
From: Zane van Iperen <zane@zanevaniperen.com>
|
||||
Date: Wed, 2 Feb 2022 23:41:59 +1000
|
||||
Subject: [PATCH] llvm/ExecutionEngine/IntelJITEvents: only use
|
||||
ITTAPI_SOURCE_DIR
|
||||
|
||||
---
|
||||
.../IntelJITEvents/CMakeLists.txt | 32 ++-----------------
|
||||
1 file changed, 2 insertions(+), 30 deletions(-)
|
||||
|
||||
diff --git a/llvm/lib/ExecutionEngine/IntelJITEvents/CMakeLists.txt b/llvm/lib/ExecutionEngine/IntelJITEvents/CMakeLists.txt
|
||||
index 0c5017c3..d20c35f3 100644
|
||||
--- a/llvm/lib/ExecutionEngine/IntelJITEvents/CMakeLists.txt
|
||||
+++ b/llvm/lib/ExecutionEngine/IntelJITEvents/CMakeLists.txt
|
||||
@@ -1,34 +1,6 @@
|
||||
include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/.. )
|
||||
|
||||
-if(NOT DEFINED ITTAPI_GIT_REPOSITORY)
|
||||
- set(ITTAPI_GIT_REPOSITORY https://github.com/intel/ittapi.git)
|
||||
-endif()
|
||||
-
|
||||
-if(NOT DEFINED ITTAPI_GIT_TAG)
|
||||
- set(ITTAPI_GIT_TAG v3.18.12)
|
||||
-endif()
|
||||
-
|
||||
-if(NOT DEFINED ITTAPI_SOURCE_DIR)
|
||||
- set(ITTAPI_SOURCE_DIR ${PROJECT_BINARY_DIR})
|
||||
-endif()
|
||||
-
|
||||
-if(NOT EXISTS ${ITTAPI_SOURCE_DIR}/ittapi)
|
||||
- execute_process(COMMAND ${GIT_EXECUTABLE} clone ${ITTAPI_GIT_REPOSITORY}
|
||||
- WORKING_DIRECTORY ${ITTAPI_SOURCE_DIR}
|
||||
- RESULT_VARIABLE GIT_CLONE_RESULT)
|
||||
- if(NOT GIT_CLONE_RESULT EQUAL "0")
|
||||
- message(FATAL_ERROR "git clone ${ITTAPI_GIT_REPOSITORY} failed with ${GIT_CLONE_RESULT}, please clone ${ITTAPI_GIT_REPOSITORY}")
|
||||
- endif()
|
||||
-endif()
|
||||
-
|
||||
-execute_process(COMMAND ${GIT_EXECUTABLE} checkout ${ITTAPI_GIT_TAG}
|
||||
- WORKING_DIRECTORY ${ITTAPI_SOURCE_DIR}/ittapi
|
||||
- RESULT_VARIABLE GIT_CHECKOUT_RESULT)
|
||||
-if(NOT GIT_CHECKOUT_RESULT EQUAL "0")
|
||||
- message(FATAL_ERROR "git checkout ${ITTAPI_GIT_TAG} failed with ${GIT_CHECKOUT_RESULT}, please checkout ${ITTAPI_GIT_TAG} at ${ITTAPI_SOURCE_DIR}/ittapi")
|
||||
-endif()
|
||||
-
|
||||
-include_directories( ${ITTAPI_SOURCE_DIR}/ittapi/include/ )
|
||||
+include_directories( ${ITTAPI_SOURCE_DIR}/include/ )
|
||||
|
||||
if( HAVE_LIBDL )
|
||||
set(LLVM_INTEL_JIT_LIBS ${CMAKE_DL_LIBS})
|
||||
@@ -40,7 +12,7 @@ set(LLVM_INTEL_JIT_LIBS ${LLVM_PTHREAD_LIB} ${LLVM_INTEL_JIT_LIBS})
|
||||
add_llvm_component_library(LLVMIntelJITEvents
|
||||
IntelJITEventListener.cpp
|
||||
jitprofiling.c
|
||||
- ${ITTAPI_SOURCE_DIR}/ittapi/src/ittnotify/ittnotify_static.c
|
||||
+ ${ITTAPI_SOURCE_DIR}/src/ittnotify/ittnotify_static.c
|
||||
|
||||
LINK_LIBS ${LLVM_INTEL_JIT_LIBS}
|
||||
|
||||
--
|
||||
2.34.1
|
||||
|
||||
@ -1,24 +1,43 @@
|
||||
{ lib, stdenv, fetchFromGitHub, wrapQtAppsHook, cmake, pkg-config, git
|
||||
, qtbase, qtquickcontrols, qtmultimedia, openal, glew, vulkan-headers, vulkan-loader, libpng
|
||||
, ffmpeg, libevdev, libusb1, zlib, curl, wolfssl, python3, pugixml, faudio, flatbuffers
|
||||
, sdl2Support ? true, SDL2
|
||||
, cubebSupport ? true, cubeb
|
||||
, waylandSupport ? true, wayland
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, wrapQtAppsHook
|
||||
, cmake
|
||||
, pkg-config
|
||||
, git
|
||||
, qtbase
|
||||
, qtquickcontrols
|
||||
, qtmultimedia
|
||||
, openal
|
||||
, glew
|
||||
, vulkan-headers
|
||||
, vulkan-loader
|
||||
, libpng
|
||||
, libSM
|
||||
, ffmpeg
|
||||
, libevdev
|
||||
, libusb1
|
||||
, zlib
|
||||
, curl
|
||||
, wolfssl
|
||||
, python3
|
||||
, pugixml
|
||||
, flatbuffers
|
||||
, llvm_16
|
||||
, cubeb
|
||||
, faudioSupport ? true
|
||||
, faudio
|
||||
, SDL2
|
||||
, waylandSupport ? true
|
||||
, wayland
|
||||
}:
|
||||
|
||||
let
|
||||
# Keep these separate so the update script can regex them
|
||||
rpcs3GitVersion = "14840-842edbcbe";
|
||||
rpcs3Version = "0.0.27-14840-842edbcbe";
|
||||
rpcs3Revision = "842edbcbe795941981993c667c2d8a866126b5b0";
|
||||
rpcs3Sha256 = "1al4dx93f02k56k62dxjqqb46cwg0nkpjax1xnjc8v3bx4gsp6f6";
|
||||
|
||||
ittapi = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "ittapi";
|
||||
rev = "v3.18.12";
|
||||
sha256 = "0c3g30rj1y8fbd2q4kwlpg1jdy02z4w5ryhj3yr9051pdnf4kndz";
|
||||
};
|
||||
rpcs3GitVersion = "15372-38a5313ed";
|
||||
rpcs3Version = "0.0.28-15372-38a5313ed";
|
||||
rpcs3Revision = "38a5313ed2c4ebb626017a4f7f28ed0c0a89f931";
|
||||
rpcs3Hash = "sha256-tiByoxPf++TK/Xowo2VQ+OEojoYIpX/B8caDyaMZ3Qc=";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "rpcs3";
|
||||
@ -29,11 +48,9 @@ stdenv.mkDerivation {
|
||||
repo = "rpcs3";
|
||||
rev = rpcs3Revision;
|
||||
fetchSubmodules = true;
|
||||
sha256 = rpcs3Sha256;
|
||||
hash = rpcs3Hash;
|
||||
};
|
||||
|
||||
patches = [ ./0001-llvm-ExecutionEngine-IntelJITEvents-only-use-ITTAPI_.patch ];
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
preConfigure = ''
|
||||
@ -55,17 +72,20 @@ stdenv.mkDerivation {
|
||||
"-DUSE_SYSTEM_FAUDIO=ON"
|
||||
"-DUSE_SYSTEM_PUGIXML=ON"
|
||||
"-DUSE_SYSTEM_FLATBUFFERS=ON"
|
||||
"-DUSE_SYSTEM_SDL=ON"
|
||||
"-DWITH_LLVM=ON"
|
||||
"-DBUILD_LLVM=OFF"
|
||||
"-DUSE_NATIVE_INSTRUCTIONS=OFF"
|
||||
"-DITTAPI_SOURCE_DIR=${ittapi}"
|
||||
"-DUSE_FAUDIO=${if faudioSupport then "ON" else "OFF"}"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config git wrapQtAppsHook ];
|
||||
|
||||
buildInputs = [
|
||||
qtbase qtquickcontrols qtmultimedia openal glew vulkan-headers vulkan-loader libpng ffmpeg
|
||||
libevdev zlib libusb1 curl wolfssl python3 pugixml faudio flatbuffers
|
||||
] ++ lib.optional sdl2Support SDL2
|
||||
++ lib.optionals cubebSupport cubeb.passthru.backendLibs
|
||||
libevdev zlib libusb1 curl wolfssl python3 pugixml flatbuffers llvm_16 libSM
|
||||
] ++ cubeb.passthru.backendLibs
|
||||
++ lib.optionals faudioSupport [ faudio SDL2 ]
|
||||
++ lib.optional waylandSupport wayland;
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash --pure --keep GITHUB_TOKEN -p gnused jq nix-prefetch-git curl cacert
|
||||
#!nix-shell -i bash --pure --keep GITHUB_TOKEN -p nix gnused jq nix-prefetch-git curl cacert
|
||||
|
||||
set -eou pipefail
|
||||
|
||||
@ -48,12 +48,13 @@ final_ver="$major_ver-$git_ver"
|
||||
echo "INFO: Latest commit is $commit_sha"
|
||||
echo "INFO: Latest version is $final_ver"
|
||||
|
||||
nix_sha256=$(nix-prefetch-git --quiet --fetch-submodules https://github.com/RPCS3/rpcs3.git "$commit_sha" | jq -r .sha256)
|
||||
echo "INFO: SHA256 is $nix_sha256"
|
||||
nix_hash=$(nix-prefetch-git --quiet --fetch-submodules https://github.com/RPCS3/rpcs3.git "$commit_sha" | jq -r .sha256)
|
||||
nix_hash=$(nix hash to-sri --type sha256 "$nix_hash")
|
||||
echo "INFO: Hash is $nix_hash"
|
||||
|
||||
sed -i -E \
|
||||
-e "s/rpcs3GitVersion\s*=\s*\"[\.a-z0-9-]+\";$/rpcs3GitVersion = \"${git_ver}\";/g" \
|
||||
-e "s/rpcs3Version\s*=\s*\"[\.a-z0-9-]+\";$/rpcs3Version = \"${final_ver}\";/g" \
|
||||
-e "s/rpcs3Revision\s*=\s*\"[a-z0-9]+\";$/rpcs3Revision = \"${commit_sha}\";/g" \
|
||||
-e "s/rpcs3Sha256\s*=\s*\"[a-z0-9]+\";$/rpcs3Sha256 = \"${nix_sha256}\";/g" \
|
||||
-e "s|rpcs3Hash\s*=\s*\"sha256-.*\";$|rpcs3Hash = \"${nix_hash}\";|g" \
|
||||
"$ROOT/default.nix"
|
||||
|
||||
@ -0,0 +1,15 @@
|
||||
diff --git a/src/nnn.c b/src/nnn.c
|
||||
index b3c0f986..c74e1ec9 100644
|
||||
--- a/src/nnn.c
|
||||
+++ b/src/nnn.c
|
||||
@@ -508,9 +508,7 @@ alignas(max_align_t) static char g_pipepath[TMP_LEN_MAX];
|
||||
static runstate g_state;
|
||||
|
||||
/* Options to identify file MIME */
|
||||
-#if defined(__APPLE__)
|
||||
-#define FILE_MIME_OPTS "-bIL"
|
||||
-#elif !defined(__sun) /* no MIME option for 'file' */
|
||||
+#if !defined(__sun) /* no MIME option for 'file' */
|
||||
#define FILE_MIME_OPTS "-biL"
|
||||
#endif
|
||||
|
||||
@ -34,6 +34,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Nix-specific: ensure nnn passes correct arguments to the Nix file command on Darwin.
|
||||
# By default, nnn expects the macOS default file command, not the one provided by Nix.
|
||||
# However, both commands use different arguments to obtain the MIME type.
|
||||
./darwin-fix-file-mime-opts.patch
|
||||
# FIXME: remove for next release
|
||||
(fetchpatch {
|
||||
url = "https://github.com/jarun/nnn/commit/20e944f5e597239ed491c213a634eef3d5be735e.patch";
|
||||
|
||||
29
pkgs/applications/misc/acpic/default.nix
Normal file
29
pkgs/applications/misc/acpic/default.nix
Normal file
@ -0,0 +1,29 @@
|
||||
{ lib
|
||||
, fetchPypi
|
||||
, python3Packages
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "acpic";
|
||||
version = "1.0.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version pname;
|
||||
hash = "sha256-vQ9VxCNbOmqHIY3e1wq1wNJl5ywfU2tm62gDg3vKvcg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
python3Packages.pbr
|
||||
];
|
||||
|
||||
# no tests
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Daemon extending acpid event handling capabilities.";
|
||||
homepage = "https://github.com/psliwka/acpic";
|
||||
license = licenses.wtfpl;
|
||||
maintainers = with maintainers; [ aacebedo ];
|
||||
};
|
||||
}
|
||||
127
pkgs/applications/misc/bloodhound/default.nix
Normal file
127
pkgs/applications/misc/bloodhound/default.nix
Normal file
@ -0,0 +1,127 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchzip
|
||||
, makeWrapper
|
||||
, alsa-lib
|
||||
, at-spi2-atk
|
||||
, at-spi2-core
|
||||
, atk
|
||||
, cairo
|
||||
, cups
|
||||
, dbus
|
||||
, expat
|
||||
, fontconfig
|
||||
, freetype
|
||||
, gdk-pixbuf
|
||||
, glib
|
||||
, gtk3
|
||||
, libGL
|
||||
, libappindicator-gtk3
|
||||
, libdrm
|
||||
, libnotify
|
||||
, libpulseaudio
|
||||
, libuuid
|
||||
, libxcb
|
||||
, libxkbcommon
|
||||
, libxshmfence
|
||||
, mesa
|
||||
, nspr
|
||||
, nss
|
||||
, pango
|
||||
, systemd
|
||||
, udev
|
||||
, unzip
|
||||
, xdg-utils
|
||||
, xorg
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "bloodhound";
|
||||
version = "4.3.1";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/BloodHoundAD/BloodHound/releases/download/v${finalAttrs.version}/BloodHound-linux-x64.zip";
|
||||
hash = "sha256-gGfZ5Mj8rmz3dwKyOitRExkgOmSVDOqKpPxvGlE4izw=";
|
||||
};
|
||||
|
||||
rpath = lib.makeLibraryPath [
|
||||
alsa-lib
|
||||
at-spi2-atk
|
||||
at-spi2-core
|
||||
atk
|
||||
cairo
|
||||
cups
|
||||
dbus
|
||||
expat
|
||||
fontconfig
|
||||
freetype
|
||||
gdk-pixbuf
|
||||
glib
|
||||
gtk3
|
||||
libGL
|
||||
libappindicator-gtk3
|
||||
libdrm
|
||||
libnotify
|
||||
libpulseaudio
|
||||
libuuid
|
||||
libxcb
|
||||
libxkbcommon
|
||||
mesa
|
||||
nspr
|
||||
nss
|
||||
pango
|
||||
systemd
|
||||
stdenv.cc.cc.lib
|
||||
udev
|
||||
xorg.libX11
|
||||
xorg.libXScrnSaver
|
||||
xorg.libXcomposite
|
||||
xorg.libXcursor
|
||||
xorg.libXdamage
|
||||
xorg.libXext
|
||||
xorg.libXfixes
|
||||
xorg.libXi
|
||||
xorg.libXrandr
|
||||
xorg.libXrender
|
||||
xorg.libXtst
|
||||
xorg.libxkbfile
|
||||
xorg.libxshmfence
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk3 # needed for GSETTINGS_SCHEMAS_PATH
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ makeWrapper unzip ];
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/{bin,/lib/BloodHound}
|
||||
mv * $out/lib/BloodHound
|
||||
chmod +x $out/lib/BloodHound/BloodHound
|
||||
|
||||
patchelf --set-interpreter ${stdenv.cc.bintools.dynamicLinker} \
|
||||
$out/lib/BloodHound/BloodHound --set-rpath ${finalAttrs.rpath}:$out/lib/BloodHound \
|
||||
--add-needed libudev.so # Needed to fix trace trap (core dump)
|
||||
|
||||
makeWrapper $out/lib/BloodHound/BloodHound $out/bin/BloodHound \
|
||||
--prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH \
|
||||
--suffix PATH : ${lib.makeBinPath [xdg-utils]} \
|
||||
--append-flags "--in-process-gpu" # fix for sandbox issues
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Active Directory reconnaissance and attack path management tool";
|
||||
homepage = "https://github.com/BloodHoundAD/BloodHound";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
changelog = "https://github.com/BloodHoundAD/BloodHound/releases/tag/v${finalAttrs.version}";
|
||||
downloadPage = "https://github.com/BloodHoundAD/BloodHound/releases";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ akechishiro ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
mainProgram = "BloodHound";
|
||||
};
|
||||
})
|
||||
@ -46,11 +46,11 @@ let
|
||||
inherit (python3.pkgs) paramiko pycairo pyodbc;
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "mysql-workbench";
|
||||
version = "8.0.33";
|
||||
version = "8.0.34";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://cdn.mysql.com//Downloads/MySQLGUITools/mysql-workbench-community-${version}-src.tar.gz";
|
||||
sha256 = "a6c9b05ee6f8accd45203d8234a43415da65ddc8118d427dd1a2ef2a209261bc";
|
||||
sha256 = "sha256-ub/D6HRtXOvX+lai71t1UjMmMzBsz5ljCrJCuf9aq7U=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
64
pkgs/applications/misc/onthespot/default.nix
Normal file
64
pkgs/applications/misc/onthespot/default.nix
Normal file
@ -0,0 +1,64 @@
|
||||
{ lib
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
, copyDesktopItems
|
||||
, wrapQtAppsHook
|
||||
, makeDesktopItem
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "onthespot";
|
||||
version = "0.5";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "casualsnek";
|
||||
repo = "onthespot";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-VaJBNsT7uNOGY43GnzhUqDQNiPoFZcc2UaIfOKgkufg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
copyDesktopItems
|
||||
pythonRelaxDepsHook
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
charset-normalizer
|
||||
defusedxml
|
||||
librespot
|
||||
music-tag
|
||||
packaging
|
||||
pillow
|
||||
protobuf
|
||||
pyogg
|
||||
pyqt5
|
||||
pyqt5_sip
|
||||
pyxdg
|
||||
requests
|
||||
setuptools
|
||||
show-in-file-manager
|
||||
urllib3
|
||||
zeroconf
|
||||
];
|
||||
|
||||
pythonRemoveDeps = [
|
||||
"PyQt5-Qt5"
|
||||
"PyQt5-stubs"
|
||||
];
|
||||
|
||||
pythonRelaxDeps = true;
|
||||
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=("''${qtWrapperArgs[@]}")
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = " QT based Spotify music downloader written in Python";
|
||||
homepage = "https://github.com/casualsnek/onthespot";
|
||||
license = lib.licenses.gpl2;
|
||||
maintainers = with lib.maintainers; [ onny ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
4830
pkgs/applications/misc/owmods-cli/Cargo.lock
generated
Normal file
4830
pkgs/applications/misc/owmods-cli/Cargo.lock
generated
Normal file
File diff suppressed because it is too large
Load Diff
65
pkgs/applications/misc/owmods-cli/default.nix
Normal file
65
pkgs/applications/misc/owmods-cli/default.nix
Normal file
@ -0,0 +1,65 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
, pkg-config
|
||||
, installShellFiles
|
||||
, zstd
|
||||
, openssl
|
||||
, Security
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "owmods-cli";
|
||||
version = "0.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ow-mods";
|
||||
repo = "ow-mod-man";
|
||||
rev = "cli_v${version}";
|
||||
hash = "sha256-kumYLlp2LRqTQz23N9lriJJf7x2pPXbqqUvkiAhyMDY=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"tauri-plugin-window-state-0.1.0" = "sha256-M6uGcf4UWAU+494wAK/r2ta1c3IZ07iaURLwJJR9F3U=";
|
||||
};
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
zstd
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
openssl
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
Security
|
||||
];
|
||||
|
||||
env = {
|
||||
ZSTD_SYS_USE_PKG_CONFIG = true;
|
||||
};
|
||||
|
||||
buildAndTestSubdir = "owmods_cli";
|
||||
|
||||
postInstall = ''
|
||||
cargo xtask dist_cli
|
||||
installManPage man/man*/*
|
||||
installShellCompletion --cmd owmods \
|
||||
dist/cli/completions/owmods.{bash,fish,zsh}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "CLI version of the mod manager for Outer Wilds Mod Loader";
|
||||
homepage = "https://github.com/ow-mods/ow-mod-man/tree/main/owmods_cli";
|
||||
downloadPage = "https://github.com/ow-mods/ow-mod-man/releases/tag/cli_v${version}";
|
||||
changelog = "https://github.com/ow-mods/ow-mod-man/releases/tag/cli_v${version}";
|
||||
mainProgram = "owmods";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ locochoco ];
|
||||
};
|
||||
}
|
||||
58
pkgs/applications/misc/rofi-screenshot/default.nix
Normal file
58
pkgs/applications/misc/rofi-screenshot/default.nix
Normal file
@ -0,0 +1,58 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, makeWrapper
|
||||
, libnotify
|
||||
, slop
|
||||
, ffcast
|
||||
, ffmpeg
|
||||
, xclip
|
||||
, rofi
|
||||
, coreutils
|
||||
, gnused
|
||||
, procps
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rofi-screenshot";
|
||||
version = "2023-07-02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ceuk";
|
||||
repo = pname;
|
||||
rev = "365cfa51c6c7deb072d98d7bfd68cf4038bf2737";
|
||||
hash = "sha256-M1cab+2pOjZ2dElMg0Y0ZrIxRE0VwymVwcElgzFrmVs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/${pname} \
|
||||
--set PATH ${
|
||||
lib.makeBinPath [
|
||||
libnotify
|
||||
slop
|
||||
ffcast
|
||||
ffmpeg
|
||||
xclip
|
||||
rofi
|
||||
coreutils
|
||||
gnused
|
||||
procps
|
||||
]
|
||||
}
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
install -Dm755 ${pname} $out/bin/${pname}
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description =
|
||||
"Use rofi to perform various types of screenshots and screen captures";
|
||||
homepage = "https://github.com/ceuk/rofi-screenshot";
|
||||
maintainers = with lib.maintainers; [ zopieux ];
|
||||
platforms = lib.platforms.all;
|
||||
license = lib.licenses.wtfpl;
|
||||
};
|
||||
}
|
||||
@ -9,14 +9,14 @@
|
||||
|
||||
rofi-unwrapped.overrideAttrs (oldAttrs: rec {
|
||||
pname = "rofi-wayland-unwrapped";
|
||||
version = "1.7.5+wayland1";
|
||||
version = "1.7.5+wayland2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lbonn";
|
||||
repo = "rofi";
|
||||
rev = version;
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-ddKLV7NvqgTQl5YlAEyBK0oalcJsLASK4z3qArQPUDQ=";
|
||||
sha256 = "sha256-5pxDA/71PV4B5T3fzLKVC4U8Gt13vwy3xSDPDsSDAKU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ wayland-scanner ];
|
||||
|
||||
@ -2,19 +2,19 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "toot";
|
||||
version = "0.37.0";
|
||||
version = "0.38.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ihabunek";
|
||||
repo = "toot";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-NmxBiFLjAW4kwuChbgR5VsAOpgE6sJOO/MmfRhotb40=";
|
||||
sha256 = "sha256-gT9xKFanQhptt46nkdzYsZ6Vu0Nab0oRsvEHVRNf8DQ=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = with python3Packages; [ pytest ];
|
||||
|
||||
propagatedBuildInputs = with python3Packages;
|
||||
[ requests beautifulsoup4 future wcwidth urwid psycopg2 ];
|
||||
[ requests beautifulsoup4 future wcwidth urwid psycopg2 tomlkit ];
|
||||
|
||||
checkPhase = ''
|
||||
py.test
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "vhs";
|
||||
version = "0.5.0";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "charmbracelet";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-d7oHPe1R0KZaVTTxmed27VZ2PphiQfy7CXYhVKHWUhE=";
|
||||
hash = "sha256-JKhijruaRjdMEbsIrcu2swSCb/nTxwIG/F9c2eGncnQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-jrXdbxH5hJrd5yyVsTOeIYJciJ6wVTydkD6aSuWYKPQ=";
|
||||
vendorHash = "sha256-IpybcyW4up9QVV7fJCh+2Lrpi571tfravN17vh/G1bQ=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles makeWrapper ];
|
||||
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "argocd";
|
||||
version = "2.7.8";
|
||||
version = "2.7.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "argoproj";
|
||||
repo = "argo-cd";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-WZD/eq04PgUURdONpGvFP/wKwz4sUaoGMvrYZqJ+QqQ=";
|
||||
sha256 = "sha256-KMoHkMHMyAaywdD/+Bg63PSoB1ORwgl1aiIirhDF0Y0=";
|
||||
};
|
||||
|
||||
proxyVendor = true; # darwin/linux hash mismatch
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubectl-cnpg";
|
||||
version = "1.20.1";
|
||||
version = "1.20.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudnative-pg";
|
||||
repo = "cloudnative-pg";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-PFibPL5jBbdGgULiqtt5tKYy3UWsldnbCN2LJpxat60=";
|
||||
hash = "sha256-JkvaFhzazvuqRJ6ertwMQhp+H2zsjRGA23XbvLCIYg0=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-jD8p5RWbCMPmZec3fEsGa8kevTi1curBazlEDvjeuq8=";
|
||||
vendorHash = "sha256-unOPTQeJW9rUOpZh7gTjD8IZDh4wi04oBAfDO5juJf8=";
|
||||
|
||||
subPackages = [ "cmd/kubectl-cnpg" ];
|
||||
|
||||
|
||||
@ -73,11 +73,11 @@
|
||||
"vendorHash": "sha256-LSAxibOYXxyIAsprMzbW+mnUXX7gHtYjMZYaUrGLtD4="
|
||||
},
|
||||
"argocd": {
|
||||
"hash": "sha256-pEcByit+xTBuJXCqhDOgHoc4lmCpbDptVocylcTqgz4=",
|
||||
"hash": "sha256-t1WGa9pfsLn5uB7/LSYIcmb/kfQCHysIcUKHwn6y8GU=",
|
||||
"homepage": "https://registry.terraform.io/providers/oboukili/argocd",
|
||||
"owner": "oboukili",
|
||||
"repo": "terraform-provider-argocd",
|
||||
"rev": "v6.0.0",
|
||||
"rev": "v6.0.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-q9PO9tMbaXTs3nBLElwU05GcDZMZqNmLVVGDmiSRSfo="
|
||||
},
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
, lib
|
||||
, pkg-config
|
||||
, fetchFromGitLab
|
||||
, fetchpatch
|
||||
, gitUpdater
|
||||
, ffmpeg_6
|
||||
|
||||
@ -90,7 +91,15 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-QeD2o6uz9r5vc3Scs1oRKYZ+aNH+01TSxLBj71ssfj4=";
|
||||
};
|
||||
|
||||
patches = (map (x: patch-src + x) (readLinesToList ./config/pjsip_patches));
|
||||
patches = (map (x: patch-src + x) (readLinesToList ./config/pjsip_patches)) ++ [
|
||||
(fetchpatch {
|
||||
name = "CVE-2023-27585.patch";
|
||||
url = "https://github.com/pjsip/pjproject/commit/d1c5e4da5bae7f220bc30719888bb389c905c0c5.patch";
|
||||
hash = "sha256-+yyKKTKG2FnfyLWnc4S80vYtDzmiu9yRmuqb5eIulPg=";
|
||||
})
|
||||
];
|
||||
|
||||
patchFlags = [ "-p1" "-l" ];
|
||||
|
||||
configureFlags = (readLinesToList ./config/pjsip_args_common)
|
||||
++ lib.optionals stdenv.isLinux (readLinesToList ./config/pjsip_args_linux);
|
||||
|
||||
@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "treesheets";
|
||||
version = "unstable-2023-07-22";
|
||||
version = "unstable-2023-07-28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aardappel";
|
||||
repo = "treesheets";
|
||||
rev = "24a80b0468d9abf15207dcb962d9e14a544d53a3";
|
||||
sha256 = "D9bLsxQ/52ziIlm0A9/be8KmcqZ+xr8ZygCCG2mgGJw=";
|
||||
rev = "e3b52c687fcdb14075d6d04a1c4e9e5ba929ba54";
|
||||
sha256 = "AnhlGbd5TbreFEwP1J5r4EQPAtG+YwJ04v7sclccGYQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -8,20 +8,20 @@
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "Dafny";
|
||||
version = "4.0.0";
|
||||
version = "4.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dafny-lang";
|
||||
repo = "dafny";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-7mVFDORbu9KsJ4IH8PrrpXE7xFrWVTyBmRaL8Kt/ghY=";
|
||||
sha256 = "sha256-RSGaOgGf3m94t3SKnvSPqz0VHhWr6NmIMtGsmOynMaM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
cp ${writeScript "fake-gradlew-for-dafny" ''
|
||||
mkdir -p build/libs/
|
||||
javac $(find -name "*.java" | grep "^./src/main") -d classes
|
||||
jar cf build/libs/DafnyRuntime.jar -C classes dafny
|
||||
jar cf build/libs/DafnyRuntime-${version}.jar -C classes dafny
|
||||
''} Source/DafnyRuntime/DafnyRuntimeJava/gradlew
|
||||
|
||||
# Needed to fix
|
||||
|
||||
25
pkgs/applications/science/logic/dafny/deps.nix
generated
25
pkgs/applications/science/logic/dafny/deps.nix
generated
@ -3,18 +3,18 @@
|
||||
|
||||
{ fetchNuGet }: [
|
||||
(fetchNuGet { pname = "Boogie"; version = "2.16.0"; sha256 = "1zcbbqhn7brxnywp3m5pfd7rcapg5w1xjr5pkfsqmmv8fk36nfja"; })
|
||||
(fetchNuGet { pname = "Boogie.AbstractInterpretation"; version = "2.16.0"; sha256 = "05l8lfh25w0a92swhlgp01l62bp6d07191jjvhnnak1k184drqm4"; })
|
||||
(fetchNuGet { pname = "Boogie.BaseTypes"; version = "2.16.0"; sha256 = "0qak5dzxja5ffprb0frgvbf88nlk232fr2m3lvg27qz3ai70p8xm"; })
|
||||
(fetchNuGet { pname = "Boogie.CodeContractsExtender"; version = "2.16.0"; sha256 = "078b5hzllqw08g5wvgp63lq2qg1ywk0scph3wdgjn966q2yfqz84"; })
|
||||
(fetchNuGet { pname = "Boogie.Concurrency"; version = "2.16.0"; sha256 = "1wcfqgnvinkfd26ig82gbj6ykn6b3f2iv8gr8h96q9jd6x9rmlkb"; })
|
||||
(fetchNuGet { pname = "Boogie.Core"; version = "2.16.0"; sha256 = "00sgvjxx613ljmppb69abrw50gv2rv9kk96rc1dq8ymlw8b3imw7"; })
|
||||
(fetchNuGet { pname = "Boogie.ExecutionEngine"; version = "2.16.0"; sha256 = "1kxyrbwcp5slgq3n26s2l69fs2hbda41v7jkxhpjh1yn9wb56b4n"; })
|
||||
(fetchNuGet { pname = "Boogie.Graph"; version = "2.16.0"; sha256 = "1qhfdysbca63agb7lcclyhi4wvi6142ipcbh9ag0g9mdf0pkwiqv"; })
|
||||
(fetchNuGet { pname = "Boogie.Houdini"; version = "2.16.0"; sha256 = "0rqhybfhbkb4cb14d546gknjabgrfl7pm1b87nzhmxpwzszw6ss3"; })
|
||||
(fetchNuGet { pname = "Boogie.Model"; version = "2.16.0"; sha256 = "0k328lcnxqf06pc97sgmqdzr564zgdvacy6j2n1209w882xs43rg"; })
|
||||
(fetchNuGet { pname = "Boogie.Provers.SMTLib"; version = "2.16.0"; sha256 = "19xx2x9ccr64rr7cldgdmd0d1xi56rz0skmvkqn1hdwcndh01n6a"; })
|
||||
(fetchNuGet { pname = "Boogie.VCExpr"; version = "2.16.0"; sha256 = "0ysmw9sl713xdpbcij3w4bm2hkigkjw7c2j1a7wwax02gsvx8djw"; })
|
||||
(fetchNuGet { pname = "Boogie.VCGeneration"; version = "2.16.0"; sha256 = "1g3ipl27qcy23g0pnsahyba9j90fvhm17wxczqx7hbgw0h183nji"; })
|
||||
(fetchNuGet { pname = "Boogie.AbstractInterpretation"; version = "2.16.8"; sha256 = "1a4pfzc7r6yxzwixsij2xijiyk50ii84zlwl151naw0y05yj4zxn"; })
|
||||
(fetchNuGet { pname = "Boogie.BaseTypes"; version = "2.16.8"; sha256 = "17zii7d31bqlhn2ygfjh5a37nb98wkn377z8rm6fg44f83788ll9"; })
|
||||
(fetchNuGet { pname = "Boogie.CodeContractsExtender"; version = "2.16.8"; sha256 = "18aixxw5xrivzpwrwj91dyhdnj3xd1apmjrgbdgg5f0z6p9863nq"; })
|
||||
(fetchNuGet { pname = "Boogie.Concurrency"; version = "2.16.8"; sha256 = "1qsp24ckvjz01mjq1fxssdvpsx6kvrdx8l7hd2rll86rrh1bc6w4"; })
|
||||
(fetchNuGet { pname = "Boogie.Core"; version = "2.16.8"; sha256 = "1qp6yaa0h16ihqrr2vgbgnakmvshd76skdhqrp1v7jcp7mw8af7n"; })
|
||||
(fetchNuGet { pname = "Boogie.ExecutionEngine"; version = "2.16.8"; sha256 = "1q3x8im85i68vz8ls51ywd4ayjsy53ygra01byscbnhc1qflpzia"; })
|
||||
(fetchNuGet { pname = "Boogie.Graph"; version = "2.16.8"; sha256 = "1pyd35rfv0bn0b1xxvqzixnprwjbps54zs0yaily9xxsyg33y1jr"; })
|
||||
(fetchNuGet { pname = "Boogie.Houdini"; version = "2.16.8"; sha256 = "1n6dlr84y9kni1sskgd6zx4cfflw28yavwwaz6hmmm01l8zg8y6w"; })
|
||||
(fetchNuGet { pname = "Boogie.Model"; version = "2.16.8"; sha256 = "0cbq5lyprz0m1kv6a8yyjnhyx42k1jbl00ljrj1bldlj7dz4ahw3"; })
|
||||
(fetchNuGet { pname = "Boogie.Provers.SMTLib"; version = "2.16.8"; sha256 = "1q48xzmzch4mc8z0wg2ap8f9glmxcj59i9a645ybysf1jah6yphy"; })
|
||||
(fetchNuGet { pname = "Boogie.VCExpr"; version = "2.16.8"; sha256 = "130jmlvvjd2ls95ry7ds0y2h7pxa109dikx1p3a3psb9dph7zxkr"; })
|
||||
(fetchNuGet { pname = "Boogie.VCGeneration"; version = "2.16.8"; sha256 = "0fim2d7p1y6ms1m8f1d5yl4pq3167pi4i7nwink5ydv3fvsckh08"; })
|
||||
(fetchNuGet { pname = "CocoR"; version = "2014.12.24"; sha256 = "0ps8h7aawkcc1910qnh13llzb01pvgsjmg862pxp0p4wca2dn7a2"; })
|
||||
(fetchNuGet { pname = "dotnet-format"; version = "5.1.250801"; sha256 = "1i0icx2yyp9141rjb2a221a71fvsy0knrfyvv631vb56r8fnsywh"; })
|
||||
(fetchNuGet { pname = "JetBrains.Annotations"; version = "2021.1.0"; sha256 = "07pnhxxlgx8spmwmakz37nmbvgyb6yjrbrhad5rrn6y767z5r1gb"; })
|
||||
@ -181,4 +181,5 @@
|
||||
(fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; })
|
||||
(fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.3"; sha256 = "0g7r6hm572ax8v28axrdxz1gnsblg6kszq17g51pj14a5rn2af7i"; })
|
||||
(fetchNuGet { pname = "System.Windows.Extensions"; version = "6.0.0"; sha256 = "1wy9pq9vn1bqg5qnv53iqrbx04yzdmjw4x5yyi09y3459vaa1sip"; })
|
||||
(fetchNuGet { pname = "Tomlyn"; version = "0.16.2"; sha256 = "1i928q6a7l65mk7wj2vvfclyvxamdjxg4dbj3g6g95inrfgvidah"; })
|
||||
]
|
||||
|
||||
@ -56,7 +56,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = toString [
|
||||
# Needed with GCC 12
|
||||
"-Wno-error=maybe-uninitialized"
|
||||
"-Wno-error=uninitialized"
|
||||
];
|
||||
|
||||
|
||||
@ -22,6 +22,7 @@
|
||||
, libnotify
|
||||
, libX11
|
||||
, libxcb
|
||||
, headless ? false
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -40,6 +41,9 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
curl
|
||||
sqlite
|
||||
patchelf
|
||||
] ++ lib.optionals (!headless) [
|
||||
libGLU
|
||||
libGL
|
||||
libXmu
|
||||
@ -47,17 +51,15 @@ stdenv.mkDerivation rec {
|
||||
freeglut
|
||||
libjpeg
|
||||
wxGTK32
|
||||
sqlite
|
||||
gtk3
|
||||
libXScrnSaver
|
||||
libnotify
|
||||
patchelf
|
||||
libX11
|
||||
libxcb
|
||||
xcbutil
|
||||
];
|
||||
|
||||
NIX_LDFLAGS = "-lX11";
|
||||
NIX_LDFLAGS = lib.optionalString (!headless) "-lX11";
|
||||
|
||||
preConfigure = ''
|
||||
./_autosetup
|
||||
@ -66,7 +68,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
configureFlags = [ "--disable-server" ];
|
||||
configureFlags = [ "--disable-server" ] ++ lib.optionals headless [ "--disable-manager" ];
|
||||
|
||||
postInstall = ''
|
||||
install --mode=444 -D 'client/scripts/boinc-client.service' "$out/etc/systemd/system/boinc.service"
|
||||
|
||||
@ -92,11 +92,11 @@ python.pkgs.buildPythonApplication rec {
|
||||
|
||||
substituteInPlace frigate/const.py \
|
||||
--replace "/media/frigate" "/var/lib/frigate" \
|
||||
--replace "/tmp/cache" "/var/cache/frigate"
|
||||
--replace "/tmp/cache" "/var/cache/frigate/"
|
||||
|
||||
substituteInPlace frigate/http.py \
|
||||
--replace "/opt/frigate" "${placeholder "out"}/${python.sitePackages}" \
|
||||
--replace "/tmp/cache/" "/var/cache/frigate"
|
||||
--replace "/tmp/cache/" "/var/cache/frigate/"
|
||||
|
||||
substituteInPlace frigate/output.py \
|
||||
--replace "/opt/frigate" "${placeholder "out"}/${python.sitePackages}"
|
||||
|
||||
36
pkgs/build-support/fetch9front/default.nix
Normal file
36
pkgs/build-support/fetch9front/default.nix
Normal file
@ -0,0 +1,36 @@
|
||||
{ fetchgit, fetchzip, lib }:
|
||||
|
||||
lib.makeOverridable (
|
||||
{ owner
|
||||
, repo
|
||||
, rev
|
||||
, domain ? "git.9front.org"
|
||||
, name ? "source"
|
||||
, leaveDotGit ? false
|
||||
, deepClone ? false
|
||||
, ... # For hash agility
|
||||
} @ args:
|
||||
|
||||
let
|
||||
passthruAttrs = removeAttrs args [ "domain" "owner" "repo" "rev" "leaveDotGit" "deepClone" ];
|
||||
|
||||
useFetchGit = leaveDotGit || deepClone;
|
||||
fetcher = if useFetchGit then fetchgit else fetchzip;
|
||||
|
||||
gitRepoUrl = "git://${domain}/${owner}/${repo}";
|
||||
|
||||
fetcherArgs = (if useFetchGit then {
|
||||
# git9 does not support shallow fetches
|
||||
inherit rev leaveDotGit;
|
||||
url = gitRepoUrl;
|
||||
} else {
|
||||
url = "https://${domain}/${owner}/${repo}/${rev}/snap.tar.gz";
|
||||
|
||||
passthru = {
|
||||
inherit gitRepoUrl;
|
||||
};
|
||||
}) // passthruAttrs // { inherit name; };
|
||||
in
|
||||
|
||||
fetcher fetcherArgs // { inherit rev; }
|
||||
)
|
||||
@ -12,6 +12,7 @@
|
||||
, branch ? null
|
||||
, stableVersion ? false # Use version format according to RFC 107 (i.e. LAST_TAG+date=YYYY-MM-DD)
|
||||
, tagPrefix ? "" # strip this prefix from a tag name when using stable version
|
||||
, shallowClone ? true
|
||||
}:
|
||||
|
||||
let
|
||||
@ -22,6 +23,7 @@ let
|
||||
branch=""
|
||||
use_stable_version=""
|
||||
tag_prefix=""
|
||||
shallow_clone=""
|
||||
|
||||
while (( $# > 0 )); do
|
||||
flag="$1"
|
||||
@ -39,6 +41,9 @@ let
|
||||
--tag-prefix=*)
|
||||
tag_prefix="''${flag#*=}"
|
||||
;;
|
||||
--shallow-clone)
|
||||
shallow_clone=1
|
||||
;;
|
||||
*)
|
||||
echo "$0: unknown option ‘''${flag}’"
|
||||
exit 1
|
||||
@ -58,9 +63,12 @@ let
|
||||
|
||||
cloneArgs=(
|
||||
--bare
|
||||
--depth=1
|
||||
)
|
||||
|
||||
if [[ "$shallow_clone" == "1" ]]; then
|
||||
cloneArgs+=(--depth=1)
|
||||
fi
|
||||
|
||||
if [[ -n "$branch" ]]; then
|
||||
cloneArgs+=(--branch="$branch")
|
||||
fi
|
||||
@ -101,7 +109,8 @@ let
|
||||
--rev="$commit_sha"
|
||||
'';
|
||||
|
||||
in [
|
||||
in
|
||||
[
|
||||
updateScript
|
||||
"--url=${builtins.toString url}"
|
||||
] ++ lib.optionals (branch != null) [
|
||||
@ -109,4 +118,6 @@ in [
|
||||
] ++ lib.optionals stableVersion [
|
||||
"--use-stable-version"
|
||||
"--tag-prefix=${tagPrefix}"
|
||||
] ++ lib.optionals shallowClone [
|
||||
"--shallow-clone"
|
||||
]
|
||||
|
||||
34
pkgs/data/fonts/commit-mono/default.nix
Normal file
34
pkgs/data/fonts/commit-mono/default.nix
Normal file
@ -0,0 +1,34 @@
|
||||
{ lib
|
||||
, stdenvNoCC
|
||||
, fetchzip
|
||||
}:
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "commit-mono";
|
||||
version = "1.132";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/eigilnikolajsen/commit-mono/releases/download/${version}/CommitMono-${version}.zip";
|
||||
sha256 = "sha256-a9zxzjfOFmqemSIb4Tav0l7YtKvbyizDy+1dwPuZ4d4=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
dontPatch = true;
|
||||
dontBuild = true;
|
||||
dontFixup = true;
|
||||
doCheck = false;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -Dm644 -t $out/share/fonts/opentype/ *.otf
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "An anonymous and neutral programming typeface focused on creating a better reading experience";
|
||||
homepage = "https://commitmono.com/";
|
||||
license = licenses.ofl;
|
||||
maintainers = [ maintainers.yoavlavi ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
@ -9,7 +9,7 @@ let
|
||||
rec{
|
||||
|
||||
inherit pname desc;
|
||||
version = "6.3";
|
||||
version = "6.4";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/subframe7536/Maple-font/releases/download/v${version}/${pname}.zip";
|
||||
inherit sha256;
|
||||
@ -39,34 +39,40 @@ let
|
||||
in
|
||||
{
|
||||
Mono = maple-font {
|
||||
pname = "MapleMono";
|
||||
sha256 = "sha256-Ap4OwP/QGFz9+xn12rekia1/pwRxZvv+H+ZmZiXcxcY=";
|
||||
desc = "monospace";
|
||||
pname = "MapleMono-ttf";
|
||||
sha256 = "sha256-a06JLIP5aVb9SeEz6kw+LqKy0ydCgaUlPDFWA2Y0G8Q=";
|
||||
desc = "monospace TrueType";
|
||||
};
|
||||
|
||||
NF = maple-font {
|
||||
pname = "MapleMono-NF";
|
||||
sha256 = "sha256-WZHFQRG+81TF5YgOT249c8VA8vAvYowiQx/pqsDuJ4o=";
|
||||
sha256 = "sha256-fy+hdUYZDW5nkMVirhkmys3tIkWezPDrlpNxnRMl4WU=";
|
||||
desc = "Nerd Font";
|
||||
};
|
||||
|
||||
SC-NF = maple-font {
|
||||
pname = "MapleMono-SC-NF";
|
||||
sha256 = "sha256-26odkmMljEwstRywDYJ7Dst5pfOXrtQTcrFFxbRwHcA=";
|
||||
sha256 = "sha256-SbXWkrpLJUrq+Jt1h3GBP9md5TbYpPchdiR0oEDMAgY=";
|
||||
desc = "Nerd Font SC";
|
||||
};
|
||||
|
||||
opentype = maple-font {
|
||||
pname = "MapleMono-otf";
|
||||
sha256 = "sha256-u2IuymjiosoSbdIW7h2QalagTI+eDMRSuhLgXy5RdRA=";
|
||||
sha256 = "sha256-fwfFlNbaWXFCjcno7NK3dZqAzsHLh9rdGkSq26xc9qw=";
|
||||
desc = "OpenType";
|
||||
};
|
||||
|
||||
woff2 = maple-font {
|
||||
pname = "MapleMono-woff2";
|
||||
sha256 = "sha256-iv6Q/aYMlAkhaem8tFWAzqc9mVgWQXghBzcHJz1dg/Y=";
|
||||
sha256 = "sha256-4akpZGGth4yZjI5wjO3ZXrXcWNxb7/6YChU7T5fNVKs=";
|
||||
desc = "WOFF2.0";
|
||||
};
|
||||
|
||||
autohint = maple-font {
|
||||
pname = "MapleMono-ttf-autohint";
|
||||
sha256 = "sha256-rSYIC42Bt+KFgxhwRhXS4sbh4etKYkCOo5nP2J2BHt4=";
|
||||
desc = "ttf autohint";
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -25,15 +25,15 @@
|
||||
let
|
||||
toCMakeBoolean = v: if v then "ON" else "OFF";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "p4c";
|
||||
version = "1.2.4.0";
|
||||
version = "1.2.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "p4lang";
|
||||
repo = "p4c";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-nIPvB6nwa55dKNeoNRrjhnnmoYLYTviaoL79+hT6gGs=";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-Whdryz1Gt0ymE7cj+mI95lW3Io9yBvLqcWa04gu5zEw=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@ -78,12 +78,12 @@ stdenv.mkDerivation rec {
|
||||
python3
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/p4lang/p4c";
|
||||
meta = {
|
||||
changelog = "https://github.com/p4lang/p4c/releases";
|
||||
description = "Reference compiler for the P4 programming language";
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ raitobezarius govanify ];
|
||||
license = licenses.asl20;
|
||||
homepage = "https://github.com/p4lang/p4c";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ raitobezarius govanify ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@ -16,13 +16,13 @@
|
||||
assert lib.elem lineEditingLibrary [ "isocline" "readline" ];
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "trealla";
|
||||
version = "2.22.17";
|
||||
version = "2.23.35";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "trealla-prolog";
|
||||
repo = "trealla";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-TUay32EzVzV2nlDYZgF5pAhnQNk7d8JbgAUHheNSpzo=";
|
||||
hash = "sha256-yCVBjxO9tEKlyWo6RlK4EdyUxCkxp0z2EzJ2np0xOUU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -17,11 +17,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ldb";
|
||||
version = "2.6.2";
|
||||
version = "2.7.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://samba/ldb/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-XLxjw1KTwjSzn5S6n/yonW0HiSXX+QIfgIZz3t8tkl4=";
|
||||
hash = "sha256-Ju5y1keFTmYtmWQ+srLTQWVavzH0mQg41mUPtc+SCcg=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
@ -66,16 +66,16 @@ let
|
||||
projectArch = "x86_64";
|
||||
};
|
||||
};
|
||||
platforms."aarch64-linux".sha256 = "0px1v7gcfxrad8ap1g93nx3aqx9yklz385yaciki5s9hnjr3rwpr";
|
||||
platforms."x86_64-linux".sha256 = "134cvgdklybf15msdbjxpcpsl06s8w91px530241yhhrx4jvzj51";
|
||||
platforms."aarch64-linux".sha256 = "1348821cprfy46fvzipqfy9qmv1jw48dsi2nxnk3k1097c6xb9zq";
|
||||
platforms."x86_64-linux".sha256 = "0w58bqys331wssfqrv27v1fbvrgj4hs1kyjanld9vvdlna0x8kpg";
|
||||
|
||||
platformInfo = builtins.getAttr stdenv.targetPlatform.system platforms;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cef-binary";
|
||||
version = "114.2.13";
|
||||
gitRevision = "6792e13";
|
||||
chromiumVersion = "114.0.5735.200";
|
||||
version = "115.3.11";
|
||||
gitRevision = "a61da9b";
|
||||
chromiumVersion = "115.0.5790.114";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://cef-builds.spotifycdn.com/cef_binary_${version}+g${gitRevision}+chromium-${chromiumVersion}_${platformInfo.platformStr}_minimal.tar.bz2";
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libgpiod";
|
||||
version = "1.6.4";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-${version}.tar.gz";
|
||||
sha256 = "sha256-gp1KwmjfB4U2CdZ8/H9HbpqnNssqaKYwvpno+tGXvgo=";
|
||||
sha256 = "sha256-M68o6YheNXZrDYu6u7pEvyPt2tXhTkVZD3Kv/AXYXA8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -2,16 +2,17 @@
|
||||
, lib
|
||||
, fetchurl
|
||||
, bzip2
|
||||
, curl
|
||||
, zlib
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cfitsio";
|
||||
version = "4.2.0";
|
||||
version = "4.3.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-${version}.tar.gz";
|
||||
sha256 = "sha256-66U9Gz9uNFYyuwmnt1LsfO09Y+xRU6hIOA84gMXWGIk=";
|
||||
url = "https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-/a3AHQnPn1QlOALF7IfrEN5RzkEwQRQVrojDCUBiG4s=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -20,6 +21,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
bzip2
|
||||
curl
|
||||
zlib
|
||||
];
|
||||
|
||||
@ -37,7 +39,7 @@ stdenv.mkDerivation rec {
|
||||
sed -e '/^install:/s/libcfitsio.a //' -e 's@/bin/@@g' -i Makefile.in
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://heasarc.gsfc.nasa.gov/fitsio/";
|
||||
description = "Library for reading and writing FITS data files";
|
||||
longDescription = ''
|
||||
@ -50,8 +52,8 @@ stdenv.mkDerivation rec {
|
||||
FITS files.
|
||||
'';
|
||||
changelog = "https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/docs/changes.txt";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ xbreak hjones2199 ];
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ xbreak hjones2199 ];
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "stb";
|
||||
version = "unstable-2021-09-10";
|
||||
version = "unstable-2023-01-29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nothings";
|
||||
repo = "stb";
|
||||
rev = "af1a5bc352164740c1cc1354942b1c6b72eacb8a";
|
||||
sha256 = "0qq35cd747lll4s7bmnxb3pqvyp2hgcr9kyf758fax9lx76iwjhr";
|
||||
rev = "5736b15f7ea0ffb08dd38af21067c314d6a3aae9";
|
||||
hash = "sha256-s2ASdlT3bBNrqvwfhhN6skjbmyEnUgvNOrvhgUSRj98=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ copyPkgconfigItems ];
|
||||
|
||||
@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sundials";
|
||||
version = "6.5.1";
|
||||
version = "6.6.0";
|
||||
|
||||
outputs = [ "out" "examples" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/LLNL/sundials/releases/download/v${version}/sundials-${version}.tar.gz";
|
||||
hash = "sha256-QlIwOAUXHk290ZoB5Swdz+Da/FmcPP7bClwv+wRainU=";
|
||||
hash = "sha256-+QApuNqEbI+v9VMP0fpIRweRiNBAVU9VwdXR4EdD0p0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -50,7 +50,7 @@ let
|
||||
strictDeps = true;
|
||||
depsBuildBuild = [ pkg-config ];
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkg-config wayland-scanner ]
|
||||
nativeBuildInputs = [ meson ninja pkg-config wayland-scanner glslang ]
|
||||
++ extraNativeBuildInputs;
|
||||
|
||||
buildInputs = [
|
||||
@ -110,23 +110,14 @@ let
|
||||
|
||||
in
|
||||
rec {
|
||||
wlroots_0_14 = generic {
|
||||
version = "0.14.1";
|
||||
hash = "sha256-wauk7TCL/V7fxjOZY77KiPbfydIc9gmOiYFOuum4UOs=";
|
||||
};
|
||||
|
||||
wlroots_0_15 = generic {
|
||||
version = "0.15.1";
|
||||
hash = "sha256-MFR38UuB/wW7J9ODDUOfgTzKLse0SSMIRYTpEaEdRwM=";
|
||||
extraBuildInputs = [ vulkan-loader ];
|
||||
extraNativeBuildInputs = [ glslang ];
|
||||
};
|
||||
|
||||
wlroots_0_16 = generic {
|
||||
version = "0.16.2";
|
||||
hash = "sha256-JeDDYinio14BOl6CbzAPnJDOnrk4vgGNMN++rcy2ItQ=";
|
||||
extraBuildInputs = [ vulkan-loader ];
|
||||
extraNativeBuildInputs = [ glslang ];
|
||||
extraPatch = ''
|
||||
substituteInPlace backend/drm/meson.build \
|
||||
--replace /usr/share/hwdata/ ${hwdata}/share/hwdata/
|
||||
|
||||
@ -40,7 +40,7 @@ let
|
||||
description = "C++ library for developing web applications";
|
||||
platforms = platforms.linux;
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ juliendehos willibutz ];
|
||||
maintainers = with maintainers; [ juliendehos ];
|
||||
};
|
||||
};
|
||||
in {
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "adafruit-platformdetect";
|
||||
version = "3.47.0";
|
||||
version = "3.48.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "Adafruit-PlatformDetect";
|
||||
inherit version;
|
||||
hash = "sha256-42YG+brxKCo16xp72+EhmCkgABC2BAFYNWTKqTT1jeE=";
|
||||
hash = "sha256-wc8TC1IoeeeANlQILFeXUx9jJqpn1Mr3KNhJC6ZJAhU=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "chess";
|
||||
version = "1.9.4";
|
||||
version = "1.10.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
||||
owner = "niklasf";
|
||||
repo = "python-${pname}";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-YBABB//53gwJIwrmKJh8W+05hTBhl+49vCYv9//4E+0=";
|
||||
hash = "sha256-jfPg1W9Qp0DlAbMXaFqZ6Ri2zMOW6EKUHwi7Azn/yl0=";
|
||||
};
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
||||
@ -14,14 +14,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-stubs";
|
||||
version = "4.2.0";
|
||||
version = "4.2.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-k7r/gk8KBW5xA2tCO5QqdPB7kJ5F4/o4GFuRD1l8XAg=";
|
||||
hash = "sha256-2tqzm0bZro83qOh5xZDzmp4EK1ZcA/oMWo91S0QbHyM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-container";
|
||||
version = "2.27.0";
|
||||
version = "2.28.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-d5XR09tdeJ/x5SRtExplDUWsbFXBtzcTQ4pbWhmjkvk=";
|
||||
hash = "sha256-yML87bCWsuiV+jcznu6QDaLwKxSCb4Nd2BUm5f+wtRE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
32
pkgs/development/python-modules/hnswlib/default.nix
Normal file
32
pkgs/development/python-modules/hnswlib/default.nix
Normal file
@ -0,0 +1,32 @@
|
||||
{ buildPythonPackage
|
||||
, hnswlib
|
||||
, numpy
|
||||
, pybind11
|
||||
, setuptools
|
||||
, unittestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage {
|
||||
pname = "hnswlib";
|
||||
inherit (hnswlib) version src meta;
|
||||
format = "pyproject";
|
||||
|
||||
nativeBuildInputs = [
|
||||
numpy
|
||||
setuptools
|
||||
pybind11
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
unittestCheckHook
|
||||
];
|
||||
|
||||
unittestFlagsArray = [
|
||||
"tests/python"
|
||||
"--pattern 'bindings_test*.py'"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"hnswlib"
|
||||
];
|
||||
}
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "imap-tools";
|
||||
version = "1.0.0";
|
||||
version = "1.1.0";
|
||||
|
||||
disabled = isPy27;
|
||||
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "ikvk";
|
||||
repo = "imap_tools";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-JAMEJv0Vc5iunuKusyD+rxLiubEIDgHsr7FrMZgLy9Q=";
|
||||
hash = "sha256-IW67v7gXV04Nlr/0/lceC5WmknaqqwOJ8bqRGZZ4KcY=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
||||
77
pkgs/development/python-modules/insightface/default.nix
Normal file
77
pkgs/development/python-modules/insightface/default.nix
Normal file
@ -0,0 +1,77 @@
|
||||
{ lib
|
||||
, albumentations
|
||||
, buildPythonPackage
|
||||
, cython
|
||||
, easydict
|
||||
, fetchPypi
|
||||
, insightface
|
||||
, matplotlib
|
||||
, mxnet
|
||||
, numpy
|
||||
, onnx
|
||||
, onnxruntime
|
||||
, opencv4
|
||||
, prettytable
|
||||
, pythonOlder
|
||||
, scikit-image
|
||||
, scikit-learn
|
||||
, tensorboard
|
||||
, testers
|
||||
, tqdm
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "insightface";
|
||||
version = "0.7.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-8ZH3GWEuuzcBj0GTaBRQBUTND4bm/NZ2wCPzVMZo3fc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cython
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
easydict
|
||||
matplotlib
|
||||
mxnet
|
||||
numpy
|
||||
onnx
|
||||
onnxruntime
|
||||
opencv4
|
||||
scikit-learn
|
||||
scikit-image
|
||||
tensorboard
|
||||
tqdm
|
||||
albumentations
|
||||
prettytable
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"insightface"
|
||||
"insightface.app"
|
||||
"insightface.data"
|
||||
];
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = insightface;
|
||||
command = "insightface-cli --help";
|
||||
# Doesn't support --version but we still want to make sure the cli is executable
|
||||
# and returns the help output
|
||||
version = "help";
|
||||
};
|
||||
|
||||
doCheck = false; # Upstream has no tests
|
||||
|
||||
meta = with lib; {
|
||||
description = "State-of-the-art 2D and 3D Face Analysis Project";
|
||||
homepage = "https://github.com/deepinsight/insightface";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ oddlama ];
|
||||
};
|
||||
}
|
||||
61
pkgs/development/python-modules/librespot/default.nix
Normal file
61
pkgs/development/python-modules/librespot/default.nix
Normal file
@ -0,0 +1,61 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, defusedxml
|
||||
, protobuf
|
||||
, pythonRelaxDepsHook
|
||||
, websocket-client
|
||||
, pyogg
|
||||
, zeroconf
|
||||
, requests
|
||||
, pycryptodomex
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "librespot";
|
||||
version = "0.0.9";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kokarare1212";
|
||||
repo = "librespot-python";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-k9qVsxjRlUZ7vCBx00quiAR7S+YkfyoZiAKVnOOG4xM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
defusedxml
|
||||
protobuf
|
||||
pycryptodomex
|
||||
pyogg
|
||||
requests
|
||||
websocket-client
|
||||
zeroconf
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"protobuf"
|
||||
"pyogg"
|
||||
"requests"
|
||||
"zeroconf"
|
||||
];
|
||||
|
||||
# Doesn't include any tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"librespot"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Open Source Spotify Client";
|
||||
homepage = "https://github.com/kokarare1212/librespot-python";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ onny ];
|
||||
};
|
||||
}
|
||||
41
pkgs/development/python-modules/music-tag/default.nix
Normal file
41
pkgs/development/python-modules/music-tag/default.nix
Normal file
@ -0,0 +1,41 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, mutagen
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "music-tag";
|
||||
version = "0.4.3";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Cqtubu2o3w9TFuwtIZC9dFYbfgNWKrCRzo1Wh828//Y=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
mutagen
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pytestFlagsArray = [ "test" ];
|
||||
|
||||
# Tests fail: ModuleNotFoundError: No module named '_test_common'
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"music_tag"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple interface to edit audio file metadata";
|
||||
homepage = "https://github.com/KristoforMaynard/music-tag";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ onny ];
|
||||
};
|
||||
}
|
||||
@ -20,6 +20,9 @@ buildPythonPackage {
|
||||
doCheck = !isPy3k;
|
||||
|
||||
postPatch = ''
|
||||
# Required to support numpy >=1.24 where np.bool is removed in favor of just bool
|
||||
substituteInPlace python/mxnet/numpy/utils.py \
|
||||
--replace "bool = onp.bool" "bool = bool"
|
||||
substituteInPlace python/setup.py \
|
||||
--replace "graphviz<0.9.0," "graphviz"
|
||||
'';
|
||||
|
||||
@ -16,16 +16,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pgvector";
|
||||
version = "0.1.8";
|
||||
version = "0.2.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pgvector";
|
||||
repo = "pgvector-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-+0daPPZGVkqfZw0gOZwIl+knL/zZki9fs5kA3dYqPpE=";
|
||||
hash = "sha256-VcV/WyDY1UN2TcuvNRQRIh5YIlewGQXf6fcTZihvftQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "plaid-python";
|
||||
version = "15.1.0";
|
||||
version = "15.2.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-BFouiIBQ2HwZ+7Qp2ULam3DW/pwsxIkOejLtTelhWd4=";
|
||||
hash = "sha256-NJCU82Q19X1fApYcbP+ZAxf76uwAnSnhch4aBer9Nm4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -7,14 +7,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sphinx-basic-ng";
|
||||
version = "1.0.0.beta1";
|
||||
version = "1.0.0.beta2";
|
||||
disable = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pradyunsg";
|
||||
repo = "sphinx-basic-ng";
|
||||
rev = version;
|
||||
hash = "sha256-Zh9KvKs4js+AVSfIk0pAj6Kzq/O2m/MGTF+HCwYJTXk=";
|
||||
hash = "sha256-MHBGIKOKhGklrx3O075LRud8NhY2hzlTWh+jalrFpko=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sqlalchemy-mixins";
|
||||
version = "2.0.3";
|
||||
version = "2.0.4.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "absent1706";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-DOQlG86VJEV1Eqqo+KLwmRo2tNePq+Na05s1eDhBjcQ=";
|
||||
hash = "sha256-soashrkokHveEI9YXAAPBPHydhoToJhCHx+g7bunhLE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "api-linter";
|
||||
version = "1.54.1";
|
||||
version = "1.55.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "googleapis";
|
||||
repo = "api-linter";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Z3VhjBI1WYLs3uEONgbItkqUX8P5ZTZ84B1YC6hPgu8=";
|
||||
hash = "sha256-aywqb//fhygphjX3suVfqNIG0saPPnhgLPA/DBpSVQY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-EXmS3ys5uFY+7vv22+a/82V2RjTaEMas8SFOXwSS9qY=";
|
||||
vendorHash = "sha256-oK1d9aQ43Zj+Xt4tMhn+Lz1Q09psqqdTUqbgEdkuBvg=";
|
||||
|
||||
subPackages = [ "cmd/api-linter" ];
|
||||
|
||||
@ -23,7 +23,7 @@ buildGoModule rec {
|
||||
"-w"
|
||||
];
|
||||
|
||||
# reference: https://github.com/googleapis/api-linter/blob/v1.54.1/.github/workflows/release.yaml#L76
|
||||
# reference: https://github.com/googleapis/api-linter/blob/v1.55.0/.github/workflows/release.yaml#L76
|
||||
preBuild = ''
|
||||
cat > cmd/api-linter/version.go <<EOF
|
||||
package main
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "codespelunker";
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "boyter";
|
||||
repo = "cs";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-kWKDr8KKD3M5MyRuEMMZXvTqflDidkMsu2fN9N0s50w=";
|
||||
hash = "sha256-9Od2SOUYf4ij+UWOX/1kWS+qUZRje1wjzSAzBc5qk8s=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "pscale";
|
||||
version = "0.147.0";
|
||||
version = "0.150.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "planetscale";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-G23KJe0KvqdFOfuvbPHPiTOz/++IEFl3SKqqS+MsD2o=";
|
||||
sha256 = "sha256-tDpiInZab7RZ54Ho9uXnNEturINMhv0YqK5A9pmnEgs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-E8ianic0W63P52qXCn2EKjZC9pAQ1bkLCx0jobD2/UE=";
|
||||
vendorHash = "sha256-I/cZa5IDmnYw/MU5h7jarYqbTY+5NrDDj5pz9WTcvGo=";
|
||||
|
||||
ldflags = [
|
||||
"-s" "-w"
|
||||
|
||||
@ -9,16 +9,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-guppy";
|
||||
version = "unstable-2023-06-26";
|
||||
version = "unstable-2023-07-29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "guppy-rs";
|
||||
repo = "guppy";
|
||||
rev = "c05b95997a127cebef76d3b238e0341086e59e32";
|
||||
sha256 = "sha256-CQ0bpc5pmPMQMQ+8mcrUwo19zqyfkk5pE/lWRr9azXs=";
|
||||
rev = "7c7f352d9d2dea1007b4475d4a76f86f061b6ba9";
|
||||
sha256 = "sha256-H2vU7qax0P8Ulh1/DHnlmGRqSqzLuRy9TZOvikSLONw=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-OHtg3za8EyQVYQ6XQzLK7UgvGSl8ObfeKURFL6vBDnE=";
|
||||
cargoSha256 = "sha256-lr7N/qqB1AwhNA+mbEAJFSp/rDxGp3qIGSKP9B3JAls=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-hakari";
|
||||
version = "0.9.26";
|
||||
version = "0.9.27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "guppy-rs";
|
||||
repo = "guppy";
|
||||
rev = "cargo-hakari-${version}";
|
||||
sha256 = "sha256-CQ0bpc5pmPMQMQ+8mcrUwo19zqyfkk5pE/lWRr9azXs=";
|
||||
sha256 = "sha256-H2vU7qax0P8Ulh1/DHnlmGRqSqzLuRy9TZOvikSLONw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-F6+GRn3l849vRVKE1KhLMnxwR5NWu1b78xTxrHi817A=";
|
||||
cargoHash = "sha256-fRaGtQc9CA5A6fQ1yj5zsg1Qv42yIi8ZlIcp4o5cNBU=";
|
||||
|
||||
cargoBuildFlags = [ "-p" "cargo-hakari" ];
|
||||
cargoTestFlags = [ "-p" "cargo-hakari" ];
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-llvm-cov";
|
||||
version = "0.5.23";
|
||||
version = "0.5.24";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-sAuarLfvgX6qjZV2eum3+wY5gRiCbRSbJUBgFIHd8y0=";
|
||||
sha256 = "sha256-Woayb/SgSCHwYYYezQXsna9N0Jot0/iga+jrOhjsSvc=";
|
||||
};
|
||||
cargoSha256 = "sha256-gGzVQqPHvjERvQV2Yo3wFP7n/w3atuLrHSch1CWui4I=";
|
||||
cargoSha256 = "sha256-8rP/wtDFH7hL3jt/QpWqriRwxlm0E2QvIqbCLiN7ZiM=";
|
||||
|
||||
# skip tests which require llvm-tools-preview
|
||||
checkFlags = [
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-llvm-lines";
|
||||
version = "0.4.31";
|
||||
version = "0.4.32";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dtolnay";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-DshvnPqbFvS1o3CYex+ObN5J4DNQH3CxaZReIAPKTns=";
|
||||
hash = "sha256-uoIfB+jkLamrsDRMaxExQC1syN6VeTJhfei8FgikTCE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Ic4ZqONusG+7TbB0GYSqzNQ3LIPxCm8ppRN94o8IYSE=";
|
||||
cargoHash = "sha256-SXiFkPm/2C5dABKPZBq3XXdElZemZN5E2vQTceATyE0=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Count the number of lines of LLVM IR across all instantiations of a generic function";
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-zigbuild";
|
||||
version = "0.16.12";
|
||||
version = "0.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "messense";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-qrttPpbmh8yL80naXeOosBDjxKjWRxmsVHJLRzLOehQ=";
|
||||
hash = "sha256-Zezrn1whQ62TnAFUZFyxORvRl4BFFeK/MEa29kaFj28=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-6bGRV1qYF+VWJjA5qS6PYx/4iLvsIDABxkN2N3AYXAU=";
|
||||
cargoHash = "sha256-921ULk061l7HHg6hLMany61N2SbMRw4wMaDvUbSGEq8=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
|
||||
33
pkgs/development/tools/rust/rustycli/default.nix
Normal file
33
pkgs/development/tools/rust/rustycli/default.nix
Normal file
@ -0,0 +1,33 @@
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, fetchCrate
|
||||
, stdenv
|
||||
, darwin
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rustycli";
|
||||
version = "0.1.1";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-4Txw6Cmwwgu7K8VIVoX9GR76VUqAEw6uYptmczbjqg0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-WU3lgGJH6qVDI1Un3HBqg0edqiP5sobTsAIXdnjeNTU=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
];
|
||||
|
||||
# some examples fail to compile
|
||||
cargoTestFlags = [ "--tests" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Access the rust playground right in terminal";
|
||||
homepage = "https://github.com/pwnwriter/rustycli";
|
||||
changelog = "https://github.com/pwnwriter/rustycli/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
};
|
||||
}
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
let
|
||||
pname = "edge-runtime";
|
||||
version = "1.6.7";
|
||||
version = "1.7.2";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
inherit pname version;
|
||||
@ -20,11 +20,11 @@ rustPlatform.buildRustPackage {
|
||||
owner = "supabase";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Jq9UXFgbTDKe1AWyg4fxn62ODqWu0AUqzlUOo+JUYpo=";
|
||||
hash = "sha256-kYV9AUXEytZoP2qUnryUE1jiKei9F8vCPZFF348SwZI=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
cargoHash = "sha256-fOqo9aPgpW6oAEHtZIE7iHjTIRrgDPbdSFBaq4s0r94=";
|
||||
cargoHash = "sha256-z/ybs6bfIXi5syRGETmBBML/WEctbCUCkzRX62rUtAk=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ];
|
||||
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "freeciv";
|
||||
version = "3.0.4";
|
||||
version = "3.0.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "freeciv";
|
||||
repo = "freeciv";
|
||||
rev = "R${lib.replaceStrings [ "." ] [ "_" ] version}";
|
||||
sha256 = "sha256-hhX+aM/NHdqOM0qSKSJyW2FAWTsyAHrjaNhxtP2vbVA=";
|
||||
hash = "sha256-6DWVou4d1oAOlhHb2A2vxR4Fy+1q7Xz9w9VK9rEzZxA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -24,6 +24,9 @@ stdenv.mkDerivation rec {
|
||||
substituteInPlace $f \
|
||||
--replace '/usr/bin/env python3' ${python3.interpreter}
|
||||
done
|
||||
for f in bootstrap/*.sh; do
|
||||
patchShebangs $f
|
||||
done
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ]
|
||||
|
||||
57
pkgs/games/jfsw/default.nix
Normal file
57
pkgs/games/jfsw/default.nix
Normal file
@ -0,0 +1,57 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, which
|
||||
, SDL2
|
||||
, perl
|
||||
, pkg-config
|
||||
, wrapGAppsHook
|
||||
, gtk3
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "jfsw";
|
||||
version = "20211225";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jonof";
|
||||
repo = "jfsw";
|
||||
rev = "refs/tags/${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-oRJHVsVo+KQfJyd8TcPxTMPPi993qxQb0wnD9nR4vJY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
which
|
||||
SDL2
|
||||
perl
|
||||
pkg-config
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
SDL2
|
||||
gtk3
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
enableParallelBuilding = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm755 sw -t $out/bin
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Modern port the original Shadow Warrior";
|
||||
homepage = "http://www.jonof.id.au/jfsw/";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
mainProgram = "sw";
|
||||
maintainers = with lib.maintainers; [ moody ];
|
||||
broken = stdenv.isDarwin;
|
||||
inherit (SDL2.meta) platforms;
|
||||
};
|
||||
})
|
||||
@ -10,13 +10,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "fastly";
|
||||
version = "10.2.3";
|
||||
version = "10.2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fastly";
|
||||
repo = "cli";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-NSXaDPb1cMLDH1Twf/Nc+O/2hfTPobTvR0lzq2JR1EQ=";
|
||||
hash = "sha256-4N2Eo6InqdK5CFhHp8X3+1xKA99Wtnj2Q0/GDglWoBc=";
|
||||
# The git commit is part of the `fastly version` original output;
|
||||
# leave that output the same in nixpkgs. Use the `.git` directory
|
||||
# to retrieve the commit SHA, and remove the directory afterwards,
|
||||
@ -33,7 +33,7 @@ buildGoModule rec {
|
||||
"cmd/fastly"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-mZg/IApgrYLpyWSWWnZE4Yu/K8daWW+phNuq3e/iwog=";
|
||||
vendorHash = "sha256-IimrJZLaSkwWsqoVmNRyLhcME4y1YKw5xLayKxRj5lw=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@ -12,61 +12,61 @@
|
||||
"4.19": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-4.19.288-hardened1.patch",
|
||||
"sha256": "0iw70vp9m7ldq85jfycfaihq2974giwi1d9fdd1yrhljlwzf9y6p",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.288-hardened1/linux-hardened-4.19.288-hardened1.patch"
|
||||
"name": "linux-hardened-4.19.289-hardened1.patch",
|
||||
"sha256": "1bi0cf15nqbk5hkhy76cd1xbb3fsnrgz705lry19v467hn3c0fx3",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.289-hardened1/linux-hardened-4.19.289-hardened1.patch"
|
||||
},
|
||||
"sha256": "1sz3jp6kx0axdwp0wsq903q1090rbav9d12m5128335m8p2d1srk",
|
||||
"version": "4.19.288"
|
||||
"sha256": "1cx33aa9v2071gixvp68pqpp4vxcx61dqg04rf6xns1qg48p93qi",
|
||||
"version": "4.19.289"
|
||||
},
|
||||
"5.10": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-5.10.186-hardened1.patch",
|
||||
"sha256": "0k6f2sxk2gy601w0132i5glznhi35wbdpxkqsfgxlr2gi2w021wr",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.186-hardened1/linux-hardened-5.10.186-hardened1.patch"
|
||||
"name": "linux-hardened-5.10.187-hardened1.patch",
|
||||
"sha256": "17m8v9xs300cd4jblvqxgmpsi0i15r57sl8xfc0vnl3b0ikip1rk",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.187-hardened1/linux-hardened-5.10.187-hardened1.patch"
|
||||
},
|
||||
"sha256": "1qqv91r13akgik1q4jybf8czskxxizk6lpv4rsvjn9sx2dm2jq0y",
|
||||
"version": "5.10.186"
|
||||
"sha256": "1fwbz5xg3jxfzji9jlxqwf5rz9acgn4sm2inp3l017iy1chm957n",
|
||||
"version": "5.10.187"
|
||||
},
|
||||
"5.15": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-5.15.120-hardened1.patch",
|
||||
"sha256": "0wqnwjww062ykh1y2yrbsy75b0fz8xlkazijgvj3rl14wvccf39x",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.120-hardened1/linux-hardened-5.15.120-hardened1.patch"
|
||||
"name": "linux-hardened-5.15.122-hardened1.patch",
|
||||
"sha256": "0845jjvs2wf81vp43f62gsbkdi1l96ajpv6n7pnc1bi02hqgb6az",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.122-hardened1/linux-hardened-5.15.122-hardened1.patch"
|
||||
},
|
||||
"sha256": "1xl3nrykbxdwv5a9rk0xnb7l61dsyjvkm1ryrdii09vbmsg0i6b4",
|
||||
"version": "5.15.120"
|
||||
"sha256": "0b9ljdi9vgwzw4wa8gx1ia5fmb1pm8lnslx0q2l2kqhwrl0mhx9q",
|
||||
"version": "5.15.122"
|
||||
},
|
||||
"5.4": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-5.4.249-hardened1.patch",
|
||||
"sha256": "11rwyr68wrhjl0cdkvbgcpxwz4bwx3hii9k6xmai7hpds6rb3nsx",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.249-hardened1/linux-hardened-5.4.249-hardened1.patch"
|
||||
"name": "linux-hardened-5.4.250-hardened1.patch",
|
||||
"sha256": "0l4a0wwv2ipwic24igvy48b114p55bx6zjbsj8j1jja6xpn8psk5",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.250-hardened1/linux-hardened-5.4.250-hardened1.patch"
|
||||
},
|
||||
"sha256": "079mylc5j7hk5xn59q3z2xydyh88pq7yipn67x3y7nvf5i35hm6w",
|
||||
"version": "5.4.249"
|
||||
"sha256": "1ywil04x3mw62n53pkrkxrhkg1xyi3g9ssvg6igbyqk0a9v8hnqg",
|
||||
"version": "5.4.250"
|
||||
},
|
||||
"6.1": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-6.1.39-hardened1.patch",
|
||||
"sha256": "0j4sgcs6m2mq9dn1v525bymhdhha3x8ivrpfrhqm553q4vdnmbg7",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.39-hardened1/linux-hardened-6.1.39-hardened1.patch"
|
||||
"name": "linux-hardened-6.1.41-hardened1.patch",
|
||||
"sha256": "084lwlynwsm76vnmp02q80vbv4bi993swz3vvwsj3na8160c1w2y",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.41-hardened1/linux-hardened-6.1.41-hardened1.patch"
|
||||
},
|
||||
"sha256": "1f45j3ch1ljbacjlg8q45iva9lvwys938rdg0s516mznzlifxpac",
|
||||
"version": "6.1.39"
|
||||
"sha256": "1dqbawgcpwxszqqnf7a66db8xlldxnr4f3sqlq42l1gaiskhja1i",
|
||||
"version": "6.1.41"
|
||||
},
|
||||
"6.4": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-6.4.4-hardened1.patch",
|
||||
"sha256": "0yy02hn190wvl24z1j9kjmnyxrlp6s9fhkyvqgcm8i56d7d69zhb",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.4.4-hardened1/linux-hardened-6.4.4-hardened1.patch"
|
||||
"name": "linux-hardened-6.4.6-hardened1.patch",
|
||||
"sha256": "1364ilh3vfvajx2ahd1mkwv13lnbfzmg0cwa9apghqfzqdn1c77x",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.4.6-hardened1/linux-hardened-6.4.6-hardened1.patch"
|
||||
},
|
||||
"sha256": "0apzfnn04w6jda9yw5cbgj8784frvqrryb1iw5ad390lwwmlmg4w",
|
||||
"version": "6.4.4"
|
||||
"sha256": "192ya79h3lw781ka22ibgbvdcx6maa74nyk0lqjsz2n4xybc9v71",
|
||||
"version": "6.4.6"
|
||||
}
|
||||
}
|
||||
|
||||
@ -3,14 +3,14 @@
|
||||
let
|
||||
# These names are how they are designated in https://xanmod.org.
|
||||
ltsVariant = {
|
||||
version = "6.1.39";
|
||||
hash = "sha256-H7KoNTl00OCQhUZXNM6PfiknI+lOVNxe2+levmJM5gA=";
|
||||
version = "6.1.42";
|
||||
hash = "sha256-mOydloX5bff9wrFh40wf12GW+sION9SoGK2mAC1yNOw=";
|
||||
variant = "lts";
|
||||
};
|
||||
|
||||
mainVariant = {
|
||||
version = "6.4.4";
|
||||
hash = "sha256-EdyGAdWIPr91SNz68tVhya9YO4/dL/wEmEklo45i2p0=";
|
||||
version = "6.4.7";
|
||||
hash = "sha256-0yOVCMqhoiWz8IlYRR0wXytAzjv81Cf5NoFa9qxGMm4=";
|
||||
variant = "main";
|
||||
};
|
||||
|
||||
|
||||
@ -1,22 +1,46 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, docutils
|
||||
, pandoc, ethtool, iproute2, libnl, udev, python3, perl
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, docutils
|
||||
, pandoc
|
||||
, ethtool
|
||||
, iproute2
|
||||
, libnl
|
||||
, udev
|
||||
, python3
|
||||
, perl
|
||||
} :
|
||||
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "rdma-core";
|
||||
version = "46.0";
|
||||
version = "46.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linux-rdma";
|
||||
repo = "rdma-core";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-/mhaEACBAtKdjn5hIj7YnuzrwraiuA4sR9eHg3w0YZM=";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-pVPWoLnWCGP+CZtG5bnOKUtjiuOa6Qic9wlGeY68w/8=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
nativeBuildInputs = [ cmake pkg-config pandoc docutils python3 ];
|
||||
buildInputs = [ libnl ethtool iproute2 udev perl ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
docutils
|
||||
pandoc
|
||||
pkg-config
|
||||
python3
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
ethtool
|
||||
iproute2
|
||||
libnl
|
||||
perl
|
||||
udev
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_INSTALL_RUNDIR=/run"
|
||||
@ -42,11 +66,11 @@ stdenv.mkDerivation rec {
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "RDMA Core Userspace Libraries and Daemons";
|
||||
homepage = "https://github.com/linux-rdma/rdma-core";
|
||||
license = licenses.gpl2Only;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ markuskowa ];
|
||||
license = lib.licenses.gpl2Only;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = [ lib.maintainers.markuskowa ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ appimageTools, lib, fetchurl }:
|
||||
let
|
||||
pname = "uhk-agent";
|
||||
version = "3.0.0";
|
||||
version = "3.0.1";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/UltimateHackingKeyboard/agent/releases/download/v${version}/UHK.Agent-${version}-linux-x86_64.AppImage";
|
||||
name = "${pname}-${version}.AppImage";
|
||||
sha256 = "sha256-oRdV2pbUlXHqBED51ThLdS4kyLuSAXxFmeSLoCbCGUI=";
|
||||
sha256 = "sha256-TX7mL6BWAZHZ2W9/BneOt1vxt2slC2Lv6eFWPAgS2a8=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extract {
|
||||
|
||||
@ -24,8 +24,8 @@ let
|
||||
# However, the version string is more useful for end-users.
|
||||
# These are contained in a attrset of their own to make it obvious that
|
||||
# people should update both.
|
||||
version = "1.26.1";
|
||||
rev = "c7e8e7356d3a969c1b8e4e1f2687699acd91c6a1";
|
||||
version = "1.26.3";
|
||||
rev = "ea9d25e93cef74b023c95ca1a3f79449cdf7fa9a";
|
||||
};
|
||||
in
|
||||
buildBazelPackage rec {
|
||||
@ -36,7 +36,7 @@ buildBazelPackage rec {
|
||||
owner = "envoyproxy";
|
||||
repo = "envoy";
|
||||
inherit (srcVer) rev;
|
||||
sha256 = "sha256-WHedup6z/9t/Jg6CBrwtDy9xv6IwO3gUuBqos4h+k2s=";
|
||||
sha256 = "sha256-ZZAVuelcPzFQRqh9SwRxt+odEjF0jTNh/KkLWHKiZ3o=";
|
||||
|
||||
postFetch = ''
|
||||
chmod -R +w $out
|
||||
@ -80,8 +80,8 @@ buildBazelPackage rec {
|
||||
|
||||
fetchAttrs = {
|
||||
sha256 = {
|
||||
x86_64-linux = "sha256-mw3k2r4heoAcBdcc7uYdnotUBrF1nM5Vmqbay+2DkjI=";
|
||||
aarch64-linux = "sha256-2gSxzm7SXvrGEgwZnp5KdEpbV/+zdosf8Z5lrkK3QiI=";
|
||||
x86_64-linux = "sha256-7CB6mRe+q1LMryh50dEjgR+RWU//tbaedgipuB4B+S4=";
|
||||
aarch64-linux = "sha256-kdc1vMPueONOaT8w0Gbkz7OUOcPMMHHdwQ+ABTIL8xs=";
|
||||
}.${stdenv.system} or (throw "unsupported system ${stdenv.system}");
|
||||
dontUseCmakeConfigure = true;
|
||||
dontUseGnConfigure = true;
|
||||
|
||||
@ -178,7 +178,7 @@ stdenv.mkDerivation {
|
||||
passthru = {
|
||||
inherit modules;
|
||||
tests = {
|
||||
inherit (nixosTests) nginx nginx-auth nginx-etag nginx-globalredirect nginx-http3 nginx-pubhtml nginx-sandbox nginx-sso nginx-proxyprotocol;
|
||||
inherit (nixosTests) nginx nginx-auth nginx-etag nginx-globalredirect nginx-http3 nginx-proxyprotocol nginx-pubhtml nginx-sandbox nginx-sso nginx-status-page;
|
||||
variants = lib.recurseIntoAttrs nixosTests.nginx-variants;
|
||||
acme-integration = nixosTests.acme;
|
||||
} // passthru.tests;
|
||||
|
||||
@ -26,6 +26,6 @@ buildGoModule rec {
|
||||
homepage = "https://github.com/jonnenauha/prometheus_varnish_exporter";
|
||||
description = "Varnish exporter for Prometheus";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ MostAwesomeDude willibutz ];
|
||||
maintainers = with lib.maintainers; [ MostAwesomeDude ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "ferretdb";
|
||||
version = "1.6.0";
|
||||
version = "1.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FerretDB";
|
||||
repo = "FerretDB";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-HRU2s+i6Be0gRsU7kNfloouBLbgZtnn6OiXYaeUYtiQ=";
|
||||
hash = "sha256-DRI05dGEzaQtI9+SEbFqK5i/8b4hmaoJubDI/6K8vUc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "pocketbase";
|
||||
version = "0.16.8";
|
||||
version = "0.16.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pocketbase";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-wZp7WfSdKN9oF6mZsT4QsKvY53MsggbEmBS8TkCFkuU=";
|
||||
sha256 = "sha256-BH3hJ+5xAJkGj2HoKpee+ZNgMmyQoHEVI0wsXRwIdGw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-h3lkmpHEMr/aueP+lJpa9HJCidEpm7xSKws28+ZSeQA=";
|
||||
|
||||
@ -51,11 +51,11 @@ with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "samba";
|
||||
version = "4.17.7";
|
||||
version = "4.18.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://samba/pub/samba/stable/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-lcnBa2VKiM+u/ZWAUt1XPi+F7N8RTk7Owxh1N6CU2Rk=";
|
||||
hash = "sha256-CVJWrDMuHZ+/m3/3gj+SoyM9PtZYzn/JszkFwiQ/RH8=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "man" ];
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user