Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
faf50dfee3
@ -35,7 +35,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
|
||||
"${pkgs.nzbget}/bin/nzbget -n -o Control_iP=127.0.0.1 -o Control_port=6789 -o Control_password=tegbzn6789 -V"
|
||||
)
|
||||
|
||||
config = server.succeed("${nodes.server.config.systemd.services.nzbget.serviceConfig.ExecStart} --printconfig")
|
||||
config = server.succeed("${nodes.server.systemd.services.nzbget.serviceConfig.ExecStart} --printconfig")
|
||||
|
||||
# confirm the test settings are applied
|
||||
assert 'MainDir = "/var/lib/nzbget"' in config
|
||||
|
||||
@ -2,10 +2,10 @@
|
||||
|
||||
let
|
||||
pname = "framesh";
|
||||
version = "0.6.2";
|
||||
version = "0.6.6";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/floating/frame/releases/download/v${version}/Frame-${version}.AppImage";
|
||||
sha256 = "sha256-nN5+6SwfHcwhePlbsXjT3qNd/d6Xqnd85NVC8vw3ehk=";
|
||||
sha256 = "sha256-5LLnITQP9m2lMdnB/rrK/M+p3AA3rYZ9GOrDdCFA/r4=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
|
||||
2270
pkgs/applications/misc/taizen/Cargo.lock
generated
Normal file
2270
pkgs/applications/misc/taizen/Cargo.lock
generated
Normal file
File diff suppressed because it is too large
Load Diff
@ -1,25 +1,46 @@
|
||||
{ rustPlatform, lib, fetchFromGitHub, ncurses, openssl, pkg-config, Security, stdenv }:
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, ncurses
|
||||
, openssl
|
||||
, stdenv
|
||||
, darwin
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "taizen";
|
||||
version = "0.1.0";
|
||||
version = "unstable-2020-05-02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NerdyPepper";
|
||||
repo = pname;
|
||||
rev = "5c1876429e2da7424e9d31b1e16f5a3147cc58d0";
|
||||
sha256 = "09izgx7icvizskdy9kplk0am61p7550fsd0v42zcihq2vap2j92z";
|
||||
rev = "5e88a55abaa2bf4356aa5bc783c2957e59c63216";
|
||||
sha256 = "sha256-cMykIh5EDGYZMJ5EPTU6G8YDXxfUzzfRfEICWmDUdrA=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
};
|
||||
|
||||
buildInputs = [ ncurses openssl ] ++ lib.optional stdenv.isDarwin Security;
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
cargoSha256 = "1yqy5v02a4qshgb7k8rnn408k3n6qx3jc8zziwvv7im61n9sjynf";
|
||||
buildInputs = [
|
||||
ncurses
|
||||
openssl
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
];
|
||||
|
||||
# update Cargo.lock to work with openssl 3
|
||||
postPatch = ''
|
||||
ln -sf ${./Cargo.lock} Cargo.lock
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://crates.io/crates/taizen";
|
||||
license = licenses.mit;
|
||||
description = "curses based mediawiki browser";
|
||||
maintainers = with maintainers; [ ];
|
||||
homepage = "https://github.com/nerdypepper/taizen";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -19,9 +19,9 @@
|
||||
}
|
||||
},
|
||||
"beta": {
|
||||
"version": "114.0.5735.16",
|
||||
"sha256": "1pynbzbc8wwc6g8ikx0hr95ylncpdx97y27c6wmfygwgvp91a6wa",
|
||||
"sha256bin64": "098aclrhifz6cpxcjdaqvi76j3g8r84p3b6cs4fbsj4cmczj4frw",
|
||||
"version": "114.0.5735.26",
|
||||
"sha256": "0v73vzgyg08683my0bc29nvbqqpq3zx9qdnxvdvp72rmyrbc5aiy",
|
||||
"sha256bin64": "0viy4ibzh04vnkv111vcz4y0s7vg3f2470j2s1b4nzwxmqadxi3n",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2023-04-19",
|
||||
@ -32,15 +32,15 @@
|
||||
}
|
||||
},
|
||||
"dev": {
|
||||
"version": "115.0.5750.0",
|
||||
"sha256": "1y0yq7k5rcv4lfxdlr4psap4hxcnrwjps6vl42hwvpw6zxscw1lv",
|
||||
"sha256bin64": "0h2d4csrznavalfnzvn59pc2jmj6ci1paslp7y2rlpv1jqjrpgq9",
|
||||
"version": "115.0.5762.4",
|
||||
"sha256": "0jlqnd4cmbm3c4xz6dcgs7p8clraldl7hncm4wc28yxv5bsxhyqi",
|
||||
"sha256bin64": "1zcpzji22fpb04bfhqlp0wy3rnjk3ylfh39r1c2zgqks31n6niz6",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2023-04-19",
|
||||
"version": "2023-05-09",
|
||||
"url": "https://gn.googlesource.com/gn",
|
||||
"rev": "5a004f9427a050c6c393c07ddb85cba8ff3849fa",
|
||||
"sha256": "01xrh9m9m6x8lz0vxwdw2mrhrvnw93zpg09hwdhqakj06agf4jjk"
|
||||
"rev": "ad1e5ce10f06ef9a1a1d91b2e48231d6b3eecbe2",
|
||||
"sha256": "1m00wqkkvgs52a9bikirnmvsw2d9kfzk59a45mg4n8m4sgpvmxc7"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
@ -164,13 +164,13 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"bitbucket": {
|
||||
"hash": "sha256-lm/BNxfB5ZosyFYihJ6kh8oro+tCP6pRFNnWrvzeKgk=",
|
||||
"hash": "sha256-T9e3IQHe6uCdllRTctJg/aG1QmPFR6V4ryw79yX2k/o=",
|
||||
"homepage": "https://registry.terraform.io/providers/DrFaust92/bitbucket",
|
||||
"owner": "DrFaust92",
|
||||
"repo": "terraform-provider-bitbucket",
|
||||
"rev": "v2.32.0",
|
||||
"rev": "v2.33.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-mnG2CZ/ko4p4CTs0YskJP41sQD9lmEz4dRQLiklim34="
|
||||
"vendorHash": "sha256-ebkUF+Xv9diwUYXYt/WK+0tWheqL1cgA665VbGLmvvo="
|
||||
},
|
||||
"brightbox": {
|
||||
"hash": "sha256-yKoYjrZs6EOX1pdDuF+LOu/jZ3fidZJBU7yhSp6qSFU=",
|
||||
|
||||
@ -6,6 +6,7 @@
|
||||
, autoPatchelfHook
|
||||
, cairo
|
||||
, cups
|
||||
, curl
|
||||
, dbus
|
||||
, dpkg
|
||||
, expat
|
||||
@ -37,6 +38,7 @@
|
||||
, libgcrypt
|
||||
, libglvnd
|
||||
, libnotify
|
||||
, libpulseaudio
|
||||
, libuuid
|
||||
, libxcb
|
||||
, libxkbcommon
|
||||
@ -61,13 +63,13 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "5.18.11";
|
||||
version = "6.1.11";
|
||||
pname = "feishu";
|
||||
packageHash = "9d89b152d581"; # A hash value used in the download url
|
||||
packageHash = "e82bd3ef"; # A hash value used in the download url
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/${packageHash}/Feishu-linux_x64-${version}.deb";
|
||||
hash = "sha256-93LEybYePIEbmE8mjRL95haMuBuY0xH6/8fhwF7/ctM=";
|
||||
hash = "sha256-IBNMNOcOYIdiTlr4+Ziju7Pbf9XJV0O+w2arHTa1zZ0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -82,9 +84,12 @@ stdenv.mkDerivation rec {
|
||||
# for autopatchelf
|
||||
alsa-lib
|
||||
cups
|
||||
curl
|
||||
libXdamage
|
||||
libXtst
|
||||
libdrm
|
||||
libgcrypt
|
||||
libpulseaudio
|
||||
libxshmfence
|
||||
mesa
|
||||
nspr
|
||||
@ -98,6 +103,7 @@ stdenv.mkDerivation rec {
|
||||
atk
|
||||
cairo
|
||||
cups
|
||||
curl
|
||||
dbus
|
||||
expat
|
||||
fontconfig
|
||||
@ -125,6 +131,7 @@ stdenv.mkDerivation rec {
|
||||
libgcrypt
|
||||
libglvnd
|
||||
libnotify
|
||||
libpulseaudio
|
||||
libuuid
|
||||
libxcb
|
||||
libxkbcommon
|
||||
@ -174,6 +181,12 @@ stdenv.mkDerivation rec {
|
||||
|
||||
mkdir -p $out/bin
|
||||
ln -s $out/opt/bytedance/feishu/bytedance-feishu $out/bin/bytedance-feishu
|
||||
|
||||
# feishu comes with a bundled libcurl.so
|
||||
# and has many dependencies that are hard to satisfy
|
||||
# e.g. openldap version 2.4
|
||||
# so replace it with our own libcurl.so
|
||||
ln -sf ${curl}/lib/libcurl.so $out/opt/bytedance/feishu/libcurl.so
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
142
pkgs/applications/virtualization/pods/Cargo.lock
generated
142
pkgs/applications/virtualization/pods/Cargo.lock
generated
@ -205,16 +205,6 @@ dependencies = [
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "codespan-reporting"
|
||||
version = "0.11.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e"
|
||||
dependencies = [
|
||||
"termcolor",
|
||||
"unicode-width",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "containers-api"
|
||||
version = "0.8.0"
|
||||
@ -230,7 +220,7 @@ dependencies = [
|
||||
"log",
|
||||
"mime",
|
||||
"paste",
|
||||
"pin-project 1.0.12",
|
||||
"pin-project 1.1.0",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"tar",
|
||||
@ -273,50 +263,6 @@ dependencies = [
|
||||
"typenum",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cxx"
|
||||
version = "1.0.94"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93"
|
||||
dependencies = [
|
||||
"cc",
|
||||
"cxxbridge-flags",
|
||||
"cxxbridge-macro",
|
||||
"link-cplusplus",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cxx-build"
|
||||
version = "1.0.94"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b"
|
||||
dependencies = [
|
||||
"cc",
|
||||
"codespan-reporting",
|
||||
"once_cell",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"scratch",
|
||||
"syn 2.0.15",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cxxbridge-flags"
|
||||
version = "1.0.94"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb"
|
||||
|
||||
[[package]]
|
||||
name = "cxxbridge-macro"
|
||||
version = "1.0.94"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.15",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "derivative"
|
||||
version = "2.2.0"
|
||||
@ -1015,7 +961,7 @@ dependencies = [
|
||||
"futures-util",
|
||||
"hex",
|
||||
"hyper",
|
||||
"pin-project 1.0.12",
|
||||
"pin-project 1.1.0",
|
||||
"tokio",
|
||||
]
|
||||
|
||||
@ -1035,12 +981,11 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "iana-time-zone-haiku"
|
||||
version = "0.1.1"
|
||||
version = "0.1.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca"
|
||||
checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
|
||||
dependencies = [
|
||||
"cxx",
|
||||
"cxx-build",
|
||||
"cc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -1177,15 +1122,6 @@ dependencies = [
|
||||
"system-deps",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "link-cplusplus"
|
||||
version = "1.0.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5"
|
||||
dependencies = [
|
||||
"cc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "linux-raw-sys"
|
||||
version = "0.3.7"
|
||||
@ -1434,11 +1370,11 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "pin-project"
|
||||
version = "1.0.12"
|
||||
version = "1.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc"
|
||||
checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead"
|
||||
dependencies = [
|
||||
"pin-project-internal 1.0.12",
|
||||
"pin-project-internal 1.1.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -1454,13 +1390,13 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "pin-project-internal"
|
||||
version = "1.0.12"
|
||||
version = "1.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55"
|
||||
checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 1.0.109",
|
||||
"syn 2.0.15",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -1518,7 +1454,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "pods"
|
||||
version = "1.1.2"
|
||||
version = "1.1.3"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"ashpd",
|
||||
@ -1695,12 +1631,6 @@ version = "1.0.13"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"
|
||||
|
||||
[[package]]
|
||||
name = "scratch"
|
||||
version = "1.0.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1"
|
||||
|
||||
[[package]]
|
||||
name = "semver"
|
||||
version = "1.0.17"
|
||||
@ -1709,18 +1639,18 @@ checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed"
|
||||
|
||||
[[package]]
|
||||
name = "serde"
|
||||
version = "1.0.162"
|
||||
version = "1.0.163"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "71b2f6e1ab5c2b98c05f0f35b236b22e8df7ead6ffbf51d7808da7f8817e7ab6"
|
||||
checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2"
|
||||
dependencies = [
|
||||
"serde_derive",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_derive"
|
||||
version = "1.0.162"
|
||||
version = "1.0.163"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a2a0814352fd64b58489904a44ea8d90cb1a91dcb6b4f5ebabc32c8318e93cb6"
|
||||
checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
@ -1920,15 +1850,6 @@ dependencies = [
|
||||
"windows-sys 0.45.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "termcolor"
|
||||
version = "1.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6"
|
||||
dependencies = [
|
||||
"winapi-util",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "thiserror"
|
||||
version = "1.0.40"
|
||||
@ -2112,9 +2033,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tracing-core"
|
||||
version = "0.1.30"
|
||||
version = "0.1.31"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a"
|
||||
checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a"
|
||||
dependencies = [
|
||||
"once_cell",
|
||||
]
|
||||
@ -2162,12 +2083,6 @@ dependencies = [
|
||||
"tinyvec",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "unicode-width"
|
||||
version = "0.1.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
|
||||
|
||||
[[package]]
|
||||
name = "url"
|
||||
version = "2.3.1"
|
||||
@ -2342,15 +2257,6 @@ version = "0.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
|
||||
|
||||
[[package]]
|
||||
name = "winapi-util"
|
||||
version = "0.1.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
|
||||
dependencies = [
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "winapi-x86_64-pc-windows-gnu"
|
||||
version = "0.4.0"
|
||||
@ -2577,9 +2483,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "zbus_names"
|
||||
version = "2.5.0"
|
||||
version = "2.5.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f34f314916bd89bdb9934154627fab152f4f28acdda03e7c4c68181b214fe7e3"
|
||||
checksum = "82441e6033be0a741157a72951a3e4957d519698f3a824439cc131c5ba77ac2a"
|
||||
dependencies = [
|
||||
"serde",
|
||||
"static_assertions",
|
||||
@ -2588,9 +2494,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "zvariant"
|
||||
version = "3.12.0"
|
||||
version = "3.13.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "46fe4914a985446d6fd287019b5fceccce38303d71407d9e6e711d44954a05d8"
|
||||
checksum = "5cb36cd95352132911c9c99fdcc1635de5c2c139bd34cbcf6dfb8350ee8ff6a7"
|
||||
dependencies = [
|
||||
"byteorder",
|
||||
"enumflags2",
|
||||
@ -2603,9 +2509,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "zvariant_derive"
|
||||
version = "3.12.0"
|
||||
version = "3.13.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "34c20260af4b28b3275d6676c7e2a6be0d4332e8e0aba4616d34007fd84e462a"
|
||||
checksum = "9b34951e1ac64f3a1443fe7181256b9ed6a811a1631917566c3d5ca718d8cf33"
|
||||
dependencies = [
|
||||
"proc-macro-crate",
|
||||
"proc-macro2",
|
||||
|
||||
@ -19,13 +19,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pods";
|
||||
version = "1.1.2";
|
||||
version = "1.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "marhkb";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-5euSMmyumZbUFsZuP7fa3wCm4n0Hx+F8bPlv4Xw/Hvw=";
|
||||
sha256 = "sha256-wZZBtvSMC83P38jzbZ1fX5f42WTPI68XGB1aG3gMYG0=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.importCargoLock {
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "otoml";
|
||||
version = "1.0.2";
|
||||
version = "1.0.4";
|
||||
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
@ -16,7 +16,7 @@ buildDunePackage rec {
|
||||
owner = "dmbaturin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-Xd3fHBN1f+tvgRFCxD/Gz8/lIvezknz7Zy3EtdqoTEM=";
|
||||
sha256 = "sha256-3bgeiwa0elisxZaWpwLqoKmeyTBKMW1IWdm6YdSIhSw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ menhir ];
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, buildPythonPackage
|
||||
@ -6,38 +7,43 @@
|
||||
, click
|
||||
, construct
|
||||
, ecdsa
|
||||
, flit-core
|
||||
, hidapi
|
||||
, intelhex
|
||||
, pillow
|
||||
, protobuf
|
||||
, protobuf3
|
||||
, requests
|
||||
, setuptools
|
||||
, tabulate
|
||||
, toml
|
||||
, AppKit
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ledgerwallet";
|
||||
version = "0.1.2";
|
||||
version = "0.2.4";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LedgerHQ";
|
||||
repo = "ledgerctl";
|
||||
rev = "v${version}";
|
||||
sha256 = "0fb93h2wxm9as9rsywlgz2ng4wrlbjphn6mgbhj6nls2i86rrdxk";
|
||||
hash = "sha256-IcStYYkKEdZxwgJKL8l2Y1BtO/Oncd4aKUAZD8umbHs=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# Fix removed function in construct library
|
||||
url = "https://github.com/LedgerHQ/ledgerctl/commit/fd23d0e14721b93789071e80632e6bd9e47c1256.patch";
|
||||
hash = "sha256-YNlENguPQW5FNFT7mqED+ghF3TJiKao4H+56Eu+j+Eo=";
|
||||
excludes = [ "setup.py" ];
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ AppKit ];
|
||||
buildInputs = [ flit-core setuptools ] ++ lib.optionals stdenv.isDarwin [ AppKit ];
|
||||
propagatedBuildInputs = [
|
||||
cryptography click construct ecdsa hidapi intelhex pillow protobuf requests tabulate
|
||||
cryptography
|
||||
click
|
||||
construct
|
||||
ecdsa
|
||||
hidapi
|
||||
intelhex
|
||||
pillow
|
||||
protobuf3
|
||||
requests
|
||||
tabulate
|
||||
toml
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "ledgerwallet" ];
|
||||
@ -46,6 +52,6 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/LedgerHQ/ledgerctl";
|
||||
description = "A library to control Ledger devices";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ d-xo ];
|
||||
maintainers = with maintainers; [ d-xo erdnaxe ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytensor";
|
||||
version = "2.10.1";
|
||||
version = "2.11.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -30,7 +30,7 @@ buildPythonPackage rec {
|
||||
owner = "pymc-devs";
|
||||
repo = pname;
|
||||
rev = "refs/tags/rel-${version}";
|
||||
hash = "sha256-sk/HGfiiNKrgnf5fPaxoOySvAEpnAXnLFmK0yah51ww=";
|
||||
hash = "sha256-4GDur8S19i8pZkywKHZUelmd2e0jZmC5HzF7o2esDl4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -72,8 +72,10 @@ buildPythonPackage rec {
|
||||
disabledTests = [
|
||||
# benchmarks (require pytest-benchmark):
|
||||
"test_elemwise_speed"
|
||||
"test_fused_elemwise_benchmark"
|
||||
"test_logsumexp_benchmark"
|
||||
"test_scan_multiple_output"
|
||||
"test_vector_taps_benchmark"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "transmission-rpc";
|
||||
version = "4.2.1";
|
||||
version = "4.2.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "Trim21";
|
||||
repo = "transmission-rpc";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-+NjJscLRGNSDmyrOMjwUMtJPVz2N32Cy80Q3iu33QJc=";
|
||||
hash = "sha256-8gNGBfU7k2SvpNqRGkT9BXyAyKizUCXY8Unuqw5IICE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "bundletool";
|
||||
version = "1.14.1";
|
||||
version = "1.15.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/google/bundletool/releases/download/${version}/bundletool-all-${version}.jar";
|
||||
sha256 = "sha256-L3j5yNBZ2xx+pKxv+yUnRmrwODjRULcPS3f+fe78oBE=";
|
||||
sha256 = "sha256-FOeyaOF1wagy0WlaHPRsXH4GlJCT5u+3qDxk16JS9/g=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo2junit";
|
||||
version = "0.1.12";
|
||||
version = "0.1.13";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-wF1vDUVEume6aWzI5smTNlwc9WyZeTtUX416tYYrZPU=";
|
||||
sha256 = "sha256-R3a87nXCnGhdeyR7409hFR5Cj3TFUWqaLNOtlXPsvto=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-GUCHWV+uPHZwhU4UhdXE2GHpeVnqbUTpfivA9Nh9MoY=";
|
||||
cargoHash = "sha256-u5Pd967qxjqFl9fV/KkClLDBwKql7p66WqbIVBvWKuM=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Converts cargo's json output (from stdin) to JUnit XML (to stdout).";
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
, stdenv
|
||||
}:
|
||||
let
|
||||
version = "2.0-1259";
|
||||
version = "2.0-1272";
|
||||
urlVersion = builtins.replaceStrings [ "." "-" ] [ "00" "0" ] version;
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
@ -24,7 +24,7 @@ stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.roonlabs.com/updates/production/RoonServer_linuxx64_${urlVersion}.tar.bz2";
|
||||
hash = "sha256-nd0dDiiUmwhuVivB78EXdj6LrK0ufdSrVYH/0Y++img=";
|
||||
hash = "sha256-oLHdgOaGnu7hRm863ryf4r05nN8wQL7WKxN3ONG67J4=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, postgresql, openssl, zlib, readline, libkrb5 }:
|
||||
{ lib, stdenv, fetchFromGitHub, postgresql, openssl, zlib, readline, libkrb5, libxcrypt }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pg_auto_failover";
|
||||
@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-CLtLOzKRB9p6+SytMvWCYo7m7s/d+clAGOa2sWi6uZ0=";
|
||||
};
|
||||
|
||||
buildInputs = [ postgresql openssl zlib readline libkrb5 ];
|
||||
buildInputs = [ postgresql openssl zlib readline libkrb5 ]
|
||||
++ lib.optionals (stdenv.isLinux && lib.versionOlder postgresql.version "13") [ libxcrypt ];
|
||||
|
||||
installPhase = ''
|
||||
install -D -t $out/bin src/bin/pg_autoctl/pg_autoctl
|
||||
|
||||
@ -1,8 +1,7 @@
|
||||
{ lib, ruby_3_0, bundlerApp, fetchpatch }:
|
||||
{ lib, bundlerApp }:
|
||||
|
||||
bundlerApp {
|
||||
pname = "3llo";
|
||||
ruby = ruby_3_0;
|
||||
|
||||
gemdir = ./.;
|
||||
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "keymapviz";
|
||||
version = "1.10.1";
|
||||
version = "1.14.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yskoht";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-I16iJ6/CrjpDOmlewIxa5Xu/b/97VNH3ATwDNi3SuP8=";
|
||||
sha256 = "sha256-eCvwgco22uPEDDsT8FfTRon1xCGy5p1PBp0pDfNprMs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [ regex ];
|
||||
|
||||
@ -1,38 +1,38 @@
|
||||
{
|
||||
"linux-386": {
|
||||
"sys": "linux-386",
|
||||
"url": "https://bin.equinox.io/a/64nFcrEHYrW/ngrok-v3-3.1.1-linux-386",
|
||||
"sha256": "ab7aa2adfa5e29da618142878e1aec93cc55ea5c8f7e69c2582baaad2e149b64",
|
||||
"version": "3.1.1"
|
||||
"url": "https://bin.equinox.io/a/n2sDPvWRHhg/ngrok-v3-3.3.0-linux-386",
|
||||
"sha256": "8f6da1ef234a20a0604ce2028bc44b7fa40791bd1adce0529ef256c6a89c5655",
|
||||
"version": "3.3.0"
|
||||
},
|
||||
"linux-amd64": {
|
||||
"sys": "linux-amd64",
|
||||
"url": "https://bin.equinox.io/a/dqrwdoEvP2Q/ngrok-v3-3.1.1-linux-amd64",
|
||||
"sha256": "9e6575f21e71b0b89b775bf66aecac68535573965391b48bfe488e18b1796b9a",
|
||||
"version": "3.1.1"
|
||||
"url": "https://bin.equinox.io/a/6wTR9C5G1pu/ngrok-v3-3.3.0-linux-amd64",
|
||||
"sha256": "ebe08529ce7ea3ee9cc05a0966e8ee33f5a41d7deeb440a15a6ff80ae2aa4716",
|
||||
"version": "3.3.0"
|
||||
},
|
||||
"linux-arm": {
|
||||
"sys": "linux-arm",
|
||||
"url": "https://bin.equinox.io/a/biK8Eisfsar/ngrok-v3-3.1.1-linux-arm",
|
||||
"sha256": "fe5c1e3918b8973397ec70a6a46d2c70c784720dc95add6e7059ed501bf498bd",
|
||||
"version": "3.1.1"
|
||||
"url": "https://bin.equinox.io/a/bbBqonHqRxm/ngrok-v3-3.3.0-linux-arm",
|
||||
"sha256": "ccd11d1319152ece16aa9f9e6edcac3ff9cd189d712b4da670bda2a79d4feae1",
|
||||
"version": "3.3.0"
|
||||
},
|
||||
"linux-arm64": {
|
||||
"sys": "linux-arm64",
|
||||
"url": "https://bin.equinox.io/a/d45uz1Sks8d/ngrok-v3-3.1.1-linux-arm64",
|
||||
"sha256": "bf1ba6948bb20d31427eb453504d7fb1bfe447c25665172b8b6b4547c5b65f0f",
|
||||
"version": "3.1.1"
|
||||
"url": "https://bin.equinox.io/a/np93VBWWrMi/ngrok-v3-3.3.0-linux-arm64",
|
||||
"sha256": "b08e4ac6858b4179e987e15ecf5648c0e84716c9a17b3726df48c9ce213dc186",
|
||||
"version": "3.3.0"
|
||||
},
|
||||
"darwin-amd64": {
|
||||
"sys": "darwin-amd64",
|
||||
"url": "https://bin.equinox.io/a/24zbF9PjSKm/ngrok-v3-3.1.1-darwin-amd64",
|
||||
"sha256": "9b1d77f0701089fd10e03a2c0835b4f04f1cc5155339336128c5491821d48513",
|
||||
"version": "3.1.1"
|
||||
"url": "https://bin.equinox.io/a/kbKhiLNGXpq/ngrok-v3-3.3.0-darwin-amd64",
|
||||
"sha256": "0810c5e3232766e9d02db884cb8bb48ef2bdad48b6863d7bd6c967a388e5431c",
|
||||
"version": "3.3.0"
|
||||
},
|
||||
"darwin-arm64": {
|
||||
"sys": "darwin-arm64",
|
||||
"url": "https://bin.equinox.io/a/kxP7ohERZDY/ngrok-v3-3.1.1-darwin-arm64",
|
||||
"sha256": "886ca873580717ca25ba9e7e3d06a0710b07cfd16bd939a43c9aa128aee00951",
|
||||
"version": "3.1.1"
|
||||
"url": "https://bin.equinox.io/a/7rqE6e5cN8r/ngrok-v3-3.3.0-darwin-arm64",
|
||||
"sha256": "618dc83411fc1d574112cd80f8337bdca64089d5c2245cfb81fe7e519f22b610",
|
||||
"version": "3.3.0"
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,5 +1,18 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, libxml2, ncurses, libsigcxx, libpar2
|
||||
, gnutls, libgcrypt, zlib, openssl, nixosTests }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, pkg-config
|
||||
, gnutls
|
||||
, libgcrypt
|
||||
, libpar2
|
||||
, libsigcxx
|
||||
, libxml2
|
||||
, ncurses
|
||||
, openssl
|
||||
, zlib
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nzbget";
|
||||
@ -7,13 +20,31 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/nzbget/nzbget/releases/download/v${version}/nzbget-${version}-src.tar.gz";
|
||||
sha256 = "sha256-To/BvrgNwq8tajajOjP0Te3d1EhgAsZE9MR5MEMHICU=";
|
||||
hash = "sha256-To/BvrgNwq8tajajOjP0Te3d1EhgAsZE9MR5MEMHICU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# openssl 3 compatibility
|
||||
# https://github.com/nzbget/nzbget/pull/793
|
||||
(fetchpatch {
|
||||
name = "daemon-connect-dont-use-fips-mode-set-with-openssl-3.patch";
|
||||
url = "https://github.com/nzbget/nzbget/commit/f76e8555504e3af4cf8dd4a8c8e374b3ca025099.patch";
|
||||
hash = "sha256-39lvnhBK4126TYsRbJOUxsV9s9Hjuviw7CH/wWn/VkM=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [ libxml2 ncurses libsigcxx libpar2 gnutls
|
||||
libgcrypt zlib openssl ];
|
||||
buildInputs = [
|
||||
gnutls
|
||||
libgcrypt
|
||||
libpar2
|
||||
libsigcxx
|
||||
libxml2
|
||||
ncurses
|
||||
openssl
|
||||
zlib
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
||||
@ -304,7 +304,8 @@ chktex = stdenv.mkDerivation {
|
||||
inherit (common) src;
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ core/*kpathsea*/ ];
|
||||
# perl used in shebang of script bin/deweb
|
||||
buildInputs = [ core/*kpathsea*/ perl ];
|
||||
|
||||
preConfigure = "cd texk/chktex";
|
||||
|
||||
|
||||
@ -4,19 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "swfmill";
|
||||
version = "0.3.3";
|
||||
version = "0.3.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://swfmill.org/releases/swfmill-${version}.tar.gz";
|
||||
sha256 = "15mcpql448vvgsbxs7wd0vdk1ln6rdcpnif6i2zjm5l4xng55s7r";
|
||||
sha256 = "sha256-2yT2OWOVf67AK7FLi2HNr3CWd0+M/eudNXPi4ZIxVI4=";
|
||||
};
|
||||
|
||||
# Fixes build with GCC 6
|
||||
env.NIX_CFLAGS_COMPILE = "-std=c++03";
|
||||
|
||||
# Remove once updated past 0.3.5
|
||||
env.NIX_LDFLAGS = "-lz";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ libxslt freetype libpng libxml2 ];
|
||||
|
||||
|
||||
@ -6153,9 +6153,7 @@ with pkgs;
|
||||
|
||||
checkmake = callPackage ../development/tools/checkmake { };
|
||||
|
||||
chit = callPackage ../development/tools/chit {
|
||||
openssl = openssl_1_1;
|
||||
};
|
||||
chit = callPackage ../development/tools/chit { };
|
||||
|
||||
chkrootkit = callPackage ../tools/security/chkrootkit { };
|
||||
|
||||
@ -10568,9 +10566,7 @@ with pkgs;
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
nzbget = callPackage ../tools/networking/nzbget {
|
||||
openssl = openssl_1_1;
|
||||
};
|
||||
nzbget = callPackage ../tools/networking/nzbget { };
|
||||
|
||||
nzbhydra2 = callPackage ../servers/nzbhydra2 {
|
||||
# You need Java (at least 8, at most 15)
|
||||
@ -34197,10 +34193,7 @@ with pkgs;
|
||||
|
||||
tailor = callPackage ../applications/version-management/tailor { };
|
||||
|
||||
taizen = callPackage ../applications/misc/taizen {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
openssl = openssl_1_1;
|
||||
};
|
||||
taizen = callPackage ../applications/misc/taizen { };
|
||||
|
||||
talosctl = callPackage ../applications/networking/cluster/talosctl { };
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user