mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-23 07:23:20 +00:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
e88cc8f10e
@ -14396,6 +14396,12 @@
|
||||
githubId = 6362238;
|
||||
name = "Christoph Honal";
|
||||
};
|
||||
star-szr = {
|
||||
email = "nixpkgs@scottr.mailworks.org";
|
||||
github = "star-szr";
|
||||
githubId = 327943;
|
||||
name = "Scott Zhu Reeves";
|
||||
};
|
||||
stasjok = {
|
||||
name = "Stanislav Asunkin";
|
||||
email = "nixpkgs@stasjok.ru";
|
||||
@ -15271,6 +15277,12 @@
|
||||
githubId = 1618946;
|
||||
name = "Tiago Castro";
|
||||
};
|
||||
tie = {
|
||||
name = "Ivan Trubach";
|
||||
email = "mr.trubach@icloud.com";
|
||||
github = "tie";
|
||||
githubId = 14792994;
|
||||
};
|
||||
tilcreator = {
|
||||
name = "TilCreator";
|
||||
email = "contact.nixos@tc-j.de";
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
# gcc only supports objc on darwin
|
||||
buildGoModule.override { stdenv = clangStdenv; } rec {
|
||||
pname = "go-musicfox";
|
||||
version = "3.7.7";
|
||||
version = "4.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anhoder";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-gQPr+mCZ7tnASs/ibow1b0Qj3ppZhdgP4U1Vxo+FfE4=";
|
||||
hash = "sha256-nhUsudytVSY/wbaP8ZuXurU2rxQPPblgPGdEyGjVpG4=";
|
||||
};
|
||||
|
||||
deleteVendor = true;
|
||||
|
||||
@ -1,8 +1,17 @@
|
||||
{ stdenv, lib, fetchFromGitHub, rustPlatform, pkg-config, ncurses, openssl
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
, pkg-config
|
||||
, ncurses
|
||||
, openssl
|
||||
, Cocoa
|
||||
, withALSA ? true, alsa-lib
|
||||
, withClipboard ? true, libxcb, python3
|
||||
, withCover ? false, ueberzug
|
||||
, withPulseAudio ? false, libpulseaudio
|
||||
, withPortAudio ? false, portaudio
|
||||
, withMPRIS ? false, dbus
|
||||
, withMPRIS ? true, withNotify ? true, dbus
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
@ -18,23 +27,31 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
cargoHash = "sha256-tEk7BxAN8jEquJiv89vC0lYrB/sKeZhThBzs09A9NpA=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
nativeBuildInputs = [ pkg-config ]
|
||||
++ lib.optional withClipboard python3;
|
||||
|
||||
buildInputs = [ ncurses ]
|
||||
++ lib.optional stdenv.isLinux openssl
|
||||
++ lib.optional withALSA alsa-lib
|
||||
++ lib.optional withClipboard libxcb
|
||||
++ lib.optional withCover ueberzug
|
||||
++ lib.optional withPulseAudio libpulseaudio
|
||||
++ lib.optional withPortAudio portaudio
|
||||
++ lib.optional withMPRIS dbus;
|
||||
++ lib.optional (withMPRIS || withNotify) dbus
|
||||
++ lib.optional stdenv.isDarwin Cocoa;
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-DNCURSES_UNCTRL_H_incl";
|
||||
|
||||
buildNoDefaultFeatures = true;
|
||||
|
||||
buildFeatures = [ "cursive/pancurses-backend" ]
|
||||
++ lib.optional withALSA "alsa_backend"
|
||||
++ lib.optional withClipboard "share_clipboard"
|
||||
++ lib.optional withCover "cover"
|
||||
++ lib.optional withPulseAudio "pulseaudio_backend"
|
||||
++ lib.optional withPortAudio "portaudio_backend"
|
||||
++ lib.optional withMPRIS "mpris";
|
||||
|
||||
doCheck = false;
|
||||
++ lib.optional withMPRIS "mpris"
|
||||
++ lib.optional withNotify "notify";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Cross-platform ncurses Spotify client written in Rust, inspired by ncmpc and the likes";
|
||||
|
||||
@ -32,11 +32,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "calibre";
|
||||
version = "6.11.0";
|
||||
version = "6.15.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-ylOZ5ljA5uBb2bX/qFhsmPQW6dJVEH9jxQaR2u8C4Wc=";
|
||||
hash = "sha256-t9fG1hBlQmDh0i5ezBoqk9C9oliNNF0peKDz1YH7RBo=";
|
||||
};
|
||||
|
||||
# https://sources.debian.org/patches/calibre/${version}+dfsg-1
|
||||
@ -44,13 +44,13 @@ stdenv.mkDerivation rec {
|
||||
# allow for plugin update check, but no calibre version check
|
||||
(fetchpatch {
|
||||
name = "0001-only-plugin-update.patch";
|
||||
url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${version}%2Bdfsg-1/debian/patches/0001-only-plugin-update.patch";
|
||||
url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${version}-1/debian/patches/0001-only-plugin-update.patch";
|
||||
hash = "sha256-uL1mSjgCl5ZRLbSuKxJM6XTfvVwog70F7vgKtQzQNEQ=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "0007-Hardening-Qt-code.patch";
|
||||
url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${version}%2Bdfsg-1/debian/patches/0007-Hardening-Qt-code.patch";
|
||||
hash = "sha256-CutVTb7K4tjewq1xAjHEGUHFcuuP/Z4FFtj4xQb4zKQ=";
|
||||
name = "0006-Hardening-Qt-code.patch";
|
||||
url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${version}-1/debian/patches/0006-Hardening-Qt-code.patch";
|
||||
hash = "sha256-9P1kGrQbWAWDzu5EUiQr7TiCPHRWUA8hxPpEvFpK20k=";
|
||||
})
|
||||
]
|
||||
++ lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch;
|
||||
|
||||
80
pkgs/applications/misc/gradience/default.nix
Normal file
80
pkgs/applications/misc/gradience/default.nix
Normal file
@ -0,0 +1,80 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, wrapGAppsHook4
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, glib
|
||||
, desktop-file-utils
|
||||
, gettext
|
||||
, librsvg
|
||||
, blueprint-compiler
|
||||
, python3Packages
|
||||
, sassc
|
||||
, appstream-glib
|
||||
, libadwaita
|
||||
, libportal
|
||||
, libportal-gtk4
|
||||
, libsoup_3
|
||||
, gobject-introspection
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "gradience";
|
||||
version = "0.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GradienceTeam";
|
||||
repo = "Gradience";
|
||||
# See https://github.com/GradienceTeam/Gradience/releases/tag/0.4.1-patch1
|
||||
rev = "0.4.1-patch1";
|
||||
sha256 = "sha256-5jloFbimJC4jP1C1uS8a9VlqyR5qqDuqcKvUXwr9SjY=";
|
||||
};
|
||||
|
||||
format = "other";
|
||||
dontWrapGApps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
appstream-glib
|
||||
blueprint-compiler
|
||||
desktop-file-utils
|
||||
gettext
|
||||
glib
|
||||
gobject-introspection
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
wrapGAppsHook4
|
||||
sassc
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libadwaita
|
||||
libportal
|
||||
libportal-gtk4
|
||||
librsvg
|
||||
libsoup_3
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
anyascii
|
||||
jinja2
|
||||
lxml
|
||||
material-color-utilities
|
||||
pygobject3
|
||||
svglib
|
||||
yapsy
|
||||
];
|
||||
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/GradienceTeam/Gradience";
|
||||
description = "Customize libadwaita and GTK3 apps (with adw-gtk3)";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ foo-dogsquared ];
|
||||
};
|
||||
}
|
||||
803
pkgs/applications/misc/tuckr/Cargo.lock
generated
Normal file
803
pkgs/applications/misc/tuckr/Cargo.lock
generated
Normal file
@ -0,0 +1,803 @@
|
||||
# This file is automatically @generated by Cargo.
|
||||
# It is not intended for manual editing.
|
||||
version = 3
|
||||
|
||||
[[package]]
|
||||
name = "aead"
|
||||
version = "0.5.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5c192eb8f11fc081b0fe4259ba5af04217d4e0faddd02417310a927911abd7c8"
|
||||
dependencies = [
|
||||
"crypto-common",
|
||||
"generic-array",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ansi-str"
|
||||
version = "0.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "84252a7e1a0df81706ce70bbad85ed1e4916448a4093ccd52dd98c6a44a477cd"
|
||||
dependencies = [
|
||||
"ansitok",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ansitok"
|
||||
version = "0.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "220044e6a1bb31ddee4e3db724d29767f352de47445a6cd75e1a173142136c83"
|
||||
dependencies = [
|
||||
"nom",
|
||||
"vte",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "arrayvec"
|
||||
version = "0.5.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
|
||||
|
||||
[[package]]
|
||||
name = "bitflags"
|
||||
version = "1.3.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
|
||||
|
||||
[[package]]
|
||||
name = "block-buffer"
|
||||
version = "0.10.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
|
||||
dependencies = [
|
||||
"generic-array",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "bytecount"
|
||||
version = "0.6.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c"
|
||||
|
||||
[[package]]
|
||||
name = "cc"
|
||||
version = "1.0.79"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
|
||||
|
||||
[[package]]
|
||||
name = "cfg-if"
|
||||
version = "1.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
||||
|
||||
[[package]]
|
||||
name = "chacha20"
|
||||
version = "0.9.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c7fc89c7c5b9e7a02dfe45cd2367bae382f9ed31c61ca8debe5f827c420a2f08"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"cipher",
|
||||
"cpufeatures",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "chacha20poly1305"
|
||||
version = "0.10.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35"
|
||||
dependencies = [
|
||||
"aead",
|
||||
"chacha20",
|
||||
"cipher",
|
||||
"poly1305",
|
||||
"zeroize",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cipher"
|
||||
version = "0.4.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
|
||||
dependencies = [
|
||||
"crypto-common",
|
||||
"inout",
|
||||
"zeroize",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "clap"
|
||||
version = "4.1.13"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3c911b090850d79fc64fe9ea01e28e465f65e821e08813ced95bced72f7a8a9b"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"clap_derive",
|
||||
"clap_lex",
|
||||
"is-terminal",
|
||||
"once_cell",
|
||||
"strsim",
|
||||
"termcolor",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "clap_derive"
|
||||
version = "4.1.12"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9a932373bab67b984c790ddf2c9ca295d8e3af3b7ef92de5a5bacdccdee4b09b"
|
||||
dependencies = [
|
||||
"heck",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.10",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "clap_lex"
|
||||
version = "0.3.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "033f6b7a4acb1f358c742aaca805c939ee73b4c6209ae4318ec7aca81c42e646"
|
||||
dependencies = [
|
||||
"os_str_bytes",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cpufeatures"
|
||||
version = "0.2.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "280a9f2d8b3a38871a3c8a46fb80db65e5e5ed97da80c4d08bf27fb63e35e181"
|
||||
dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "crypto-common"
|
||||
version = "0.1.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
|
||||
dependencies = [
|
||||
"generic-array",
|
||||
"rand_core",
|
||||
"typenum",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "digest"
|
||||
version = "0.10.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f"
|
||||
dependencies = [
|
||||
"block-buffer",
|
||||
"crypto-common",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "dirs"
|
||||
version = "4.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059"
|
||||
dependencies = [
|
||||
"dirs-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "dirs-sys"
|
||||
version = "0.3.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"redox_users",
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "errno"
|
||||
version = "0.2.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1"
|
||||
dependencies = [
|
||||
"errno-dragonfly",
|
||||
"libc",
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "errno-dragonfly"
|
||||
version = "0.1.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
|
||||
dependencies = [
|
||||
"cc",
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "fnv"
|
||||
version = "1.0.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
|
||||
|
||||
[[package]]
|
||||
name = "generic-array"
|
||||
version = "0.14.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9"
|
||||
dependencies = [
|
||||
"typenum",
|
||||
"version_check",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "getrandom"
|
||||
version = "0.2.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"libc",
|
||||
"wasi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "heck"
|
||||
version = "0.4.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
|
||||
|
||||
[[package]]
|
||||
name = "hermit-abi"
|
||||
version = "0.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
|
||||
|
||||
[[package]]
|
||||
name = "inout"
|
||||
version = "0.1.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5"
|
||||
dependencies = [
|
||||
"generic-array",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "io-lifetimes"
|
||||
version = "1.0.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "09270fd4fa1111bc614ed2246c7ef56239a3063d5be0d1ec3b589c505d400aeb"
|
||||
dependencies = [
|
||||
"hermit-abi",
|
||||
"libc",
|
||||
"windows-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "is-terminal"
|
||||
version = "0.4.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8687c819457e979cc940d09cb16e42a1bf70aa6b60a549de6d3a62a0ee90c69e"
|
||||
dependencies = [
|
||||
"hermit-abi",
|
||||
"io-lifetimes",
|
||||
"rustix",
|
||||
"windows-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
version = "0.2.140"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c"
|
||||
|
||||
[[package]]
|
||||
name = "linux-raw-sys"
|
||||
version = "0.1.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"
|
||||
|
||||
[[package]]
|
||||
name = "memchr"
|
||||
version = "2.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
|
||||
|
||||
[[package]]
|
||||
name = "minimal-lexical"
|
||||
version = "0.2.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
|
||||
|
||||
[[package]]
|
||||
name = "nom"
|
||||
version = "7.1.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
|
||||
dependencies = [
|
||||
"memchr",
|
||||
"minimal-lexical",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "once_cell"
|
||||
version = "1.17.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
|
||||
|
||||
[[package]]
|
||||
name = "opaque-debug"
|
||||
version = "0.3.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
|
||||
|
||||
[[package]]
|
||||
name = "os_str_bytes"
|
||||
version = "6.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267"
|
||||
|
||||
[[package]]
|
||||
name = "owo-colors"
|
||||
version = "3.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f"
|
||||
|
||||
[[package]]
|
||||
name = "papergrid"
|
||||
version = "0.7.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1526bb6aa9f10ec339fb10360f22c57edf81d5678d0278e93bc12a47ffbe4b01"
|
||||
dependencies = [
|
||||
"ansi-str",
|
||||
"ansitok",
|
||||
"bytecount",
|
||||
"fnv",
|
||||
"unicode-width",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "poly1305"
|
||||
version = "0.8.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf"
|
||||
dependencies = [
|
||||
"cpufeatures",
|
||||
"opaque-debug",
|
||||
"universal-hash",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ppv-lite86"
|
||||
version = "0.2.17"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro-error"
|
||||
version = "1.0.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
|
||||
dependencies = [
|
||||
"proc-macro-error-attr",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 1.0.109",
|
||||
"version_check",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro-error-attr"
|
||||
version = "1.0.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"version_check",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro2"
|
||||
version = "1.0.54"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e472a104799c74b514a57226160104aa483546de37e839ec50e3c2e41dd87534"
|
||||
dependencies = [
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "quote"
|
||||
version = "1.0.26"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rand"
|
||||
version = "0.8.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"rand_chacha",
|
||||
"rand_core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rand_chacha"
|
||||
version = "0.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
|
||||
dependencies = [
|
||||
"ppv-lite86",
|
||||
"rand_core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rand_core"
|
||||
version = "0.6.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
|
||||
dependencies = [
|
||||
"getrandom",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "redox_syscall"
|
||||
version = "0.2.16"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "redox_users"
|
||||
version = "0.4.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
|
||||
dependencies = [
|
||||
"getrandom",
|
||||
"redox_syscall",
|
||||
"thiserror",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rpassword"
|
||||
version = "7.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6678cf63ab3491898c0d021b493c94c9b221d91295294a2a5746eacbe5928322"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"rtoolbox",
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rtoolbox"
|
||||
version = "0.0.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "034e22c514f5c0cb8a10ff341b9b048b5ceb21591f31c8f44c43b960f9b3524a"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rustix"
|
||||
version = "0.36.11"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "db4165c9963ab29e422d6c26fbc1d37f15bace6b2810221f9d925023480fcf0e"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"errno",
|
||||
"io-lifetimes",
|
||||
"libc",
|
||||
"linux-raw-sys",
|
||||
"windows-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "same-file"
|
||||
version = "1.0.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
|
||||
dependencies = [
|
||||
"winapi-util",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "sha2"
|
||||
version = "0.10.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"cpufeatures",
|
||||
"digest",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "strsim"
|
||||
version = "0.10.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
|
||||
|
||||
[[package]]
|
||||
name = "subtle"
|
||||
version = "2.4.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "1.0.109"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "2.0.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5aad1363ed6d37b84299588d62d3a7d95b5a5c2d9aad5c85609fda12afaa1f40"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tabled"
|
||||
version = "0.10.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "56c3ee73732ffceaea7b8f6b719ce3bb17f253fa27461ffeaf568ebd0cdb4b85"
|
||||
dependencies = [
|
||||
"ansi-str",
|
||||
"papergrid",
|
||||
"tabled_derive",
|
||||
"unicode-width",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tabled_derive"
|
||||
version = "0.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "beca1b4eaceb4f2755df858b88d9b9315b7ccfd1ffd0d7a48a52602301f01a57"
|
||||
dependencies = [
|
||||
"heck",
|
||||
"proc-macro-error",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 1.0.109",
|
||||
]
|
||||
|
||||
[[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"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac"
|
||||
dependencies = [
|
||||
"thiserror-impl",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "thiserror-impl"
|
||||
version = "1.0.40"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.10",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tuckr"
|
||||
version = "0.8.0"
|
||||
dependencies = [
|
||||
"chacha20poly1305",
|
||||
"clap",
|
||||
"dirs",
|
||||
"owo-colors",
|
||||
"rand",
|
||||
"rpassword",
|
||||
"sha2",
|
||||
"tabled",
|
||||
"walkdir",
|
||||
"zeroize",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "typenum"
|
||||
version = "1.16.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
|
||||
|
||||
[[package]]
|
||||
name = "unicode-ident"
|
||||
version = "1.0.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"
|
||||
|
||||
[[package]]
|
||||
name = "unicode-width"
|
||||
version = "0.1.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
|
||||
|
||||
[[package]]
|
||||
name = "universal-hash"
|
||||
version = "0.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7d3160b73c9a19f7e2939a2fdad446c57c1bbbbf4d919d3213ff1267a580d8b5"
|
||||
dependencies = [
|
||||
"crypto-common",
|
||||
"subtle",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "utf8parse"
|
||||
version = "0.2.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
|
||||
|
||||
[[package]]
|
||||
name = "version_check"
|
||||
version = "0.9.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
|
||||
|
||||
[[package]]
|
||||
name = "vte"
|
||||
version = "0.10.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6cbce692ab4ca2f1f3047fcf732430249c0e971bfdd2b234cf2c47ad93af5983"
|
||||
dependencies = [
|
||||
"arrayvec",
|
||||
"utf8parse",
|
||||
"vte_generate_state_changes",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "vte_generate_state_changes"
|
||||
version = "0.1.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "walkdir"
|
||||
version = "2.3.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698"
|
||||
dependencies = [
|
||||
"same-file",
|
||||
"winapi-util",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wasi"
|
||||
version = "0.11.0+wasi-snapshot-preview1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
|
||||
|
||||
[[package]]
|
||||
name = "winapi"
|
||||
version = "0.3.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
|
||||
dependencies = [
|
||||
"winapi-i686-pc-windows-gnu",
|
||||
"winapi-x86_64-pc-windows-gnu",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "winapi-i686-pc-windows-gnu"
|
||||
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"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
|
||||
|
||||
[[package]]
|
||||
name = "windows-sys"
|
||||
version = "0.45.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
|
||||
dependencies = [
|
||||
"windows-targets",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "windows-targets"
|
||||
version = "0.42.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
|
||||
dependencies = [
|
||||
"windows_aarch64_gnullvm",
|
||||
"windows_aarch64_msvc",
|
||||
"windows_i686_gnu",
|
||||
"windows_i686_msvc",
|
||||
"windows_x86_64_gnu",
|
||||
"windows_x86_64_gnullvm",
|
||||
"windows_x86_64_msvc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "windows_aarch64_gnullvm"
|
||||
version = "0.42.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
|
||||
|
||||
[[package]]
|
||||
name = "windows_aarch64_msvc"
|
||||
version = "0.42.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_gnu"
|
||||
version = "0.42.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_msvc"
|
||||
version = "0.42.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnu"
|
||||
version = "0.42.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnullvm"
|
||||
version = "0.42.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_msvc"
|
||||
version = "0.42.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
|
||||
|
||||
[[package]]
|
||||
name = "zeroize"
|
||||
version = "1.6.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9"
|
||||
@ -2,21 +2,18 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "tuckr";
|
||||
version = "0.7.1";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RaphGL";
|
||||
repo = "Tuckr";
|
||||
rev = version;
|
||||
sha256 = "sha256-47qnBGCiPWJGF4QcqjzmDIZWlCO3xE3QyIF6nSPGWAc=";
|
||||
sha256 = "sha256-S4mHNCyK7WGYRBckxQkwA3+eu7QhUyKkOZ/KqhMJf+s=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-IX7ZX4fKBK0wS7nlSdf/bVGzXl2GU7qwwmtPMoOe/m8=";
|
||||
|
||||
# Cargo.lock is outdated
|
||||
preConfigure = ''
|
||||
cargo update --offline
|
||||
'';
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
};
|
||||
|
||||
doCheck = false; # test result: FAILED. 5 passed; 3 failed;
|
||||
|
||||
|
||||
@ -13,7 +13,7 @@ buildPythonApplication rec {
|
||||
sha256 = "0qm3qn4a1nahhs7q81liz514n9blsi107g9s9xfw2i8pzi7v9v0v";
|
||||
};
|
||||
|
||||
buildInputs = lib.optionals enableGUI [ qt5.qtbase ];
|
||||
buildInputs = lib.optionals enableGUI [ qt5.qtwayland ];
|
||||
propagatedBuildInputs = [ twisted certifi ]
|
||||
++ twisted.optional-dependencies.tls
|
||||
++ lib.optional enableGUI pyside2;
|
||||
|
||||
33
pkgs/applications/science/molecular-dynamics/raspa/data.nix
Normal file
33
pkgs/applications/science/molecular-dynamics/raspa/data.nix
Normal file
@ -0,0 +1,33 @@
|
||||
{ lib
|
||||
, stdenvNoCC
|
||||
, gzip
|
||||
, raspa
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "raspa-data";
|
||||
inherit (raspa) version src;
|
||||
|
||||
outputs = [ "out" "doc" ];
|
||||
|
||||
nativeBuildInpuhs = [ gzip ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p "$out/share/raspa"
|
||||
mv examples "$out/share/raspa"
|
||||
mkdir -p "$doc/share/raspa"
|
||||
mv -T "Docs" "$doc/share/raspa/doc"
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
# Keep the shebangs of the examples from being patched
|
||||
dontPatchShebangs = true;
|
||||
|
||||
meta = with lib; {
|
||||
inherit (raspa.meta) homepage license maintainers;
|
||||
description = "Example packs and documentation of RASPA";
|
||||
outputsToInstall = [ "out" "doc" ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
@ -0,0 +1,79 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, autoreconfHook
|
||||
, makeWrapper
|
||||
, fftw
|
||||
, lapack
|
||||
, openblas
|
||||
, runCommandLocal
|
||||
, raspa
|
||||
, raspa-data
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "raspa";
|
||||
version = "2.0.47";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "iRASPA";
|
||||
repo = "RASPA2";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-i8Y+pejiOuyPNJto+/0CmRoAnMljCrnDFx8qDh4I/68=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
fftw
|
||||
lapack
|
||||
openblas
|
||||
];
|
||||
|
||||
# Prepare for the Python binding packaging.
|
||||
strictDeps = true;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
preAutoreconf = ''
|
||||
mkdir "m4"
|
||||
'';
|
||||
|
||||
postAutoreconf = ''
|
||||
automake --add-missing
|
||||
autoconf
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
||||
# Wrap with RASPA_DIR
|
||||
# so that users can run $out/bin/simulate directly
|
||||
# without the need of a `run` srcipt.
|
||||
postInstall = ''
|
||||
wrapProgram "$out/bin/simulate" \
|
||||
--set RASPA_DIR "$out"
|
||||
'';
|
||||
|
||||
passthru.tests.run-an-example = runCommandLocal "raspa-test-run-an-example" { }
|
||||
''
|
||||
set -eu -o pipefail
|
||||
exampleDir="${raspa-data}/share/raspa/examples/Basic/1_MC_Methane_in_Box"
|
||||
exampleDirWritable="$(basename "$exampleDir")"
|
||||
cp -rT "$exampleDir" "./$exampleDirWritable"
|
||||
chmod u+rw -R "$exampleDirWritable"
|
||||
cd "$exampleDirWritable"
|
||||
${raspa}/bin/simulate
|
||||
touch "$out"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A general purpose classical molecular simulation package";
|
||||
homepage = "https://iraspa.org/raspa/";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ ShamrockLee ];
|
||||
mainProgram = "simulate";
|
||||
};
|
||||
}
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "yuview";
|
||||
version = "2.12.1";
|
||||
version = "2.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "IENT";
|
||||
repo = "YUView";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-BQnlq6TBxGbwqn6lAZGBo4+2HeXdFYL33LKqKSXMvdY=";
|
||||
rev = "v.${version}";
|
||||
sha256 = "sha256-2mNIuyY/ni+zkUc8V/iXUEa7JeBJyOnNod7friMYAm8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake wrapQtAppsHook ];
|
||||
|
||||
@ -4,18 +4,18 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "crosvm";
|
||||
version = "111.1";
|
||||
version = "112.0";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://chromium.googlesource.com/chromiumos/platform/crosvm";
|
||||
rev = "9ad89972330f70fca5a29967f226cf905977bf7f";
|
||||
sha256 = "hvP3V7kzfPXOIe+6GBWupfhW5SM3ifoqmx7dyTgSTeU=";
|
||||
rev = "014b853ebdba00c7bad751a37fa4271ff2a50d77";
|
||||
sha256 = "qVfkNN6dHfMeDYMDvccU9PAz78Dh2ylL6UpoApoYKJw=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
cargoSha256 = "S8zeOB+S5ZTuHqWNjxDIa4ev24ose/fByYwPrhR9OY8=";
|
||||
cargoSha256 = "ath0x9dfQCWWU9+zKyYLC6Q/QXupifHhdQxrS+N2UWw=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config protobuf python3 rustPlatform.bindgenHook wayland-scanner
|
||||
|
||||
@ -27,6 +27,8 @@ with urlopen('https://chromiumdash.appspot.com/cros/download_serving_builds_csv?
|
||||
platform_version = []
|
||||
|
||||
for line in reader:
|
||||
if line[cr_stable_index] == "no update":
|
||||
continue
|
||||
this_chrome_version = list(map(int, line[cr_stable_index].split('.')))
|
||||
this_platform_version = list(map(int, line[cros_stable_index].split('.')))
|
||||
chrome_version = max(chrome_version, this_chrome_version)
|
||||
|
||||
@ -42,11 +42,11 @@ stdenv.mkDerivation rec {
|
||||
+ lib.optionalString xenSupport "-xen"
|
||||
+ lib.optionalString hostCpuOnly "-host-cpu-only"
|
||||
+ lib.optionalString nixosTestRunner "-for-vm-tests";
|
||||
version = "7.2.0";
|
||||
version = "7.2.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.qemu.org/qemu-${version}.tar.xz";
|
||||
sha256 = "sha256-W0nOJod0Ta1JSukKiYxSIEo0BuhNBySCoeG+hU7rIVc=";
|
||||
sha256 = "jIVpms+dekOl/immTN1WNwsMLRrQdLr3CYqCTReq1zs=";
|
||||
};
|
||||
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
@ -138,7 +138,7 @@ stdenv.mkDerivation rec {
|
||||
preConfigure = ''
|
||||
unset CPP # intereferes with dependency calculation
|
||||
# this script isn't marked as executable b/c it's indirectly used by meson. Needed to patch its shebang
|
||||
chmod +x ./scripts/shaderinclude.pl
|
||||
chmod +x ./scripts/shaderinclude.py
|
||||
patchShebangs .
|
||||
# avoid conflicts with libc++ include for <version>
|
||||
mv VERSION QEMU_VERSION
|
||||
|
||||
@ -17,15 +17,17 @@
|
||||
|
||||
let
|
||||
isQt5 = lib.versions.major qtbase.version == "5";
|
||||
in stdenv.mkDerivation rec {
|
||||
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "zeal";
|
||||
version = "0.6.20221022";
|
||||
version = "0.6.1.20230320";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zealdocs";
|
||||
repo = "zeal";
|
||||
rev = "7ea03e4bb9754020e902a2989f56f4bc42b85c82";
|
||||
sha256 = "sha256-BozRLlws56i9P7Qtc5qPZWgJR5yhYqnLQsEdsymt5us=";
|
||||
rev = "a617ae5e06b95cec99bae058650e55b98613916d";
|
||||
hash = "sha256-WL2uqA0sZ5Q3lZIA9vkLVyfec/jBkfGcWb6XQ7AuM94=";
|
||||
};
|
||||
|
||||
# we only need this if we are using a version that hasn't been released. We
|
||||
@ -39,16 +41,15 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ cmake extra-cmake-modules pkg-config wrapQtAppsHook ];
|
||||
|
||||
buildInputs =
|
||||
[
|
||||
qtbase
|
||||
qtimageformats
|
||||
qtwebengine
|
||||
libarchive
|
||||
libXdmcp
|
||||
libpthreadstubs
|
||||
xcbutilkeysyms
|
||||
] ++ lib.optionals isQt5 [ qtx11extras ];
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qtimageformats
|
||||
qtwebengine
|
||||
libarchive
|
||||
libXdmcp
|
||||
libpthreadstubs
|
||||
xcbutilkeysyms
|
||||
] ++ lib.optionals isQt5 [ qtx11extras ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A simple offline API documentation browser";
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "luau";
|
||||
version = "0.570";
|
||||
version = "0.571";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Roblox";
|
||||
repo = "luau";
|
||||
rev = version;
|
||||
hash = "sha256-22T/NweWrDNWmGKJIk/htHUSU2htwsJ+0tHw5AtfoOo=";
|
||||
hash = "sha256-LWA4cssbdV2LfNRYygDHehmnTfNLvbZrh34NjGf3fqg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -13,21 +13,21 @@
|
||||
assert sevVariant -> stdenv.isx86_64;
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libkrunfw";
|
||||
version = "3.10.0";
|
||||
version = "3.11.0";
|
||||
|
||||
src = if stdenv.isLinux then fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-yL5D8oOGucLWi4kFPxan5Gq+jIkVSDOW/v1+zKg3G+o=";
|
||||
hash = "sha256-p5z3Dc7o/Ja3K0VlOWIPc0qOIU5p+JSxWe7QiVQNkjs=";
|
||||
} else fetchurl {
|
||||
url = "https://github.com/containers/libkrunfw/releases/download/v${version}/v${version}-with_macos_prebuilts.tar.gz";
|
||||
hash = "sha256-Q7n+Og+eAnHSQm7kLUN0uV+CKcdtLBYAgt7Q0+CxEfA=";
|
||||
hash = "sha256-XcdsK8L5NwMgelSMhE2YKYxaAin/3p/+GrljGGZpK5Y=";
|
||||
};
|
||||
|
||||
kernelSrc = fetchurl {
|
||||
url = "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.2.1.tar.xz";
|
||||
hash = "sha256-L8wH4ckOpM4Uj1D5vusNygtuSzeado3oq8ekom8lJTQ=";
|
||||
url = "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.2.9.tar.xz";
|
||||
hash = "sha256-kDRJwWTAPw50KqzJIOGFY1heB6KMbLeeD9bDZpX9Q/U=";
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioambient";
|
||||
version = "2022.10.0";
|
||||
version = "2023.04.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -24,13 +24,12 @@ buildPythonPackage rec {
|
||||
owner = "bachya";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Oppi4J0TuLbqwVn1Hpa4xcU9c/I+YDP3E0VXwiP8a/w=";
|
||||
hash = "sha256-ar2UGSlVukMD5EZsEn7TFfIOovaI+B3Ym+UeGo95oks=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# https://github.com/bachya/aioambient/pull/97
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'websockets = ">=9.1,<11.0"' 'websockets = "*"'
|
||||
--replace 'websockets = ">=11.0.1"' 'websockets = "*"'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -32,7 +32,8 @@ buildPythonPackage rec {
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'transitions = "^0.8.0"' 'transitions = "*"'
|
||||
--replace 'transitions = "^0.8.0"' 'transitions = "*"' \
|
||||
--replace 'websockets = ">=9.0,<11.0"' 'websockets = "*"'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "env-canada";
|
||||
version = "0.5.30";
|
||||
version = "0.5.31";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "michaeldavie";
|
||||
repo = "env_canada";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-bwoLxE47rLr7KNv0qEHjqKf5PJxBNdkaGLf86diTnKo=";
|
||||
hash = "sha256-68pHCsY2smaS1nO+fWN1tXy7VyhXcbYzoGmA1cAN5h4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "flux-led";
|
||||
version = "0.28.36";
|
||||
version = "0.28.37";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "Danielhiversen";
|
||||
repo = "flux_led";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-UoWeVLsfc8rK3U7zaF8bKXk/XdrgT6F3biNe/UFq/rE=";
|
||||
hash = "sha256-3SlgYENtyv0JdUwGFpT3lWUDOciAKThYGz/RV8z+tac=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "gcal-sync";
|
||||
version = "4.1.3";
|
||||
version = "4.1.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "allenporter";
|
||||
repo = "gcal_sync";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-NfgR+X77cuhXCy55Bx9ecP8vN8zs2coexcnCsQ4SbfU=";
|
||||
hash = "sha256-LJJyJj1HXNdBBs4hDvkuz74PDHRpeVpwbq0vSfESuXY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -34,6 +34,12 @@ buildPythonPackage rec {
|
||||
hash = "sha256-yr8IyAwZ6y2MPTe6bHRW+CIp19R3ZJWHuqdN5qultnQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py --replace \
|
||||
"websockets>=10,<11;python_version>'3.6'" \
|
||||
"websockets>=10,<12;python_version>'3.6'"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
backoff
|
||||
graphql-core
|
||||
|
||||
@ -10,12 +10,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "islpy";
|
||||
version = "2022.2.1";
|
||||
version = "2023.1";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "07062ljvznm2dg3r9b3lq98qygxsha8ylxi4zs7hx49l0jw2vbjy";
|
||||
sha256 = "sha256-QLkpCBF95OBOzPrBXmlzyhFMfq1bs2+S/8Z5n4oMekg=";
|
||||
};
|
||||
|
||||
postConfigure = ''
|
||||
|
||||
@ -9,11 +9,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "marisa-trie";
|
||||
version = "0.7.8";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-ruPeXyg2B0z9gD8crxb2g5DyYu8JzX3H0Oiu6baHhkM=";
|
||||
hash = "sha256-PQGdF7DX9i1ubXvQUjbYJSYk6hwUC+uL+cbu/zizxwc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -0,0 +1,28 @@
|
||||
{ stdenv, lib, buildPythonPackage, fetchPypi, pillow, regex }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "material-color-utilities-python";
|
||||
version = "0.1.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-PG8C585wWViFRHve83z3b9NijHyV+iGY2BdMJpyVH64=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pillow
|
||||
regex
|
||||
];
|
||||
|
||||
# No tests implemented.
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "material_color_utilities_python" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://pypi.org/project/material_color_utilities_python";
|
||||
description = "Python port of material_color_utilities used for Material You colors";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ foo-dogsquared ];
|
||||
};
|
||||
}
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytorch-metric-learning";
|
||||
version = "2.0.1";
|
||||
version = "2.1.0";
|
||||
|
||||
disabled = isPy27;
|
||||
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "KevinMusgrave";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-zB0g6GJcqWRhjJZgUWmTdG4fhBBfFR6yEM2FEOVLWIs=";
|
||||
hash = "sha256-9MIwNsiuWobgBaD2kXHz5nwBy04dxmxpF+7qfZ2l77M=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
, amqtt
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, orjson
|
||||
, paho-mqtt
|
||||
, poetry-core
|
||||
, pytest-asyncio
|
||||
@ -11,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "roombapy";
|
||||
version = "1.6.7";
|
||||
version = "1.6.8";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -20,14 +21,24 @@ buildPythonPackage rec {
|
||||
owner = "pschmitt";
|
||||
repo = "roombapy";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-cZoHUup3Znna4Za5twYyua3r03InapzU4c1aRrG6rpo=";
|
||||
hash = "sha256-z9D9FiE+14/x05AFu3EpBYlAqpDPc5y6S+pLTsSO0cU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# hbmqtt was replaced by amqtt
|
||||
substituteInPlace tests/test_roomba_integration.py \
|
||||
--replace "from hbmqtt.broker import Broker" "from amqtt.broker import Broker"
|
||||
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'orjson = ">=3.8.7"' 'orjson = "*"'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
orjson
|
||||
paho-mqtt
|
||||
];
|
||||
|
||||
@ -37,12 +48,6 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# hbmqtt was replaced by amqtt
|
||||
substituteInPlace tests/test_roomba_integration.py \
|
||||
--replace "from hbmqtt.broker import Broker" "from amqtt.broker import Broker"
|
||||
'';
|
||||
|
||||
disabledTestPaths = [
|
||||
# Requires network access
|
||||
"tests/test_discovery.py"
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
{ lib
|
||||
, aiohttp
|
||||
, asynctest
|
||||
, buildPythonPackage
|
||||
, cryptography
|
||||
, fetchFromGitHub
|
||||
@ -12,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "subarulink";
|
||||
version = "0.7.5";
|
||||
version = "0.7.6";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -21,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "G-Two";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-lvL/bRHvQvvYqr+qzrWe7dOscYFGVA2OrVt/RPGdmzA=";
|
||||
hash = "sha256-D2nwzj7uYL/v5Ew2+LfJBLH904Htam4Fa3Gs6t8Hbyo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -30,7 +29,6 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
asynctest
|
||||
cryptography
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
|
||||
@ -1,11 +1,13 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, cython
|
||||
, async-timeout
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, ifaddr
|
||||
, poetry-core
|
||||
, pytest-asyncio
|
||||
, pytest-timeout
|
||||
, pythonOlder
|
||||
, pytestCheckHook
|
||||
, setuptools
|
||||
@ -13,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "zeroconf";
|
||||
version = "0.54.0";
|
||||
version = "0.56.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -22,24 +24,24 @@ buildPythonPackage rec {
|
||||
owner = "jstasiak";
|
||||
repo = "python-zeroconf";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-rbolWawEbjF46Im/mqyOHpvk+4UojgFIaFoG4jbPwYY=";
|
||||
hash = "sha256-EglL06umgKjbA7mWuOfss7xemp53XJNOs3eJR5VNWxk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cython
|
||||
poetry-core
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
async-timeout
|
||||
ifaddr
|
||||
] ++ lib.optionals (pythonOlder "3.11") [
|
||||
async-timeout
|
||||
];
|
||||
|
||||
# OSError: [Errno 48] Address already in use
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest-asyncio
|
||||
pytest-timeout
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
@ -48,17 +50,12 @@ buildPythonPackage rec {
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
# tests that require network interaction
|
||||
# OSError: [Errno 19] No such device
|
||||
"test_close_multiple_times"
|
||||
"test_integration_with_listener_ipv6"
|
||||
"test_launch_and_close"
|
||||
"test_launch_and_close_context_manager"
|
||||
"test_launch_and_close_v4_v6"
|
||||
"test_launch_and_close_v6_only"
|
||||
"test_integration_with_listener_ipv6"
|
||||
# Starting with 0.39.0: AssertionError: assert [('add', '_ht..._tcp.local.')]
|
||||
"test_service_browser_expire_callbacks"
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
"test_lots_of_names"
|
||||
];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
@ -71,7 +68,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/python-zeroconf/python-zeroconf/releases/tag/${version}";
|
||||
description = "Python implementation of multicast DNS service discovery";
|
||||
homepage = "https://github.com/jstasiak/python-zeroconf";
|
||||
homepage = "https://github.com/python-zeroconf/python-zeroconf";
|
||||
license = licenses.lgpl21Only;
|
||||
maintainers = with maintainers; [ abbradar ];
|
||||
};
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "zha-quirks";
|
||||
version = "0.0.95";
|
||||
version = "0.0.96";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "zigpy";
|
||||
repo = "zha-device-handlers";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-LCO4jLwPqPDOoKdzay7cKuAv36UZ+OGu39AoBj6iqpY=";
|
||||
hash = "sha256-GqKQPOP3cJe4UyE5OsLCjNVPT8YKsJ0q8ApsJsAk4uw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -1,17 +1,35 @@
|
||||
{ lib, stdenv, fetchurl, makeWrapper, makeDesktopItem
|
||||
, alsa-lib, libpulseaudio, libX11, libXcursor, libXinerama, libXrandr, libXi, libGL
|
||||
, libSM, libICE, libXext, factorio-utils
|
||||
{ lib
|
||||
, alsa-lib
|
||||
, factorio-utils
|
||||
, fetchurl
|
||||
, libGL
|
||||
, libICE
|
||||
, libSM
|
||||
, libX11
|
||||
, libXcursor
|
||||
, libXext
|
||||
, libXi
|
||||
, libXinerama
|
||||
, libXrandr
|
||||
, libpulseaudio
|
||||
, libxkbcommon
|
||||
, makeDesktopItem
|
||||
, makeWrapper
|
||||
, releaseType
|
||||
, mods ? []
|
||||
, stdenv
|
||||
, wayland
|
||||
|
||||
, mods ? [ ]
|
||||
, mods-dat ? null
|
||||
, versionsJson ? ./versions.json
|
||||
, username ? "", token ? "" # get/reset token at https://factorio.com/profile
|
||||
, username ? ""
|
||||
, token ? "" # get/reset token at https://factorio.com/profile
|
||||
, experimental ? false # true means to always use the latest branch
|
||||
}:
|
||||
|
||||
assert releaseType == "alpha"
|
||||
|| releaseType == "headless"
|
||||
|| releaseType == "demo";
|
||||
|| releaseType == "headless"
|
||||
|| releaseType == "demo";
|
||||
|
||||
let
|
||||
|
||||
@ -68,16 +86,17 @@ let
|
||||
actual = binDists.${stdenv.hostPlatform.system}.${releaseType}.${branch} or (throw "Factorio ${releaseType}-${branch} binaries for ${stdenv.hostPlatform.system} are not available for download.");
|
||||
|
||||
makeBinDists = versions:
|
||||
let f = path: name: value:
|
||||
if builtins.isAttrs value then
|
||||
if value ? "name" then
|
||||
makeBinDist value
|
||||
let
|
||||
f = path: name: value:
|
||||
if builtins.isAttrs value then
|
||||
if value ? "name" then
|
||||
makeBinDist value
|
||||
else
|
||||
builtins.mapAttrs (f (path ++ [ name ])) value
|
||||
else
|
||||
builtins.mapAttrs (f (path ++ [ name ])) value
|
||||
else
|
||||
throw "expected attrset at ${toString path} - got ${toString value}";
|
||||
throw "expected attrset at ${toString path} - got ${toString value}";
|
||||
in
|
||||
builtins.mapAttrs (f []) versions;
|
||||
builtins.mapAttrs (f [ ]) versions;
|
||||
makeBinDist = { name, version, tarDirectory, url, sha256, needsAuth }: {
|
||||
inherit version tarDirectory;
|
||||
src =
|
||||
@ -89,26 +108,29 @@ let
|
||||
inherit name url sha256;
|
||||
curlOptsList = [
|
||||
"--get"
|
||||
"--data-urlencode" "username@username"
|
||||
"--data-urlencode" "token@token"
|
||||
"--data-urlencode"
|
||||
"username@username"
|
||||
"--data-urlencode"
|
||||
"token@token"
|
||||
];
|
||||
})
|
||||
(_: { # This preHook hides the credentials from /proc
|
||||
preHook =
|
||||
if username != "" && token != "" then ''
|
||||
echo -n "${username}" >username
|
||||
echo -n "${token}" >token
|
||||
'' else ''
|
||||
# Deliberately failing since username/token was not provided, so we can't fetch.
|
||||
# We can't use builtins.throw since we want the result to be used if the tar is in the store already.
|
||||
exit 1
|
||||
'';
|
||||
failureHook = ''
|
||||
cat <<EOF
|
||||
${helpMsg}
|
||||
EOF
|
||||
'';
|
||||
}));
|
||||
(_: {
|
||||
# This preHook hides the credentials from /proc
|
||||
preHook =
|
||||
if username != "" && token != "" then ''
|
||||
echo -n "${username}" >username
|
||||
echo -n "${token}" >token
|
||||
'' else ''
|
||||
# Deliberately failing since username/token was not provided, so we can't fetch.
|
||||
# We can't use builtins.throw since we want the result to be used if the tar is in the store already.
|
||||
exit 1
|
||||
'';
|
||||
failureHook = ''
|
||||
cat <<EOF
|
||||
${helpMsg}
|
||||
EOF
|
||||
'';
|
||||
}));
|
||||
};
|
||||
|
||||
configBaseCfg = ''
|
||||
@ -149,9 +171,12 @@ let
|
||||
$out/bin/factorio
|
||||
'';
|
||||
|
||||
passthru.updateScript = if (username != "" && token != "") then [
|
||||
./update.py "--username=${username}" "--token=${token}"
|
||||
] else null;
|
||||
passthru.updateScript =
|
||||
if (username != "" && token != "") then [
|
||||
./update.py
|
||||
"--username=${username}"
|
||||
"--token=${token}"
|
||||
] else null;
|
||||
|
||||
meta = {
|
||||
description = "A game in which you build and maintain factories";
|
||||
@ -184,16 +209,18 @@ let
|
||||
|
||||
libPath = lib.makeLibraryPath [
|
||||
alsa-lib
|
||||
libpulseaudio
|
||||
libGL
|
||||
libICE
|
||||
libSM
|
||||
libX11
|
||||
libXcursor
|
||||
libXext
|
||||
libXi
|
||||
libXinerama
|
||||
libXrandr
|
||||
libXi
|
||||
libGL
|
||||
libSM
|
||||
libICE
|
||||
libXext
|
||||
libpulseaudio
|
||||
libxkbcommon
|
||||
wayland
|
||||
];
|
||||
|
||||
installPhase = base.installPhase + ''
|
||||
@ -244,4 +271,5 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
in stdenv.mkDerivation (releases.${releaseType})
|
||||
in
|
||||
stdenv.mkDerivation (releases.${releaseType})
|
||||
|
||||
@ -3,14 +3,14 @@
|
||||
let
|
||||
# These names are how they are designated in https://xanmod.org.
|
||||
ltsVariant = {
|
||||
version = "6.1.22";
|
||||
hash = "sha256-eom3vlcbTTnVk+zcKja82mKmSmO8v0uqxccdA1VRj6s=";
|
||||
version = "6.1.23";
|
||||
hash = "sha256-yKbePeImBpDLXfexvGJdghSBr3j/oFKXeMuBAOtDqJ8=";
|
||||
variant = "lts";
|
||||
};
|
||||
|
||||
mainVariant = {
|
||||
version = "6.2.9";
|
||||
hash = "sha256-Nwd3C5YSfEO4/2fOzkQmNAqettvt6bM2Gz0k8a9O/DI=";
|
||||
version = "6.2.10";
|
||||
hash = "sha256-zy6mKpoOu9YmGI6a8ZWjV761m+AGlTaWEzpL1QloCk8=";
|
||||
variant = "main";
|
||||
};
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
# Do not edit!
|
||||
|
||||
{
|
||||
version = "2023.4.1";
|
||||
version = "2023.4.2";
|
||||
components = {
|
||||
"3_day_blinds" = ps: with ps; [
|
||||
];
|
||||
|
||||
@ -109,6 +109,11 @@ let
|
||||
};
|
||||
});
|
||||
|
||||
# moto tests are a nuissance
|
||||
moto = super.moto.overridePythonAttrs (_: {
|
||||
doCheck = false;
|
||||
});
|
||||
|
||||
# Pinned due to API changes in 1.3.0
|
||||
ovoenergy = super.ovoenergy.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "1.2.0";
|
||||
@ -208,11 +213,11 @@ let
|
||||
});
|
||||
|
||||
sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "2.0.6";
|
||||
version = "2.0.9";
|
||||
src = super.fetchPypi {
|
||||
pname = "SQLAlchemy";
|
||||
inherit version;
|
||||
hash = "sha256-w0PwtUZJX116I5xwv1CpmkjXMhwWW4Kvr6hIO56+v24=";
|
||||
hash = "sha256-lXGSFePscze59Xw8LtoOanYZvhlKUWbAfB5Zn2r8IPo=";
|
||||
};
|
||||
});
|
||||
|
||||
@ -249,6 +254,16 @@ let
|
||||
};
|
||||
});
|
||||
|
||||
websockets = super.websockets.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "11.0.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "aaugustin";
|
||||
repo = "websockets";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-cD8pC7n2OGS8AjG0VdjNXi8jXxvN7yKkadNR0GCqc90=";
|
||||
};
|
||||
});
|
||||
|
||||
# internal python packages only consumed by home-assistant itself
|
||||
home-assistant-frontend = self.callPackage ./frontend.nix { };
|
||||
home-assistant-intents = self.callPackage ./intents.nix { };
|
||||
@ -273,7 +288,7 @@ let
|
||||
extraBuildInputs = extraPackages python.pkgs;
|
||||
|
||||
# Don't forget to run parse-requirements.py after updating
|
||||
hassVersion = "2023.4.1";
|
||||
hassVersion = "2023.4.2";
|
||||
|
||||
in python.pkgs.buildPythonApplication rec {
|
||||
pname = "homeassistant";
|
||||
@ -289,7 +304,7 @@ in python.pkgs.buildPythonApplication rec {
|
||||
# Primary source is the pypi sdist, because it contains translations
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-p9dR8q9eWxDGo+cBXO0zd9MFdB7pFeAfLfudHsYxcK8=";
|
||||
hash = "sha256-Fl8CxHK8Gg4wf+kyptyiLZx8MG/eI5kTr+pSLEl729I=";
|
||||
};
|
||||
|
||||
# Secondary source is git for tests
|
||||
@ -297,7 +312,7 @@ in python.pkgs.buildPythonApplication rec {
|
||||
owner = "home-assistant";
|
||||
repo = "core";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-TSTn2o37XMmcU4XCPCMwvRNWW7BUadcfbK7NU/ulsNE=";
|
||||
hash = "sha256-XCxFi7ts4KQdKl68YP4Ps60SWW22NoNuoGFo50xbl8s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "homeassistant-stubs";
|
||||
version = "2023.4.0";
|
||||
version = "2023.4.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = python.version != home-assistant.python.version;
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "KapJI";
|
||||
repo = "homeassistant-stubs";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Gu65PlRjAqKK6BdzNjcHeRy4Cqr6z2o+PRwmDFkSlMA=";
|
||||
hash = "sha256-FzcgGyYtmU8owlvUfP/D+Y6m5QwOWj4njoLTZX6skLE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -77,7 +77,7 @@ stdenv.mkDerivation {
|
||||
|
||||
|
||||
configureFlagsArray=(
|
||||
"--with-gssapi"
|
||||
"--with-krb5"
|
||||
"--sysconfdir=/etc"
|
||||
"--localstatedir=/var"
|
||||
"--disable-kernel-module"
|
||||
@ -108,6 +108,8 @@ stdenv.mkDerivation {
|
||||
cp "doc/xml/''${d}"/*.html "$doc/share/doc/openafs/''${d}"
|
||||
done
|
||||
|
||||
cp src/tools/dumpscan/{afsdump_dirlist,afsdump_extract,afsdump_scan,dumptool} $out/bin
|
||||
|
||||
rm -r $out/lib/openafs
|
||||
'' + optionalString withDevdoc ''
|
||||
mkdir -p $devdoc/share/devhelp/openafs/doxygen
|
||||
|
||||
@ -94,6 +94,6 @@ buildGoModule rec {
|
||||
description = "A free, open source game management panel";
|
||||
homepage = "https://www.pufferpanel.com/";
|
||||
license = with licenses; [ asl20 ];
|
||||
maintainers = with maintainers; [ ckie ];
|
||||
maintainers = with maintainers; [ ckie tie ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
{ lib, buildGoModule, fetchFromGitHub, testers, carapace }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "carapace";
|
||||
@ -13,6 +13,12 @@ buildGoModule rec {
|
||||
|
||||
vendorHash = "sha256-s8U0ERAb/qLwen8ABfeZ21HLTgHWvHaYHazztSeP87c=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X main.version=${version}"
|
||||
];
|
||||
|
||||
subPackages = [ "./cmd/carapace" ];
|
||||
|
||||
tags = [ "release" ];
|
||||
@ -21,10 +27,12 @@ buildGoModule rec {
|
||||
go generate ./...
|
||||
'';
|
||||
|
||||
passthru.tests.version = testers.testVersion { package = carapace; };
|
||||
|
||||
meta = with lib; {
|
||||
description = "Multi-shell multi-command argument completer";
|
||||
homepage = "https://rsteube.github.io/carapace-bin/";
|
||||
maintainers = with maintainers; [ mredaelli ];
|
||||
maintainers = with maintainers; [ star-szr ];
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, installShellFiles }:
|
||||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, installShellFiles, util-linux }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "swapspace";
|
||||
@ -16,8 +16,23 @@ stdenv.mkDerivation rec {
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace 'swapspace.service' \
|
||||
--replace '/usr/local/sbin/' "$out/bin/"
|
||||
substituteInPlace 'src/support.c' \
|
||||
--replace '/sbin/swapon' '${lib.getBin util-linux}/bin/swapon' \
|
||||
--replace '/sbin/swapoff' '${lib.getBin util-linux}/bin/swapoff'
|
||||
substituteInPlace 'src/swaps.c' \
|
||||
--replace 'mkswap' '${lib.getBin util-linux}/bin/mkswap'
|
||||
|
||||
# Don't create empty directory $out/var/lib/swapspace
|
||||
substituteInPlace 'Makefile.am' \
|
||||
--replace 'install-data-local:' 'do-not-execute:'
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
installManPage doc/swapspace.8
|
||||
install --mode=444 -D 'swapspace.service' "$out/etc/systemd/system/swapspace.service"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
@ -25,6 +40,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/Tookmund/Swapspace";
|
||||
license = licenses.gpl2Only;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ misuzu ];
|
||||
maintainers = with maintainers; [ misuzu Luflosi ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "juicefs";
|
||||
version = "1.0.3";
|
||||
version = "1.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "juicedata";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-zGVOodjNPH/vCIBEjXo3MTg8McybakMv7tg0Y9ahasU=";
|
||||
sha256 = "sha256-Bez9wwAPDyYYECDwW9CB/ACTGUJl6PW3YiipIGY0Zbo=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-YzFGqn9r06TEMiKuuUbUkoacFpsAOPopX9MNB4mlTIM=";
|
||||
vendorHash = "sha256-dsKNFIXcSeYUyh1TO1h1Ze3jS97pdhn2eU9hHjTARCo=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
|
||||
@ -6,17 +6,17 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubescape";
|
||||
version = "2.2.5";
|
||||
version = "2.2.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubescape";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-J3E41xQxI53iRfo5E+DMXD70sSCBO3TpSm3qZmpxvW8=";
|
||||
hash = "sha256-tXfjbE4C08YWgLJlZHjagAP3upqCpaOgwSegovVSFCI=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
vendorHash = "sha256-KoAuM1H9FRcPLD0AipnXOCUiNHcCWnek4sV0ztu5SyI=";
|
||||
vendorHash = "sha256-bZPM8PCn0+W7Sf/+lQ3ASeqxFSZi49r32rjvQdD7Bvc=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ugrep";
|
||||
version = "3.11.0";
|
||||
version = "3.11.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Genivia";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-nqnuEahOsnGX38526cIe8Vj7YoEJxO1ydbgfPwlpK+o=";
|
||||
hash = "sha256-NDH2OEweIU0/JHfkq0md6cll2uwCTLkVmJcmF337DUw=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -8017,6 +8017,8 @@ with pkgs;
|
||||
|
||||
grafterm = callPackage ../tools/misc/grafterm { };
|
||||
|
||||
gradience = callPackage ../applications/misc/gradience { };
|
||||
|
||||
grafx2 = callPackage ../applications/graphics/grafx2 { };
|
||||
|
||||
grails = callPackage ../development/web/grails { jdk = null; };
|
||||
@ -32592,6 +32594,8 @@ with pkgs;
|
||||
ncdc = callPackage ../applications/networking/p2p/ncdc { };
|
||||
|
||||
ncspot = callPackage ../applications/audio/ncspot {
|
||||
inherit (darwin.apple_sdk.frameworks) Cocoa;
|
||||
|
||||
withALSA = stdenv.isLinux;
|
||||
withPulseAudio = config.pulseaudio or stdenv.isLinux;
|
||||
withPortAudio = stdenv.isDarwin;
|
||||
@ -37924,6 +37928,10 @@ with pkgs;
|
||||
|
||||
pspp = callPackage ../applications/science/math/pspp { };
|
||||
|
||||
raspa = callPackage ../applications/science/molecular-dynamics/raspa { };
|
||||
|
||||
raspa-data = callPackage ../applications/science/molecular-dynamics/raspa/data.nix { };
|
||||
|
||||
ssw = callPackage ../applications/misc/ssw { };
|
||||
|
||||
pynac = callPackage ../applications/science/math/pynac { };
|
||||
|
||||
@ -5882,6 +5882,8 @@ self: super: with self; {
|
||||
|
||||
mat2 = callPackage ../development/python-modules/mat2 { };
|
||||
|
||||
material-color-utilities = callPackage ../development/python-modules/material-color-utilities { };
|
||||
|
||||
matchpy = callPackage ../development/python-modules/matchpy { };
|
||||
|
||||
mathlibtools = callPackage ../development/python-modules/mathlibtools { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user