Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
df6db8c5b0
|
|
@ -1180,6 +1180,12 @@
|
|||
githubId = 58516559;
|
||||
name = "Alexander Rezvov";
|
||||
};
|
||||
arian-d = {
|
||||
email = "arianxdehghani@gmail.com";
|
||||
github = "arian-d";
|
||||
githubId = 40076285;
|
||||
name = "Arian Dehghani";
|
||||
};
|
||||
arianvp = {
|
||||
email = "arian.vanputten@gmail.com";
|
||||
github = "arianvp";
|
||||
|
|
@ -3679,6 +3685,12 @@
|
|||
githubId = 706758;
|
||||
name = "Christian Gerbrandt";
|
||||
};
|
||||
derdennisop = {
|
||||
email = "dennish@wuitz.de";
|
||||
github = "derdennisop";
|
||||
githubId = 52411861;
|
||||
name = "Dennis";
|
||||
};
|
||||
derekcollison = {
|
||||
email = "derek@nats.io";
|
||||
github = "derekcollison";
|
||||
|
|
|
|||
63
pkgs/applications/audio/mpd-touch-screen-gui/default.nix
Normal file
63
pkgs/applications/audio/mpd-touch-screen-gui/default.nix
Normal file
|
|
@ -0,0 +1,63 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, autoreconfHook
|
||||
, pkg-config
|
||||
, SDL2
|
||||
, SDL2_ttf
|
||||
, SDL2_image
|
||||
, boost
|
||||
, libmpdclient
|
||||
, libwtk-sdl2
|
||||
, icu
|
||||
, libconfig
|
||||
, dejavu_fonts
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mpd-touch-screen-gui";
|
||||
version = "unstable-2022-12-30";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "muesli4";
|
||||
repo = pname;
|
||||
rev = "156eaebede89da2b83a98d8f9dfa46af12282fb4";
|
||||
sha256 = "sha256-vr/St4BghrndjUQ0nZI/uJq+F/MjEj6ulc4DYwQ/pgU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
autoreconfHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
sed -i s#/usr/share/fonts/TTF#${dejavu_fonts}/share/fonts/truetype#g data/program.conf
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
SDL2
|
||||
SDL2_ttf
|
||||
SDL2_image
|
||||
boost
|
||||
libmpdclient
|
||||
libwtk-sdl2
|
||||
icu
|
||||
libconfig
|
||||
];
|
||||
|
||||
# https://stackoverflow.com/questions/53089494/configure-error-could-not-find-a-version-of-the-library
|
||||
configureFlags = [
|
||||
"--with-boost-libdir=${boost.out}/lib"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A small MPD client that let's you view covers and has controls suitable for small touchscreens";
|
||||
homepage = "https://github.com/muesli4/mpd-touch-screen-gui";
|
||||
# See: https://github.com/muesli4/mpd-touch-screen-gui/tree/master/LICENSES
|
||||
license = licenses.lgpl3Plus;
|
||||
maintainers = with maintainers; [ doronbehar ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -3,7 +3,6 @@ chrome_pgo_phase=0
|
|||
clang_use_chrome_plugins=false
|
||||
disable_fieldtrial_testing_config=true
|
||||
enable_hangout_services_extension=false
|
||||
enable_js_type_check=false
|
||||
enable_mdns=false
|
||||
enable_mse_mpeg2ts_stream_parser=true
|
||||
enable_nacl=false
|
||||
|
|
|
|||
|
|
@ -45,19 +45,19 @@
|
|||
}
|
||||
},
|
||||
"ungoogled-chromium": {
|
||||
"version": "111.0.5563.147",
|
||||
"sha256": "0absyydskz59pxicq4z468sr0cxcmrcanx0yk4lla9hvs05lx7f4",
|
||||
"version": "112.0.5615.50",
|
||||
"sha256": "006x62z7cpb2aqi2q67l1n3nq1wyrmdgdnkdc46xjw751jax8h8j",
|
||||
"sha256bin64": null,
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2022-12-12",
|
||||
"version": "2023-02-17",
|
||||
"url": "https://gn.googlesource.com/gn",
|
||||
"rev": "5e19d2fb166fbd4f6f32147fbb2f497091a54ad8",
|
||||
"sha256": "1b5fwldfmkkbpp5x63n1dxv0nc965hphc8rm8ah7zg44zscm9z30"
|
||||
"rev": "b25a2f8c2d33f02082f0f258350f5e22c0973108",
|
||||
"sha256": "075p4jwk1apvwmqmvhwfw5f669ci7nxwjq9mz5aa2g5lz4fkdm4c"
|
||||
},
|
||||
"ungoogled-patches": {
|
||||
"rev": "111.0.5563.147-1",
|
||||
"sha256": "1ynnwrjjdwjlhzpc51rl03dv10bn4dxvwxvd29jksf5brwcr9bzb"
|
||||
"rev": "112.0.5615.50-1",
|
||||
"sha256": "0axz76hbcc5h6gqv41yxd0yy9vcldps5xn9ffx98iyzghi76z1sa"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
39
pkgs/applications/networking/discordo/default.nix
Normal file
39
pkgs/applications/networking/discordo/default.nix
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub, nix-update-script, makeWrapper, xsel
|
||||
, wl-clipboard }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "discordo";
|
||||
version = "unstable-2023-04-07";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ayn2op";
|
||||
repo = pname;
|
||||
rev = "f8c58057945b1ded2f78dc0956ea25aa281a0b31";
|
||||
hash = "sha256-FUSPQK4rB0J89s+I7yhF8SQ/Q9uygQSCF9o6ltYxOk4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-fLhyyIChqh+eEzht3CSLPfx6glw0YhiTb9PsbWJafWQ=";
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
# Clipboard support on X11 and Wayland
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/discordo \
|
||||
--prefix PATH : ${lib.makeBinPath [ xsel wl-clipboard ]}
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [ "--version=branch" ];
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A lightweight, secure, and feature-rich Discord terminal client";
|
||||
homepage = "https://github.com/ayn2op/discordo";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.arian-d ];
|
||||
};
|
||||
}
|
||||
|
|
@ -5,9 +5,9 @@ version = 3
|
|||
[[package]]
|
||||
name = "acpi_tables"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/rust-vmm/acpi_tables?branch=main#12bb6d7b252831527e630f8b3ef48877dbb11924"
|
||||
source = "git+https://github.com/rust-vmm/acpi_tables?branch=main#0b892e2c2053c4ecfac8d9e5a52babae75114702"
|
||||
dependencies = [
|
||||
"vm-memory",
|
||||
"zerocopy",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -179,7 +179,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
|||
|
||||
[[package]]
|
||||
name = "cloud-hypervisor"
|
||||
version = "30.0.0"
|
||||
version = "31.0.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"api_client",
|
||||
|
|
@ -224,9 +224,9 @@ checksum = "55626594feae15d266d52440b26ff77de0e22230cf0c113abe619084c1ddc910"
|
|||
|
||||
[[package]]
|
||||
name = "darling"
|
||||
version = "0.14.3"
|
||||
version = "0.14.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c0808e1bd8671fb44a113a14e13497557533369847788fa2ae912b6ebfce9fa8"
|
||||
checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850"
|
||||
dependencies = [
|
||||
"darling_core",
|
||||
"darling_macro",
|
||||
|
|
@ -234,9 +234,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "darling_core"
|
||||
version = "0.14.3"
|
||||
version = "0.14.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "001d80444f28e193f30c2f293455da62dcf9a6b29918a4253152ae2b1de592cb"
|
||||
checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0"
|
||||
dependencies = [
|
||||
"fnv",
|
||||
"ident_case",
|
||||
|
|
@ -248,9 +248,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "darling_macro"
|
||||
version = "0.14.3"
|
||||
version = "0.14.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b36230598a2d5de7ec1c6f51f72d8a99a9208daff41de2084d06e3fd3ea56685"
|
||||
checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e"
|
||||
dependencies = [
|
||||
"darling_core",
|
||||
"quote",
|
||||
|
|
@ -382,9 +382,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
|
|||
|
||||
[[package]]
|
||||
name = "gdbstub"
|
||||
version = "0.6.3"
|
||||
version = "0.6.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "32c95766e0414f8bfc1d07055574c621b67739466d6ba516c4fef8e99d30d2e6"
|
||||
checksum = "ba4fddc6f9d12cbef29e395d9a6b48c128f513c8a2ded7048c97ed5c484e53e7"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"cfg-if",
|
||||
|
|
@ -497,9 +497,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "io-uring"
|
||||
version = "0.5.12"
|
||||
version = "0.5.13"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "41c85eff7f7c8d3ab8c7ec87313c0c194bbaf4371bb7d40f80293ba01bce8264"
|
||||
checksum = "dd1e1a01cfb924fd8c5c43b6827965db394f5a3a16c599ce03452266e1cf984c"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"libc",
|
||||
|
|
@ -516,9 +516,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "is-terminal"
|
||||
version = "0.4.3"
|
||||
version = "0.4.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "22e18b0a45d56fe973d6db23972bf5bc46f988a4a2385deac9cc29572f09daef"
|
||||
checksum = "8687c819457e979cc940d09cb16e42a1bf70aa6b60a549de6d3a62a0ee90c69e"
|
||||
dependencies = [
|
||||
"hermit-abi",
|
||||
"io-lifetimes",
|
||||
|
|
@ -528,9 +528,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "itoa"
|
||||
version = "1.0.5"
|
||||
version = "1.0.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440"
|
||||
checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
|
||||
|
||||
[[package]]
|
||||
name = "kvm-bindings"
|
||||
|
|
@ -668,7 +668,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "mshv-bindings"
|
||||
version = "0.1.1"
|
||||
source = "git+https://github.com/rust-vmm/mshv?branch=main#0b2af251285385f8e39c2cd0fe8ffacab534932f"
|
||||
source = "git+https://github.com/rust-vmm/mshv?branch=main#66531ba242be0b744ee2e4cd602ab0000377bdf7"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"serde",
|
||||
|
|
@ -680,7 +680,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "mshv-ioctls"
|
||||
version = "0.1.1"
|
||||
source = "git+https://github.com/rust-vmm/mshv?branch=main#0b2af251285385f8e39c2cd0fe8ffacab534932f"
|
||||
source = "git+https://github.com/rust-vmm/mshv?branch=main#66531ba242be0b744ee2e4cd602ab0000377bdf7"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"mshv-bindings",
|
||||
|
|
@ -760,9 +760,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "openssl-sys"
|
||||
version = "0.9.80"
|
||||
version = "0.9.83"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "23bbbf7854cd45b83958ebe919f0e8e516793727652e27fda10a8384cfc790b7"
|
||||
checksum = "666416d899cf077260dac8698d60a60b435a46d57e82acb1be3d0dad87284e5b"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
"cc",
|
||||
|
|
@ -826,9 +826,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "paste"
|
||||
version = "1.0.11"
|
||||
version = "1.0.12"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba"
|
||||
checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79"
|
||||
|
||||
[[package]]
|
||||
name = "pci"
|
||||
|
|
@ -965,9 +965,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "proc-macro2"
|
||||
version = "1.0.51"
|
||||
version = "1.0.52"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6"
|
||||
checksum = "1d0e1ae9e836cc3beddd63db0df682593d7e2d3d891ae8c9083d2113e1744224"
|
||||
dependencies = [
|
||||
"unicode-ident",
|
||||
]
|
||||
|
|
@ -1034,9 +1034,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "regex-syntax"
|
||||
version = "0.6.28"
|
||||
version = "0.6.29"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
|
||||
checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
|
||||
|
||||
[[package]]
|
||||
name = "remain"
|
||||
|
|
@ -1086,9 +1086,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "ryu"
|
||||
version = "1.0.12"
|
||||
version = "1.0.13"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde"
|
||||
checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"
|
||||
|
||||
[[package]]
|
||||
name = "scopeguard"
|
||||
|
|
@ -1107,9 +1107,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "semver"
|
||||
version = "1.0.16"
|
||||
version = "1.0.17"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a"
|
||||
checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed"
|
||||
|
||||
[[package]]
|
||||
name = "serde"
|
||||
|
|
@ -1133,9 +1133,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "serde_json"
|
||||
version = "1.0.93"
|
||||
version = "1.0.95"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cad406b69c91885b5107daf2c29572f6c8cdb3c66826821e286c533490c0bc76"
|
||||
checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744"
|
||||
dependencies = [
|
||||
"itoa",
|
||||
"ryu",
|
||||
|
|
@ -1144,9 +1144,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "serde_with"
|
||||
version = "2.2.0"
|
||||
version = "2.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "30d904179146de381af4c93d3af6ca4984b3152db687dacb9c3c35e86f39809c"
|
||||
checksum = "85456ffac572dc8826334164f2fb6fb40a7c766aebe195a2a21ee69ee2885ecf"
|
||||
dependencies = [
|
||||
"serde",
|
||||
"serde_with_macros",
|
||||
|
|
@ -1154,9 +1154,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "serde_with_macros"
|
||||
version = "2.2.0"
|
||||
version = "2.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a1966009f3c05f095697c537312f5415d1e3ed31ce0a56942bac4c771c5c335e"
|
||||
checksum = "7cbcd6104f8a4ab6af7f6be2a0da6be86b9de3c401f6e86bb856ab2af739232f"
|
||||
dependencies = [
|
||||
"darling",
|
||||
"proc-macro2",
|
||||
|
|
@ -1170,9 +1170,9 @@ version = "0.1.0"
|
|||
|
||||
[[package]]
|
||||
name = "signal-hook"
|
||||
version = "0.3.14"
|
||||
version = "0.3.15"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a253b5e89e2698464fc26b545c9edceb338e18a89effeeecfea192c3025be29d"
|
||||
checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"signal-hook-registry",
|
||||
|
|
@ -1258,18 +1258,18 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "thiserror"
|
||||
version = "1.0.38"
|
||||
version = "1.0.39"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0"
|
||||
checksum = "a5ab016db510546d856297882807df8da66a16fb8c4101cb8b30054b0d5b2d9c"
|
||||
dependencies = [
|
||||
"thiserror-impl",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "thiserror-impl"
|
||||
version = "1.0.38"
|
||||
version = "1.0.39"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f"
|
||||
checksum = "5420d42e90af0c38c3290abcca25b9b3bdf379fc9f55c528f53a269d9c9a267e"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
|
|
@ -1329,9 +1329,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
|
|||
|
||||
[[package]]
|
||||
name = "versionize"
|
||||
version = "0.1.9"
|
||||
version = "0.1.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d6e2495726cf917e7ba7ec8bf0f0fceab543dd38d0a4195ed6bef331e38a290f"
|
||||
checksum = "dca4b7062e7e6d685901e815c35f9671e059de97c1c0905eeff8592f3fff442f"
|
||||
dependencies = [
|
||||
"bincode",
|
||||
"crc64",
|
||||
|
|
@ -1357,7 +1357,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "vfio-bindings"
|
||||
version = "0.4.0"
|
||||
source = "git+https://github.com/rust-vmm/vfio?branch=main#43439e056ddfa84a4f7906ee7f2f58be70505c08"
|
||||
source = "git+https://github.com/rust-vmm/vfio?branch=main#ea8f710464a24690ce109e6b7dfaa623dc518304"
|
||||
dependencies = [
|
||||
"vmm-sys-util",
|
||||
]
|
||||
|
|
@ -1365,7 +1365,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "vfio-ioctls"
|
||||
version = "0.2.0"
|
||||
source = "git+https://github.com/rust-vmm/vfio?branch=main#43439e056ddfa84a4f7906ee7f2f58be70505c08"
|
||||
source = "git+https://github.com/rust-vmm/vfio?branch=main#ea8f710464a24690ce109e6b7dfaa623dc518304"
|
||||
dependencies = [
|
||||
"byteorder",
|
||||
"kvm-bindings",
|
||||
|
|
@ -1524,9 +1524,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "virtio-queue"
|
||||
version = "0.7.0"
|
||||
version = "0.7.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "19e927d93d54c365034fd7f31a5f458a1f540de4a37c52e892670dad9692173c"
|
||||
checksum = "3ba81e2bcc21c0d2fc5e6683e79367e26ad219197423a498df801d79d5ba77bd"
|
||||
dependencies = [
|
||||
"log",
|
||||
"virtio-bindings 0.1.0",
|
||||
|
|
@ -1559,7 +1559,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "vm-fdt"
|
||||
version = "0.2.0"
|
||||
source = "git+https://github.com/rust-vmm/vm-fdt?branch=main#c5a99ab71b130435927d19b50c85fcd5ce904a8c"
|
||||
source = "git+https://github.com/rust-vmm/vm-fdt?branch=main#ad21ede0ddb4cc97448eeb64c1dfc27803b9ec08"
|
||||
|
||||
[[package]]
|
||||
name = "vm-memory"
|
||||
|
|
@ -1640,6 +1640,7 @@ dependencies = [
|
|||
"vm-migration",
|
||||
"vm-virtio",
|
||||
"vmm-sys-util",
|
||||
"zerocopy",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -1726,9 +1727,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "windows-targets"
|
||||
version = "0.42.1"
|
||||
version = "0.42.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7"
|
||||
checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
|
||||
dependencies = [
|
||||
"windows_aarch64_gnullvm",
|
||||
"windows_aarch64_msvc",
|
||||
|
|
@ -1741,45 +1742,45 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "windows_aarch64_gnullvm"
|
||||
version = "0.42.1"
|
||||
version = "0.42.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608"
|
||||
checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
|
||||
|
||||
[[package]]
|
||||
name = "windows_aarch64_msvc"
|
||||
version = "0.42.1"
|
||||
version = "0.42.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7"
|
||||
checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_gnu"
|
||||
version = "0.42.1"
|
||||
version = "0.42.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640"
|
||||
checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_msvc"
|
||||
version = "0.42.1"
|
||||
version = "0.42.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605"
|
||||
checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnu"
|
||||
version = "0.42.1"
|
||||
version = "0.42.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45"
|
||||
checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnullvm"
|
||||
version = "0.42.1"
|
||||
version = "0.42.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463"
|
||||
checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_msvc"
|
||||
version = "0.42.1"
|
||||
version = "0.42.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd"
|
||||
checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
|
||||
|
||||
[[package]]
|
||||
name = "zerocopy"
|
||||
|
|
|
|||
|
|
@ -2,13 +2,27 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cloud-hypervisor";
|
||||
version = "30.0";
|
||||
version = "31.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloud-hypervisor";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-emy4Sk/j9G+Ou/9h1Kgd70MgbpYMobAXyqAE2LJeOio=";
|
||||
sha256 = "RDHrBu8ePpFkN7BkTbqe2EXNNW7q96zNrjo269K1Zdo=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"acpi_tables-0.1.0" = "sha256-hP9Fi1K6hX0PkOuomjIzY+oOiPO/5YSNzo0Z98Syz2A=";
|
||||
"kvm-bindings-0.6.0" = "sha256-wGdAuPwsgRIqx9dh0m+hC9A/Akz9qg9BM+p06Fi5ACM=";
|
||||
"micro_http-0.1.0" = "sha256-w2witqKXE60P01oQleujmHSnzMKxynUGKWyq5GEh1Ew=";
|
||||
"mshv-bindings-0.1.1" = "sha256-NwLPzX23nOe00qGoj1rLCWsJ5xEMmPUEtPVZNAYorWQ=";
|
||||
"versionize_derive-0.1.4" = "sha256-BPl294UqjVl8tThuvylXUFjFNjJx8OSfBGJLg8jIkWw=";
|
||||
"vfio-bindings-0.4.0" = "sha256-lKdoo/bmnZTRV7RRWugwHDFFCB6FKxpzxDEEMVqSbwA=";
|
||||
"vfio_user-0.1.0" = "sha256-IIwf7fmE6awpcgvWH/KWQY9tK3IHN+jkUGImQJFxnFM=";
|
||||
"vm-fdt-0.2.0" = "sha256-gVKGiE3ZSe+z3oOHR3zqVdc7XMHzkp4kO4p/WfK0VI8=";
|
||||
};
|
||||
};
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
|
@ -16,20 +30,6 @@ rustPlatform.buildRustPackage rec {
|
|||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ openssl ] ++ lib.optional stdenv.isAarch64 dtc;
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"acpi_tables-0.1.0" = "sha256-uWzw1FwIUCVvf9VfJYVA6VcMDEhA7sl6lME6N61k1ic=";
|
||||
"kvm-bindings-0.6.0" = "sha256-wGdAuPwsgRIqx9dh0m+hC9A/Akz9qg9BM+p06Fi5ACM=";
|
||||
"micro_http-0.1.0" = "sha256-w2witqKXE60P01oQleujmHSnzMKxynUGKWyq5GEh1Ew=";
|
||||
"mshv-bindings-0.1.1" = "sha256-ah6H43QRt39AmjpX9/2mxF3Jrbu14HH4CIUHTS1Mh0s=";
|
||||
"versionize_derive-0.1.4" = "sha256-BPl294UqjVl8tThuvylXUFjFNjJx8OSfBGJLg8jIkWw=";
|
||||
"vfio-bindings-0.4.0" = "sha256-NHzA+c1gAXtoCPLsZZ8mi+AGTpdxAfn5zlr04BCsbao=";
|
||||
"vfio_user-0.1.0" = "sha256-IIwf7fmE6awpcgvWH/KWQY9tK3IHN+jkUGImQJFxnFM=";
|
||||
"vm-fdt-0.2.0" = "sha256-dpUCj74FAjCM0BwxkSuByYIuqGcAisBy09Umhhyi0Jc=";
|
||||
};
|
||||
};
|
||||
|
||||
OPENSSL_NO_VENDOR = true;
|
||||
|
||||
# Integration tests require root.
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@
|
|||
, libxcb
|
||||
, libxkbcommon
|
||||
, mesa
|
||||
, pango
|
||||
, pciutils
|
||||
, systemd
|
||||
, udis86
|
||||
|
|
@ -37,13 +38,13 @@ in
|
|||
assert assertXWayland;
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "hyprland" + lib.optionalString debug "-debug";
|
||||
version = "0.23.0beta";
|
||||
version = "0.24.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hyprwm";
|
||||
repo = "hyprland";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-aPSmhgof4nIJquHmtxxirIMVv439wTYYCwf1ekS96gA=";
|
||||
hash = "sha256-zbtxX0NezuNg46PAKscmDfFfNID4rAq2qGNf1BE3Cqc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -84,6 +85,7 @@ stdenv.mkDerivation rec {
|
|||
udis86
|
||||
wayland
|
||||
wayland-protocols
|
||||
pango
|
||||
pciutils
|
||||
(wlroots.override { inherit enableXWayland hidpiXWayland nvidiaPatches; })
|
||||
]
|
||||
|
|
|
|||
|
|
@ -49,8 +49,8 @@ assert (lib.assertMsg (hidpiXWayland -> enableXWayland) ''
|
|||
domain = "gitlab.freedesktop.org";
|
||||
owner = "wlroots";
|
||||
repo = "wlroots";
|
||||
rev = "5ae17de23f5fd9bb252a698f3771c840280e2c05";
|
||||
hash = "sha256-dWrk+Q3bLdtFe5rkyaAKWCQJCeE/KFNllcu1DvBC38c=";
|
||||
rev = "7abda952d0000b72d240fe1d41457b9288f0b6e5";
|
||||
hash = "sha256-LmI/4Yp/pOOoI4RxLRx9I90NBsiqdRLVOfbATKlgpkg=";
|
||||
};
|
||||
|
||||
pname =
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hyprpaper";
|
||||
version = "unstable-2022-09-30";
|
||||
version = "unstable-2023-04-05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hyprwm";
|
||||
repo = "hyprpaper";
|
||||
rev = "8f4c712950ad6a9bc7c7281c15a63f5fa06ba92b";
|
||||
hash = "sha256-KojBifIOkJ2WmO/lRjQIgPgUnX5Eu10U4VDg+1MB2co=";
|
||||
rev = "9182de9ffc8c76fbf24d16dec0ea7a9430597a06";
|
||||
hash = "sha256-LqvhYx1Gu+rlkF4pA1NYZzwRQwz3FeWBqXqmQq86m8o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
inherit (finalAttrs.src.meta) homepage;
|
||||
description = "A blazing fast wayland wallpaper utility";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ wozeparrot ];
|
||||
maintainers = with maintainers; [ wozeparrot fufexan ];
|
||||
inherit (wayland.meta) platforms;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -23,13 +23,13 @@
|
|||
}:
|
||||
stdenv.mkDerivation {
|
||||
pname = "hyprpicker" + lib.optionalString debug "-debug";
|
||||
version = "unstable-2023-03-09";
|
||||
version = "unstable-2023-03-31";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hyprwm";
|
||||
repo = "hyprpicker";
|
||||
rev = "234c2da51a71941c0cd2ee380f42de365f90dd6f";
|
||||
hash = "sha256-wb1oXsaM0AkThPJGjn0Ytxt8vbBQG+mg2AGY0uxhUJ0=";
|
||||
rev = "cc6b3234b2966acd61c8a2e5caae947774666601";
|
||||
hash = "sha256-8Tc8am5+iQvzRdnTYIpD3Ewge6TIctrm8tr0H+RvcsE=";
|
||||
};
|
||||
|
||||
cmakeFlags = lib.optional debug "-DCMAKE_BUILD_TYPE=Debug";
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
, wayland
|
||||
}:
|
||||
{
|
||||
version = "unstable-2023-03-16";
|
||||
version = "unstable-2023-04-06";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hyprwm";
|
||||
repo = "xdg-desktop-portal-hyprland";
|
||||
rev = "85f49f4d6c9c398428117e9bdb588f53f09e52e0";
|
||||
hash = "sha256-qed+BV0NBt1egGCBEM7d5MiZJevQb8jd1WybfFM53Ak=";
|
||||
rev = "803c00db1191604d50766358dbc5be2de4fcb4e7";
|
||||
hash = "sha256-+AagxTHrzKgngG+guIWAIV5hX1HkkvMbDxbUq2IVwAM=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
51
pkgs/development/libraries/libwtk-sdl2/default.nix
Normal file
51
pkgs/development/libraries/libwtk-sdl2/default.nix
Normal file
|
|
@ -0,0 +1,51 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, autoreconfHook
|
||||
, pkg-config
|
||||
, boost
|
||||
, SDL2
|
||||
, SDL2_ttf
|
||||
, SDL2_image
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libwtk-sdl2";
|
||||
version = "unstable-2023-02-28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "muesli4";
|
||||
repo = pname;
|
||||
rev = "0504f8342c8c97d0c8b43d33751427c564ad8d44";
|
||||
sha256 = "sha256-NAjsDQ4/hklYRfa85uleOr50tmc6UJVo2xiDnEbmIxk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
autoreconfHook
|
||||
];
|
||||
buildInputs = [
|
||||
boost
|
||||
SDL2
|
||||
SDL2_ttf
|
||||
SDL2_image
|
||||
];
|
||||
# From some reason, this is needed as otherwise SDL.h is not found
|
||||
NIX_CFLAGS_COMPILE = "-I${SDL2.dev}/include/SDL2";
|
||||
|
||||
outputs = [ "out" "dev" "lib" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simplistic SDL2 GUI framework in early developement";
|
||||
homepage = "https://github.com/muesli4/libwtk-sdl2";
|
||||
# See: https://github.com/muesli4/mpd-touch-screen-gui/tree/master/LICENSES
|
||||
license = licenses.lgpl3Plus;
|
||||
maintainers = with maintainers; [ doronbehar ];
|
||||
/* Partial darwin build failure log (from ofborg):
|
||||
geometry.cpp:95:34: error: no member named 'abs' in namespace 'std'
|
||||
> return { std::abs(v.w), std::abs(v.h) };
|
||||
> ~~~~~^
|
||||
*/
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,5 +1,6 @@
|
|||
{ qtModule
|
||||
, qtbase
|
||||
, qtlanguageserver
|
||||
, qtshadertools
|
||||
, openssl
|
||||
, python3
|
||||
|
|
@ -7,7 +8,7 @@
|
|||
|
||||
qtModule {
|
||||
pname = "qtdeclarative";
|
||||
qtInputs = [ qtbase qtshadertools ];
|
||||
qtInputs = [ qtbase qtlanguageserver qtshadertools ];
|
||||
propagatedBuildInputs = [ openssl python3 ];
|
||||
preConfigure = ''
|
||||
export LD_LIBRARY_PATH="$PWD/build/lib''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
|
||||
|
|
|
|||
|
|
@ -1,9 +1,12 @@
|
|||
{ lib
|
||||
, python3
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, metakernel
|
||||
, pytestCheckHook
|
||||
, yasi
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonPackage rec {
|
||||
buildPythonPackage rec {
|
||||
pname = "calysto-scheme";
|
||||
version = "1.4.7";
|
||||
format = "setuptools";
|
||||
|
|
@ -15,11 +18,15 @@ python3.pkgs.buildPythonPackage rec {
|
|||
hash = "sha256-5InImTbucggjf/tl8K31ZtLrwu5hqvggl7sYb0eqIEg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
propagatedBuildInputs = [
|
||||
yasi
|
||||
metakernel
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "calysto_scheme" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,9 +1,14 @@
|
|||
{ lib
|
||||
, python3
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, metakernel
|
||||
, svgwrite
|
||||
, ipywidgets
|
||||
, cairosvg
|
||||
, numpy
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonPackage rec {
|
||||
buildPythonPackage rec {
|
||||
pname = "calysto";
|
||||
version = "1.0.6";
|
||||
format = "setuptools";
|
||||
|
|
@ -15,7 +20,7 @@ python3.pkgs.buildPythonPackage rec {
|
|||
hash = "sha256-lr/cHFshpFs/PGMCsa3FKMRPTP+eE9ziH5XCpV+KzO8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
propagatedBuildInputs = [
|
||||
metakernel
|
||||
svgwrite
|
||||
ipywidgets
|
||||
|
|
@ -23,7 +28,7 @@ python3.pkgs.buildPythonPackage rec {
|
|||
numpy
|
||||
];
|
||||
|
||||
# Tests are failing not because of Nix.
|
||||
# there are no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "calysto" ];
|
||||
|
|
|
|||
|
|
@ -1,38 +1,53 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
|
||||
# propagates
|
||||
, chardet
|
||||
, regex
|
||||
, packaging
|
||||
|
||||
# optionals
|
||||
, faust-cchardet
|
||||
, pandas
|
||||
, regex
|
||||
, tabview
|
||||
# TODO: , wilderness
|
||||
|
||||
# tests
|
||||
, python
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "clevercsv";
|
||||
version = "0.7.6";
|
||||
version = "0.8.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alan-turing-institute";
|
||||
repo = "CleverCSV";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-mdsznhxTykEGZAFvTRZTCM11fR4tkwfpa95k7udE33c=";
|
||||
hash = "sha256-/JveB6fpIJvR5byGcmO9XBuCbUw7yNTpSoDs68Wffmo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
chardet
|
||||
faust-cchardet
|
||||
pandas
|
||||
regex
|
||||
tabview
|
||||
packaging
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
full = [
|
||||
faust-cchardet
|
||||
pandas
|
||||
tabview
|
||||
# TODO: wilderness
|
||||
];
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
] ++ passthru.optional-dependencies.full;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"clevercsv"
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@
|
|||
, jsonpickle
|
||||
, numpy
|
||||
, pytestCheckHook
|
||||
, python-dateutil
|
||||
, pyyaml
|
||||
, toml
|
||||
, pythonOlder
|
||||
|
|
@ -50,6 +51,7 @@ buildPythonPackage rec {
|
|||
jsonpickle
|
||||
numpy
|
||||
pytestCheckHook
|
||||
python-dateutil
|
||||
] ++ passthru.optional-dependencies.cli;
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
|
|
|||
73
pkgs/development/python-modules/django-payments/default.nix
Normal file
73
pkgs/development/python-modules/django-payments/default.nix
Normal file
|
|
@ -0,0 +1,73 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, braintree
|
||||
, cryptography
|
||||
, django
|
||||
, django-phonenumber-field
|
||||
, fetchFromGitHub
|
||||
, mercadopago
|
||||
, pythonOlder
|
||||
, requests
|
||||
, setuptools-scm
|
||||
, sphinx-rtd-theme
|
||||
, stripe
|
||||
, xmltodict
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-payments";
|
||||
version = "2.0.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jazzband";
|
||||
repo = "django-payments";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-6WPV08CV+rko/tRnsT5GyTGYaJbiIKTvpisfRwizBIo=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "django-phonenumber-field[phonenumberslite]" "django-phonenumber-field"
|
||||
'';
|
||||
|
||||
env.SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
django
|
||||
django-phonenumber-field
|
||||
requests
|
||||
] ++ django-phonenumber-field.optional-dependencies.phonenumbers;
|
||||
|
||||
# require internet connection
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"payments"
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
all = [ braintree /* suds-community */ mercadopago cryptography xmltodict stripe ];
|
||||
braintree = [ braintree ];
|
||||
cybersource = [ /* suds-community */ ];
|
||||
docs = [ sphinx-rtd-theme ];
|
||||
mercadopago = [ mercadopago ];
|
||||
sagepay = [ cryptography ];
|
||||
sofort = [ xmltodict ];
|
||||
stripe = [ stripe ];
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Universal payment handling for Django.";
|
||||
homepage = "https://github.com/jazzband/django-payments/";
|
||||
changelog = "https://github.com/jazzband/django-payments/releases/tag/v${version}";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ derdennisop ];
|
||||
};
|
||||
}
|
||||
|
|
@ -32,11 +32,10 @@ buildPythonPackage rec {
|
|||
|
||||
propagatedBuildInputs = [
|
||||
django
|
||||
phonenumbers
|
||||
babel
|
||||
];
|
||||
] ++ passthru.optional-dependencies.phonenumbers;
|
||||
|
||||
nativeCheckInputs = [
|
||||
babel
|
||||
djangorestframework
|
||||
];
|
||||
|
||||
|
|
@ -48,6 +47,10 @@ buildPythonPackage rec {
|
|||
${python.interpreter} -m django test --settings tests.settings
|
||||
'';
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
phonenumbers = [ phonenumbers ];
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A django model and form field for normalised phone numbers using python-phonenumbers";
|
||||
homepage = "https://github.com/stefanfoulis/django-phonenumber-field/";
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "inflect";
|
||||
version = "6.0.2";
|
||||
version = "6.0.4";
|
||||
disabled = isPy27;
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-8aa8sBBQRviWGf3hp9BExhLGFMLYXvGCWC2dybhtMJo=";
|
||||
hash = "sha256-GEJkmhe2ytZoEqXJvfrLYxDh57bdijHwJnZt8bYmEus=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
|
|
|
|||
40
pkgs/development/python-modules/mercadopago/default.nix
Normal file
40
pkgs/development/python-modules/mercadopago/default.nix
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, requests
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mercadopago";
|
||||
version = "2.2.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mercadopago";
|
||||
repo = "sdk-python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-HtPyIwip/cjvnBDZ0qGpLKJOkwETGSqXvTkH2pcd6cc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
requests
|
||||
];
|
||||
|
||||
# require internet
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"mercadopago"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "This library provides developers with a simple set of bindings to help you integrate Mercado Pago API to a website and start receiving payments.";
|
||||
homepage = "https://www.mercadopago.com";
|
||||
changelog = "https://github.com/mercadopago/sdk-python/releases/tag/${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ derdennisop ];
|
||||
};
|
||||
}
|
||||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "xmldiff";
|
||||
version = "2.5";
|
||||
version = "2.6.1";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-bF8wvGXOboHZpwo8sCafe6YYUv1sqnoPv8Dt8zs8txc=";
|
||||
hash = "sha256-gbgX7y/Q3pswM2tH/R1GSMmbMGhQJKB7w08sFGQE4Vk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,9 +1,11 @@
|
|||
{ lib
|
||||
, python3
|
||||
, buildPythonApplication
|
||||
, colorama
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
buildPythonApplication rec {
|
||||
pname = "yasi";
|
||||
version = "2.1.2";
|
||||
format = "setuptools";
|
||||
|
|
@ -15,10 +17,14 @@ python3.pkgs.buildPythonApplication rec {
|
|||
hash = "sha256-xKhVTmh/vrtBkatxtk8R4yqbGroH0I+xTKNYUpuikt4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
propagatedBuildInputs = [
|
||||
colorama
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "test.test_yasi" "tests.test_yasi"
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "trino-cli";
|
||||
version = "410";
|
||||
version = "412";
|
||||
|
||||
jarfilename = "${pname}-${version}-executable.jar";
|
||||
|
||||
|
|
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://maven/io/trino/${pname}/${version}/${jarfilename}";
|
||||
sha256 = "sha256-8ywle5z8OOFejAsBKSrh8RvaKyO1zht1My4QjKe/Lps=";
|
||||
sha256 = "sha256-jVz4VjlCVzuKOSa99vhmiu8v0ISIoCU9Vv9tRQ5vcX4=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
, Security
|
||||
, callPackage
|
||||
, linkFarm
|
||||
|
||||
, CoreServices
|
||||
, enableShared ? !stdenv.hostPlatform.isStatic
|
||||
, enableStatic ? stdenv.hostPlatform.isStatic
|
||||
, webUISupport ? false
|
||||
|
|
@ -29,9 +29,9 @@ let
|
|||
# 2) nix-build -A tree-sitter.updater.update-all-grammars
|
||||
# 3) Set GITHUB_TOKEN env variable to avoid api rate limit (Use a Personal Access Token from https://github.com/settings/tokens It does not need any permissions)
|
||||
# 4) run the ./result script that is output by that (it updates ./grammars)
|
||||
version = "0.20.7";
|
||||
sha256 = "sha256-5ILiN5EfJ7WpeYBiXynfcLucdp8zmxVOj4gLkaFQYts=";
|
||||
cargoSha256 = "sha256-V4frCaU5QzTx3ujdaplw7vNkosbzyXHQvE+T7ntVOtU=";
|
||||
version = "0.20.8";
|
||||
sha256 = "sha256-278zU5CLNOwphGBUa4cGwjBqRJ87dhHMzFirZB09gYM=";
|
||||
cargoSha256 = "sha256-0avy53pmR7CztDrL+5WAmlqpZwd/EA3Fh10hfPXyXZc=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
|
|
@ -111,7 +111,7 @@ rustPlatform.buildRustPackage {
|
|||
inherit src version cargoSha256;
|
||||
|
||||
buildInputs =
|
||||
lib.optionals stdenv.isDarwin [ Security ];
|
||||
lib.optionals stdenv.isDarwin [ Security CoreServices];
|
||||
nativeBuildInputs =
|
||||
[ which ]
|
||||
++ lib.optionals webUISupport [ emscripten ];
|
||||
|
|
|
|||
79
pkgs/development/tools/phpactor/default.nix
Normal file
79
pkgs/development/tools/phpactor/default.nix
Normal file
|
|
@ -0,0 +1,79 @@
|
|||
{ lib, stdenvNoCC, fetchFromGitHub, php, phpPackages }:
|
||||
|
||||
let
|
||||
version = "2023.01.21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "phpactor";
|
||||
repo = "phpactor";
|
||||
rev = version;
|
||||
hash = "sha256-jWZgBEaffjQ5wCStSEe+eIi7BJt6XAQFEjmq5wvW5V8=";
|
||||
};
|
||||
|
||||
vendor = stdenvNoCC.mkDerivation rec {
|
||||
pname = "phpactor-vendor";
|
||||
inherit src version;
|
||||
|
||||
|
||||
# See https://github.com/NixOS/nix/issues/6660
|
||||
dontPatchShebangs = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
php
|
||||
phpPackages.composer
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
substituteInPlace composer.json \
|
||||
--replace '"config": {' '"config": { "autoloader-suffix": "Phpactor",' \
|
||||
--replace '"name": "phpactor/phpactor",' '"name": "phpactor/phpactor", "version": "${version}",'
|
||||
composer install --no-interaction --optimize-autoloader --no-dev --no-scripts
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out
|
||||
cp -ar ./vendor $out/
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
outputHashMode = "recursive";
|
||||
outputHashAlgo = "sha256";
|
||||
outputHash = "sha256-7R6nadWFv7A5Hv14D9egsTD/zcKK5uK9LQlHmwtbKdE=";
|
||||
};
|
||||
in
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "phpactor";
|
||||
inherit src version;
|
||||
|
||||
buildInputs = [
|
||||
php
|
||||
];
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/share/php/phpactor $out/bin
|
||||
cp -r . $out/share/php/phpactor
|
||||
cp -r ${vendor}/vendor $out/share/php/phpactor
|
||||
ln -s $out/share/php/phpactor/bin/phpactor $out/bin/phpactor
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Mainly a PHP Language Server";
|
||||
homepage = "https://github.com/phpactor/phpactor";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = lib.teams.php.members ++ [ lib.maintainers.ryantm ];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
@ -1,21 +1,18 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, python3
|
||||
}:
|
||||
|
||||
let
|
||||
py = python3.override {
|
||||
packageOverrides = self: super: {
|
||||
|
||||
# ansible doesn't support resolvelib > 0.6.0 and can't have an override
|
||||
resolvelib = super.resolvelib.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "0.8.1";
|
||||
cyclonedx-python-lib = super.cyclonedx-python-lib.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "2.7.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sarugaku";
|
||||
repo = "resolvelib";
|
||||
rev = version;
|
||||
sha256 = "1qpd0gg9yl0kbamlgjs9pkxd39kx511kbc92civ77v0ka5sw8ca0";
|
||||
owner = "CycloneDX";
|
||||
repo = "cyclonedx-python-lib";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-c/KhoJOa121/h0n0GUazjUFChnUo05ThD+fuZXc5/Pk=";
|
||||
};
|
||||
});
|
||||
};
|
||||
|
|
@ -25,14 +22,14 @@ with py.pkgs;
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "pip-audit";
|
||||
version = "2.4.12";
|
||||
version = "2.5.4";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "trailofbits";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-bpAs7xXWvBVGzbX6Fij71BnEMpqYjSSCtWjuA/EFms8=";
|
||||
hash = "sha256-aByzVPQADTNz5rVzmkNH/zk4u+RkWPcfk0sQhR3K2cQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -43,14 +40,12 @@ buildPythonApplication rec {
|
|||
cachecontrol
|
||||
cyclonedx-python-lib
|
||||
html5lib
|
||||
lockfile
|
||||
packaging
|
||||
pip-api
|
||||
pip-requirements-parser
|
||||
progress
|
||||
resolvelib
|
||||
rich
|
||||
];
|
||||
toml
|
||||
] ++ cachecontrol.optional-dependencies.filecache;
|
||||
|
||||
nativeCheckInputs = [
|
||||
pretend
|
||||
|
|
@ -68,7 +63,6 @@ buildPythonApplication rec {
|
|||
disabledTestPaths = [
|
||||
# Tests require network access
|
||||
"test/dependency_source/test_requirement.py"
|
||||
"test/dependency_source/resolvelib/test_resolvelib.py"
|
||||
"test/service/test_pypi.py"
|
||||
"test/service/test_osv.py"
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{ stdenv, cmake, libpcap, fetchFromGitHub, lib }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "updreplay";
|
||||
version = "1.0.0";
|
||||
version = "1.1.0";
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ libpcap ];
|
||||
src = fetchFromGitHub {
|
||||
owner = "rigtorp";
|
||||
repo = "udpreplay";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-8cp1RyVBnq3vx2LPkAx7ktmdLo0bSq9UWlbb/DrJxpc=";
|
||||
hash = "sha256-kF9a3pjQbFKf25NKyK7uSq0AAO6JK7QeChLhm9Z3wEA=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -5378,6 +5378,8 @@ with pkgs;
|
|||
|
||||
mpris-scrobbler = callPackage ../tools/audio/mpris-scrobbler { };
|
||||
|
||||
mpd-touch-screen-gui = callPackage ../applications/audio/mpd-touch-screen-gui { };
|
||||
|
||||
mq-cli = callPackage ../tools/system/mq-cli { };
|
||||
|
||||
mrkd = with python3Packages; toPythonApplication mrkd;
|
||||
|
|
@ -16743,6 +16745,7 @@ with pkgs;
|
|||
php80Extensions = recurseIntoAttrs php80.extensions;
|
||||
php80Packages = recurseIntoAttrs php80.packages;
|
||||
|
||||
phpactor = callPackage ../development/tools/phpactor { };
|
||||
|
||||
picoc = callPackage ../development/interpreters/picoc { };
|
||||
|
||||
|
|
@ -18357,6 +18360,8 @@ with pkgs;
|
|||
|
||||
libwhich = callPackage ../development/tools/misc/libwhich { };
|
||||
|
||||
libwtk-sdl2 = callPackage ../development/libraries/libwtk-sdl2 { };
|
||||
|
||||
linuxkit = callPackage ../development/tools/misc/linuxkit {
|
||||
inherit (darwin.apple_sdk_11_0.frameworks) Virtualization;
|
||||
};
|
||||
|
|
@ -19002,7 +19007,7 @@ with pkgs;
|
|||
travis = callPackage ../development/tools/misc/travis { };
|
||||
|
||||
tree-sitter = makeOverridable (callPackage ../development/tools/parsing/tree-sitter) {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
inherit (darwin.apple_sdk.frameworks) Security CoreServices;
|
||||
};
|
||||
|
||||
tree-sitter-grammars = recurseIntoAttrs tree-sitter.builtGrammars;
|
||||
|
|
@ -39528,6 +39533,8 @@ with pkgs;
|
|||
branch = "stable";
|
||||
};
|
||||
|
||||
discordo = callPackage ../applications/networking/discordo/default.nix { };
|
||||
|
||||
discord-ptb = import ../applications/networking/instant-messengers/discord {
|
||||
inherit lib stdenv;
|
||||
inherit (pkgs) callPackage fetchurl;
|
||||
|
|
|
|||
|
|
@ -2687,6 +2687,8 @@ self: super: with self; {
|
|||
|
||||
django-pattern-library = callPackage ../development/python-modules/django-pattern-library { };
|
||||
|
||||
django-payments = callPackage ../development/python-modules/django-payments { };
|
||||
|
||||
django-pglocks = callPackage ../development/python-modules/django-pglocks { };
|
||||
|
||||
django-phonenumber-field = callPackage ../development/python-modules/django-phonenumber-field { };
|
||||
|
|
@ -5971,6 +5973,8 @@ self: super: with self; {
|
|||
|
||||
meraki = callPackage ../development/python-modules/meraki { };
|
||||
|
||||
mercadopago = callPackage ../development/python-modules/mercadopago { };
|
||||
|
||||
mercantile = callPackage ../development/python-modules/mercantile { };
|
||||
|
||||
mercurial = toPythonModule (pkgs.mercurial.override {
|
||||
|
|
@ -12854,7 +12858,7 @@ self: super: with self; {
|
|||
|
||||
yarl = callPackage ../development/python-modules/yarl { };
|
||||
|
||||
yasi = toPythonModule (callPackage ../development/python-modules/yasi { });
|
||||
yasi = callPackage ../development/python-modules/yasi { };
|
||||
|
||||
yaspin = callPackage ../development/python-modules/yaspin { };
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue