mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-10 08:39:08 +03:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
66d14ccd84
16
.github/CODEOWNERS
vendored
16
.github/CODEOWNERS
vendored
@ -240,11 +240,11 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
|
||||
/pkgs/top-level/php-packages.nix @jtojnar @aanderse @drupol @etu @globin @ma27 @talyz
|
||||
|
||||
# Podman, CRI-O modules and related
|
||||
/nixos/modules/virtualisation/containers.nix @zowoq @adisbladis
|
||||
/nixos/modules/virtualisation/cri-o.nix @zowoq @adisbladis
|
||||
/nixos/modules/virtualisation/podman @zowoq @adisbladis
|
||||
/nixos/tests/cri-o.nix @zowoq @adisbladis
|
||||
/nixos/tests/podman @zowoq @adisbladis
|
||||
/nixos/modules/virtualisation/containers.nix @adisbladis
|
||||
/nixos/modules/virtualisation/cri-o.nix @adisbladis
|
||||
/nixos/modules/virtualisation/podman @adisbladis
|
||||
/nixos/tests/cri-o.nix @adisbladis
|
||||
/nixos/tests/podman @adisbladis
|
||||
|
||||
# Docker tools
|
||||
/pkgs/build-support/docker @roberth
|
||||
@ -275,12 +275,6 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
|
||||
# terraform providers
|
||||
/pkgs/applications/networking/cluster/terraform-providers @zowoq
|
||||
|
||||
# kubernetes
|
||||
/nixos/doc/manual/configuration/kubernetes.chapter.md @zowoq
|
||||
/nixos/modules/services/cluster/kubernetes @zowoq
|
||||
/nixos/tests/kubernetes @zowoq
|
||||
/pkgs/applications/networking/cluster/kubernetes @zowoq
|
||||
|
||||
# Matrix
|
||||
/pkgs/servers/heisenbridge @piegamesde
|
||||
/pkgs/servers/matrix-conduit @piegamesde
|
||||
|
||||
@ -11721,6 +11721,12 @@
|
||||
githubId = 38578268;
|
||||
name = "Morgan Wolfe";
|
||||
};
|
||||
mxkrsv = {
|
||||
email = "mxkrsv@disroot.org";
|
||||
github = "mxkrsv";
|
||||
githubId = 59313755;
|
||||
name = "Maxim Karasev";
|
||||
};
|
||||
myaats = {
|
||||
email = "mats@mats.sh";
|
||||
github = "Myaats";
|
||||
|
||||
@ -425,7 +425,6 @@ with lib.maintainers; {
|
||||
offline
|
||||
saschagrunert
|
||||
srhb
|
||||
zowoq
|
||||
];
|
||||
scope = "Maintain the Kubernetes package and module";
|
||||
shortName = "Kubernetes";
|
||||
@ -712,7 +711,6 @@ with lib.maintainers; {
|
||||
adisbladis
|
||||
saschagrunert
|
||||
vdemeester
|
||||
zowoq
|
||||
];
|
||||
githubTeams = [
|
||||
"podman"
|
||||
|
||||
@ -42,6 +42,8 @@
|
||||
|
||||
- [systemd-sysupdate](https://www.freedesktop.org/software/systemd/man/systemd-sysupdate.html), atomically updates the host OS, container images, portable service images or other sources. Available as [systemd.sysupdate](opt-systemd.sysupdate).
|
||||
|
||||
- [eris-server](https://codeberg.org/eris/eris-go). [ERIS](https://eris.codeberg.page/) is an encoding for immutable storage and this server provides block exchange as well as content decoding over HTTP and through a FUSE file-system. Available as [services.eris-server](#opt-services.eris-server.enable).
|
||||
|
||||
## Backward Incompatibilities {#sec-release-23.11-incompatibilities}
|
||||
|
||||
- The `boot.loader.raspberryPi` options have been marked deprecated, with intent for removal for NixOS 24.11. They had a limited use-case, and do not work like people expect. They required either very old installs ([before mid-2019](https://github.com/NixOS/nixpkgs/pull/62462)) or customized builds out of scope of the standard and generic AArch64 support. That option set never supported the Raspberry Pi 4 family of devices.
|
||||
|
||||
@ -807,6 +807,7 @@
|
||||
./services/network-filesystems/davfs2.nix
|
||||
./services/network-filesystems/diod.nix
|
||||
./services/network-filesystems/drbd.nix
|
||||
./services/network-filesystems/eris-server.nix
|
||||
./services/network-filesystems/glusterfs.nix
|
||||
./services/network-filesystems/kbfs.nix
|
||||
./services/network-filesystems/kubo.nix
|
||||
|
||||
103
nixos/modules/services/network-filesystems/eris-server.nix
Normal file
103
nixos/modules/services/network-filesystems/eris-server.nix
Normal file
@ -0,0 +1,103 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
let
|
||||
cfg = config.services.eris-server;
|
||||
stateDirectoryPath = "\${STATE_DIRECTORY}";
|
||||
in {
|
||||
|
||||
options.services.eris-server = {
|
||||
|
||||
enable = lib.mkEnableOption "an ERIS server";
|
||||
|
||||
package = lib.mkOption {
|
||||
type = lib.types.package;
|
||||
default = pkgs.eris-go;
|
||||
defaultText = lib.literalExpression "pkgs.eris-go";
|
||||
description = "Package to use for the ERIS server.";
|
||||
};
|
||||
|
||||
decode = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Whether the HTTP service (when enabled) will decode ERIS content at /uri-res/N2R?urn:eris:.
|
||||
Enabling this is recommended only for private or local-only servers.
|
||||
'';
|
||||
};
|
||||
|
||||
listenCoap = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = ":5683";
|
||||
example = "[::1]:5683";
|
||||
description = ''
|
||||
Server CoAP listen address. Listen on all IP addresses at port 5683 by default.
|
||||
Please note that the server can service client requests for ERIS-blocks by
|
||||
querying other clients connected to the server. Whether or not blocks are
|
||||
relayed back to the server depends on client configuration but be aware this
|
||||
may leak sensitive metadata and trigger network activity.
|
||||
'';
|
||||
};
|
||||
|
||||
listenHttp = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "";
|
||||
example = "[::1]:8080";
|
||||
description = "Server HTTP listen address. Do not listen by default.";
|
||||
};
|
||||
|
||||
backends = lib.mkOption {
|
||||
type = with lib.types; listOf str;
|
||||
description = ''
|
||||
List of backend URLs.
|
||||
Add "get" and "put" as query elements to enable those operations.
|
||||
'';
|
||||
example = [
|
||||
"bolt+file:///srv/eris.bolt?get&put"
|
||||
"coap+tcp://eris.example.com:5683?get"
|
||||
];
|
||||
};
|
||||
|
||||
mountpoint = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "";
|
||||
example = "/eris";
|
||||
description = ''
|
||||
Mountpoint for FUSE namespace that exposes "urn:eris:…" files.
|
||||
'';
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
systemd.services.eris-server = let
|
||||
cmd =
|
||||
"${cfg.package}/bin/eris-go server --coap '${cfg.listenCoap}' --http '${cfg.listenHttp}' ${
|
||||
lib.optionalString cfg.decode "--decode "
|
||||
}${
|
||||
lib.optionalString (cfg.mountpoint != "")
|
||||
''--mountpoint "${cfg.mountpoint}" ''
|
||||
}${lib.strings.escapeShellArgs cfg.backends}";
|
||||
in {
|
||||
description = "ERIS block server";
|
||||
after = [ "network.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
script = lib.mkIf (cfg.mountpoint != "") ''
|
||||
export PATH=${config.security.wrapperDir}:$PATH
|
||||
${cmd}
|
||||
'';
|
||||
serviceConfig = let
|
||||
umounter = lib.mkIf (cfg.mountpoint != "")
|
||||
"-${config.security.wrapperDir}/fusermount -uz ${cfg.mountpoint}";
|
||||
in {
|
||||
ExecStartPre = umounter;
|
||||
ExecStart = lib.mkIf (cfg.mountpoint == "") cmd;
|
||||
ExecStopPost = umounter;
|
||||
Restart = "always";
|
||||
RestartSec = 20;
|
||||
AmbientCapabilities = "CAP_NET_BIND_SERVICE";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
meta.maintainers = with lib.maintainers; [ ehmry ];
|
||||
}
|
||||
@ -252,6 +252,7 @@ in {
|
||||
envoy = handleTest ./envoy.nix {};
|
||||
ergo = handleTest ./ergo.nix {};
|
||||
ergochat = handleTest ./ergochat.nix {};
|
||||
eris-server = handleTest ./eris-server.nix {};
|
||||
esphome = handleTest ./esphome.nix {};
|
||||
etc = pkgs.callPackage ../modules/system/etc/test.nix { inherit evalMinimalConfig; };
|
||||
activation = pkgs.callPackage ../modules/system/activation/test.nix { };
|
||||
|
||||
@ -22,22 +22,6 @@ import ./make-test-python.nix ({ pkgs, ... }: {
|
||||
'';
|
||||
services.caddy.enableReload = true;
|
||||
|
||||
specialisation.etag.configuration = {
|
||||
services.caddy.extraConfig = lib.mkForce ''
|
||||
http://localhost {
|
||||
encode gzip
|
||||
|
||||
file_server
|
||||
root * ${
|
||||
pkgs.runCommand "testdir2" {} ''
|
||||
mkdir "$out"
|
||||
echo changed > "$out/example.html"
|
||||
''
|
||||
}
|
||||
}
|
||||
'';
|
||||
};
|
||||
|
||||
specialisation.config-reload.configuration = {
|
||||
services.caddy.extraConfig = ''
|
||||
http://localhost:8080 {
|
||||
@ -55,7 +39,6 @@ import ./make-test-python.nix ({ pkgs, ... }: {
|
||||
|
||||
testScript = { nodes, ... }:
|
||||
let
|
||||
etagSystem = "${nodes.webserver.system.build.toplevel}/specialisation/etag";
|
||||
justReloadSystem = "${nodes.webserver.system.build.toplevel}/specialisation/config-reload";
|
||||
multipleConfigs = "${nodes.webserver.system.build.toplevel}/specialisation/multiple-configs";
|
||||
in
|
||||
@ -65,33 +48,6 @@ import ./make-test-python.nix ({ pkgs, ... }: {
|
||||
webserver.wait_for_open_port(80)
|
||||
|
||||
|
||||
def check_etag(url):
|
||||
etag = webserver.succeed(
|
||||
"curl --fail -v '{}' 2>&1 | sed -n -e \"s/^< [Ee][Tt][Aa][Gg]: *//p\"".format(
|
||||
url
|
||||
)
|
||||
)
|
||||
etag = etag.replace("\r\n", " ")
|
||||
http_code = webserver.succeed(
|
||||
"curl --fail --silent --show-error -o /dev/null -w \"%{{http_code}}\" --head -H 'If-None-Match: {}' {}".format(
|
||||
etag, url
|
||||
)
|
||||
)
|
||||
assert int(http_code) == 304, "HTTP code is {}, expected 304".format(http_code)
|
||||
return etag
|
||||
|
||||
|
||||
with subtest("check ETag if serving Nix store paths"):
|
||||
old_etag = check_etag(url)
|
||||
webserver.succeed(
|
||||
"${etagSystem}/bin/switch-to-configuration test >&2"
|
||||
)
|
||||
webserver.sleep(1)
|
||||
new_etag = check_etag(url)
|
||||
assert old_etag != new_etag, "Old ETag {} is the same as {}".format(
|
||||
old_etag, new_etag
|
||||
)
|
||||
|
||||
with subtest("config is reloaded on nixos-rebuild switch"):
|
||||
webserver.succeed(
|
||||
"${justReloadSystem}/bin/switch-to-configuration test >&2"
|
||||
|
||||
23
nixos/tests/eris-server.nix
Normal file
23
nixos/tests/eris-server.nix
Normal file
@ -0,0 +1,23 @@
|
||||
import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
||||
name = "eris-server";
|
||||
meta.maintainers = with lib.maintainers; [ ehmry ];
|
||||
|
||||
nodes.server = {
|
||||
environment.systemPackages = [ pkgs.eris-go pkgs.nim.pkgs.eris ];
|
||||
services.eris-server = {
|
||||
enable = true;
|
||||
decode = true;
|
||||
listenHttp = "[::1]:80";
|
||||
backends = [ "badger+file:///var/cache/eris.badger?get&put" ];
|
||||
mountpoint = "/eris";
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
start_all()
|
||||
server.wait_for_unit("eris-server.service")
|
||||
server.wait_for_open_port(5683)
|
||||
server.wait_for_open_port(80)
|
||||
server.succeed("eriscmd get http://[::1] $(echo 'Hail ERIS!' | eriscmd put coap+tcp://[::1]:5683)")
|
||||
'';
|
||||
})
|
||||
@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
description = "CLI PulseAudio Volume Control";
|
||||
homepage = "https://github.com/falconindy/ponymix";
|
||||
mainProgram = "ponymix";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ ericsagnes ];
|
||||
|
||||
3321
pkgs/applications/editors/neovim/neovide/Cargo.lock
generated
3321
pkgs/applications/editors/neovim/neovide/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -25,23 +25,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec {
|
||||
pname = "neovide";
|
||||
version = "0.10.4";
|
||||
version = "0.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "neovide";
|
||||
repo = "neovide";
|
||||
rev = version;
|
||||
sha256 = "sha256-0vIq8vJPvcmA7hRyGY4qQRxwmgQAKHVU+452iMohGCA=";
|
||||
sha256 = "sha256-OIAGqr34QcpYVUTcW+aPoGeBez/VuT6sSFC5JQaodOI=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"glutin-0.26.0" = "sha256-Ie4Jb3wCMZSmF1MUzkLG2TqsLrXXzzi6ATjzCjevZBc=";
|
||||
"winit-0.24.0" = "sha256-p/eAaDVmTHzfZ+0DiBA/9v06Z5o1dXVNoCgWRqC1ed0=";
|
||||
"xkbcommon-dl-0.1.0" = "sha256-ojokJF7ivN8JpXo+JAfX3kUOeXneNek7pzIy8D1n4oU=";
|
||||
};
|
||||
};
|
||||
cargoSha256 = "sha256-SMix6lKBkje0o+SxTK7AVSd+QbUyTlu4yPZ3bxnpggg=";
|
||||
|
||||
SKIA_SOURCE_DIR =
|
||||
let
|
||||
@ -49,8 +42,8 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec {
|
||||
owner = "rust-skia";
|
||||
repo = "skia";
|
||||
# see rust-skia:skia-bindings/Cargo.toml#package.metadata skia
|
||||
rev = "m103-0.51.1";
|
||||
sha256 = "sha256-w5dw/lGm40gKkHPR1ji/L82Oa808Kuh8qaCeiqBLkLw=";
|
||||
rev = "m113-0.61.8";
|
||||
sha256 = "sha256-xGfkc1JLBGQW4WcblFyluZ2paEuisCVPNDU4Rfkv3BE=";
|
||||
};
|
||||
# The externals for skia are taken from skia/DEPS
|
||||
externals = linkFarm "skia-externals" (lib.mapAttrsToList
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{
|
||||
"expat": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git",
|
||||
"rev": "a28238bdeebc087071777001245df1876a11f5ee",
|
||||
"sha256": "sha256-TSaVtKEk7J0fckDvpI6/U5Aq7d37nsixp0Ft7sMHi8w="
|
||||
"rev": "441f98d02deafd9b090aea568282b28f66a50e36",
|
||||
"sha256": "sha256-FXTDGAK03jc2wvazhRKqtsFRKZUYS/9HLpZNp4JfZJI="
|
||||
},
|
||||
"libjpeg-turbo": {
|
||||
"url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git",
|
||||
@ -21,17 +21,17 @@
|
||||
},
|
||||
"harfbuzz": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git",
|
||||
"rev": "8d1b000a3edc90c12267b836b4ef3f81c0e53edc",
|
||||
"sha256": "sha256-nFAT7HnYkIWZcV6kjDQiRltbPcmbtuRM4m5ecY4/s6E="
|
||||
"rev": "09a266236147497bd8149240062c31c16fbc81e3",
|
||||
"sha256": "sha256-NLydUJI15zRBFFDc7VRDXjgc0AwS3l6GMt2usMWOSG4="
|
||||
},
|
||||
"wuffs": {
|
||||
"url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",
|
||||
"rev": "a0041ac0310b3156b963e2f2bea09245f25ec073",
|
||||
"sha256": "sha256-obRMrrKY3rPdFwQNa5IplpuKqiodHvRC8jbIOjp7R2w="
|
||||
},
|
||||
"libpng": {
|
||||
"url": "https://skia.googlesource.com/third_party/libpng.git",
|
||||
"rev": "386707c6d19b974ca2e3db7f5c61873813c6fe44",
|
||||
"sha256": "sha256-67kf5MBsnBBi0bOfX/RKL52xpaCWm/ampltAI+EeQ+c="
|
||||
},
|
||||
"libgifcodec": {
|
||||
"url": "https://skia.googlesource.com/libgifcodec",
|
||||
"rev": "fd59fa92a0c86788dcdd84d091e1ce81eda06a77",
|
||||
"sha256": "sha256-spyZU4QhV2xrHcBRoYqYgCR0wEM5lgfhGh8pqJE5yXM="
|
||||
}
|
||||
}
|
||||
|
||||
1916
pkgs/applications/misc/diebahn/Cargo.lock
generated
Normal file
1916
pkgs/applications/misc/diebahn/Cargo.lock
generated
Normal file
File diff suppressed because it is too large
Load Diff
67
pkgs/applications/misc/diebahn/default.nix
Normal file
67
pkgs/applications/misc/diebahn/default.nix
Normal file
@ -0,0 +1,67 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitLab
|
||||
, cargo
|
||||
, desktop-file-utils
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, rustPlatform
|
||||
, rustc
|
||||
, wrapGAppsHook4
|
||||
, cairo
|
||||
, gdk-pixbuf
|
||||
, glib
|
||||
, gtk4
|
||||
, libadwaita
|
||||
, pango
|
||||
, darwin
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "diebahn";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "schmiddi-on-mobile";
|
||||
repo = "diebahn";
|
||||
rev = version;
|
||||
hash = "sha256-WEjMtRXRmcbgCIQNJRlGYGQhem9W8nb/lsjft0oWxAk=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.importCargoLock {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"hafas-rs-0.1.0" = "sha256-9YmWiief8Nux1ZkPTZjzer/qKAa5hORVn8HngMtKDxM=";
|
||||
};
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cargo
|
||||
desktop-file-utils
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
rustPlatform.cargoSetupHook
|
||||
rustc
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
cairo
|
||||
gdk-pixbuf
|
||||
glib
|
||||
gtk4
|
||||
libadwaita
|
||||
pango
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "GTK4 frontend for the travel information of the german railway";
|
||||
homepage = "https://gitlab.com/schmiddi-on-mobile/diebahn";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
||||
@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "hugo";
|
||||
version = "0.116.1";
|
||||
version = "0.117.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gohugoio";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-YACMkfDdcou+Yve3D/ealaku1pzuWxInDtnhL/Y+cWw=";
|
||||
hash = "sha256-WxYTlEqTWY78lHd+qEvmbRmbC6Ewph9U84SjvrlqgtY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-l7XCCsJbqZ4g1U8G3VMVArMofPgchUP0T7wGF57d4rA=";
|
||||
vendorHash = "sha256-yjARpHewjCm2W/08xu7O/PlE9jIOgYmunEyGEfTHNQs=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
49
pkgs/applications/misc/johnny/default.nix
Normal file
49
pkgs/applications/misc/johnny/default.nix
Normal file
@ -0,0 +1,49 @@
|
||||
{ lib, stdenv, fetchFromGitHub, qt5, john, makeWrapper, makeDesktopItem
|
||||
, copyDesktopItems }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "johnny";
|
||||
version = "2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openwall";
|
||||
repo = "johnny";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-fwRvyQbRO63iVt9AHlfl+Cv4NRFQmyVsZUQLxmzGjAY=";
|
||||
};
|
||||
|
||||
buildInputs = [ john qt5.qtbase ];
|
||||
nativeBuildInputs =
|
||||
[ makeWrapper copyDesktopItems qt5.wrapQtAppsHook qt5.qmake ];
|
||||
|
||||
installPhase = ''
|
||||
install -D ${pname} $out/bin/${pname}
|
||||
wrapProgram $out/bin/${pname} \
|
||||
--prefix PATH : ${lib.makeBinPath [ john ]}
|
||||
install -D README $out/share/doc/${pname}/README
|
||||
install -D LICENSE $out/share/licenses/${pname}/LICENSE
|
||||
install -D resources/icons/${pname}_128.png $out/share/pixmaps/${pname}.png
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "Johnny";
|
||||
desktopName = "Johnny";
|
||||
comment = "A GUI for John the Ripper";
|
||||
icon = pname;
|
||||
exec = pname;
|
||||
terminal = false;
|
||||
categories = [ "Application" "System" ];
|
||||
startupNotify = true;
|
||||
})
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://openwall.info/wiki/john/johnny";
|
||||
description = "Open Source GUI frontend for John the Ripper";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ Misaka13514 ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -80,13 +80,13 @@ let
|
||||
self: super: {
|
||||
octoprint = self.buildPythonPackage rec {
|
||||
pname = "OctoPrint";
|
||||
version = "1.9.1";
|
||||
version = "1.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OctoPrint";
|
||||
repo = "OctoPrint";
|
||||
rev = version;
|
||||
hash = "sha256-T0kK9JaaX8+hUxsnG/TftGPHWwkhPDx4nqGrplmIiI0=";
|
||||
hash = "sha256-DSngV8nWHNqfPEBIfGq3HQeC1p9s6Q+GX+LcJiAiS4E=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with self; [
|
||||
|
||||
@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "typioca";
|
||||
version = "2.4.2";
|
||||
version = "2.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bloznelis";
|
||||
repo = "typioca";
|
||||
rev = version;
|
||||
hash = "sha256-gSHJkMyRgJ58kccQAh1bJNveirDaqGjlhrzgvEX5c8o=";
|
||||
hash = "sha256-u/vpS9BQxeKd8eaJicmn2wMk9EYjCO7LXdoshCBa4rw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-umtBvcfQoMQdWmQIAReeOkhRq+pelZzPvFsTq5ZwPXU=";
|
||||
vendorHash = "sha256-m6hPj1IZr+jEA/h2qbz03tuVq3aPEMmcnWiEC0LKtxI=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@ -454,22 +454,22 @@
|
||||
"vendorHash": "sha256-AVTWTS16d8QsPLLAJeAfgcVDzUBMp+b2oAphaCBqhS0="
|
||||
},
|
||||
"google": {
|
||||
"hash": "sha256-6VLZW6RlBW7D4GS/JTvlpIcF3AhIEKbNFOqsQI58HyE=",
|
||||
"hash": "sha256-vhWtIJ5hKe/8a7N5Qxs8CQuSNlZEF3gdRzSqZiFqhVg=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/google",
|
||||
"owner": "hashicorp",
|
||||
"proxyVendor": true,
|
||||
"repo": "terraform-provider-google",
|
||||
"rev": "v4.76.0",
|
||||
"rev": "v4.77.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-rlNYh42Cw2wMF/9aI8QM0x8t2jdz+V9u4uJvS6A4zx8="
|
||||
},
|
||||
"google-beta": {
|
||||
"hash": "sha256-ecmCr1AHpyYDmt1ofjFgJjirsNhpcdLggp9EXz3hT5E=",
|
||||
"hash": "sha256-nfgoGYBAW5VdgMm2gkI2Ff5NlY2CAwuFjckN7xgGtcI=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/google-beta",
|
||||
"owner": "hashicorp",
|
||||
"proxyVendor": true,
|
||||
"repo": "terraform-provider-google-beta",
|
||||
"rev": "v4.76.0",
|
||||
"rev": "v4.77.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-rlNYh42Cw2wMF/9aI8QM0x8t2jdz+V9u4uJvS6A4zx8="
|
||||
},
|
||||
@ -1061,13 +1061,13 @@
|
||||
"vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8="
|
||||
},
|
||||
"spotinst": {
|
||||
"hash": "sha256-8Pwy/jSzPWGXRCY+MszDPpbPWL6FFleoiu4VtSle0Kg=",
|
||||
"hash": "sha256-eZiWhMtsrys64NjN12BDaxL2b2GynIJMhWe+D33wgsw=",
|
||||
"homepage": "https://registry.terraform.io/providers/spotinst/spotinst",
|
||||
"owner": "spotinst",
|
||||
"repo": "terraform-provider-spotinst",
|
||||
"rev": "v1.131.0",
|
||||
"rev": "v1.132.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-NN4mnXzt1GJYGC0HBvYQBBZKENXfvVq7cTbE4XSPwto="
|
||||
"vendorHash": "sha256-5F8A8v8YQXrYAgWGYjO5G+sY3SY+O2oiYo3zVLZ9LUc="
|
||||
},
|
||||
"stackpath": {
|
||||
"hash": "sha256-7KQUddq+M35WYyAIAL8sxBjAaXFcsczBRO1R5HURUZg=",
|
||||
@ -1124,13 +1124,13 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"tfe": {
|
||||
"hash": "sha256-wrqlEWM2id6NXfTGOM7iVbQkKP2CUwpCZdr9n3Lgvuk=",
|
||||
"hash": "sha256-KYJ37/lr/ZC3CSbWEYemM9pzzWDAlfNQS0KP68VqPso=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/tfe",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-tfe",
|
||||
"rev": "v0.47.0",
|
||||
"rev": "v0.48.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-HdTx9f9ytE5/IG4yv1Xnqd/5ZA+ZaF6jjUmtI/q5yc0="
|
||||
"vendorHash": "sha256-Q66BRTiZ/Yuk7+fQWhqM8WCCRNVnfu6qx4E9jr+goXI="
|
||||
},
|
||||
"thunder": {
|
||||
"hash": "sha256-CZjoWme/f1F5JzYlntEKL5ijRF/qR3h4ZTiv9vwzbJI=",
|
||||
|
||||
@ -6,19 +6,19 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "coreth";
|
||||
version = "0.12.3";
|
||||
version = "0.12.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ava-labs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-4eaoTcbb7ddcSRWng3GsgK8JdFRMxxb0V7V1G7WV9tg=";
|
||||
hash = "sha256-AcU/1/TBS0nT7bXYguM8KI4mBUQzvSTVwuQkzq3t3EY=";
|
||||
};
|
||||
|
||||
# go mod vendor has a bug, see: golang/go#57529
|
||||
proxyVendor = true;
|
||||
|
||||
vendorHash = "sha256-wOD/Iuks32TiBOFVsuaLzYe3vlOtz6MCI9abscZMxJc=";
|
||||
vendorHash = "sha256-GVSI3yv7YzW2QPC26gA2C3TqjBnTxyiPzmW+hsGGdaQ=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@ -81,6 +81,9 @@ stdenv.mkDerivation {
|
||||
# Remove bundled libraries
|
||||
rm -r $out/opt/QQ/resources/app/sharp-lib
|
||||
|
||||
# https://aur.archlinux.org/cgit/aur.git/commit/?h=linuxqq&id=f7644776ee62fa20e5eb30d0b1ba832513c77793
|
||||
rm -r $out/opt/QQ/resources/app/libssh2.so.1
|
||||
|
||||
# https://github.com/microcai/gentoo-zh/commit/06ad5e702327adfe5604c276635ae8a373f7d29e
|
||||
ln -s ${libayatana-appindicator}/lib/libayatana-appindicator3.so \
|
||||
$out/opt/QQ/libappindicator3.so
|
||||
|
||||
67
pkgs/applications/office/planner/default.nix
Normal file
67
pkgs/applications/office/planner/default.nix
Normal file
@ -0,0 +1,67 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitLab
|
||||
, desktop-file-utils
|
||||
, gsettings-desktop-schemas
|
||||
, glib
|
||||
, gtk3
|
||||
, libgda
|
||||
, libxml2
|
||||
, libxslt
|
||||
, makeWrapper
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, shared-mime-info
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "planner";
|
||||
version = "0.14.91";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "World";
|
||||
repo = "planner";
|
||||
rev = version;
|
||||
hash = "sha256-LxctZv/CKolJ1I4Hql20E+/+p+ZoJLR1eZe34HPMqvY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs \
|
||||
meson_post_install.sh \
|
||||
tools/strip_trailing_white_space.sh \
|
||||
tests/python/task-test.py
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
desktop-file-utils
|
||||
makeWrapper
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
shared-mime-info
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libgda
|
||||
libxml2
|
||||
libxslt
|
||||
glib
|
||||
gsettings-desktop-schemas
|
||||
gtk3
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/planner \
|
||||
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share/gsettings-schemas/planner-${version}"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Project management tool for the GNOME desktop";
|
||||
homepage = "https://wiki.gnome.org/Apps/Planner";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [ amiloradovsky ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
@ -97,7 +97,7 @@ let
|
||||
else stdenv;
|
||||
in stdenv'.mkDerivation (finalAttrs: {
|
||||
pname = "mpv";
|
||||
version = "0.35.1";
|
||||
version = "0.36.0";
|
||||
|
||||
outputs = [ "out" "dev" "man" ];
|
||||
|
||||
@ -105,15 +105,16 @@ in stdenv'.mkDerivation (finalAttrs: {
|
||||
owner = "mpv-player";
|
||||
repo = "mpv";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-CoYTX9hgxLo72YdMoa0sEywg4kybHbFsypHk1rCM6tM=";
|
||||
hash = "sha256-82moFbWvfc1awXih0d0D+dHqYbIoGNZ77RmafQ80IOY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Revert "meson: use the new build_options method" to avoid a
|
||||
# cycle between the out and dev outputs.
|
||||
(fetchpatch {
|
||||
# fixes EDL error on youtube DASH streams https://github.com/mpv-player/mpv/issues/11392
|
||||
# to be removed on next release
|
||||
url = "https://github.com/mpv-player/mpv/commit/94c189dae76ba280d9883b16346c3dfb9720687e.patch";
|
||||
sha256 = "sha256-GeAltLAwkOKk82YfXYSrkNEX08uPauh7+kVbBGPWeT8=";
|
||||
url = "https://github.com/mpv-player/mpv/commit/3c1686488b48bd2760e9b19f42e7d3be1363d00a.patch";
|
||||
hash = "sha256-eYXfX8Y08q4Bl41VHBpwbxYRMZgm/iziXeK6AOp8O6I=";
|
||||
revert = true;
|
||||
})
|
||||
];
|
||||
|
||||
|
||||
@ -50,7 +50,7 @@ buildGoModule rec {
|
||||
homepage = "https://containerd.io/";
|
||||
description = "A daemon to control runC";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ offline vdemeester endocrimes zowoq ];
|
||||
maintainers = with maintainers; [ offline vdemeester endocrimes ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -30,14 +30,14 @@
|
||||
, withDebug ? false
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "picom";
|
||||
version = "10.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yshui";
|
||||
repo = "picom";
|
||||
rev = "v${version}";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-C+icJXTkE+XMaU7N6JupsP8xhmRVggX9hY1P7za0pO0=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
@ -113,5 +113,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/yshui/picom";
|
||||
maintainers = with maintainers; [ ertes twey thiagokokada ];
|
||||
platforms = platforms.linux;
|
||||
mainProgram = "picom";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@ -31,6 +31,7 @@ stdenv.mkDerivation rec {
|
||||
you need to set "security.pam.services.swaylock = {};" manually.
|
||||
'';
|
||||
inherit (src.meta) homepage;
|
||||
mainProgram = "swaylock";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ primeos ];
|
||||
|
||||
@ -11,6 +11,7 @@ let
|
||||
, rev
|
||||
, hash
|
||||
, zip ? ""
|
||||
, prefix ? ""
|
||||
}:
|
||||
let Family =
|
||||
lib.toUpper (lib.substring 0 1 family) +
|
||||
@ -21,7 +22,7 @@ let
|
||||
version = lib.removeSuffix "R" rev;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/adobe-fonts/source-han-${family}/releases/download/${rev}/SourceHan${Family}.ttc${zip}";
|
||||
url = "https://github.com/adobe-fonts/source-han-${family}/releases/download/${rev}/${prefix}SourceHan${Family}.ttc${zip}";
|
||||
inherit hash;
|
||||
};
|
||||
|
||||
@ -61,9 +62,10 @@ in
|
||||
serif = makePackage {
|
||||
family = "serif";
|
||||
description = "serif";
|
||||
rev = "2.000R";
|
||||
hash = "sha256-RDgywab7gwT+YBO7F1KJvKOv0E/3+7Zi/pQl+UDsGcM=";
|
||||
rev = "2.001R";
|
||||
hash = "sha256-ULdrtPLtzsgfZEHWkr4ebC/FSROHBWJJVD+PzdIJ6Og=";
|
||||
zip = ".zip";
|
||||
prefix = "01_";
|
||||
};
|
||||
|
||||
mono = makePackage {
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "source-sans";
|
||||
version = "3.046";
|
||||
version = "3.052";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/adobe-fonts/source-sans/archive/${version}R.zip";
|
||||
hash = "sha256-nBLEK+T5n1CdZK2zvCWIhF2MxPmiAwL9l55a55yHtgU=";
|
||||
hash = "sha256-yzbYy/ZS1GGlgJW+ARVWF4tjFqmMq7x+YqSQnojtQBs=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation rec {
|
||||
|
||||
install -Dm444 OTF/*.otf -t $out/share/fonts/opentype
|
||||
install -Dm444 TTF/*.ttf -t $out/share/fonts/truetype
|
||||
install -Dm444 VAR/*.otf -t $out/share/fonts/variable
|
||||
install -Dm444 VF/*.otf -t $out/share/fonts/variable
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "source-serif";
|
||||
version = "4.004";
|
||||
version = "4.005";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/adobe-fonts/source-serif/releases/download/${version}R/source-serif-${version}.zip";
|
||||
hash = "sha256-tGSMOwYBEZat7MI78wkPr6lgJdsOdOaIZb+IAOoOlq4=";
|
||||
url = "https://github.com/adobe-fonts/source-serif/archive/refs/tags/${version}R.zip";
|
||||
hash = "sha256-djeRJWcKqirkHus52JSeZJXeB7yMTnUXpkPxyzgRC04=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -0,0 +1,73 @@
|
||||
From 0417f60c7e760e1ebc6acd3dc23818b38c3929e7 Mon Sep 17 00:00:00 2001
|
||||
From: Weijia Wang <contact@weijia.wang>
|
||||
Date: Mon, 7 Aug 2023 21:51:30 +0200
|
||||
Subject: [PATCH] Fix build with Exiv2 0.28
|
||||
|
||||
---
|
||||
src/gcm-helper-exiv.cpp | 20 ++++++++++++++++++--
|
||||
1 file changed, 18 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/gcm-helper-exiv.cpp b/src/gcm-helper-exiv.cpp
|
||||
index 7ec69948..23c8b320 100644
|
||||
--- a/src/gcm-helper-exiv.cpp
|
||||
+++ b/src/gcm-helper-exiv.cpp
|
||||
@@ -22,6 +22,10 @@
|
||||
#include <exiv2/image.hpp>
|
||||
#include <exiv2/exif.hpp>
|
||||
|
||||
+#if EXIV2_MAJOR_VERSION >= 1 || (EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION >= 28)
|
||||
+#define HAVE_EXIV2_0_28
|
||||
+#endif
|
||||
+
|
||||
#if EXIV2_MAJOR_VERSION >= 1 || (EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION >= 27)
|
||||
#define HAVE_EXIV2_ERROR_CODE
|
||||
#include <exiv2/error.hpp>
|
||||
@@ -33,7 +37,11 @@
|
||||
int
|
||||
main (int argc, char* const argv[])
|
||||
{
|
||||
+#ifdef HAVE_EXIV2_0_28
|
||||
+ Exiv2::Image::UniquePtr image;
|
||||
+#else
|
||||
Exiv2::Image::AutoPtr image;
|
||||
+#endif
|
||||
Exiv2::ExifData exifData;
|
||||
std::string filename;
|
||||
std::string make;
|
||||
@@ -57,7 +65,9 @@ main (int argc, char* const argv[])
|
||||
if (argc == 2)
|
||||
filename = argv[1];
|
||||
if (filename.empty())
|
||||
-#ifdef HAVE_EXIV2_ERROR_CODE
|
||||
+#ifdef HAVE_EXIV2_0_28
|
||||
+ throw Exiv2::Error(Exiv2::ErrorCode::kerErrorMessage, "No filename specified");
|
||||
+#elif defined(HAVE_EXIV2_ERROR_CODE)
|
||||
throw Exiv2::Error(Exiv2::kerErrorMessage, "No filename specified");
|
||||
#else
|
||||
throw Exiv2::Error(1, "No filename specified");
|
||||
@@ -70,7 +80,9 @@ main (int argc, char* const argv[])
|
||||
if (exifData.empty()) {
|
||||
std::string error(argv[1]);
|
||||
error += ": No Exif data found in the file";
|
||||
-#ifdef HAVE_EXIV2_ERROR_CODE
|
||||
+#ifdef HAVE_EXIV2_0_28
|
||||
+ throw Exiv2::Error(Exiv2::ErrorCode::kerErrorMessage, error);
|
||||
+#elif defined(HAVE_EXIV2_ERROR_CODE)
|
||||
throw Exiv2::Error(Exiv2::kerErrorMessage, error);
|
||||
#else
|
||||
throw Exiv2::Error(1, error);
|
||||
@@ -89,7 +101,11 @@ main (int argc, char* const argv[])
|
||||
std::cout << model << "\n";
|
||||
std::cout << make << "\n";
|
||||
std::cout << serial << "\n";
|
||||
+#ifdef HAVE_EXIV2_0_28
|
||||
+ } catch (Exiv2::Error& e) {
|
||||
+#else
|
||||
} catch (Exiv2::AnyError& e) {
|
||||
+#endif
|
||||
std::cout << "Failed to load: " << e << "\n";
|
||||
retval = -1;
|
||||
}
|
||||
--
|
||||
2.39.2 (Apple Git-143)
|
||||
|
||||
@ -28,6 +28,10 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1vpxa2zjz3lkq9ldjg0fl65db9s6b4kcs8nyaqfz3jygma7ifg3w";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./0001-Fix-build-with-Exiv2-0.28.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
|
||||
@ -4,6 +4,7 @@
|
||||
, ninja
|
||||
, pkg-config
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, dleyna-core
|
||||
, glib
|
||||
}:
|
||||
@ -19,6 +20,17 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "WDmymia9MD3BRU6BOCzCIMrz9V0ACRzmEGqjbbuUmlA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build with meson 1.2. We use the gentoo patch intead of the
|
||||
# usptream one because the latter only applies on the libsoup_3 based
|
||||
# merged dLeyna project.
|
||||
# https://gitlab.gnome.org/World/dLeyna/-/merge_requests/6
|
||||
(fetchpatch {
|
||||
url = "https://github.com/gentoo/gentoo/raw/4a0982b49a1d94aa785b05d9b7d256c26c499910/net-libs/dleyna-connector-dbus/files/meson-1.2.0.patch";
|
||||
sha256 = "sha256-/p2OaPO5ghWtPotwIir2TtcFF5IDFN9FFuyqPHevuFI=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
@ -27,6 +28,17 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-bGasT3XCa7QHV3D7z59TSHoqWksNSIgaO0z9zYfHHuw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build with meson 1.2. We use the gentoo patch intead of the
|
||||
# usptream one because the latter only applies on the libsoup_3 based
|
||||
# merged dLeyna project.
|
||||
# https://gitlab.gnome.org/World/dLeyna/-/merge_requests/6
|
||||
(fetchpatch {
|
||||
url = "https://github.com/gentoo/gentoo/raw/2ebe20ff4cda180cc248d31a021107d08ecf39d9/net-libs/dleyna-renderer/files/meson-1.2.0.patch";
|
||||
sha256 = "sha256-/p2OaPO5ghWtPotwIir2TtcFF5IDFN9FFuyqPHevuFI=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, meson
|
||||
, ninja
|
||||
, makeWrapper
|
||||
@ -25,6 +26,17 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-jlF9Lr/NG+Fsy/bB7aLb7xOLqel8GueJK5luo9rsDME=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build with meson 1.2. We use the gentoo patch intead of the
|
||||
# usptream one because the latter only applies on the libsoup_3 based
|
||||
# merged dLeyna project.
|
||||
# https://gitlab.gnome.org/World/dLeyna/-/merge_requests/6
|
||||
(fetchpatch {
|
||||
url = "https://github.com/gentoo/gentoo/raw/2e3a1f4f7a1ef0c3e387389142785d98b5834e60/net-misc/dleyna-server/files/meson-1.2.0.patch";
|
||||
sha256 = "sha256-/p2OaPO5ghWtPotwIir2TtcFF5IDFN9FFuyqPHevuFI=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
|
||||
@ -4,12 +4,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "arrayqueues";
|
||||
version = "1.3.1";
|
||||
version = "1.4.1";
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "a955df768e39d459de28c7ea10ee02f67b1c70996cfa229846ab98df77a6fb69";
|
||||
sha256 = "sha256-7I+5BQO/gsvTREDkBfxrMblw3JPfY48S4KI4PCGPtFY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "atlassian-python-api";
|
||||
version = "3.39.0";
|
||||
version = "3.40.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "atlassian-api";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-ixESPQqXQ7HDiYm8rJ8oZ/xaRHO4spUGMyRdov4vJr8=";
|
||||
hash = "sha256-2yY1shsdlX40FJV3K7nT6HfKKI14/3zH8dOEnJeTahw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -11,20 +11,19 @@
|
||||
, phonopy
|
||||
, potentials
|
||||
, pymatgen
|
||||
, pytest
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, pythonAtLeast
|
||||
, requests
|
||||
, scipy
|
||||
, setuptools
|
||||
, toolz
|
||||
, wheel
|
||||
, xmltodict
|
||||
, pythonRelaxDepsHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "1.4.6";
|
||||
version = "unstable-2023-07-28";
|
||||
pname = "atomman";
|
||||
format = "pyproject";
|
||||
|
||||
@ -33,12 +32,13 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "usnistgov";
|
||||
repo = "atomman";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-tcsxtFbBdMC6+ixzqhnR+5UNwcQmnPQSvuyNA2IYelI=";
|
||||
rev = "b8af21a9285959d38ee26173081db1b4488401bc";
|
||||
hash = "sha256-WfB+OY61IPprT6OCVHl8VA60p7lLVkRGuyYX+nm7bbA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
wheel
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
@ -70,7 +70,6 @@ buildPythonPackage rec {
|
||||
ase
|
||||
phonopy
|
||||
pymatgen
|
||||
pytest
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-batch";
|
||||
version = "17.0.0";
|
||||
version = "17.1.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
hash = "sha256-hkM4WVLuwxj4qgXsY8Ya7zu7/v37gKdP0Xbf2EqrsWo=";
|
||||
hash = "sha256-OFv5IImNwtWAeGX75FAZ8QzfvvZRxtv6R0WoQlJduvs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
{ lib
|
||||
{ stdenv
|
||||
, lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, jsonschema
|
||||
@ -54,6 +55,14 @@ buildPythonPackage rec {
|
||||
changelog = "https://github.com/devicetree-org/dt-schema/releases/tag/v${version}";
|
||||
license = with licenses; [ bsd2 /* or */ gpl2Only ];
|
||||
maintainers = with maintainers; [ sorki ];
|
||||
|
||||
broken = (
|
||||
# Library not loaded: @rpath/libfdt.1.dylib
|
||||
stdenv.isDarwin ||
|
||||
|
||||
# see https://github.com/devicetree-org/dt-schema/issues/108
|
||||
versionAtLeast jsonschema.version "4.18"
|
||||
);
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mypy-boto3-s3";
|
||||
version = "1.28.16";
|
||||
version = "1.28.19";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-TlX9rXKbbm9FIR41S9Ggp0WlZf6dHkYnN/d1wohJz7U=";
|
||||
hash = "sha256-uBBLGRkk2GcgaNIddIwPiuCw4ZUDJMsxXsihzu2dI6w=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -1,4 +1,6 @@
|
||||
{ lib
|
||||
, aiohttp
|
||||
, asgiref
|
||||
, buildPythonPackage
|
||||
, django
|
||||
, djangorestframework
|
||||
@ -7,36 +9,35 @@
|
||||
, flask
|
||||
, httpx
|
||||
, isodate
|
||||
, jsonschema
|
||||
, jsonschema-spec
|
||||
, mock
|
||||
, more-itertools
|
||||
, openapi-schema-validator
|
||||
, openapi-spec-validator
|
||||
, parse
|
||||
, pathable
|
||||
, poetry-core
|
||||
, pytest-aiohttp
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, responses
|
||||
, requests
|
||||
, starlette
|
||||
, typing-extensions
|
||||
, webob
|
||||
, werkzeug
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "openapi-core";
|
||||
version = "0.17.1";
|
||||
version = "0.18.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "p1c2u";
|
||||
repo = "openapi-core";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-xlrG2FF55qDsrkdSqCBLu3/QLtZs48ZUB90B2CemY64=";
|
||||
hash = "sha256-2OcGaZQwzgxcwrXinmJjFc91620Ri0O79c8WZWfDdlQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -50,17 +51,19 @@ buildPythonPackage rec {
|
||||
propagatedBuildInputs = [
|
||||
isodate
|
||||
more-itertools
|
||||
pathable
|
||||
more-itertools
|
||||
openapi-schema-validator
|
||||
jsonschema-spec
|
||||
openapi-spec-validator
|
||||
typing-extensions
|
||||
parse
|
||||
openapi-schema-validator
|
||||
openapi-spec-validator
|
||||
werkzeug
|
||||
jsonschema-spec
|
||||
asgiref
|
||||
jsonschema
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
aiohttp = [
|
||||
aiohttp
|
||||
];
|
||||
django = [
|
||||
django
|
||||
];
|
||||
@ -80,7 +83,7 @@ buildPythonPackage rec {
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
mock
|
||||
pytest-aiohttp
|
||||
pytestCheckHook
|
||||
responses
|
||||
webob
|
||||
|
||||
@ -19,14 +19,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "openstacksdk";
|
||||
version = "1.3.1";
|
||||
version = "1.4.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-+g/YOGv311SaOs65xOKai3BJp4GbhkD1awEFL4oQLMo=";
|
||||
hash = "sha256-NhUSnttnyCr70aFwbpFf+mjg7r/JnJA8NDqsZRfdWFg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -6,14 +6,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pox";
|
||||
version = "0.3.2";
|
||||
version = "0.3.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-6CUiUpdjjW49SUFfjPtlQHpdFeVvL7f+nZueMFDGXuE=";
|
||||
hash = "sha256-4c7WbyoMkqWM82Rrx8y4tHc9QIhLdvhe7aBnBHSHFmc=";
|
||||
};
|
||||
|
||||
# Test sare failing the sandbox
|
||||
|
||||
@ -11,14 +11,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "py-pdf-parser";
|
||||
version = "0.10.2";
|
||||
version = "0.11.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-F12uDAjG9P3eVyaXqVSHNFrEGnOzLlJERDwOiWSq1ZY=";
|
||||
hash = "sha256-GsiGBigvtAgrM0sRffZBG2tVoEaDai+eUxXhMXWNBr0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pylink-square";
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
|
||||
format = "setuptools";
|
||||
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "square";
|
||||
repo = "pylink";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-pICSU33n/oH+LRbWNYOdnTaa5qAGRRXWsO1NjO4ylzw=";
|
||||
hash = "sha256-rcM7gvUUfXN5pL9uIihzmOCXA7NKjiMt2GaQaGJxD9M=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ psutil six future ];
|
||||
|
||||
@ -11,12 +11,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytools";
|
||||
version = "2023.1";
|
||||
version = "2023.1.1";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-8Q5CUiCu+h/5JTQrZY/wLcM1l8IfuI16Y/lEG/LnpQ4=";
|
||||
hash = "sha256-gGN4c9IG9rzt9820atk+horLTqIlbbBS38yocr3QMh8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytorch-metric-learning";
|
||||
version = "2.2.0";
|
||||
version = "2.3.0";
|
||||
|
||||
disabled = isPy27;
|
||||
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "KevinMusgrave";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-KolC1lcJWOcVjFEEYK2RNZodVrS/GjBzhlQ6z8kFOmE=";
|
||||
hash = "sha256-eDQQPIyUUEkvpXjWAcyljlFgVlu9is4fPPUTudP7NF4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sagemaker";
|
||||
version = "2.173.0";
|
||||
version = "2.175.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -35,7 +35,7 @@ buildPythonPackage rec {
|
||||
owner = "aws";
|
||||
repo = "sagemaker-python-sdk";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Fzkw37bRBbCD7VBIsN4Qkk6dI0Qh4Gvt5TJbnoUuPCs=";
|
||||
hash = "sha256-7wITaGTHazC34bUF78ZFXFQYz48g1fZlPE8jvIBvE9w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
30
pkgs/development/tools/dt-schema/default.nix
Normal file
30
pkgs/development/tools/dt-schema/default.nix
Normal file
@ -0,0 +1,30 @@
|
||||
{ lib
|
||||
, python3
|
||||
}:
|
||||
|
||||
let python = python3.override {
|
||||
packageOverrides = self: super: {
|
||||
# see https://github.com/devicetree-org/dt-schema/issues/108
|
||||
jsonschema = super.jsonschema.overridePythonAttrs (old: rec {
|
||||
version = "4.17.3";
|
||||
disabled = self.pythonOlder "3.7";
|
||||
|
||||
src = old.src.override {
|
||||
inherit version;
|
||||
hash = "sha256-D4ZEN6uLYHa6ZwdFPvj5imoNUSqA6T+KvbZ29zfstg0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with self; ([
|
||||
attrs
|
||||
pyrsistent
|
||||
] ++ lib.optionals (pythonOlder "3.8") [
|
||||
importlib-metadata
|
||||
typing-extensions
|
||||
] ++ lib.optionals (pythonOlder "3.9") [
|
||||
importlib-resources
|
||||
pkgutil-resolve-name
|
||||
]);
|
||||
});
|
||||
};
|
||||
}; in python.pkgs.toPythonApplication python.pkgs.dtschema
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "lazygit";
|
||||
version = "0.40.0";
|
||||
version = "0.40.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jesseduffield";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-UGIqrdjIP7AyLck1DT38wS48hSn46uZXcMrSehXOui8=";
|
||||
hash = "sha256-xj5WKAduaJWA3NhWuMsF5EXF91+NTGAXkbdhpeFqLxE=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
@ -22,5 +22,6 @@ buildGoModule rec {
|
||||
changelog = "https://github.com/jesseduffield/lazygit/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ Br1ght0ne equirosa paveloom ];
|
||||
mainProgram = "lazygit";
|
||||
};
|
||||
}
|
||||
|
||||
@ -7,23 +7,18 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rsonpath";
|
||||
version = "0.6.0";
|
||||
version = "0.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "v0ldek";
|
||||
repo = "rsonpath";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-RRMT//OnwzoZEsOPZyHfQQbkphopZBI1u8xQe8LsPBo=";
|
||||
hash = "sha256-3ncaO7B3e4F2LFj1IjHvOyoWXBYQM69vPfPnsBr+tKI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-o9L6GUYDDm/WM8iD0k/OGf26w9O8DLH0jMr//ruKnrs=";
|
||||
cargoHash = "sha256-EjifSABhowk3PSQTuAm8+xRYbc0OwdqHMb9o/z1yuP0=";
|
||||
|
||||
buildNoDefaultFeatures = true;
|
||||
buildFeatures = [
|
||||
"default-optimizations"
|
||||
] ++ lib.optionals withSimd [
|
||||
"simd"
|
||||
];
|
||||
buildNoDefaultFeatures = !withSimd;
|
||||
|
||||
cargoBuildFlags = [ "-p=rsonpath" ];
|
||||
cargoTestFlags = cargoBuildFlags;
|
||||
|
||||
30
pkgs/development/tools/rust/cargo-shuttle/Cargo.lock
generated
30
pkgs/development/tools/rust/cargo-shuttle/Cargo.lock
generated
@ -1139,7 +1139,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "cargo-shuttle"
|
||||
version = "0.22.0"
|
||||
version = "0.23.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"assert_cmd",
|
||||
@ -5321,7 +5321,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "shuttle-admin"
|
||||
version = "0.22.0"
|
||||
version = "0.23.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"clap",
|
||||
@ -5338,7 +5338,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "shuttle-auth"
|
||||
version = "0.22.0"
|
||||
version = "0.23.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"async-trait",
|
||||
@ -5367,7 +5367,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "shuttle-codegen"
|
||||
version = "0.22.0"
|
||||
version = "0.23.0"
|
||||
dependencies = [
|
||||
"pretty_assertions",
|
||||
"proc-macro-error",
|
||||
@ -5379,7 +5379,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "shuttle-common"
|
||||
version = "0.22.0"
|
||||
version = "0.23.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"async-trait",
|
||||
@ -5428,7 +5428,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "shuttle-common-tests"
|
||||
version = "0.22.0"
|
||||
version = "0.23.0"
|
||||
dependencies = [
|
||||
"hyper",
|
||||
"shuttle-common",
|
||||
@ -5437,7 +5437,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "shuttle-deployer"
|
||||
version = "0.22.0"
|
||||
version = "0.23.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"async-trait",
|
||||
@ -5480,6 +5480,7 @@ dependencies = [
|
||||
"tracing",
|
||||
"tracing-opentelemetry",
|
||||
"tracing-subscriber",
|
||||
"ulid",
|
||||
"utoipa",
|
||||
"utoipa-swagger-ui",
|
||||
"uuid",
|
||||
@ -5487,7 +5488,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "shuttle-gateway"
|
||||
version = "0.22.0"
|
||||
version = "0.23.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"async-trait",
|
||||
@ -5536,6 +5537,7 @@ dependencies = [
|
||||
"tracing-opentelemetry",
|
||||
"tracing-subscriber",
|
||||
"ttl_cache",
|
||||
"ulid",
|
||||
"utoipa",
|
||||
"utoipa-swagger-ui",
|
||||
"uuid",
|
||||
@ -5544,13 +5546,14 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "shuttle-proto"
|
||||
version = "0.22.0"
|
||||
version = "0.23.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"chrono",
|
||||
"home",
|
||||
"prost",
|
||||
"prost-types",
|
||||
"serde_json",
|
||||
"shuttle-common",
|
||||
"tokio",
|
||||
"tonic",
|
||||
@ -5561,7 +5564,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "shuttle-provisioner"
|
||||
version = "0.22.0"
|
||||
version = "0.23.0"
|
||||
dependencies = [
|
||||
"aws-config",
|
||||
"aws-sdk-rds",
|
||||
@ -5587,7 +5590,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "shuttle-resource-recorder"
|
||||
version = "0.22.0"
|
||||
version = "0.23.0"
|
||||
dependencies = [
|
||||
"async-trait",
|
||||
"chrono",
|
||||
@ -5611,7 +5614,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "shuttle-runtime"
|
||||
version = "0.22.0"
|
||||
version = "0.23.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"async-trait",
|
||||
@ -5644,7 +5647,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "shuttle-service"
|
||||
version = "0.22.0"
|
||||
version = "0.23.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"async-trait",
|
||||
@ -6898,6 +6901,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "13a3aaa69b04e5b66cc27309710a569ea23593612387d67daaf102e73aa974fd"
|
||||
dependencies = [
|
||||
"rand",
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-shuttle";
|
||||
version = "0.22.0";
|
||||
version = "0.23.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "shuttle-hq";
|
||||
repo = "shuttle";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-mHmeNKr9Q/wIHO2G8xVOJTSr5myIzhXWl6R+SLEbDN8=";
|
||||
hash = "sha256-WRmqejTx1nR5Ov2av/f8yRoexVzJGYbfEf+y8pvH/oY=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
|
||||
@ -29,11 +29,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openttd";
|
||||
version = "13.3";
|
||||
version = "13.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://cdn.openttd.org/openttd-releases/${version}/${pname}-${version}-source.tar.xz";
|
||||
hash = "sha256-qvoW0vtnFlE0xzqIj3n3pe19oXoEz26ez2csnLiecZI=";
|
||||
hash = "sha256-Kh3roBv+WOIYiHn0UMP6TzgZJxq0m/NI3WZUXwQNFG8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake makeWrapper ];
|
||||
|
||||
@ -2,14 +2,20 @@
|
||||
|
||||
openttd.overrideAttrs (oldAttrs: rec {
|
||||
pname = "openttd-jgrpp";
|
||||
version = "0.54.1";
|
||||
version = "0.54.4";
|
||||
|
||||
src = fetchFromGitHub rec {
|
||||
owner = "JGRennison";
|
||||
repo = "OpenTTD-patches";
|
||||
rev = "jgrpp-${version}";
|
||||
hash = "sha256-MfYh2a3wjWB/5zgTE8AAIREI2OEhykqF0Rad7I+912U=";
|
||||
hash = "sha256-bTpHlKffQbANXIrAn9WSEK/PEzBW1nzaHhGKIyclAo0=";
|
||||
};
|
||||
|
||||
buildInputs = oldAttrs.buildInputs ++ [ zstd ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/JGRennison/OpenTTD-patches";
|
||||
changelog = "https://github.com/JGRennison/OpenTTD-patches/blob/jgrpp-${version}/jgrpp-changelog.md";
|
||||
};
|
||||
|
||||
})
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
, imake, gccmakedep, libX11, libXext, libXScrnSaver, xorgproto
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "xautolock";
|
||||
version = "2.2-7-ga23dd5c";
|
||||
|
||||
@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "peti";
|
||||
repo = "xautolock";
|
||||
rev = "v${version}";
|
||||
sha256 = "10j61rl0sx9sh84rjyfyddl73xb5i2cpb17fyrli8kwj39nw0v2g";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-T2zAbRqSTxRp9u6EdZmIZfVxaGveeZkJgjp1DWgORoI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ imake gccmakedep ];
|
||||
@ -31,5 +31,6 @@ stdenv.mkDerivation rec {
|
||||
maintainers = with maintainers; [ peti ];
|
||||
platforms = platforms.linux;
|
||||
license = licenses.gpl2;
|
||||
mainProgram = "xautolock";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@ -27,6 +27,7 @@ stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
description = "Backlight and Keyboard LED control tool";
|
||||
homepage = "https://gitlab.com/cameronnemo/brillo";
|
||||
mainProgram = "brillo";
|
||||
license = [ licenses.gpl3 licenses.bsd0 ];
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.alexarice ];
|
||||
|
||||
@ -7,12 +7,12 @@
|
||||
, installShellFiles
|
||||
}:
|
||||
let
|
||||
version = "2.6.4";
|
||||
version = "2.7.3";
|
||||
dist = fetchFromGitHub {
|
||||
owner = "caddyserver";
|
||||
repo = "dist";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-SJO1q4g9uyyky9ZYSiqXJgNIvyxT5RjrpYd20YDx8ec=";
|
||||
hash = "sha256-fQhujBYyl2p3cdqyf+LVebPBGxXn2lKMB/dsvTo5+NM=";
|
||||
};
|
||||
in
|
||||
buildGoModule {
|
||||
@ -23,10 +23,10 @@ buildGoModule {
|
||||
owner = "caddyserver";
|
||||
repo = "caddy";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-3a3+nFHmGONvL/TyQRqgJtrSDIn0zdGy9YwhZP17mU0=";
|
||||
hash = "sha256-KezKMpx3M7rdKXEWf5XUSXqY5SEimACkv3OB/4XccCE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-toi6efYZobjDV3YPT9seE/WZAzNaxgb1ioVG4txcuXM=";
|
||||
vendorHash = "sha256-mTHEM+0yakKiy4ZFi+2qakjSlKFyRkbjeXOXdvx+9lA=";
|
||||
|
||||
subPackages = [ "cmd/caddy" ];
|
||||
|
||||
|
||||
@ -28,7 +28,7 @@ let
|
||||
else llvmPackages.stdenv).mkDerivation;
|
||||
in mkDerivation rec {
|
||||
pname = "clickhouse";
|
||||
version = "23.3.5.9";
|
||||
version = "23.3.8.21";
|
||||
|
||||
src = fetchFromGitHub rec {
|
||||
owner = "ClickHouse";
|
||||
@ -36,7 +36,7 @@ in mkDerivation rec {
|
||||
rev = "v${version}-lts";
|
||||
fetchSubmodules = true;
|
||||
name = "clickhouse-${rev}.tar.gz";
|
||||
hash = "sha256-soF0L69oi95r0zgzPL0DfDhhXfRKekN5u/4+/mt8QwM=";
|
||||
hash = "sha256-bynr196H6g/GmvNTtrfB6QDdAScvYvbe7EIceoOwCKc=";
|
||||
postFetch = ''
|
||||
# delete files that make the source too big
|
||||
rm -rf $out/contrib/llvm-project/llvm/test
|
||||
|
||||
@ -1,27 +1,26 @@
|
||||
{ lib, stdenv, buildGoModule, fetchFromGitea }:
|
||||
{ lib, stdenv, buildGoModule, fetchFromGitea, nixosTests }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "eris-go";
|
||||
version = "20230202";
|
||||
version = "20230729";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "eris";
|
||||
repo = pname;
|
||||
repo = "eris-go";
|
||||
rev = version;
|
||||
hash = "sha256-o9FRlUtMk1h8sR+am2gNEQOMgAceRTdRusI4a6ikHUM=";
|
||||
hash = "sha256-yFWmfWmlGL4fC36XsjO/ao/v8FVI20EpXSblZ0EcosI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ZDJm7ZlDBVWLnuC90pOwa608GnuEgy0N/I96vvesZPY=";
|
||||
vendorHash = "sha256-Z6rirsiiBzH0herQAkxZp1Xr++489qNoiD4fqoLt9/A=";
|
||||
|
||||
postInstall = "ln -s $out/bin/eris-get $out/bin/eris-put";
|
||||
# eris-get is a multicall binary
|
||||
passthru.tests = { inherit (nixosTests) eris-server; };
|
||||
|
||||
meta = src.meta // {
|
||||
description = "Implementation of ERIS for Go";
|
||||
homepage = "https://codeberg.org/eris/eris-go";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ ehmry ];
|
||||
mainProgram = "eris-get";
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
||||
@ -28,7 +28,7 @@ buildGoPackage rec {
|
||||
description = "Distributed reliable key-value store for the most critical data of a distributed system";
|
||||
license = licenses.asl20;
|
||||
homepage = "https://etcd.io/";
|
||||
maintainers = with maintainers; [ offline zowoq ];
|
||||
maintainers = with maintainers; [ offline ];
|
||||
broken = stdenv.isDarwin; # outdated golang.org/x/sys
|
||||
knownVulnerabilities = [ "CVE-2023-32082" ];
|
||||
};
|
||||
|
||||
@ -29,6 +29,6 @@ buildGoModule rec {
|
||||
description = "Distributed reliable key-value store for the most critical data of a distributed system";
|
||||
license = licenses.asl20;
|
||||
homepage = "https://etcd.io/";
|
||||
maintainers = with maintainers; [ offline zowoq ];
|
||||
maintainers = with maintainers; [ offline ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -16,7 +16,7 @@ let
|
||||
description = "Distributed reliable key-value store for the most critical data of a distributed system";
|
||||
license = licenses.asl20;
|
||||
homepage = "https://etcd.io/";
|
||||
maintainers = with maintainers; [ offline zowoq endocrimes ];
|
||||
maintainers = with maintainers; [ offline endocrimes ];
|
||||
platforms = platforms.darwin ++ platforms.linux;
|
||||
};
|
||||
|
||||
|
||||
@ -690,8 +690,8 @@ let self = {
|
||||
name = "set-misc";
|
||||
owner = "openresty";
|
||||
repo = "set-misc-nginx-module";
|
||||
rev = "v0.32";
|
||||
sha256 = "048a6jwinbjgxiprjj9ml3fdp0mhkx89g6ggams57fsx9m5vaxax";
|
||||
rev = "v0.33";
|
||||
hash = "sha256-jMMj3Ki1uSfQzagoB/O4NarxPjiaF9YRwjSKo+cgMxo=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "nats-server";
|
||||
version = "2.9.20";
|
||||
version = "2.9.21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nats-io";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-RRWn1xPvYkDL+81/JOAW+K8I2ezq+z65KiJPYMrF7Sw=";
|
||||
hash = "sha256-gzwnD9o0lqo1lUw9viSnvjsWSCSmMi2qR9ndtWztMjQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-INzCHNr469LajEggVpVZ0Kj0zpe7GwX26af2C/7zx7o=";
|
||||
vendorHash = "sha256-RK5OD1zea4M4/mXjGKhU+igSoE4YaA2/jAL7RFBoouo=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -2,28 +2,27 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rustypaste";
|
||||
version = "0.11.1";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "orhun";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-5yttOaDsWcRCFBzziOW4H1Nrs7/X/pGFlnPNUQRf+w8=";
|
||||
sha256 = "sha256-Kk9SDGDTCq1qHew9yrf1HmYAhse5mB4AqH/Oo/lc0dc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-8lv0AGcV4LW6r+K0rIZNV0NPhX4j3+wbMw4JeJkNuXw=";
|
||||
cargoHash = "sha256-6YTdOb1JvP5yTD1FVpHGG3C+hgiuTUiy05s+e3k8cdI=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.CoreServices
|
||||
];
|
||||
|
||||
# Some tests need network
|
||||
dontUseCargoParallelTests = true;
|
||||
|
||||
checkFlags = [
|
||||
# requires internet access
|
||||
"--skip=paste::tests::test_paste_data"
|
||||
"--skip=server::tests::test_index_with_landing_page_file_not_found"
|
||||
"--skip=server::tests::test_upload_file"
|
||||
"--skip=server::tests::test_upload_remote_file"
|
||||
"--skip=util::tests::test_get_expired_files"
|
||||
];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
896
pkgs/servers/search/qdrant/Cargo.lock
generated
896
pkgs/servers/search/qdrant/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -11,30 +11,24 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "qdrant";
|
||||
version = "1.3.2";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qdrant";
|
||||
repo = "qdrant";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-UKGpbI5XjS0s9Aedos8FX7J1zcbsAgLY1zS3M0DSf9s=";
|
||||
sha256 = "sha256-ccvtDz6woANSotTn6GwTAbGd0UlrpddvfH8+GR1dI3g=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"quantization-0.1.0" = "sha256-ZPz2vVRA81SZ1xK1d4iiTU54xnr8zGaUzKXIZKGTZOc=";
|
||||
"quantization-0.1.0" = "sha256-pV+lfO0LV/+jOV+v/oQADsde6a8XKNah0OVJdTnzdvw=";
|
||||
"tonic-0.9.2" = "sha256-ZlcDUZy/FhxcgZE7DtYhAubOq8DMSO17T+TCmXar1jE=";
|
||||
"wal-0.1.2" = "sha256-sMleBUAZcSnUx7/oQZr9lSDmVHxUjfGaVodvVtFEle0=";
|
||||
};
|
||||
};
|
||||
|
||||
prePatch = lib.optionalString stdenv.isAarch64 ''
|
||||
substituteInPlace .cargo/config.toml \
|
||||
--replace "[target.aarch64-unknown-linux-gnu]" "" \
|
||||
--replace "linker = \"aarch64-linux-gnu-gcc\"" ""
|
||||
'';
|
||||
|
||||
# Needed to get openssl-sys to use pkg-config.
|
||||
OPENSSL_NO_VENDOR = 1;
|
||||
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
, dash
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dash";
|
||||
version = "0.5.12";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://gondor.apana.org.au/~herbert/dash/files/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-akdKxG6LCzKRbExg32lMggWNMpfYs4W3RQgDDKSo8oo=";
|
||||
url = "http://gondor.apana.org.au/~herbert/dash/files/dash-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-akdKxG6LCzKRbExg32lMggWNMpfYs4W3RQgDDKSo8oo=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
@ -31,22 +31,23 @@ stdenv.mkDerivation rec {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://gondor.apana.org.au/~herbert/dash/";
|
||||
description = "A POSIX-compliant implementation of /bin/sh that aims to be as small as possible";
|
||||
platforms = platforms.unix;
|
||||
license = with licenses; [ bsd3 gpl2 ];
|
||||
};
|
||||
|
||||
passthru = {
|
||||
shellPath = "/bin/dash";
|
||||
tests = {
|
||||
"execute-simple-command" = runCommand "${pname}-execute-simple-command" { } ''
|
||||
"execute-simple-command" = runCommand "dash-execute-simple-command" { } ''
|
||||
mkdir $out
|
||||
${dash}/bin/dash -c 'echo "Hello World!" > $out/success'
|
||||
${lib.getExe dash} -c 'echo "Hello World!" > $out/success'
|
||||
[ -s $out/success ]
|
||||
grep -q "Hello World" $out/success
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://gondor.apana.org.au/~herbert/dash/";
|
||||
description = "A POSIX-compliant implementation of /bin/sh that aims to be as small as possible";
|
||||
platforms = platforms.unix;
|
||||
license = with licenses; [ bsd3 gpl2 ];
|
||||
mainProgram = "dash";
|
||||
};
|
||||
})
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nix-zsh-completions";
|
||||
version = "unstable-2023-01-30";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nix-community";
|
||||
repo = "nix-zsh-completions";
|
||||
rev = "6a1bfc024481bdba568f2ced65e02f3a359a7692";
|
||||
hash = "sha256-aXetjkl5nPuYHHyuX59ywXF+4Xg+PUCV6Y2u+g18gEk=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-DKvCpjAeCiUwD5l6PUW7WlEvM0cNZEOk41IiVXoh9D8=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "bzip3";
|
||||
version = "1.3.1";
|
||||
version = "1.3.2";
|
||||
|
||||
outputs = [ "bin" "dev" "out" ];
|
||||
|
||||
@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "kspalaiologos";
|
||||
repo = "bzip3";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-9yUd6FnobJEH/L5X4WMJFb9yLkJH9b8MAyhU2Wdtfig=";
|
||||
hash = "sha256-nSmKpOwlbxbUN2TJwsS2CFP5UV2ODOKXFHAUsCje7mc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -14,16 +14,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "eza";
|
||||
version = "0.10.4";
|
||||
version = "0.10.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cafkafk";
|
||||
repo = "eza";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-9Pw7DQ/QTRHNsCPen+Nn5HdvjX1ju08q+KyitPF9+xQ=";
|
||||
hash = "sha256-+MA9p15RGPaQ7Drhiljeb7KqThQnXMymjXFFS5sLxdM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-KveRmlgyree77ZDOB4hQA35F/u/ARKiAHRgHpjCXOow=";
|
||||
cargoHash = "sha256-aplwr9X9MLhKrF5125gMtmuI/72RGf+1GZqkBYyxUSQ=";
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ];
|
||||
buildInputs = [ zlib ]
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ripdrag";
|
||||
version = "0.3.2";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-vxAAAFLTIfLqYD7E/nwsHgFLhzMRF7DspIaWqAMZcXk=";
|
||||
hash = "sha256-9VGvwMovJb1IIpwf+1FxcxnPcmPl+59jfQC6365E95s=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-6GKLBnG1p6iaFvnEQgfNlGpZwEG93tI256DCMLuJjOU=";
|
||||
cargoHash = "sha256-kxT0wJodPiHXX/bsvrlPbyfUbxPBgmv68a8I5pKOwEg=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config wrapGAppsHook4 ];
|
||||
|
||||
|
||||
@ -2,9 +2,10 @@
|
||||
, cargo
|
||||
, cmake
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, go
|
||||
, lib
|
||||
, libgcrypt
|
||||
, libgpg-error
|
||||
, libsecret
|
||||
, pkg-config
|
||||
, polkit
|
||||
@ -24,29 +25,17 @@
|
||||
|
||||
let
|
||||
pname = "mozillavpn";
|
||||
version = "2.15.0";
|
||||
version = "2.16.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mozilla-mobile";
|
||||
repo = "mozilla-vpn-client";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-eyYrA8ysfmXxlHNUBkGU9ioYrnbx3L1wP9byNz9L/MA=";
|
||||
hash = "sha256-Yd53QUnoZ+5imt8kWpfGL6mkWeEFvqRrTpSu6efGgOA=";
|
||||
};
|
||||
patches = [
|
||||
# Force version downgrade for openssl and openssl-sys crates
|
||||
(fetchpatch {
|
||||
url = "https://github.com/mozilla-mobile/mozilla-vpn-client/commit/5911071ea37d12401af32dcdf2a542ca5049bf2f.patch";
|
||||
hash = "sha256-b3yOgn3Et0sYpqzUUdmlGIbzZSz13Q9HW56hyQqRnHc=";
|
||||
revert = true;
|
||||
})
|
||||
# [2.15] Restore qtglean/Cargo.lock
|
||||
(fetchpatch {
|
||||
url = "https://github.com/mozilla-mobile/mozilla-vpn-client/pull/7026/commits/13c1b77ee4249883a33b6ac240b3ca143b485ba1.patch";
|
||||
hash = "sha256-L4D71zreDMLAIbP4x1as9QdNmMC1snUZSwlkKehg5yM=";
|
||||
})
|
||||
];
|
||||
patches = [ ];
|
||||
|
||||
netfilter-goModules = (buildGoModule {
|
||||
netfilterGoModules = (buildGoModule {
|
||||
inherit pname version src patches;
|
||||
modRoot = "linux/netfilter";
|
||||
vendorHash = "sha256-Cmo0wnl0z5r1paaEf1MhCPbInWeoMhGjnxCxGh0cyO8=";
|
||||
@ -56,19 +45,19 @@ let
|
||||
inherit src patches;
|
||||
name = "${pname}-${version}-extension-bridge";
|
||||
preBuild = "cd extension/bridge";
|
||||
hash = "sha256-R/9ePEhc4qVgg3WC5ng+cD88K/N3PTnx4QWyaZZfRds=";
|
||||
hash = "sha256-WKnc2nGXJVhzNluh0RFSdmPtGdo2QnNuEJ7r5xJCGi0=";
|
||||
};
|
||||
signatureDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src patches;
|
||||
name = "${pname}-${version}-signature";
|
||||
preBuild = "cd signature";
|
||||
hash = "sha256-27g2qnnUrxbThM1cHZquQgWQLWDtZaBnlf8PjvQtBJU=";
|
||||
hash = "sha256-XlOnUB0TO6rrLkWU9eT1sTOcDtJdz4yi/ejKcEfFcFc=";
|
||||
};
|
||||
qtgleanDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src patches;
|
||||
name = "${pname}-${version}-qtglean";
|
||||
preBuild = "cd qtglean";
|
||||
hash = "sha256-cW+nf+Dho+eSzOBo3xhxki7NXpg0wd5ZM9OMA6iOUl4=";
|
||||
hash = "sha256-BU++ZWb4Fp8LS2woohuDSD2iYo/3rBO6xgeLzyrdLkU=";
|
||||
};
|
||||
|
||||
in
|
||||
@ -76,8 +65,9 @@ stdenv.mkDerivation {
|
||||
inherit pname version src patches;
|
||||
|
||||
buildInputs = [
|
||||
libgcrypt
|
||||
libgpg-error
|
||||
libsecret
|
||||
polkit
|
||||
qt5compat
|
||||
qtbase
|
||||
qtnetworkauth
|
||||
@ -85,6 +75,7 @@ stdenv.mkDerivation {
|
||||
qtwebsockets
|
||||
];
|
||||
nativeBuildInputs = [
|
||||
cargo
|
||||
cmake
|
||||
go
|
||||
pkg-config
|
||||
@ -92,8 +83,8 @@ stdenv.mkDerivation {
|
||||
python3.pkgs.glean-parser
|
||||
python3.pkgs.pyyaml
|
||||
python3.pkgs.setuptools
|
||||
qttools
|
||||
rustPlatform.cargoSetupHook
|
||||
cargo
|
||||
rustc
|
||||
wrapQtAppsHook
|
||||
];
|
||||
@ -117,22 +108,15 @@ stdenv.mkDerivation {
|
||||
dontCargoSetupPostUnpack = true;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/apps/vpn/platforms/linux/daemon/org.mozilla.vpn.dbus.service --replace /usr/bin/mozillavpn "$out/bin/mozillavpn"
|
||||
|
||||
substituteInPlace scripts/addon/build.py \
|
||||
--replace 'qtbinpath = args.qtpath' 'qtbinpath = "${qttools.dev}/bin"' \
|
||||
--replace 'rcc = os.path.join(qtbinpath, rcc_bin)' 'rcc = "${qtbase.dev}/libexec/rcc"'
|
||||
|
||||
substituteInPlace src/apps/vpn/cmake/linux.cmake \
|
||||
--replace '/etc/xdg/autostart' "$out/etc/xdg/autostart" \
|
||||
--replace '${"$"}{POLKIT_POLICY_DIR}' "$out/share/polkit-1/actions" \
|
||||
--replace '/usr/share/dbus-1' "$out/share/dbus-1" \
|
||||
--replace '${"$"}{SYSTEMD_UNIT_DIR}' "$out/lib/systemd/system"
|
||||
|
||||
substituteInPlace extension/CMakeLists.txt \
|
||||
--replace '/etc' "$out/etc"
|
||||
|
||||
ln -s '${netfilter-goModules}' linux/netfilter/vendor
|
||||
ln -s '${netfilterGoModules}' linux/netfilter/vendor
|
||||
|
||||
pushd extension/bridge
|
||||
cargoDepsCopy="$extensionBridgeDepsCopy" cargoSetupPostPatchHook
|
||||
|
||||
@ -25,9 +25,7 @@ buildPythonApplication rec {
|
||||
|
||||
makeWrapperArgs = [ "--prefix" "LD_LIBRARY_PATH" ":" (lib.makeLibraryPath [ nss ]) ];
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [ "--version=branch" ];
|
||||
};
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/unode/firefox_decrypt";
|
||||
|
||||
@ -5,14 +5,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "frogmouth";
|
||||
version = "0.8.0";
|
||||
version = "0.9.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Textualize";
|
||||
repo = "frogmouth";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-GVXzYPYvqgWRFOZW+dfYVI6Dhk9yUmuJ7V8wtM0VjR0=";
|
||||
hash = "sha256-TMCeIwMEoNDQV9iue4XrdYQMmwofXDvdMMLTZKILQ9Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
432
pkgs/tools/typesetting/typst/Cargo.lock
generated
432
pkgs/tools/typesetting/typst/Cargo.lock
generated
@ -99,17 +99,6 @@ version = "0.7.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6"
|
||||
|
||||
[[package]]
|
||||
name = "atty"
|
||||
version = "0.2.14"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
|
||||
dependencies = [
|
||||
"hermit-abi 0.1.19",
|
||||
"libc",
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "autocfg"
|
||||
version = "1.1.0"
|
||||
@ -166,6 +155,12 @@ version = "0.6.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
|
||||
|
||||
[[package]]
|
||||
name = "bit_field"
|
||||
version = "0.10.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61"
|
||||
|
||||
[[package]]
|
||||
name = "bitflags"
|
||||
version = "1.3.2"
|
||||
@ -253,21 +248,6 @@ dependencies = [
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "clap"
|
||||
version = "3.2.25"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123"
|
||||
dependencies = [
|
||||
"atty",
|
||||
"bitflags 1.3.2",
|
||||
"clap_lex 0.2.4",
|
||||
"indexmap",
|
||||
"strsim",
|
||||
"termcolor",
|
||||
"textwrap",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "clap"
|
||||
version = "4.2.7"
|
||||
@ -288,7 +268,7 @@ dependencies = [
|
||||
"anstream",
|
||||
"anstyle",
|
||||
"bitflags 1.3.2",
|
||||
"clap_lex 0.4.1",
|
||||
"clap_lex",
|
||||
"strsim",
|
||||
]
|
||||
|
||||
@ -298,7 +278,7 @@ version = "4.2.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1594fe2312ec4abf402076e407628f5c313e54c32ade058521df4ee34ecac8a8"
|
||||
dependencies = [
|
||||
"clap 4.2.7",
|
||||
"clap",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -313,15 +293,6 @@ dependencies = [
|
||||
"syn 2.0.16",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "clap_lex"
|
||||
version = "0.2.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
|
||||
dependencies = [
|
||||
"os_str_bytes",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "clap_lex"
|
||||
version = "0.4.1"
|
||||
@ -334,7 +305,7 @@ version = "0.2.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4237e29de9c6949982ba87d51709204504fb8ed2fd38232fcb1e5bf7d4ba48c8"
|
||||
dependencies = [
|
||||
"clap 4.2.7",
|
||||
"clap",
|
||||
"roff",
|
||||
]
|
||||
|
||||
@ -425,9 +396,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "crossbeam-epoch"
|
||||
version = "0.9.14"
|
||||
version = "0.9.15"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695"
|
||||
checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
"cfg-if",
|
||||
@ -445,6 +416,12 @@ dependencies = [
|
||||
"cfg-if",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "crunchy"
|
||||
version = "0.2.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
|
||||
|
||||
[[package]]
|
||||
name = "csv"
|
||||
version = "1.2.1"
|
||||
@ -473,7 +450,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"hashbrown",
|
||||
"hashbrown 0.12.3",
|
||||
"lock_api",
|
||||
"once_cell",
|
||||
"parking_lot_core",
|
||||
@ -554,6 +531,12 @@ dependencies = [
|
||||
"log",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "equivalent"
|
||||
version = "1.0.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
|
||||
|
||||
[[package]]
|
||||
name = "errno"
|
||||
version = "0.3.1"
|
||||
@ -575,6 +558,22 @@ dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "exr"
|
||||
version = "1.7.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d1e481eb11a482815d3e9d618db8c42a93207134662873809335a92327440c18"
|
||||
dependencies = [
|
||||
"bit_field",
|
||||
"flume",
|
||||
"half",
|
||||
"lebe",
|
||||
"miniz_oxide",
|
||||
"rayon-core",
|
||||
"smallvec",
|
||||
"zune-inflate",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "fancy-regex"
|
||||
version = "0.7.1"
|
||||
@ -631,6 +630,19 @@ version = "0.9.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4"
|
||||
|
||||
[[package]]
|
||||
name = "flume"
|
||||
version = "0.10.14"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577"
|
||||
dependencies = [
|
||||
"futures-core",
|
||||
"futures-sink",
|
||||
"nanorand",
|
||||
"pin-project",
|
||||
"spin 0.9.8",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "fnv"
|
||||
version = "1.0.7"
|
||||
@ -673,6 +685,18 @@ version = "2.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
|
||||
|
||||
[[package]]
|
||||
name = "futures-core"
|
||||
version = "0.3.28"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"
|
||||
|
||||
[[package]]
|
||||
name = "futures-sink"
|
||||
version = "0.3.28"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e"
|
||||
|
||||
[[package]]
|
||||
name = "getopts"
|
||||
version = "0.2.21"
|
||||
@ -689,8 +713,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"js-sys",
|
||||
"libc",
|
||||
"wasi",
|
||||
"wasm-bindgen",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -704,10 +730,13 @@ dependencies = [
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "glob"
|
||||
version = "0.3.1"
|
||||
name = "half"
|
||||
version = "2.2.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
|
||||
checksum = "02b4af3693f1b705df946e9fe5631932443781d0aabb423b62fcd4d73f6d2fd0"
|
||||
dependencies = [
|
||||
"crunchy",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "hashbrown"
|
||||
@ -715,6 +744,12 @@ version = "0.12.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
|
||||
|
||||
[[package]]
|
||||
name = "hashbrown"
|
||||
version = "0.14.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
|
||||
|
||||
[[package]]
|
||||
name = "hayagriva"
|
||||
version = "0.3.0"
|
||||
@ -742,24 +777,6 @@ version = "0.4.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
|
||||
|
||||
[[package]]
|
||||
name = "hermit-abi"
|
||||
version = "0.1.19"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
|
||||
dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "hermit-abi"
|
||||
version = "0.2.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7"
|
||||
dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "hermit-abi"
|
||||
version = "0.3.1"
|
||||
@ -768,9 +785,9 @@ checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
|
||||
|
||||
[[package]]
|
||||
name = "hypher"
|
||||
version = "0.1.1"
|
||||
version = "0.1.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f0cf92443ef10ecfc1b8b4b65a93e31d983f020a355699d83874b12a7c797ac3"
|
||||
checksum = "927f74d31cdbfd8de201340c0bc474c52c9145193ccd8885fcede14005591aad"
|
||||
|
||||
[[package]]
|
||||
name = "iai"
|
||||
@ -940,11 +957,14 @@ dependencies = [
|
||||
"bytemuck",
|
||||
"byteorder",
|
||||
"color_quant",
|
||||
"exr",
|
||||
"gif",
|
||||
"jpeg-decoder",
|
||||
"num-rational",
|
||||
"num-traits",
|
||||
"png",
|
||||
"qoi",
|
||||
"tiff",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -979,8 +999,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
"hashbrown",
|
||||
"hashbrown 0.12.3",
|
||||
"rayon",
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "indexmap"
|
||||
version = "2.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
|
||||
dependencies = [
|
||||
"equivalent",
|
||||
"hashbrown 0.14.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -990,18 +1021,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2fb7c1b80a1dfa604bb4a649a5c5aeef3d913f7c520cb42b40e534e8a61bcdfc"
|
||||
dependencies = [
|
||||
"ahash",
|
||||
"clap 4.2.7",
|
||||
"clap",
|
||||
"crossbeam-channel",
|
||||
"crossbeam-utils",
|
||||
"dashmap",
|
||||
"env_logger",
|
||||
"indexmap",
|
||||
"indexmap 1.9.3",
|
||||
"is-terminal",
|
||||
"itoa",
|
||||
"log",
|
||||
"num-format",
|
||||
"once_cell",
|
||||
"quick-xml",
|
||||
"quick-xml 0.26.0",
|
||||
"rgb",
|
||||
"str_stack",
|
||||
]
|
||||
@ -1041,7 +1072,7 @@ version = "1.0.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220"
|
||||
dependencies = [
|
||||
"hermit-abi 0.3.1",
|
||||
"hermit-abi",
|
||||
"libc",
|
||||
"windows-sys 0.48.0",
|
||||
]
|
||||
@ -1061,7 +1092,7 @@ version = "0.4.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f"
|
||||
dependencies = [
|
||||
"hermit-abi 0.3.1",
|
||||
"hermit-abi",
|
||||
"io-lifetimes",
|
||||
"rustix",
|
||||
"windows-sys 0.48.0",
|
||||
@ -1106,6 +1137,9 @@ name = "jpeg-decoder"
|
||||
version = "0.3.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e"
|
||||
dependencies = [
|
||||
"rayon",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "js-sys"
|
||||
@ -1151,6 +1185,12 @@ version = "1.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
|
||||
|
||||
[[package]]
|
||||
name = "lebe"
|
||||
version = "0.5.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8"
|
||||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
version = "0.2.144"
|
||||
@ -1181,6 +1221,15 @@ version = "0.2.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4"
|
||||
|
||||
[[package]]
|
||||
name = "line-wrap"
|
||||
version = "0.1.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9"
|
||||
dependencies = [
|
||||
"safemem",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "linked-hash-map"
|
||||
version = "0.5.6"
|
||||
@ -1245,9 +1294,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "memoffset"
|
||||
version = "0.8.0"
|
||||
version = "0.9.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1"
|
||||
checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
]
|
||||
@ -1274,6 +1323,15 @@ dependencies = [
|
||||
"windows-sys 0.45.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "nanorand"
|
||||
version = "0.7.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3"
|
||||
dependencies = [
|
||||
"getrandom",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "notify"
|
||||
version = "5.2.0"
|
||||
@ -1356,11 +1414,11 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "num_cpus"
|
||||
version = "1.15.0"
|
||||
version = "1.16.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b"
|
||||
checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
|
||||
dependencies = [
|
||||
"hermit-abi 0.2.6",
|
||||
"hermit-abi",
|
||||
"libc",
|
||||
]
|
||||
|
||||
@ -1370,6 +1428,15 @@ version = "0.1.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e25be21376a772d15f97ae789845340a9651d3c4246ff5ebb6a2b35f9c37bd31"
|
||||
|
||||
[[package]]
|
||||
name = "oklab"
|
||||
version = "1.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "467e40ada50d13bab19019e3707862b5076ca15841f31ee1474c40397c1b9f11"
|
||||
dependencies = [
|
||||
"rgb",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "once_cell"
|
||||
version = "1.17.1"
|
||||
@ -1392,12 +1459,6 @@ version = "0.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
|
||||
|
||||
[[package]]
|
||||
name = "os_str_bytes"
|
||||
version = "6.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267"
|
||||
|
||||
[[package]]
|
||||
name = "overload"
|
||||
version = "0.1.1"
|
||||
@ -1411,11 +1472,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "630638e107fb436644c300e781d3f17e1b04656138ba0d40564be4be3b06db32"
|
||||
dependencies = [
|
||||
"bitvec",
|
||||
"clap 3.2.25",
|
||||
"crossbeam-channel",
|
||||
"filetime",
|
||||
"image",
|
||||
"indexmap",
|
||||
"indexmap 1.9.3",
|
||||
"itertools",
|
||||
"libdeflater",
|
||||
"log",
|
||||
@ -1423,8 +1483,6 @@ dependencies = [
|
||||
"rgb",
|
||||
"rustc-hash",
|
||||
"rustc_version",
|
||||
"stderrlog",
|
||||
"wild",
|
||||
"zopfli",
|
||||
]
|
||||
|
||||
@ -1455,9 +1513,9 @@ checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd"
|
||||
|
||||
[[package]]
|
||||
name = "pdf-writer"
|
||||
version = "0.7.1"
|
||||
version = "0.8.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "30900f178ea696fc5d9637171f98aaa93d5aae54f0726726df68fc3e32810db6"
|
||||
checksum = "86af2eb3faa4614bc7fda8bd578c25e76a17ff3b1577be034b81e0c20527e204"
|
||||
dependencies = [
|
||||
"bitflags 1.3.2",
|
||||
"itoa",
|
||||
@ -1494,6 +1552,26 @@ version = "0.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315"
|
||||
|
||||
[[package]]
|
||||
name = "pin-project"
|
||||
version = "1.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead"
|
||||
dependencies = [
|
||||
"pin-project-internal",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "pin-project-internal"
|
||||
version = "1.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.16",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "pin-project-lite"
|
||||
version = "0.2.9"
|
||||
@ -1509,6 +1587,20 @@ dependencies = [
|
||||
"ttf-parser",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "plist"
|
||||
version = "1.4.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9bd9647b268a3d3e14ff09c23201133a62589c658db02bb7388c7246aafe0590"
|
||||
dependencies = [
|
||||
"base64",
|
||||
"indexmap 1.9.3",
|
||||
"line-wrap",
|
||||
"quick-xml 0.28.2",
|
||||
"serde",
|
||||
"time",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "png"
|
||||
version = "0.17.8"
|
||||
@ -1568,6 +1660,15 @@ dependencies = [
|
||||
"unicase",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "qoi"
|
||||
version = "0.4.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001"
|
||||
dependencies = [
|
||||
"bytemuck",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "quick-xml"
|
||||
version = "0.26.0"
|
||||
@ -1577,6 +1678,15 @@ dependencies = [
|
||||
"memchr",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "quick-xml"
|
||||
version = "0.28.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0ce5e73202a820a31f8a0ee32ada5e21029c81fd9e3ebf668a40832e4219d9d1"
|
||||
dependencies = [
|
||||
"memchr",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "quote"
|
||||
version = "1.0.27"
|
||||
@ -1703,8 +1813,11 @@ version = "0.32.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "142e83d8ae8c8c639f304698a5567b229ba65caba867bf4387bbc0ae158827cf"
|
||||
dependencies = [
|
||||
"gif",
|
||||
"jpeg-decoder",
|
||||
"log",
|
||||
"pico-args",
|
||||
"png",
|
||||
"rgb",
|
||||
"svgtypes",
|
||||
"tiny-skia",
|
||||
@ -1729,7 +1842,7 @@ dependencies = [
|
||||
"cc",
|
||||
"libc",
|
||||
"once_cell",
|
||||
"spin",
|
||||
"spin 0.5.2",
|
||||
"untrusted",
|
||||
"web-sys",
|
||||
"winapi",
|
||||
@ -1842,6 +1955,12 @@ version = "1.0.13"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"
|
||||
|
||||
[[package]]
|
||||
name = "safemem"
|
||||
version = "0.3.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072"
|
||||
|
||||
[[package]]
|
||||
name = "same-file"
|
||||
version = "1.0.6"
|
||||
@ -1919,12 +2038,25 @@ version = "0.8.26"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b"
|
||||
dependencies = [
|
||||
"indexmap",
|
||||
"indexmap 1.9.3",
|
||||
"ryu",
|
||||
"serde",
|
||||
"yaml-rust",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_yaml"
|
||||
version = "0.9.25"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574"
|
||||
dependencies = [
|
||||
"indexmap 2.0.0",
|
||||
"itoa",
|
||||
"ryu",
|
||||
"serde",
|
||||
"unsafe-libyaml",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "sharded-slab"
|
||||
version = "0.1.4"
|
||||
@ -1976,6 +2108,15 @@ version = "0.5.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
|
||||
|
||||
[[package]]
|
||||
name = "spin"
|
||||
version = "0.9.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
|
||||
dependencies = [
|
||||
"lock_api",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "stable_deref_trait"
|
||||
version = "1.2.0"
|
||||
@ -1995,18 +2136,6 @@ dependencies = [
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "stderrlog"
|
||||
version = "0.5.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "69a26bbf6de627d389164afa9783739b56746c6c72c4ed16539f4ff54170327b"
|
||||
dependencies = [
|
||||
"atty",
|
||||
"log",
|
||||
"termcolor",
|
||||
"thread_local",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "str_stack"
|
||||
version = "0.1.0"
|
||||
@ -2058,8 +2187,9 @@ checksum = "09eab8a83bff89ba2200bd4c59be45c7c787f988431b936099a5a266c957f2f9"
|
||||
|
||||
[[package]]
|
||||
name = "svg2pdf"
|
||||
version = "0.4.1"
|
||||
source = "git+https://github.com/typst/svg2pdf#35f4bb87fb677473661c6d12919e01a6d64a716d"
|
||||
version = "0.6.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c966e59fd4afd959edcc226687f751a7d05c94d0477cca1a4c2b15a7220f2b24"
|
||||
dependencies = [
|
||||
"image",
|
||||
"miniz_oxide",
|
||||
@ -2124,12 +2254,14 @@ dependencies = [
|
||||
"fnv",
|
||||
"lazy_static",
|
||||
"once_cell",
|
||||
"plist",
|
||||
"regex-syntax 0.6.29",
|
||||
"serde",
|
||||
"serde_derive",
|
||||
"serde_json",
|
||||
"thiserror",
|
||||
"walkdir",
|
||||
"yaml-rust",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -2171,12 +2303,6 @@ dependencies = [
|
||||
"winapi-util",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "textwrap"
|
||||
version = "0.16.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
|
||||
|
||||
[[package]]
|
||||
name = "thiserror"
|
||||
version = "1.0.40"
|
||||
@ -2207,6 +2333,17 @@ dependencies = [
|
||||
"once_cell",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tiff"
|
||||
version = "0.8.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7449334f9ff2baf290d55d73983a7d6fa15e01198faef72af07e2a8db851e471"
|
||||
dependencies = [
|
||||
"flate2",
|
||||
"jpeg-decoder",
|
||||
"weezl",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "time"
|
||||
version = "0.3.21"
|
||||
@ -2313,7 +2450,7 @@ version = "0.19.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "92d964908cec0d030b812013af25a0e57fddfadb1e066ecc6681d86253129d4f"
|
||||
dependencies = [
|
||||
"indexmap",
|
||||
"indexmap 1.9.3",
|
||||
"serde",
|
||||
"serde_spanned",
|
||||
"toml_datetime",
|
||||
@ -2413,7 +2550,7 @@ checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a"
|
||||
|
||||
[[package]]
|
||||
name = "typst"
|
||||
version = "0.6.0"
|
||||
version = "0.7.0"
|
||||
dependencies = [
|
||||
"bitflags 2.3.1",
|
||||
"bytemuck",
|
||||
@ -2423,9 +2560,10 @@ dependencies = [
|
||||
"fontdb",
|
||||
"if_chain",
|
||||
"image",
|
||||
"indexmap",
|
||||
"indexmap 1.9.3",
|
||||
"log",
|
||||
"miniz_oxide",
|
||||
"oklab",
|
||||
"once_cell",
|
||||
"pdf-writer",
|
||||
"pixglyph",
|
||||
@ -2444,6 +2582,7 @@ dependencies = [
|
||||
"tracing",
|
||||
"ttf-parser",
|
||||
"typst-macros",
|
||||
"typst-syntax",
|
||||
"unicode-general-category",
|
||||
"unicode-ident",
|
||||
"unicode-math-class",
|
||||
@ -2455,10 +2594,10 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "typst-cli"
|
||||
version = "0.6.0"
|
||||
version = "0.7.0"
|
||||
dependencies = [
|
||||
"chrono",
|
||||
"clap 4.2.7",
|
||||
"clap",
|
||||
"clap_complete",
|
||||
"clap_mangen",
|
||||
"codespan-reporting",
|
||||
@ -2471,6 +2610,9 @@ dependencies = [
|
||||
"once_cell",
|
||||
"open",
|
||||
"same-file",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"serde_yaml 0.9.25",
|
||||
"siphasher",
|
||||
"tar",
|
||||
"tempfile",
|
||||
@ -2486,7 +2628,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "typst-docs"
|
||||
version = "0.6.0"
|
||||
version = "0.7.0"
|
||||
dependencies = [
|
||||
"comemo",
|
||||
"heck",
|
||||
@ -2494,7 +2636,7 @@ dependencies = [
|
||||
"once_cell",
|
||||
"pulldown-cmark",
|
||||
"serde",
|
||||
"serde_yaml",
|
||||
"serde_yaml 0.8.26",
|
||||
"syntect",
|
||||
"typed-arena",
|
||||
"typst",
|
||||
@ -2506,7 +2648,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "typst-library"
|
||||
version = "0.6.0"
|
||||
version = "0.7.0"
|
||||
dependencies = [
|
||||
"az",
|
||||
"chinese-number",
|
||||
@ -2527,7 +2669,7 @@ dependencies = [
|
||||
"roxmltree",
|
||||
"rustybuzz",
|
||||
"serde_json",
|
||||
"serde_yaml",
|
||||
"serde_yaml 0.8.26",
|
||||
"smallvec",
|
||||
"syntect",
|
||||
"time",
|
||||
@ -2544,7 +2686,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "typst-macros"
|
||||
version = "0.6.0"
|
||||
version = "0.7.0"
|
||||
dependencies = [
|
||||
"heck",
|
||||
"proc-macro2",
|
||||
@ -2553,10 +2695,25 @@ dependencies = [
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "typst-tests"
|
||||
version = "0.6.0"
|
||||
name = "typst-syntax"
|
||||
version = "0.7.0"
|
||||
dependencies = [
|
||||
"clap 4.2.7",
|
||||
"comemo",
|
||||
"ecow",
|
||||
"once_cell",
|
||||
"serde",
|
||||
"tracing",
|
||||
"unicode-ident",
|
||||
"unicode-math-class",
|
||||
"unicode-segmentation",
|
||||
"unscanny",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "typst-tests"
|
||||
version = "0.7.0"
|
||||
dependencies = [
|
||||
"clap",
|
||||
"comemo",
|
||||
"iai",
|
||||
"once_cell",
|
||||
@ -2678,6 +2835,12 @@ version = "0.6.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "446c96c6dd42604779487f0a981060717156648c1706aa1f464677f03c6cc059"
|
||||
|
||||
[[package]]
|
||||
name = "unsafe-libyaml"
|
||||
version = "0.2.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f28467d3e1d3c6586d8f25fa243f544f5800fec42d97032474e17222c2b75cfa"
|
||||
|
||||
[[package]]
|
||||
name = "unscanny"
|
||||
version = "0.1.0"
|
||||
@ -2896,15 +3059,6 @@ version = "0.1.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb"
|
||||
|
||||
[[package]]
|
||||
name = "wild"
|
||||
version = "2.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "05b116685a6be0c52f5a103334cbff26db643826c7b3735fc0a3ba9871310a74"
|
||||
dependencies = [
|
||||
"glob",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "winapi"
|
||||
version = "0.3.9"
|
||||
@ -3135,7 +3289,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a94fb32d2b438e3fddf901fbfe9eb87b34d63853ca6c6da5d2ab7e27031e0bae"
|
||||
dependencies = [
|
||||
"serde",
|
||||
"serde_yaml",
|
||||
"serde_yaml 0.8.26",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -3218,13 +3372,21 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "zopfli"
|
||||
version = "0.7.2"
|
||||
version = "0.7.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a5b2bed49d3f0af28729a2338ee8c3a48eba2133a78ebc560779be161ebaaad8"
|
||||
checksum = "4e0650ae6a051326d798eb099b632f1afb0d323d25ee4ec82ffb0779512084d5"
|
||||
dependencies = [
|
||||
"byteorder",
|
||||
"crc32fast",
|
||||
"log",
|
||||
"simd-adler32",
|
||||
"typed-arena",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "zune-inflate"
|
||||
version = "0.2.54"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02"
|
||||
dependencies = [
|
||||
"simd-adler32",
|
||||
]
|
||||
|
||||
@ -8,20 +8,19 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "typst";
|
||||
version = "0.6.0";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "typst";
|
||||
repo = "typst";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-8e6BNffKgAUNwic4uEfDh77y2nIyYt9BwZr+ypv+d5A=";
|
||||
hash = "sha256-yrtOmlFAKOqAmhCP7n0HQCOQpU3DWyms5foCdUb9QTg=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"iai-0.1.1" = "sha256-EdNzCPht5chg7uF9O8CtPWR/bzSYyfYIXNdLltqdlR0=";
|
||||
"svg2pdf-0.4.1" = "sha256-WeVP+yhqizpTdRfyoj2AUxFKhGvVJIIiRV0GTXkgLtQ=";
|
||||
};
|
||||
};
|
||||
|
||||
@ -38,10 +37,10 @@ rustPlatform.buildRustPackage rec {
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
installManPage cli/artifacts/*.1
|
||||
installManPage crates/typst-cli/artifacts/*.1
|
||||
installShellCompletion \
|
||||
cli/artifacts/typst.{bash,fish} \
|
||||
--zsh cli/artifacts/_typst
|
||||
crates/typst-cli/artifacts/typst.{bash,fish} \
|
||||
--zsh crates/typst-cli/artifacts/_typst
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
52
pkgs/tools/wayland/chayang/default.nix
Normal file
52
pkgs/tools/wayland/chayang/default.nix
Normal file
@ -0,0 +1,52 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromSourcehut
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, wayland-scanner
|
||||
, wayland-protocols
|
||||
, wayland
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "chayang";
|
||||
version = "0.1.0";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~emersion";
|
||||
repo = "chayang";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-3Vu9/Bu2WQe2Yx/2BK25pEpuPNwX6g3qoFUMznCFHeI=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
pkgsBuildBuild = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
wayland-scanner
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
wayland-protocols
|
||||
wayland
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Gradually dim the screen on Wayland";
|
||||
homepage = "https://git.sr.ht/~emersion/chayang/";
|
||||
license = licenses.mit;
|
||||
longDescription = ''
|
||||
Gradually dim the screen on Wayland.
|
||||
Can be used to implement a grace period before locking the session.
|
||||
'';
|
||||
maintainers = with maintainers; [ mxkrsv ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
})
|
||||
@ -1362,7 +1362,6 @@ mapAliases ({
|
||||
pixie = throw "pixie has been removed: abandoned by upstream"; # Added 2022-04-21
|
||||
pkgconfig = pkg-config; # Added 2018-02-02, moved to aliases.nix 2021-01-18
|
||||
pkgconfigUpstream = throw "'pkgconfigUpstream' has been renamed to/replaced by 'pkg-configUpstream'"; # Converted to throw 2022-02-22
|
||||
planner = throw "planner has been removed from nixpkgs, as it is no longer developed and still uses python2/PyGTK"; # Added 2021-02-02
|
||||
pleroma-otp = pleroma; # Added 2021-07-10
|
||||
plexpy = throw "'plexpy' has been renamed to/replaced by 'tautulli'"; # Converted to throw 2022-02-22
|
||||
pltScheme = racket; # just to be sure
|
||||
|
||||
@ -4619,6 +4619,8 @@ with pkgs;
|
||||
inherit (darwin.apple_sdk.frameworks) Foundation;
|
||||
};
|
||||
|
||||
chayang = callPackage ../tools/wayland/chayang { };
|
||||
|
||||
cherrytree = callPackage ../applications/misc/cherrytree { };
|
||||
|
||||
chntpw = callPackage ../tools/security/chntpw { };
|
||||
@ -7409,7 +7411,7 @@ with pkgs;
|
||||
|
||||
dtc = callPackage ../development/compilers/dtc { };
|
||||
|
||||
dt-schema = with python3Packages; toPythonApplication dtschema;
|
||||
dt-schema = callPackage ../development/tools/dt-schema { };
|
||||
|
||||
dub = callPackage ../development/tools/build-managers/dub { };
|
||||
|
||||
@ -30857,6 +30859,8 @@ with pkgs;
|
||||
|
||||
dia = callPackage ../applications/graphics/dia { };
|
||||
|
||||
diebahn = callPackage ../applications/misc/diebahn { };
|
||||
|
||||
digital = callPackage ../applications/science/electronics/digital { };
|
||||
|
||||
direwolf = callPackage ../applications/radio/direwolf {
|
||||
@ -32302,6 +32306,8 @@ with pkgs;
|
||||
|
||||
pixinsight = libsForQt5.callPackage ../applications/graphics/pixinsight { };
|
||||
|
||||
planner = callPackage ../applications/office/planner { };
|
||||
|
||||
please-cli = callPackage ../applications/misc/please-cli { };
|
||||
|
||||
protonup-qt = python3Packages.callPackage ../applications/misc/protonup-qt { };
|
||||
@ -32733,6 +32739,8 @@ with pkgs;
|
||||
|
||||
joe = callPackage ../applications/editors/joe { };
|
||||
|
||||
johnny = callPackage ../applications/misc/johnny { };
|
||||
|
||||
josm = callPackage ../applications/misc/josm { };
|
||||
|
||||
js8call = qt5.callPackage ../applications/radio/js8call { };
|
||||
|
||||
@ -13874,10 +13874,10 @@ with self; {
|
||||
|
||||
locallib = buildPerlPackage {
|
||||
pname = "local-lib";
|
||||
version = "2.000024";
|
||||
version = "2.000029";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/H/HA/HAARG/local-lib-2.000024.tar.gz";
|
||||
hash = "sha256-LpuRe9SKBhXkJjOyoydJTgRhDY9xB2W5ST0wbOrZigU=";
|
||||
url = "mirror://cpan/authors/id/H/HA/HAARG/local-lib-2.000029.tar.gz";
|
||||
hash = "sha256-jfh6EMFMjpCcW0fFcB5LgYfVGeUlHofIBwmwK7M+/dc=";
|
||||
};
|
||||
propagatedBuildInputs = [ ModuleBuild ];
|
||||
meta = {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user