mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-30 09:37:59 +03:00
Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
GitHub
commit
1e83653904
1
.github/CODEOWNERS
vendored
1
.github/CODEOWNERS
vendored
@ -270,6 +270,7 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
|
||||
# GNOME
|
||||
/pkgs/desktops/gnome @jtojnar
|
||||
/pkgs/desktops/gnome/extensions @piegamesde @jtojnar
|
||||
/pkgs/build-support/make-hardcode-gsettings-patch @jtojnar
|
||||
|
||||
# Cinnamon
|
||||
/pkgs/desktops/cinnamon @mkg20001
|
||||
|
||||
@ -232,7 +232,6 @@ androidenv.emulateApp {
|
||||
platformVersion = "24";
|
||||
abiVersion = "armeabi-v7a"; # mips, x86, x86_64
|
||||
systemImageType = "default";
|
||||
useGoogleAPIs = false;
|
||||
app = ./MyApp.apk;
|
||||
package = "MyApp";
|
||||
activity = "MainActivity";
|
||||
|
||||
@ -969,6 +969,11 @@ in mkLicense lset) ({
|
||||
fullName = "wxWindows Library Licence, Version 3.1";
|
||||
};
|
||||
|
||||
x11 = {
|
||||
spdxId = "X11";
|
||||
fullName = "X11 License";
|
||||
};
|
||||
|
||||
xfig = {
|
||||
fullName = "xfig";
|
||||
url = "http://mcj.sourceforge.net/authors.html#xfig"; # https is broken
|
||||
|
||||
@ -281,7 +281,7 @@ rec {
|
||||
=> [ ]
|
||||
stringToCharacters "abc"
|
||||
=> [ "a" "b" "c" ]
|
||||
stringToCharacters "💩"
|
||||
stringToCharacters "🦄"
|
||||
=> [ "<EFBFBD>" "<EFBFBD>" "<EFBFBD>" "<EFBFBD>" ]
|
||||
*/
|
||||
stringToCharacters = s:
|
||||
|
||||
@ -186,6 +186,12 @@
|
||||
githubId = 7755101;
|
||||
name = "Aaron Andersen";
|
||||
};
|
||||
aaqaishtyaq = {
|
||||
email = "aaqaishtyaq@gmail.com";
|
||||
github = "aaqaishtyaq";
|
||||
githubId = 22131756;
|
||||
name = "Aaqa Ishtyaq";
|
||||
};
|
||||
aaronjanse = {
|
||||
email = "aaron@ajanse.me";
|
||||
matrix = "@aaronjanse:matrix.org";
|
||||
@ -1695,6 +1701,15 @@
|
||||
fingerprint = "D35E C9CE E631 638F F1D8 B401 6F0E 410D C3EE D02";
|
||||
}];
|
||||
};
|
||||
benjaminedwardwebb = {
|
||||
name = "Ben Webb";
|
||||
email = "benjaminedwardwebb@gmail.com";
|
||||
github = "benjaminedwardwebb";
|
||||
githubId = 7118777;
|
||||
keys = [{
|
||||
fingerprint = "E9A3 7864 2165 28CE 507C CA82 72EA BF75 C331 CD25";
|
||||
}];
|
||||
};
|
||||
benley = {
|
||||
email = "benley@gmail.com";
|
||||
github = "benley";
|
||||
@ -1728,12 +1743,6 @@
|
||||
githubId = 442623;
|
||||
name = "Ben Pye";
|
||||
};
|
||||
benwbooth = {
|
||||
email = "benwbooth@gmail.com";
|
||||
github = "benwbooth";
|
||||
githubId = 75972;
|
||||
name = "Ben Booth";
|
||||
};
|
||||
berberman = {
|
||||
email = "berberman@yandex.com";
|
||||
matrix = "@berberman:mozilla.org";
|
||||
@ -3932,6 +3941,16 @@
|
||||
github = "edlimerkaj";
|
||||
githubId = 71988351;
|
||||
};
|
||||
edrex = {
|
||||
email = "ericdrex@gmail.com";
|
||||
github = "edrex";
|
||||
githubId = 14615;
|
||||
keys = [{
|
||||
fingerprint = "AC47 2CCC 9867 4644 A9CF EB28 1C5C 1ED0 9F66 6824";
|
||||
}];
|
||||
matrix = "@edrex:matrix.org";
|
||||
name = "Eric Drechsel";
|
||||
};
|
||||
ehllie = {
|
||||
email = "me@ehllie.xyz";
|
||||
github = "ehllie";
|
||||
@ -12041,7 +12060,7 @@
|
||||
name = "Russell O'Connor";
|
||||
};
|
||||
rodrgz = {
|
||||
email = "rodrgz@proton.me";
|
||||
email = "erik@rodgz.com";
|
||||
github = "rodrgz";
|
||||
githubId = 53882428;
|
||||
name = "Erik Rodriguez";
|
||||
|
||||
@ -11,6 +11,7 @@ compat53,,,,0.7-1,,vcunat
|
||||
cosmo,,,,,,marsam
|
||||
coxpcall,,,,1.17.0-1,,
|
||||
cqueues,,,,,,vcunat
|
||||
cyan,,,,,,
|
||||
cyrussasl,https://github.com/JorjBauer/lua-cyrussasl.git,,,,,
|
||||
digestif,https://github.com/astoff/digestif.git,,,0.2-1,5.3,
|
||||
dkjson,,,,,,
|
||||
@ -99,6 +100,7 @@ sqlite,,,,,,
|
||||
std._debug,https://github.com/lua-stdlib/_debug.git,,,,,
|
||||
std.normalize,https://github.com/lua-stdlib/normalize.git,,,,,
|
||||
stdlib,,,,41.2.2,,vyp
|
||||
teal-language-server,,,http://luarocks.org/dev,,,
|
||||
tl,,,,,,mephistophiles
|
||||
vstruct,https://github.com/ToxicFrog/vstruct.git,,,,,
|
||||
vusted,,,,,,figsoda
|
||||
|
||||
|
@ -555,7 +555,7 @@ in {
|
||||
auto_assign_org_role = mkOption {
|
||||
description = lib.mdDoc "Default role new users will be auto assigned.";
|
||||
default = "Viewer";
|
||||
type = types.enum ["Viewer" "Editor"];
|
||||
type = types.enum ["Viewer" "Editor" "Admin"];
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -205,8 +205,9 @@ let
|
||||
# Copy ld manually since it isn't detected correctly
|
||||
cp -pv ${pkgs.stdenv.cc.libc.out}/lib/ld*.so.? $out/lib
|
||||
|
||||
# Copy all of the needed libraries
|
||||
find $out/bin $out/lib -type f | while read BIN; do
|
||||
# Copy all of the needed libraries in a consistent order so
|
||||
# duplicates are resolved the same way.
|
||||
find $out/bin $out/lib -type f | sort | while read BIN; do
|
||||
echo "Copying libs for executable $BIN"
|
||||
for LIB in $(${findLibs}/bin/find-libs $BIN); do
|
||||
TGT="$out/lib/$(basename $LIB)"
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
import ./make-test-python.nix ({pkgs, lib, ...}:
|
||||
let
|
||||
# A filesystem image with a (presumably) bootable debian
|
||||
debianImage = pkgs.vmTools.diskImageFuns.debian9i386 {
|
||||
debianImage = pkgs.vmTools.diskImageFuns.debian11i386 {
|
||||
# os-prober cannot detect systems installed on disks without a partition table
|
||||
# so we create the disk ourselves
|
||||
createRootFS = with pkgs; ''
|
||||
|
||||
@ -64,6 +64,10 @@ stdenv.mkDerivation {
|
||||
description = "An integrated development environment for Java, C, C++ and PHP";
|
||||
homepage = "https://netbeans.apache.org/";
|
||||
license = lib.licenses.asl20;
|
||||
sourceProvenance = with lib.sourceTypes; [
|
||||
binaryBytecode
|
||||
binaryNativeCode
|
||||
];
|
||||
maintainers = with lib.maintainers; [ sander rszibele asbachb ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ stdenv, lib, makeDesktopItem
|
||||
, unzip, libsecret, libXScrnSaver, libxshmfence, wrapGAppsHook, makeWrapper
|
||||
, atomEnv, at-spi2-atk, autoPatchelfHook
|
||||
, systemd, fontconfig, libdbusmenu, glib, buildFHSUserEnvBubblewrap
|
||||
, systemd, fontconfig, libdbusmenu, glib, buildFHSUserEnvBubblewrap, wayland
|
||||
|
||||
# Populate passthru.tests
|
||||
, tests
|
||||
@ -66,7 +66,7 @@ let
|
||||
buildInputs = [ libsecret libXScrnSaver libxshmfence ]
|
||||
++ lib.optionals (!stdenv.isDarwin) ([ at-spi2-atk ] ++ atomEnv.packages);
|
||||
|
||||
runtimeDependencies = lib.optionals stdenv.isLinux [ (lib.getLib systemd) fontconfig.lib libdbusmenu ];
|
||||
runtimeDependencies = lib.optionals stdenv.isLinux [ (lib.getLib systemd) fontconfig.lib libdbusmenu wayland ];
|
||||
|
||||
nativeBuildInputs = [ unzip ]
|
||||
++ lib.optionals stdenv.isLinux [
|
||||
|
||||
@ -9,16 +9,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "felix";
|
||||
version = "2.2.1";
|
||||
version = "2.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kyoheiu";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-DHFQLC89ZNf6wk/L9cmEj1qSfQhqFAmQ9msYTRy0y00=";
|
||||
sha256 = "sha256-VKesly7Jp1PgukArNKvDGzSRh7DaL3A/Dub3dLR6ET4=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-9AC8muMKc0eU3g4uQvWscIULNetlgEs6ZVsMr4dpwqk=";
|
||||
cargoSha256 = "sha256-7+4SIBnu4R2mbH2nWBX9BmJL1n8t46d1vrMpNaUHAo4=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@ -46,13 +46,13 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "imagemagick";
|
||||
version = "7.1.0-54";
|
||||
version = "7.1.0-55";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ImageMagick";
|
||||
repo = "ImageMagick";
|
||||
rev = version;
|
||||
hash = "sha256-aQipCcqOS9viOLPHEx21MrJHdxYKZl++3DIKMz97Ukw=";
|
||||
hash = "sha256-V0poyS1QnHhnSc3QbHHE+BctCBv2knriK0ihMF565d8=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
|
||||
|
||||
@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "evilpixie";
|
||||
version = "0.3";
|
||||
version = "0.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bcampbell";
|
||||
repo = "evilpixie";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-t7ccaMXaCanCyn3oV8WJ11bhF7xTBkd992AheFJpSGQ=";
|
||||
sha256 = "sha256-+DdAN+xDOYxLgLHUlr75piTEPrWpuOyXvxckhBEl7yU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -13,9 +13,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = [ vtk_9 ]
|
||||
++ lib.optionals stdenv.isLinux [ libGL libX11 ]
|
||||
++ lib.optionals stdenv.isDarwin [ Cocoa OpenGL ];
|
||||
buildInputs = [ vtk_9 ] ++ lib.optionals stdenv.isDarwin [ Cocoa OpenGL ];
|
||||
|
||||
# conflict between VTK and Nixpkgs;
|
||||
# see https://github.com/NixOS/nixpkgs/issues/89167
|
||||
|
||||
@ -28,13 +28,13 @@
|
||||
}:
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "bottles-unwrapped";
|
||||
version = "2022.12.14";
|
||||
version = "2022.12.14.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bottlesdevs";
|
||||
repo = "bottles";
|
||||
rev = version;
|
||||
sha256 = "sha256-G2FQy+mea/+2RjK/WjLeX+7TP+HU6fCUFYuprFGKEyw=";
|
||||
sha256 = "sha256-hoWyXCP7/0m8akUGBJyuF2yQcRKR8C7MDBLUdPdtBgE=";
|
||||
};
|
||||
|
||||
patches = [ ./vulkan_icd.patch ];
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
, buildFHSUserEnvBubblewrap
|
||||
, symlinkJoin
|
||||
, bottles-unwrapped
|
||||
, gst_all_1
|
||||
, extraPkgs ? pkgs: [ ]
|
||||
, extraLibraries ? pkgs: [ ]
|
||||
}:
|
||||
@ -9,6 +10,8 @@
|
||||
let fhsEnv = {
|
||||
targetPkgs = pkgs: with pkgs; [
|
||||
bottles-unwrapped
|
||||
# This only allows to enable the toggle, vkBasalt won't work if not installed with environment.systemPackages (or nix-env)
|
||||
# See https://github.com/bottlesdevs/Bottles/issues/2401
|
||||
vkbasalt
|
||||
] ++ extraPkgs pkgs;
|
||||
|
||||
@ -46,6 +49,9 @@ let fhsEnv = {
|
||||
gsm
|
||||
gst_all_1.gstreamer
|
||||
gst_all_1.gst-plugins-base
|
||||
gst_all_1.gst-plugins-good
|
||||
gst_all_1.gst-plugins-ugly
|
||||
gst_all_1.gst-plugins-bad
|
||||
libgphoto2
|
||||
libjpeg_turbo
|
||||
libkrb5
|
||||
@ -83,6 +89,13 @@ let fhsEnv = {
|
||||
zlib # Freetype
|
||||
] ++ xorgDeps pkgs
|
||||
++ extraLibraries pkgs;
|
||||
|
||||
profile = ''
|
||||
# Remove if merged https://github.com/bottlesdevs/Bottles/pull/2415
|
||||
export BOTTLES_USE_SYSTEM_GSTREAMER=1
|
||||
# Dirty hack, may be related with https://github.com/NixOS/nixpkgs/issues/148007
|
||||
export GST_PLUGIN_PATH=${ lib.makeSearchPath "lib/gstreamer-1.0" (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad ]) }
|
||||
'';
|
||||
};
|
||||
in
|
||||
symlinkJoin {
|
||||
|
||||
862
pkgs/applications/misc/dmenu-rs/Cargo.lock
generated
Normal file
862
pkgs/applications/misc/dmenu-rs/Cargo.lock
generated
Normal file
@ -0,0 +1,862 @@
|
||||
# This file is automatically @generated by Cargo.
|
||||
# It is not intended for manual editing.
|
||||
version = 3
|
||||
|
||||
[[package]]
|
||||
name = "aho-corasick"
|
||||
version = "0.7.19"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e"
|
||||
dependencies = [
|
||||
"memchr",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ansi_term"
|
||||
version = "0.12.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
|
||||
dependencies = [
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "arrayref"
|
||||
version = "0.3.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"
|
||||
|
||||
[[package]]
|
||||
name = "arrayvec"
|
||||
version = "0.5.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
|
||||
|
||||
[[package]]
|
||||
name = "atty"
|
||||
version = "0.2.14"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
|
||||
dependencies = [
|
||||
"hermit-abi",
|
||||
"libc",
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "base64"
|
||||
version = "0.13.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
|
||||
|
||||
[[package]]
|
||||
name = "bindgen"
|
||||
version = "0.53.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c72a978d268b1d70b0e963217e60fdabd9523a941457a6c42a7315d15c7e89e5"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"cexpr",
|
||||
"cfg-if 0.1.10",
|
||||
"clang-sys",
|
||||
"clap",
|
||||
"env_logger",
|
||||
"lazy_static",
|
||||
"lazycell",
|
||||
"log",
|
||||
"peeking_take_while",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"regex",
|
||||
"rustc-hash",
|
||||
"shlex",
|
||||
"which",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "bitflags"
|
||||
version = "1.3.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
|
||||
|
||||
[[package]]
|
||||
name = "blake2b_simd"
|
||||
version = "0.5.11"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587"
|
||||
dependencies = [
|
||||
"arrayref",
|
||||
"arrayvec",
|
||||
"constant_time_eq",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "block"
|
||||
version = "0.1.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
|
||||
|
||||
[[package]]
|
||||
name = "bstr"
|
||||
version = "0.2.17"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223"
|
||||
dependencies = [
|
||||
"lazy_static",
|
||||
"memchr",
|
||||
"regex-automata",
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "byteorder"
|
||||
version = "1.4.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
|
||||
|
||||
[[package]]
|
||||
name = "cc"
|
||||
version = "1.0.76"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "76a284da2e6fe2092f2353e51713435363112dfd60030e22add80be333fb928f"
|
||||
|
||||
[[package]]
|
||||
name = "cexpr"
|
||||
version = "0.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f4aedb84272dbe89af497cf81375129abda4fc0a9e7c5d317498c15cc30c0d27"
|
||||
dependencies = [
|
||||
"nom",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cfg-if"
|
||||
version = "0.1.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
|
||||
|
||||
[[package]]
|
||||
name = "cfg-if"
|
||||
version = "1.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
||||
|
||||
[[package]]
|
||||
name = "clang-sys"
|
||||
version = "0.29.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fe6837df1d5cba2397b835c8530f51723267e16abbf83892e9e5af4f0e5dd10a"
|
||||
dependencies = [
|
||||
"glob",
|
||||
"libc",
|
||||
"libloading",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "clap"
|
||||
version = "2.34.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
|
||||
dependencies = [
|
||||
"ansi_term",
|
||||
"atty",
|
||||
"bitflags",
|
||||
"strsim",
|
||||
"textwrap",
|
||||
"unicode-width",
|
||||
"vec_map",
|
||||
"yaml-rust",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "clipboard"
|
||||
version = "0.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "25a904646c0340239dcf7c51677b33928bf24fdf424b79a57909c0109075b2e7"
|
||||
dependencies = [
|
||||
"clipboard-win",
|
||||
"objc",
|
||||
"objc-foundation",
|
||||
"objc_id",
|
||||
"x11-clipboard",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "clipboard-win"
|
||||
version = "2.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e3a093d6fed558e5fe24c3dfc85a68bb68f1c824f440d3ba5aca189e2998786b"
|
||||
dependencies = [
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cmake"
|
||||
version = "0.1.49"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "db34956e100b30725f2eb215f90d4871051239535632f84fea3bc92722c66b7c"
|
||||
dependencies = [
|
||||
"cc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "config"
|
||||
version = "0.0.0"
|
||||
dependencies = [
|
||||
"glob",
|
||||
"itertools",
|
||||
"man_dmenu",
|
||||
"prettytable-rs",
|
||||
"termcolor",
|
||||
"yaml-rust",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "constant_time_eq"
|
||||
version = "0.1.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
|
||||
|
||||
[[package]]
|
||||
name = "crossbeam-utils"
|
||||
version = "0.8.12"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "edbafec5fa1f196ca66527c1b12c2ec4745ca14b50f1ad8f9f6f720b55d11fac"
|
||||
dependencies = [
|
||||
"cfg-if 1.0.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "csv"
|
||||
version = "1.1.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1"
|
||||
dependencies = [
|
||||
"bstr",
|
||||
"csv-core",
|
||||
"itoa",
|
||||
"ryu",
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "csv-core"
|
||||
version = "0.1.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90"
|
||||
dependencies = [
|
||||
"memchr",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "dirs"
|
||||
version = "1.0.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"redox_users",
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "dmenu-build"
|
||||
version = "0.0.0"
|
||||
dependencies = [
|
||||
"clap",
|
||||
"clipboard",
|
||||
"itertools",
|
||||
"lazy_static",
|
||||
"libc",
|
||||
"overrider",
|
||||
"overrider_build",
|
||||
"pledge",
|
||||
"proc_use",
|
||||
"regex",
|
||||
"rustc_version_runtime",
|
||||
"servo-fontconfig",
|
||||
"termcolor",
|
||||
"unicode-segmentation",
|
||||
"x11",
|
||||
"yaml-rust",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "either"
|
||||
version = "1.8.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"
|
||||
|
||||
[[package]]
|
||||
name = "encode_unicode"
|
||||
version = "0.3.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
|
||||
|
||||
[[package]]
|
||||
name = "env_logger"
|
||||
version = "0.7.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36"
|
||||
dependencies = [
|
||||
"atty",
|
||||
"humantime",
|
||||
"log",
|
||||
"regex",
|
||||
"termcolor",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "expat-sys"
|
||||
version = "2.1.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "658f19728920138342f68408b7cf7644d90d4784353d8ebc32e7e8663dbe45fa"
|
||||
dependencies = [
|
||||
"cmake",
|
||||
"pkg-config",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "freetype-sys"
|
||||
version = "0.13.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a37d4011c0cc628dfa766fcc195454f4b068d7afdc2adfd28861191d866e731a"
|
||||
dependencies = [
|
||||
"cmake",
|
||||
"libc",
|
||||
"pkg-config",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "getrandom"
|
||||
version = "0.1.16"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
|
||||
dependencies = [
|
||||
"cfg-if 1.0.0",
|
||||
"libc",
|
||||
"wasi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "glob"
|
||||
version = "0.3.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
|
||||
|
||||
[[package]]
|
||||
name = "headers"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"bindgen",
|
||||
"termcolor",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "hermit-abi"
|
||||
version = "0.1.19"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
|
||||
dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "humantime"
|
||||
version = "1.3.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
|
||||
dependencies = [
|
||||
"quick-error",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "itertools"
|
||||
version = "0.9.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b"
|
||||
dependencies = [
|
||||
"either",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "itoa"
|
||||
version = "0.4.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
|
||||
|
||||
[[package]]
|
||||
name = "lazy_static"
|
||||
version = "1.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
|
||||
|
||||
[[package]]
|
||||
name = "lazycell"
|
||||
version = "1.3.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
|
||||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
version = "0.2.137"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89"
|
||||
|
||||
[[package]]
|
||||
name = "libloading"
|
||||
version = "0.5.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753"
|
||||
dependencies = [
|
||||
"cc",
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "log"
|
||||
version = "0.4.17"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
|
||||
dependencies = [
|
||||
"cfg-if 1.0.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "malloc_buf"
|
||||
version = "0.0.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb"
|
||||
dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "man_dmenu"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"itertools",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "memchr"
|
||||
version = "2.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
|
||||
|
||||
[[package]]
|
||||
name = "nom"
|
||||
version = "5.1.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af"
|
||||
dependencies = [
|
||||
"memchr",
|
||||
"version_check",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "objc"
|
||||
version = "0.2.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
|
||||
dependencies = [
|
||||
"malloc_buf",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "objc-foundation"
|
||||
version = "0.1.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9"
|
||||
dependencies = [
|
||||
"block",
|
||||
"objc",
|
||||
"objc_id",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "objc_id"
|
||||
version = "0.1.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b"
|
||||
dependencies = [
|
||||
"objc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "overrider"
|
||||
version = "0.7.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "55b9fb8c67b6adf9fff65ad57571c42ccc80e8a9d2712e5427d00aa7fa293114"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "overrider_build"
|
||||
version = "0.7.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1d9709eba39b602b089deaf80b123e5c8ecfd071aab827a66c1a58412074fbcc"
|
||||
dependencies = [
|
||||
"glob",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "peeking_take_while"
|
||||
version = "0.1.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
|
||||
|
||||
[[package]]
|
||||
name = "pkg-config"
|
||||
version = "0.3.26"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160"
|
||||
|
||||
[[package]]
|
||||
name = "pledge"
|
||||
version = "0.4.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "252599417b7d9a43b7fdc63dd790b0848666a8910b2ebe1a25118309c3c981e5"
|
||||
dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "prettytable-rs"
|
||||
version = "0.8.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0fd04b170004fa2daccf418a7f8253aaf033c27760b5f225889024cf66d7ac2e"
|
||||
dependencies = [
|
||||
"atty",
|
||||
"csv",
|
||||
"encode_unicode",
|
||||
"lazy_static",
|
||||
"term",
|
||||
"unicode-width",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro2"
|
||||
version = "1.0.47"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725"
|
||||
dependencies = [
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "proc_use"
|
||||
version = "0.2.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fd16b1c456def2ad84b3574651f069541dea178ee688e882943cb21232a5cb01"
|
||||
dependencies = [
|
||||
"glob",
|
||||
"itertools",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "quick-error"
|
||||
version = "1.2.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
|
||||
|
||||
[[package]]
|
||||
name = "quote"
|
||||
version = "1.0.21"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "redox_syscall"
|
||||
version = "0.1.57"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
|
||||
|
||||
[[package]]
|
||||
name = "redox_users"
|
||||
version = "0.3.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d"
|
||||
dependencies = [
|
||||
"getrandom",
|
||||
"redox_syscall",
|
||||
"rust-argon2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "regex"
|
||||
version = "1.7.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a"
|
||||
dependencies = [
|
||||
"aho-corasick",
|
||||
"memchr",
|
||||
"regex-syntax",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "regex-automata"
|
||||
version = "0.1.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
|
||||
|
||||
[[package]]
|
||||
name = "regex-syntax"
|
||||
version = "0.6.28"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
|
||||
|
||||
[[package]]
|
||||
name = "rust-argon2"
|
||||
version = "0.8.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb"
|
||||
dependencies = [
|
||||
"base64",
|
||||
"blake2b_simd",
|
||||
"constant_time_eq",
|
||||
"crossbeam-utils",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rustc-hash"
|
||||
version = "1.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
|
||||
|
||||
[[package]]
|
||||
name = "rustc_version"
|
||||
version = "0.2.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
|
||||
dependencies = [
|
||||
"semver",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rustc_version_runtime"
|
||||
version = "0.2.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d31b7153270ebf48bf91c65ae5b0c00e749c4cfad505f66530ac74950249582f"
|
||||
dependencies = [
|
||||
"rustc_version",
|
||||
"semver",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ryu"
|
||||
version = "1.0.11"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09"
|
||||
|
||||
[[package]]
|
||||
name = "semver"
|
||||
version = "0.9.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
|
||||
dependencies = [
|
||||
"semver-parser",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "semver-parser"
|
||||
version = "0.7.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
|
||||
|
||||
[[package]]
|
||||
name = "serde"
|
||||
version = "1.0.147"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965"
|
||||
|
||||
[[package]]
|
||||
name = "servo-fontconfig"
|
||||
version = "0.5.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c7e3e22fe5fd73d04ebf0daa049d3efe3eae55369ce38ab16d07ddd9ac5c217c"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"servo-fontconfig-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "servo-fontconfig-sys"
|
||||
version = "5.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e36b879db9892dfa40f95da1c38a835d41634b825fbd8c4c418093d53c24b388"
|
||||
dependencies = [
|
||||
"expat-sys",
|
||||
"freetype-sys",
|
||||
"pkg-config",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "shlex"
|
||||
version = "0.1.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2"
|
||||
|
||||
[[package]]
|
||||
name = "strsim"
|
||||
version = "0.8.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "1.0.103"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "term"
|
||||
version = "0.5.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "edd106a334b7657c10b7c540a0106114feadeb4dc314513e97df481d5d966f42"
|
||||
dependencies = [
|
||||
"byteorder",
|
||||
"dirs",
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "termcolor"
|
||||
version = "1.1.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
|
||||
dependencies = [
|
||||
"winapi-util",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "textwrap"
|
||||
version = "0.11.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
|
||||
dependencies = [
|
||||
"unicode-width",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "unicode-ident"
|
||||
version = "1.0.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3"
|
||||
|
||||
[[package]]
|
||||
name = "unicode-segmentation"
|
||||
version = "1.10.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a"
|
||||
|
||||
[[package]]
|
||||
name = "unicode-width"
|
||||
version = "0.1.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
|
||||
|
||||
[[package]]
|
||||
name = "vec_map"
|
||||
version = "0.8.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
|
||||
|
||||
[[package]]
|
||||
name = "version_check"
|
||||
version = "0.9.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
|
||||
|
||||
[[package]]
|
||||
name = "wasi"
|
||||
version = "0.9.0+wasi-snapshot-preview1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
|
||||
|
||||
[[package]]
|
||||
name = "which"
|
||||
version = "3.1.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d011071ae14a2f6671d0b74080ae0cd8ebf3a6f8c9589a2cd45f23126fe29724"
|
||||
dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[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 = "x11"
|
||||
version = "2.20.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f7ae97874a928d821b061fce3d1fc52f08071dd53c89a6102bc06efcac3b2908"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"pkg-config",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "x11-clipboard"
|
||||
version = "0.3.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "89bd49c06c9eb5d98e6ba6536cf64ac9f7ee3a009b2f53996d405b3944f6bcea"
|
||||
dependencies = [
|
||||
"xcb",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "xcb"
|
||||
version = "0.8.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5e917a3f24142e9ff8be2414e36c649d47d6cc2ba81f16201cdef96e533e02de"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"log",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "yaml-rust"
|
||||
version = "0.3.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e66366e18dc58b46801afbf2ca7661a9f59cc8c5962c29892b6039b4f86fa992"
|
||||
89
pkgs/applications/misc/dmenu-rs/default.nix
Normal file
89
pkgs/applications/misc/dmenu-rs/default.nix
Normal file
@ -0,0 +1,89 @@
|
||||
{ stdenv
|
||||
, rustPlatform
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cargo
|
||||
, expat
|
||||
, fontconfig
|
||||
, libXft
|
||||
, libXinerama
|
||||
, m4
|
||||
, pkg-config
|
||||
, python3
|
||||
}:
|
||||
|
||||
# The dmenu-rs package has extensive plugin support. However, this derivation
|
||||
# only builds the package with the default set of plugins. If you'd like to
|
||||
# further customize dmenu-rs you can build it from the source.
|
||||
# See: https://github.com/Shizcow/dmenu-rs#plugins
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dmenu-rs";
|
||||
version = "5.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Shizcow";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-WpDqBjIZ5ESnoRtWZmvm+gNTLKqxL4IibRVCj0yRIFM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cargo
|
||||
m4
|
||||
pkg-config
|
||||
python3
|
||||
rustPlatform.bindgenHook
|
||||
rustPlatform.cargoSetupHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
expat
|
||||
fontconfig
|
||||
libXft
|
||||
libXinerama
|
||||
];
|
||||
|
||||
# The dmenu-rs repository does not include a Cargo.lock because of its
|
||||
# dynamic build and plugin support. Generating it with make and checking it
|
||||
# in to nixpkgs here was the easiest way to supply it to rustPlatform.
|
||||
# See: https://github.com/Shizcow/dmenu-rs/issues/34#issuecomment-757415584
|
||||
cargoDeps = rustPlatform.importCargoLock {
|
||||
lockFile = ./Cargo.lock;
|
||||
};
|
||||
|
||||
# The rust-xcb dependency dynamically generates rust code at build time.
|
||||
# This derivation uses nixpkgs rust functions that vendor each cargo
|
||||
# dependency's source code into the READ-ONLY nix store. To avoid the code
|
||||
# generation step failing, we copy the rust-xcb source out of the nix store
|
||||
# and make it writeable. Also, we remove the build's hardcoded c compiler.
|
||||
# See: https://github.com/rust-x-bindings/rust-xcb/tree/v0.8.2
|
||||
postPatch = ''
|
||||
substituteInPlace config.mk --replace "clang" ""
|
||||
|
||||
chmod +w "$NIX_BUILD_TOP/cargo-vendor-dir"
|
||||
mkdir -p "$NIX_BUILD_TOP/cargo-vendor-dir/xcb-0.8.2-readwrite"
|
||||
cp -r --no-preserve=mod "$NIX_BUILD_TOP/cargo-vendor-dir/xcb-0.8.2/." "$NIX_BUILD_TOP/cargo-vendor-dir/xcb-0.8.2-readwrite"
|
||||
unlink "$NIX_BUILD_TOP/cargo-vendor-dir/xcb-0.8.2"
|
||||
mv "$NIX_BUILD_TOP/cargo-vendor-dir/xcb-0.8.2-readwrite" "$NIX_BUILD_TOP/cargo-vendor-dir/xcb-0.8.2"
|
||||
|
||||
cp ${./Cargo.lock} src/Cargo.lock
|
||||
'';
|
||||
|
||||
cargoRoot = "src";
|
||||
|
||||
installFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
# Running make test requires an X11 server. It also runs dmenu, which then
|
||||
# hangs on user input. It was too hard to figure out how to run these tests
|
||||
# deterministically. See the original PR for some discussion on this.
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A pixel perfect port of dmenu, rewritten in Rust with extensive plugin support";
|
||||
homepage = "https://github.com/Shizcow/dmenu-rs";
|
||||
license = with licenses; [ gpl3Only ];
|
||||
maintainers = with maintainers; [ benjaminedwardwebb ];
|
||||
platforms = platforms.linux;
|
||||
broken = (stdenv.isLinux && stdenv.isAarch64);
|
||||
};
|
||||
}
|
||||
28
pkgs/applications/misc/lswt/default.nix
Normal file
28
pkgs/applications/misc/lswt/default.nix
Normal file
@ -0,0 +1,28 @@
|
||||
{ lib, stdenv, fetchFromSourcehut, nixos, wayland }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lswt";
|
||||
version = "1.0.4";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~leon_plickat";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Orwa7sV56AeznEcq/Xj5qj4PALMxq0CI+ZnXuY4JYE0=";
|
||||
};
|
||||
|
||||
buildInputs = [ wayland ];
|
||||
|
||||
makeFlags = [
|
||||
"DESTDIR=${placeholder "out"}"
|
||||
"PREFIX="
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A command that lists Wayland toplevels";
|
||||
homepage = "https://sr.ht/~leon_plickat/lswt";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ edrex ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -3,11 +3,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "thedesk";
|
||||
version = "23.0.1";
|
||||
version = "23.0.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/cutls/TheDesk/releases/download/v${version}/${pname}_${version}_amd64.deb";
|
||||
sha256 = "sha256-DyaJggucFOxkrpaJSmg5fTrK8O3HA0Byd5pHwcgPSIM=";
|
||||
sha256 = "sha256-X1WNfpsHRkk2UNTExn338r4pWhtC1osrCo6V8g7Pxcc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -90,6 +90,7 @@ let
|
||||
ps.nixops-hetzner
|
||||
ps.nixopsvbox
|
||||
ps.nixops-virtd
|
||||
ps.nixops-hetznercloud
|
||||
]) // rec {
|
||||
# Workaround for https://github.com/NixOS/nixpkgs/issues/119407
|
||||
# TODO after #1199407: Use .overrideAttrs(pkg: old: { passthru.tests = .....; })
|
||||
|
||||
@ -71,6 +71,16 @@ self: super: {
|
||||
}
|
||||
);
|
||||
|
||||
nixops-hetznercloud = super.nixops-hetznercloud.overridePythonAttrs (
|
||||
_: {
|
||||
src = pkgs.fetchgit {
|
||||
url = "https://github.com/lukebfox/nixops-hetznercloud.git";
|
||||
rev = "386f8b7cfe724308a9c1e97e76d238498a279495";
|
||||
sha256 = "0ig9maxcprxvz0fgriyzgcqz990s1pspizzsqj7x3xg0w0dpx853";
|
||||
};
|
||||
}
|
||||
);
|
||||
|
||||
nixops-virtd = super.nixops-virtd.overridePythonAttrs (
|
||||
_: {
|
||||
src = pkgs.fetchgit {
|
||||
|
||||
980
pkgs/applications/networking/cluster/nixops/poetry.lock
generated
980
pkgs/applications/networking/cluster/nixops/poetry.lock
generated
File diff suppressed because it is too large
Load Diff
@ -13,6 +13,7 @@ nixops-encrypted-links = {git = "https://github.com/nix-community/nixops-encrypt
|
||||
nixops-gcp = {git = "https://github.com/nix-community/nixops-gce.git"}
|
||||
nixops-hercules-ci = {git = "https://github.com/hercules-ci/nixops-hercules-ci.git"}
|
||||
nixops-hetzner = {git = "https://github.com/NixOS/nixops-hetzner"}
|
||||
nixops-hetznercloud = {git = "https://github.com/lukebfox/nixops-hetznercloud.git"}
|
||||
nixopsvbox = {git = "https://github.com/nix-community/nixops-vbox.git"}
|
||||
nixops-virtd = {git = "https://github.com/nix-community/nixops-libvirtd.git"}
|
||||
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "odo";
|
||||
version = "3.3.0";
|
||||
version = "3.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "redhat-developer";
|
||||
repo = "odo";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Np2O3mO9wBxDcCHG8/zMdIU2N+3RNRT2SN3kh7+l2Nc=";
|
||||
sha256 = "sha256-UXeSerVtskEloH60vNom8H6/gEy7adUnBsc/5q7wrDM=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
@ -5,11 +5,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "alfaview";
|
||||
version = "8.57.0";
|
||||
version = "8.58.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://production-alfaview-assets.alfaview.com/stable/linux/${pname}_${version}.deb";
|
||||
sha256 = "sha256-xYHi+lOONE2cxEcuuN2bWh5kF5fcfCNq2GII792IGro=";
|
||||
sha256 = "sha256-z6GjIR9K4OWFuQTGBbP05aYFNa2sD1UW4e/GW01xj78=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -17,6 +17,7 @@
|
||||
, substituteAll
|
||||
, _experimental-update-script-combinators
|
||||
, glib
|
||||
, makeHardcodeGsettingsPatch
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -64,9 +65,9 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
passthru = {
|
||||
hardcodeGsettingsPatch = glib.mkHardcodeGsettingsPatch {
|
||||
hardcodeGsettingsPatch = makeHardcodeGsettingsPatch {
|
||||
inherit src;
|
||||
glib-schema-to-var = {
|
||||
schemaIdToVariableMapping = {
|
||||
"org.gnome.evolution.mail" = "evo";
|
||||
"org.gnome.evolution.calendar" = "evo";
|
||||
};
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
let
|
||||
pname = "synology-drive-client";
|
||||
baseUrl = "https://global.download.synology.com/download/Utility/SynologyDriveClient";
|
||||
version = "3.1.0-12923";
|
||||
version = "3.2.0-13258";
|
||||
buildNumber = with lib; last (splitString "-" version);
|
||||
meta = with lib; {
|
||||
description = "Desktop application to synchronize files and folders between the computer and the Synology Drive server.";
|
||||
@ -29,7 +29,7 @@ let
|
||||
|
||||
src = fetchurl {
|
||||
url = "${baseUrl}/${version}/Ubuntu/Installer/x86_64/synology-drive-client-${buildNumber}.x86_64.deb";
|
||||
sha256 = "sha256-gL08uJbA2S+SuP1afMBmcJMIcu7QRzdiXgIMxSZQl/I=";
|
||||
sha256 = "sha256-jnMwhirZphguW+hluhzD9aXDTQ9RuJgAtjh+Iy23c3w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook dpkg ];
|
||||
@ -59,7 +59,7 @@ let
|
||||
|
||||
src = fetchurl {
|
||||
url = "${baseUrl}/${version}/Mac/Installer/synology-drive-client-${buildNumber}.dmg";
|
||||
sha256 = "0pwm2xi1b9p9zmhy4dhix3aas49i183wxslyidfwvlaphic9qkxm";
|
||||
sha256 = "0hv0vgbvgqhzayc4przqhnkyvsykhw40hrwk6imvla00nix853wy";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cpio xar undmg ];
|
||||
|
||||
@ -27,11 +27,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "PortfolioPerformance";
|
||||
version = "0.59.5";
|
||||
version = "0.60.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz";
|
||||
sha256 = "sha256-6AEc9wc3/8AubPvqq8s9R1RnO+P8+92UsNEt6AdQv+w=";
|
||||
sha256 = "sha256-L4ZLlxHsnJrvrrrX56Z+agjnaMl472Izm4Un1uaNqZA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -48,13 +48,13 @@
|
||||
, pname ? "gnuradio"
|
||||
, versionAttr ? {
|
||||
major = "3.10";
|
||||
minor = "4";
|
||||
minor = "5";
|
||||
patch = "0";
|
||||
}
|
||||
}:
|
||||
|
||||
let
|
||||
sourceSha256 = "sha256-Ov2NGiEj3mhqYwDYXWd6wcCAv78Ux2/LWyGjQ/ukQNk=";
|
||||
sourceSha256 = "sha256-NP7OH4kRulWpWxyHudIzCJPfjiiilgnhBlixmwOj70I=";
|
||||
featuresInfo = {
|
||||
# Needed always
|
||||
basic = {
|
||||
|
||||
@ -17,13 +17,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "srsran";
|
||||
version = "22.04.1";
|
||||
version = "22.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "srsran";
|
||||
repo = "srsran";
|
||||
rev = "release_${builtins.replaceStrings ["."] ["_"] version}";
|
||||
sha256 = "sha256-jqaGlMhy6L6lRknl6Ezi0n+vNjMb7C+FN9a+QeOy/RY=";
|
||||
sha256 = "sha256-O43MXJ6EyKXg7hA1WjW8TqLmAWC+h5RLBGzBO6f/0zo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
@ -33,6 +33,7 @@
|
||||
, dbus
|
||||
, at-spi2-core
|
||||
, libXtst
|
||||
, pcre2
|
||||
|
||||
, swig4
|
||||
, python
|
||||
@ -67,6 +68,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = kicadSrc;
|
||||
|
||||
patches = [
|
||||
# upstream issue 12941 (attempted to upstream, but appreciably unacceptable)
|
||||
./writable.patch
|
||||
];
|
||||
|
||||
# tagged releases don't have "unknown"
|
||||
# kicad nightlies use git describe --dirty
|
||||
# nix removes .git, so its approximated here
|
||||
@ -114,6 +120,9 @@ stdenv.mkDerivation rec {
|
||||
]
|
||||
++ optionals (!withPCM && stable) [
|
||||
"-DKICAD_PCM=OFF"
|
||||
]
|
||||
++ optionals (!stable) [ # upstream issue 12491
|
||||
"-DCMAKE_CTEST_ARGUMENTS='--exclude-regex;qa_eeschema'"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -136,6 +145,7 @@ stdenv.mkDerivation rec {
|
||||
dbus
|
||||
at-spi2-core
|
||||
libXtst
|
||||
pcre2
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@ -162,14 +172,10 @@ stdenv.mkDerivation rec {
|
||||
++ optional (withScripting) wxPython
|
||||
++ optional (withNgspice) libngspice
|
||||
++ optional (withOCC) opencascade-occt
|
||||
++ optional (debug) valgrind
|
||||
;
|
||||
|
||||
# started becoming necessary halfway into 2022, not sure what changed to break a test...
|
||||
preInstallCheck = optionals (withNgspice) [ "export LD_LIBRARY_PATH=${libngspice}/lib" ];
|
||||
++ optional (debug) valgrind;
|
||||
|
||||
# debug builds fail all but the python test
|
||||
doInstallCheck = !debug;
|
||||
doInstallCheck = !(debug);
|
||||
installCheckTarget = "test";
|
||||
|
||||
dontStrip = debug;
|
||||
|
||||
@ -138,8 +138,7 @@ stdenv.mkDerivation rec {
|
||||
++ optionals (withScripting)
|
||||
[ python.pkgs.wrapPython ];
|
||||
|
||||
# We are emulating wrapGAppsHook, along with other variables to the
|
||||
# wrapper
|
||||
# We are emulating wrapGAppsHook, along with other variables to the wrapper
|
||||
makeWrapperArgs = with passthru.libraries; [
|
||||
"--prefix XDG_DATA_DIRS : ${base}/share"
|
||||
"--prefix XDG_DATA_DIRS : ${hicolor-icon-theme}/share"
|
||||
@ -231,5 +230,7 @@ stdenv.mkDerivation rec {
|
||||
# as long as the base and libraries (minus 3d) are build,
|
||||
# this wrapper does not need to get built
|
||||
# the kicad-*small "packages" cause this to happen
|
||||
|
||||
mainProgram = "kicad";
|
||||
};
|
||||
}
|
||||
|
||||
@ -3,45 +3,45 @@
|
||||
{
|
||||
"kicad" = {
|
||||
kicadVersion = {
|
||||
version = "6.0.9";
|
||||
version = "6.0.10";
|
||||
src = {
|
||||
rev = "8da3e8f7071484853b31c61cbd5045903b5c6dd3";
|
||||
sha256 = "1fr02jcy09v14d3k8ril0zhwnzhcqcf77wfj5b3bkrh6r8xraqhs";
|
||||
rev = "86aedd382b4ece39e27bef209e81792915103704";
|
||||
sha256 = "0pz8d96imc0q3nh7npr5zf0jkzi94wchvw57spcrgqfac9yrld3q";
|
||||
};
|
||||
};
|
||||
libVersion = {
|
||||
version = "6.0.9";
|
||||
version = "6.0.10";
|
||||
libSources = {
|
||||
symbols.rev = "0d9559dfddd51110e5c5223901ada2445285ce80";
|
||||
symbols.sha256 = "0y5mjjmmln37hkp9wmydinlfgrn8im8rn20145g9xgdpj8j38d48";
|
||||
symbols.rev = "3ec40517b37d78faf7ff5504c81362420c4b601f";
|
||||
symbols.sha256 = "1fwnr8x345jbifk71rhyd4b88c4ijp2rcw3pmivnwfb444hbr1lp";
|
||||
templates.rev = "ae2b46f8756d79379b90fec01d4fdde1ccfd73c1";
|
||||
templates.sha256 = "08zxh83fbygh1x2jhca8nrp3f9kihf7kmg65qmyp95wvps4p5h8v";
|
||||
footprints.rev = "6705da57c29e9896556c7cdbe719ede3f96e9121";
|
||||
footprints.sha256 = "02j445i0kcf87fhj9y6pwfcwq3arppxbrv77lbizm8kcpkpcfldl";
|
||||
packages3d.rev = "45df600c5e3dd5113d62e6445115e7c37bdf362f";
|
||||
packages3d.sha256 = "0cnrg7mr3khpglviid1adk2ihs1qwj0r7l32z2vqsl8aidzbg9kr";
|
||||
footprints.rev = "24671f7754c74dfa528e6b62ebef33b161aa4ab6";
|
||||
footprints.sha256 = "1rs05n1wjb2w3x7xqkkijbdxyw3fj0fph8znvnsxp9bgwaaipd4h";
|
||||
packages3d.rev = "417c4ea884a0d1501061f511730604890bbb0a35";
|
||||
packages3d.sha256 = "0nmvfchp25i4bkx6yf7fz1rwy7w6whj2w7mlp02ag3w5v4f137vz";
|
||||
};
|
||||
};
|
||||
};
|
||||
"kicad-unstable" = {
|
||||
kicadVersion = {
|
||||
version = "2022-09-18";
|
||||
version = "2022-12-19";
|
||||
src = {
|
||||
rev = "0efc1149afed2af5b81e4555de4623217ece650f";
|
||||
sha256 = "19fqy8yvvl45izg5ynhch9r4gl4ncx0bz9s6n1x98bgzxkdyc14q";
|
||||
rev = "a3a2e2e5b1981ebfbb60f1e8e40bd02625d33692";
|
||||
sha256 = "1584n2gn68vdyzlm9805ln1bdgzf831j5l4v29z08dkbi2sl3rg0";
|
||||
};
|
||||
};
|
||||
libVersion = {
|
||||
version = "2022-09-18";
|
||||
version = "2022-12-19";
|
||||
libSources = {
|
||||
symbols.rev = "879023fba005d23f285b6d052d9e6bcba1d754aa";
|
||||
symbols.sha256 = "1nxz8r3h3j62fs3s77lj27333fsj5c4i01n05lv0gqx36h28hqxk";
|
||||
symbols.rev = "2fa69d6d1dce065f8d0998733f66d2cd7db31b9e";
|
||||
symbols.sha256 = "1kp8v0q1pirpi4v485j5bg72jpnxglbpgxjxda6kvq8d2124pwlb";
|
||||
templates.rev = "ae2b46f8756d79379b90fec01d4fdde1ccfd73c1";
|
||||
templates.sha256 = "08zxh83fbygh1x2jhca8nrp3f9kihf7kmg65qmyp95wvps4p5h8v";
|
||||
footprints.rev = "b1dfe894de90b0063befc02b914dc9e2b47e3a62";
|
||||
footprints.sha256 = "06kn6c00wlnr33mks582xhadvkbbgmqhb4qc1wjfw264pavz7v7y";
|
||||
packages3d.rev = "45df600c5e3dd5113d62e6445115e7c37bdf362f";
|
||||
packages3d.sha256 = "0cnrg7mr3khpglviid1adk2ihs1qwj0r7l32z2vqsl8aidzbg9kr";
|
||||
footprints.rev = "24671f7754c74dfa528e6b62ebef33b161aa4ab6";
|
||||
footprints.sha256 = "1rs05n1wjb2w3x7xqkkijbdxyw3fj0fph8znvnsxp9bgwaaipd4h";
|
||||
packages3d.rev = "7aeaa02a2e7438fbbe94a00ca321366a39dc1267";
|
||||
packages3d.sha256 = "13wfcm7fgsgl3a0g00ra3v35c8wqw9yzgdiai54f1m77r2cr7bhp";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
49
pkgs/applications/science/electronics/kicad/writable.patch
Normal file
49
pkgs/applications/science/electronics/kicad/writable.patch
Normal file
@ -0,0 +1,49 @@
|
||||
commit 6a72fd032405515e468797be91b5a6ebcbbb5fd8
|
||||
Author: Evils <evils.devils@protonmail.com>
|
||||
Date: Wed Nov 23 19:49:13 2022 +0100
|
||||
|
||||
ensure new projects are writable
|
||||
|
||||
diff --git a/kicad/kicad_manager_frame.cpp b/kicad/kicad_manager_frame.cpp
|
||||
index 7ee8090858..391514519c 100644
|
||||
--- a/kicad/kicad_manager_frame.cpp
|
||||
+++ b/kicad/kicad_manager_frame.cpp
|
||||
@@ -638,6 +638,12 @@ void KICAD_MANAGER_FRAME::CreateNewProject( const wxFileName& aProjectFileName,
|
||||
|
||||
// wxFFile dtor will close the file
|
||||
}
|
||||
+
|
||||
+ if( destFileName.IsOk() && !destFileName.IsFileWritable() )
|
||||
+ {
|
||||
+ destFileName.SetPermissions(0644);
|
||||
+ }
|
||||
+
|
||||
}
|
||||
}
|
||||
|
||||
diff --git a/kicad/project_template.cpp b/kicad/project_template.cpp
|
||||
index bf951fcddb..2bef94326b 100644
|
||||
--- a/kicad/project_template.cpp
|
||||
+++ b/kicad/project_template.cpp
|
||||
@@ -282,6 +282,21 @@ bool PROJECT_TEMPLATE::CreateProject( wxFileName& aNewProjectPath, wxString* aEr
|
||||
|
||||
result = false;
|
||||
}
|
||||
+ else if( !destFile.IsFileWritable() && !destFile.SetPermissions(0644) )
|
||||
+ {
|
||||
+ if( aErrorMsg )
|
||||
+ {
|
||||
+ if( !aErrorMsg->empty() )
|
||||
+ *aErrorMsg += "\n";
|
||||
+
|
||||
+ wxString msg;
|
||||
+
|
||||
+ msg.Printf( _( "Cannot make file writable: '%s'." ), destFile.GetFullPath() );
|
||||
+ *aErrorMsg += msg;
|
||||
+ }
|
||||
+
|
||||
+ result = false;
|
||||
+ }
|
||||
}
|
||||
|
||||
return result;
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qalculate-gtk";
|
||||
version = "4.4.0";
|
||||
version = "4.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qalculate";
|
||||
repo = "qalculate-gtk";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-gXzGjELVcZ7LIOCu+Nub6K+zx8b6InkZk2NTfDHw8/E=";
|
||||
sha256 = "sha256-NRoHmQw20NfZtZVzckh8eigJ4s2RUcQRb8w8fLh5yeQ=";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qalculate-qt";
|
||||
version = "4.4.0";
|
||||
version = "4.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qalculate";
|
||||
repo = "qalculate-qt";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-C3alvl8hLxUy+soSjfxlNQ++QTcU9Gong1ydVpu8xGs=";
|
||||
sha256 = "sha256-oUteOAtNjmYzHeIg4xdMAlMW/lLRV0DZCK1RqHVvYEQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake intltool pkg-config wrapQtAppsHook ];
|
||||
|
||||
@ -0,0 +1,26 @@
|
||||
{ lib
|
||||
, fetchPypi
|
||||
, buildPythonApplication
|
||||
, git-revise
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "git-branchstack";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-gja93LOcVCQ6l+Cygvsm+3uomvxtvUl6t23GIb/tKyQ=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
git-revise
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/krobelus/git-branchstack";
|
||||
description = "Efficiently manage Git branches without leaving your local branch";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.AndersonTorres ];
|
||||
};
|
||||
}
|
||||
60
pkgs/build-support/make-hardcode-gsettings-patch/default.nix
Normal file
60
pkgs/build-support/make-hardcode-gsettings-patch/default.nix
Normal file
@ -0,0 +1,60 @@
|
||||
{
|
||||
runCommand,
|
||||
git,
|
||||
coccinelle,
|
||||
python3,
|
||||
}:
|
||||
|
||||
/*
|
||||
Can be used as part of an update script to automatically create a patch
|
||||
hardcoding the path of all GSettings schemas in C code.
|
||||
For example:
|
||||
passthru = {
|
||||
hardcodeGsettingsPatch = makeHardcodeGsettingsPatch {
|
||||
inherit src;
|
||||
schemaIdToVariableMapping = {
|
||||
...
|
||||
};
|
||||
};
|
||||
|
||||
updateScript =
|
||||
let
|
||||
updateSource = ...;
|
||||
updatePatch = _experimental-update-script-combinators.copyAttrOutputToFile "evolution-ews.hardcodeGsettingsPatch" ./hardcode-gsettings.patch;
|
||||
in
|
||||
_experimental-update-script-combinators.sequence [
|
||||
updateSource
|
||||
updatePatch
|
||||
];
|
||||
};
|
||||
}
|
||||
takes as input a mapping from schema path to variable name.
|
||||
For example `{ "org.gnome.evolution" = "EVOLUTION_SCHEMA_PATH"; }`
|
||||
hardcodes looking for `org.gnome.evolution` into `@EVOLUTION_SCHEMA_PATH@`.
|
||||
All schemas must be listed.
|
||||
*/
|
||||
{
|
||||
src,
|
||||
schemaIdToVariableMapping,
|
||||
}:
|
||||
|
||||
runCommand
|
||||
"hardcode-gsettings.patch"
|
||||
{
|
||||
inherit src;
|
||||
nativeBuildInputs = [
|
||||
git
|
||||
coccinelle
|
||||
python3 # For patch script
|
||||
];
|
||||
}
|
||||
''
|
||||
unpackPhase
|
||||
cd "''${sourceRoot:-.}"
|
||||
set -x
|
||||
cp ${builtins.toFile "glib-schema-to-var.json" (builtins.toJSON schemaIdToVariableMapping)} ./glib-schema-to-var.json
|
||||
git init
|
||||
git add -A
|
||||
spatch --sp-file "${./hardcode-gsettings.cocci}" --dir . --in-place
|
||||
git diff > "$out"
|
||||
''
|
||||
@ -0,0 +1,142 @@
|
||||
/**
|
||||
* Since Nix does not have a standard location like /usr/share,
|
||||
* where GSettings system could look for schemas, we need to point the software to a correct location somehow.
|
||||
* For executables, we handle this using wrappers but this is not an option for libraries like e-d-s.
|
||||
* Instead, we hardcode the schema path when creating the settings.
|
||||
* A schema path (ie org.gnome.evolution) can be replaced by @EVOLUTION_SCHEMA_ID@
|
||||
* which is then replaced at build time by substituteAll.
|
||||
* The mapping is provided in a json file ./glib-schema-to-var.json
|
||||
*/
|
||||
|
||||
@initialize:python@
|
||||
@@
|
||||
import json
|
||||
|
||||
cpp_constants = {}
|
||||
|
||||
def register_cpp_constant(const_name, val):
|
||||
cpp_constants[const_name] = val.strip()
|
||||
|
||||
def resolve_cpp_constant(const_name):
|
||||
return cpp_constants.get(const_name, const_name)
|
||||
|
||||
with open("./glib-schema-to-var.json") as mapping_file:
|
||||
schema_to_var = json.load(mapping_file);
|
||||
|
||||
def get_schema_directory(schema_id):
|
||||
# Sometimes the schema id is referenced using C preprocessor #define constant in the same file
|
||||
# let’s try to resolve it first.
|
||||
schema_id = resolve_cpp_constant(schema_id.strip()).strip('"')
|
||||
if schema_id in schema_to_var:
|
||||
return f'"@{schema_to_var[schema_id]}@"'
|
||||
raise Exception(f"Unknown schema path {schema_id!r}, please add it to ./glib-schema-to-var.json")
|
||||
|
||||
@find_cpp_constants@
|
||||
identifier const_name;
|
||||
expression val;
|
||||
@@
|
||||
|
||||
#define const_name val
|
||||
|
||||
@script:python record_cpp_constants depends on find_cpp_constants@
|
||||
const_name << find_cpp_constants.const_name;
|
||||
val << find_cpp_constants.val;
|
||||
@@
|
||||
|
||||
register_cpp_constant(const_name, val)
|
||||
|
||||
|
||||
@depends on ever record_cpp_constants || never record_cpp_constants@
|
||||
// We want to run after #define constants have been collected but even if there are no #defines.
|
||||
expression SCHEMA_ID;
|
||||
expression settings;
|
||||
// Coccinelle does not like autocleanup macros in + sections,
|
||||
// let’s use fresh id with concatenation to produce the code as a string.
|
||||
fresh identifier schema_source_decl = "g_autoptr(GSettingsSchemaSource) " ## "schema_source";
|
||||
fresh identifier schema_decl = "g_autoptr(GSettingsSchema) " ## "schema";
|
||||
fresh identifier SCHEMA_DIRECTORY = script:python(SCHEMA_ID) { get_schema_directory(SCHEMA_ID) };
|
||||
@@
|
||||
-settings = g_settings_new(SCHEMA_ID);
|
||||
+{
|
||||
+ schema_source_decl;
|
||||
+ schema_decl;
|
||||
+ schema_source = g_settings_schema_source_new_from_directory(SCHEMA_DIRECTORY,
|
||||
+ g_settings_schema_source_get_default(),
|
||||
+ TRUE,
|
||||
+ NULL);
|
||||
+ schema = g_settings_schema_source_lookup(schema_source, SCHEMA_ID, FALSE);
|
||||
+ settings = g_settings_new_full(schema, NULL, NULL);
|
||||
+}
|
||||
|
||||
|
||||
@depends on ever record_cpp_constants || never record_cpp_constants@
|
||||
// We want to run after #define constants have been collected but even if there are no #defines.
|
||||
expression SCHEMA_ID;
|
||||
expression settings;
|
||||
expression BACKEND;
|
||||
// Coccinelle does not like autocleanup macros in + sections,
|
||||
// let’s use fresh id with concatenation to produce the code as a string.
|
||||
fresh identifier schema_source_decl = "g_autoptr(GSettingsSchemaSource) " ## "schema_source";
|
||||
fresh identifier schema_decl = "g_autoptr(GSettingsSchema) " ## "schema";
|
||||
fresh identifier SCHEMA_DIRECTORY = script:python(SCHEMA_ID) { get_schema_directory(SCHEMA_ID) };
|
||||
@@
|
||||
-settings = g_settings_new_with_backend(SCHEMA_ID, BACKEND);
|
||||
+{
|
||||
+ schema_source_decl;
|
||||
+ schema_decl;
|
||||
+ schema_source = g_settings_schema_source_new_from_directory(SCHEMA_DIRECTORY,
|
||||
+ g_settings_schema_source_get_default(),
|
||||
+ TRUE,
|
||||
+ NULL);
|
||||
+ schema = g_settings_schema_source_lookup(schema_source, SCHEMA_ID, FALSE);
|
||||
+ settings = g_settings_new_full(schema, BACKEND, NULL);
|
||||
+}
|
||||
|
||||
|
||||
@depends on ever record_cpp_constants || never record_cpp_constants@
|
||||
// We want to run after #define constants have been collected but even if there are no #defines.
|
||||
expression SCHEMA_ID;
|
||||
expression settings;
|
||||
expression BACKEND;
|
||||
expression PATH;
|
||||
// Coccinelle does not like autocleanup macros in + sections,
|
||||
// let’s use fresh id with concatenation to produce the code as a string.
|
||||
fresh identifier schema_source_decl = "g_autoptr(GSettingsSchemaSource) " ## "schema_source";
|
||||
fresh identifier schema_decl = "g_autoptr(GSettingsSchema) " ## "schema";
|
||||
fresh identifier SCHEMA_DIRECTORY = script:python(SCHEMA_ID) { get_schema_directory(SCHEMA_ID) };
|
||||
@@
|
||||
-settings = g_settings_new_with_backend_and_path(SCHEMA_ID, BACKEND, PATH);
|
||||
+{
|
||||
+ schema_source_decl;
|
||||
+ schema_decl;
|
||||
+ schema_source = g_settings_schema_source_new_from_directory(SCHEMA_DIRECTORY,
|
||||
+ g_settings_schema_source_get_default(),
|
||||
+ TRUE,
|
||||
+ NULL);
|
||||
+ schema = g_settings_schema_source_lookup(schema_source, SCHEMA_ID, FALSE);
|
||||
+ settings = g_settings_new_full(schema, BACKEND, PATH);
|
||||
+}
|
||||
|
||||
|
||||
@depends on ever record_cpp_constants || never record_cpp_constants@
|
||||
// We want to run after #define constants have been collected but even if there are no #defines.
|
||||
expression SCHEMA_ID;
|
||||
expression settings;
|
||||
expression PATH;
|
||||
// Coccinelle does not like autocleanup macros in + sections,
|
||||
// let’s use fresh id with concatenation to produce the code as a string.
|
||||
fresh identifier schema_source_decl = "g_autoptr(GSettingsSchemaSource) " ## "schema_source";
|
||||
fresh identifier schema_decl = "g_autoptr(GSettingsSchema) " ## "schema";
|
||||
fresh identifier SCHEMA_DIRECTORY = script:python(SCHEMA_ID) { get_schema_directory(SCHEMA_ID) };
|
||||
@@
|
||||
-settings = g_settings_new_with_path(SCHEMA_ID, PATH);
|
||||
+{
|
||||
+ schema_source_decl;
|
||||
+ schema_decl;
|
||||
+ schema_source = g_settings_schema_source_new_from_directory(SCHEMA_DIRECTORY,
|
||||
+ g_settings_schema_source_get_default(),
|
||||
+ TRUE,
|
||||
+ NULL);
|
||||
+ schema = g_settings_schema_source_lookup(schema_source, SCHEMA_ID, FALSE);
|
||||
+ settings = g_settings_new_full(schema, NULL, PATH);
|
||||
+}
|
||||
@ -977,45 +977,45 @@ rec {
|
||||
packages = commonDebPackages ++ [ "diffutils" "libc-bin" ];
|
||||
};
|
||||
|
||||
debian9i386 = {
|
||||
name = "debian-9.13-stretch-i386";
|
||||
fullName = "Debian 9.13 Stretch (i386)";
|
||||
packagesList = fetchurl {
|
||||
url = "https://snapshot.debian.org/archive/debian/20210526T143040Z/dists/stretch/main/binary-i386/Packages.xz";
|
||||
sha256 = "sha256-fFRumd20wuVaYxzw0VPkAw5mQo8kIg+eXII15VSz9wA=";
|
||||
};
|
||||
urlPrefix = "mirror://debian";
|
||||
packages = commonDebianPackages;
|
||||
};
|
||||
|
||||
debian9x86_64 = {
|
||||
name = "debian-9.13-stretch-amd64";
|
||||
fullName = "Debian 9.13 Stretch (amd64)";
|
||||
packagesList = fetchurl {
|
||||
url = "https://snapshot.debian.org/archive/debian/20210526T143040Z/dists/stretch/main/binary-amd64/Packages.xz";
|
||||
sha256 = "sha256-1p4DEVpTGlBE3PtbQ90kYw4QNHkW0F4rna/Xz+ncMhw=";
|
||||
};
|
||||
urlPrefix = "mirror://debian";
|
||||
packages = commonDebianPackages;
|
||||
};
|
||||
|
||||
debian10i386 = {
|
||||
name = "debian-10.9-buster-i386";
|
||||
fullName = "Debian 10.9 Buster (i386)";
|
||||
name = "debian-10.13-buster-i386";
|
||||
fullName = "Debian 10.13 Buster (i386)";
|
||||
packagesList = fetchurl {
|
||||
url = "https://snapshot.debian.org/archive/debian/20210526T143040Z/dists/buster/main/binary-i386/Packages.xz";
|
||||
sha256 = "sha256-zlkbKV+IGBCyWKD4v4LFM/EUA4TYS9fkLBPuF6MgUDo=";
|
||||
url = "https://snapshot.debian.org/archive/debian/20221126T084953Z/dists/buster/main/binary-i386/Packages.xz";
|
||||
hash = "sha256-n9JquhtZgxw3qr9BX0MQoY3ZTIHN0dit+iru3DC31UY=";
|
||||
};
|
||||
urlPrefix = "mirror://debian";
|
||||
packages = commonDebianPackages;
|
||||
};
|
||||
|
||||
debian10x86_64 = {
|
||||
name = "debian-10.9-buster-amd64";
|
||||
fullName = "Debian 10.9 Buster (amd64)";
|
||||
name = "debian-10.13-buster-amd64";
|
||||
fullName = "Debian 10.13 Buster (amd64)";
|
||||
packagesList = fetchurl {
|
||||
url = "https://snapshot.debian.org/archive/debian/20210526T143040Z/dists/buster/main/binary-amd64/Packages.xz";
|
||||
sha256 = "sha256-k13toY1b3CX7GBPQ7Jm24OMqCEsgPlGK8M99x57o69o=";
|
||||
url = "https://snapshot.debian.org/archive/debian/20221126T084953Z/dists/buster/main/binary-amd64/Packages.xz";
|
||||
hash = "sha256-YukIIB3u87jgp9oudwklsxyKVKjSL618wFgDSXiFmjU=";
|
||||
};
|
||||
urlPrefix = "mirror://debian";
|
||||
packages = commonDebianPackages;
|
||||
};
|
||||
|
||||
debian11i386 = {
|
||||
name = "debian-11.5-bullseye-i386";
|
||||
fullName = "Debian 11.5 Bullseye (i386)";
|
||||
packagesList = fetchurl {
|
||||
url = "https://snapshot.debian.org/archive/debian/20221126T084953Z/dists/bullseye/main/binary-i386/Packages.xz";
|
||||
hash = "sha256-tHrWSd4K5TCwIaLTPqK/Rcon0O0r+Jsxb7OcchOo8Vo=";
|
||||
};
|
||||
urlPrefix = "mirror://debian";
|
||||
packages = commonDebianPackages;
|
||||
};
|
||||
|
||||
debian11x86_64 = {
|
||||
name = "debian-11.5-bullseye-amd64";
|
||||
fullName = "Debian 11.5 Bullseye (amd64)";
|
||||
packagesList = fetchurl {
|
||||
url = "https://snapshot.debian.org/archive/debian/20221126T084953Z/dists/bullseye/main/binary-amd64/Packages.xz";
|
||||
hash = "sha256-whpBERKOPyhrWguVQ2QchrwRHU4tCkGwu42x6khF/2g=";
|
||||
};
|
||||
urlPrefix = "mirror://debian";
|
||||
packages = commonDebianPackages;
|
||||
|
||||
26
pkgs/data/fonts/garamond-libre/default.nix
Normal file
26
pkgs/data/fonts/garamond-libre/default.nix
Normal file
@ -0,0 +1,26 @@
|
||||
{ lib, fetchzip }:
|
||||
|
||||
fetchzip rec {
|
||||
pname = "garamond-libre";
|
||||
version = "1.4";
|
||||
|
||||
url = "https://github.com/dbenjaminmiller/garamond-libre/releases/download/${version}/garamond-libre_${version}.zip";
|
||||
stripRoot = false;
|
||||
|
||||
postFetch = ''
|
||||
install -Dm644 $out/*.otf -t $out/share/fonts/opentype
|
||||
shopt -s extglob dotglob
|
||||
rm -rf $out/!(share)
|
||||
shopt -u extglob dotglob
|
||||
'';
|
||||
|
||||
sha256 = "6WiuUe3CHXXL/0G7wURvSIgWPQ4isl50e3OBQ+ui0U4=";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/dbenjaminmiller/garamond-libre";
|
||||
description = "Garamond Libre font family";
|
||||
maintainers = with maintainers; [ drupol ];
|
||||
license = licenses.x11;
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
@ -45,6 +45,7 @@
|
||||
, boost
|
||||
, protobuf
|
||||
, libiconv
|
||||
, makeHardcodeGsettingsPatch
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -150,8 +151,8 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
hardcodeGsettingsPatch = glib.mkHardcodeGsettingsPatch {
|
||||
glib-schema-to-var = {
|
||||
hardcodeGsettingsPatch = makeHardcodeGsettingsPatch {
|
||||
schemaIdToVariableMapping = {
|
||||
"org.gnome.Evolution.DefaultSources" = "EDS";
|
||||
"org.gnome.evolution.shell.network-config" = "EDS";
|
||||
"org.gnome.evolution-data-server.addressbook" = "EDS";
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
{ lib, stdenv, fetchFromGitHub, z3, ocamlPackages, makeWrapper, installShellFiles }:
|
||||
{ lib, stdenv, writeScript, fetchFromGitHub, z3, ocamlPackages, makeWrapper, installShellFiles }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fstar";
|
||||
version = "2022.01.15";
|
||||
version = "2022.11.19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FStarLang";
|
||||
repo = "FStar";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-bK3McF/wTjT9q6luihPaEXjx7Lu6+ZbQ9G61Mc4KoB0=";
|
||||
sha256 = "sha256-IJMzRi335RbK8mEXQaF1UDPC0JVi6zSqcz6RS874m3Q=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
@ -61,6 +61,15 @@ stdenv.mkDerivation rec {
|
||||
installShellCompletion --zsh --name _fstar.exe .completion/zsh/__fstar.exe
|
||||
'';
|
||||
|
||||
passthru.updateScript = writeScript "update-fstar" ''
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p git gnugrep common-updater-scripts
|
||||
set -eu -o pipefail
|
||||
|
||||
version="$(git ls-remote --tags git@github.com:FStarLang/FStar.git | grep -Po 'v\K\d{4}\.\d{2}\.\d{2}' | sort | tail -n1)"
|
||||
update-source-version fstar "$version"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "ML-like functional programming language aimed at program verification";
|
||||
homepage = "https://www.fstar-lang.org";
|
||||
|
||||
@ -18,8 +18,7 @@
|
||||
, coreutils, dbus, libxml2, tzdata
|
||||
, desktop-file-utils, shared-mime-info
|
||||
, darwin
|
||||
# update script
|
||||
, runCommand, git, coccinelle
|
||||
, makeHardcodeGsettingsPatch
|
||||
}:
|
||||
|
||||
assert stdenv.isLinux -> util-linuxMinimal != null;
|
||||
@ -271,55 +270,18 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
packageName = "glib";
|
||||
versionPolicy = "odd-unstable";
|
||||
};
|
||||
/*
|
||||
can be used as part of an update script to automatically create a patch
|
||||
hardcoding the path of all gsettings schemas in C code.
|
||||
For example:
|
||||
passthru = {
|
||||
hardcodeGsettingsPatch = glib.mkHardcodeGsettingsPatch {
|
||||
inherit src;
|
||||
glib-schema-to-var = {
|
||||
...
|
||||
};
|
||||
};
|
||||
|
||||
updateScript =
|
||||
let
|
||||
updateSource = ...;
|
||||
patch = _experimental-update-script-combinators.copyAttrOutputToFile "evolution-ews.hardcodeGsettingsPatch" ./hardcode-gsettings.patch;
|
||||
in
|
||||
_experimental-update-script-combinators.sequence [
|
||||
updateSource
|
||||
patch
|
||||
];
|
||||
};
|
||||
}
|
||||
takes as input a mapping from schema path to variable name.
|
||||
For example `{ "org.gnome.evolution" = "EVOLUTION_SCHEMA_PATH"; }`
|
||||
hardcodes looking for `org.gnome.evolution` into `@EVOLUTION_SCHEMA_PATH@`.
|
||||
All schemas must be listed.
|
||||
*/
|
||||
mkHardcodeGsettingsPatch = { src, glib-schema-to-var }:
|
||||
runCommand
|
||||
"hardcode-gsettings.patch"
|
||||
{
|
||||
mkHardcodeGsettingsPatch =
|
||||
{
|
||||
src,
|
||||
glib-schema-to-var,
|
||||
}:
|
||||
builtins.trace
|
||||
"glib.mkHardcodeGsettingsPatch is deprecated, please use makeHardcodeGsettingsPatch instead"
|
||||
(makeHardcodeGsettingsPatch {
|
||||
inherit src;
|
||||
nativeBuildInputs = [
|
||||
git
|
||||
coccinelle
|
||||
python3 # For patch script
|
||||
];
|
||||
}
|
||||
''
|
||||
unpackPhase
|
||||
cd "''${sourceRoot:-.}"
|
||||
set -x
|
||||
cp ${builtins.toFile "glib-schema-to-var.json" (builtins.toJSON glib-schema-to-var)} ./glib-schema-to-var.json
|
||||
git init
|
||||
git add -A
|
||||
spatch --sp-file "${./hardcode-gsettings.cocci}" --dir . --in-place
|
||||
git diff > "$out"
|
||||
'';
|
||||
schemaIdToVariableMapping = glib-schema-to-var;
|
||||
});
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -1,70 +0,0 @@
|
||||
/**
|
||||
* Since Nix does not have a standard location like /usr/share,
|
||||
* where GSettings system could look for schemas, we need to point the software to a correct location somehow.
|
||||
* For executables, we handle this using wrappers but this is not an option for libraries like e-d-s.
|
||||
* Instead, we hardcode the schema path when creating the settings.
|
||||
* A schema path (ie org.gnome.evolution) can be replaced by @EVOLUTION_SCHEMA_PATH@
|
||||
* which is then replaced at build time by substituteAll.
|
||||
* The mapping is provided in a json file ./glib-schema-to-var.json
|
||||
*/
|
||||
|
||||
@initialize:python@
|
||||
@@
|
||||
import json
|
||||
|
||||
cpp_constants = {}
|
||||
|
||||
def register_cpp_constant(const_name, val):
|
||||
cpp_constants[const_name] = val.strip()
|
||||
|
||||
def resolve_cpp_constant(const_name):
|
||||
return cpp_constants.get(const_name, const_name)
|
||||
|
||||
with open("./glib-schema-to-var.json") as mapping_file:
|
||||
schema_to_var = json.load(mapping_file);
|
||||
|
||||
def get_schema_directory(schema_path):
|
||||
# Sometimes the schema id is referenced using C preprocessor #define constant in the same file
|
||||
# let’s try to resolve it first.
|
||||
schema_path = resolve_cpp_constant(schema_path.strip()).strip('"')
|
||||
if schema_path in schema_to_var:
|
||||
return f'"@{schema_to_var[schema_path]}@"'
|
||||
raise Exception(f"Unknown schema path {schema_path!r}, please add it to ./glib-schema-to-var.json")
|
||||
|
||||
|
||||
@find_cpp_constants@
|
||||
identifier const_name;
|
||||
expression val;
|
||||
@@
|
||||
|
||||
#define const_name val
|
||||
|
||||
@script:python record_cpp_constants depends on find_cpp_constants@
|
||||
const_name << find_cpp_constants.const_name;
|
||||
val << find_cpp_constants.val;
|
||||
@@
|
||||
|
||||
register_cpp_constant(const_name, val)
|
||||
|
||||
|
||||
@depends on ever record_cpp_constants || never record_cpp_constants@
|
||||
// We want to run after #define constants have been collected but even if there are no #defines.
|
||||
expression SCHEMA_PATH;
|
||||
expression settings;
|
||||
// Coccinelle does not like autocleanup macros in + sections,
|
||||
// let’s use fresh id with concatenation to produce the code as a string.
|
||||
fresh identifier schema_source_decl = "g_autoptr(GSettingsSchemaSource) " ## "schema_source";
|
||||
fresh identifier schema_decl = "g_autoptr(GSettingsSchema) " ## "schema";
|
||||
fresh identifier SCHEMA_DIRECTORY = script:python(SCHEMA_PATH) { get_schema_directory(SCHEMA_PATH) };
|
||||
@@
|
||||
-settings = g_settings_new(SCHEMA_PATH);
|
||||
+{
|
||||
+ schema_source_decl;
|
||||
+ schema_decl;
|
||||
+ schema_source = g_settings_schema_source_new_from_directory(SCHEMA_DIRECTORY,
|
||||
+ g_settings_schema_source_get_default(),
|
||||
+ TRUE,
|
||||
+ NULL);
|
||||
+ schema = g_settings_schema_source_lookup(schema_source, SCHEMA_PATH, FALSE);
|
||||
+ settings = g_settings_new_full(schema, NULL, NULL);
|
||||
+}
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libqalculate";
|
||||
version = "4.4.0";
|
||||
version = "4.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qalculate";
|
||||
repo = "libqalculate";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-/TgsGlO8RJ3L+2425odye365QqBzCHrr1Z4zUj+Ld8I=";
|
||||
sha256 = "sha256-EOr5FtQnF5N96s9Aeh5sMV3vwXQgpqFSvrYVGmNkWrs=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
|
||||
@ -16,13 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rocksdb";
|
||||
version = "7.7.3";
|
||||
version = "7.8.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Np3HPTZYzyoPOKL0xgsLzcvOkceFiEQd+1nyGbg4BHo=";
|
||||
sha256 = "sha256-HVLxLltOZ0e9BCekynjdc+f/fTS9vz15GZVKB77uDXo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ninja ];
|
||||
@ -31,6 +31,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = lib.optional enableJemalloc jemalloc;
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"tools"
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=deprecated-copy -Wno-error=pessimizing-move"
|
||||
+ lib.optionalString stdenv.cc.isClang "-Wno-error=unused-private-field -faligned-allocation";
|
||||
|
||||
@ -41,6 +46,7 @@ stdenv.mkDerivation rec {
|
||||
"-DWITH_BENCHMARK_TOOLS=0"
|
||||
"-DWITH_TESTS=1"
|
||||
"-DWITH_TOOLS=0"
|
||||
"-DWITH_CORE_TOOLS=1"
|
||||
"-DWITH_BZ2=1"
|
||||
"-DWITH_LZ4=1"
|
||||
"-DWITH_SNAPPY=1"
|
||||
@ -57,6 +63,15 @@ stdenv.mkDerivation rec {
|
||||
# otherwise "cc1: error: -Wformat-security ignored without -Wformat [-Werror=format-security]"
|
||||
hardeningDisable = lib.optional stdenv.hostPlatform.isWindows "format";
|
||||
|
||||
preInstall = ''
|
||||
mkdir -p $tools/bin
|
||||
cp tools/{ldb,sst_dump} $tools/bin/
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
ls -1 $tools/bin/* | xargs -I{} install_name_tool -change "@rpath/librocksdb.7.dylib" $out/lib/librocksdb.dylib {}
|
||||
'' + lib.optionalString (stdenv.isLinux && enableShared) ''
|
||||
ls -1 $tools/bin/* | xargs -I{} patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib {}
|
||||
'';
|
||||
|
||||
# Old version doesn't ship the .pc file, new version puts wrong paths in there.
|
||||
postFixup = ''
|
||||
if [ -f "$out"/lib/pkgconfig/rocksdb.pc ]; then
|
||||
|
||||
@ -30,8 +30,6 @@ in stdenv.mkDerivation rec {
|
||||
else [ (qtEnv "qvtk-qt-env" [ qtx11extras qttools qtdeclarative ]) ])
|
||||
++ optionals stdenv.isLinux [
|
||||
libGLU
|
||||
libGL
|
||||
libX11
|
||||
xorgproto
|
||||
libXt
|
||||
] ++ optionals stdenv.isDarwin [
|
||||
@ -51,7 +49,9 @@ in stdenv.mkDerivation rec {
|
||||
] ++ optionals enablePython [
|
||||
pythonInterpreter
|
||||
];
|
||||
propagatedBuildInputs = optionals stdenv.isDarwin [ libobjc ];
|
||||
propagatedBuildInputs = optionals stdenv.isDarwin [ libobjc ]
|
||||
++ optionals stdenv.isLinux [ libX11 libGL ];
|
||||
# see https://github.com/NixOS/nixpkgs/pull/178367#issuecomment-1238827254
|
||||
|
||||
patches = map fetchpatch patchesToFetch;
|
||||
|
||||
|
||||
@ -224,17 +224,17 @@ cldr = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
|
||||
}:
|
||||
buildLuarocksPackage {
|
||||
pname = "cldr";
|
||||
version = "0.2.0-0";
|
||||
version = "0.3.0-0";
|
||||
knownRockspec = (fetchurl {
|
||||
url = "mirror://luarocks/cldr-0.2.0-0.rockspec";
|
||||
sha256 = "1vjwrlrdy10bacn0324fvs4sx85xryyg7npw2mp1k9kmasfr8r1s";
|
||||
url = "mirror://luarocks/cldr-0.3.0-0.rockspec";
|
||||
sha256 = "1fnr8k713w21v7hc64s4w5lgcgnbphq3gm69pisc2s4wq2fkija1";
|
||||
}).outPath;
|
||||
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
|
||||
"url": "https://github.com/alerque/cldr-lua.git",
|
||||
"rev": "51e4760838c0a83ef1a76d0a0fb2e9f964069a50",
|
||||
"date": "2022-04-16T14:46:14+03:00",
|
||||
"path": "/nix/store/7jziz15bjm27zw9i3arrxprglakz8n4d-cldr-lua",
|
||||
"sha256": "1i22mcs50z99850j47gkgwyf0ahl4yh1732b4x3davjwy2fwak1x",
|
||||
"rev": "4602a7859535ca198ddfaba73a02f9bce3e81025",
|
||||
"date": "2022-12-06T12:36:06+03:00",
|
||||
"path": "/nix/store/3xgwqd2pica8301sbfrw4bmv0xm2wzx5-cldr-lua",
|
||||
"sha256": "0hlfb115qhamczzskvckxczf9dpp8cv8h6vz7zgdl2n025ik9dp4",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": true,
|
||||
"deepClone": false,
|
||||
@ -368,6 +368,38 @@ buildLuarocksPackage {
|
||||
};
|
||||
}) {};
|
||||
|
||||
cyan = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
|
||||
, fetchgit, argparse, luafilesystem, tl
|
||||
}:
|
||||
buildLuarocksPackage {
|
||||
pname = "cyan";
|
||||
version = "0.2.0-1";
|
||||
knownRockspec = (fetchurl {
|
||||
url = "mirror://luarocks/cyan-0.2.0-1.rockspec";
|
||||
sha256 = "06v9arib8slcllqxxx0a1z7wqmb184v7klrisvkdqqhpbrry7ys5";
|
||||
}).outPath;
|
||||
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
|
||||
"url": "https://github.com/teal-language/cyan",
|
||||
"rev": "d2048e73fec6c693a90b189c63db47006cbae699",
|
||||
"date": "2022-08-21T17:11:18-05:00",
|
||||
"path": "/nix/store/gz58lng3g8hflqgl6xsnmzkjika0ncvx-cyan",
|
||||
"sha256": "119slbsvl39r2c51gvv9yvnsda0x9yvbrxnm2nzz2pnwh3ry50qc",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": true,
|
||||
"deepClone": false,
|
||||
"leaveDotGit": false
|
||||
}
|
||||
'') ["date" "path"]) ;
|
||||
|
||||
propagatedBuildInputs = [ argparse luafilesystem tl ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/teal-language/cyan";
|
||||
description = "A build system for the Teal language";
|
||||
license.fullName = "MIT";
|
||||
};
|
||||
}) {};
|
||||
|
||||
cyrussasl = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
|
||||
, fetchgit, lua
|
||||
}:
|
||||
@ -407,10 +439,10 @@ buildLuarocksPackage {
|
||||
|
||||
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
|
||||
"url": "https://github.com/astoff/digestif",
|
||||
"rev": "95b13ba7ed33605406353b200920ece08868d5a8",
|
||||
"date": "2022-07-03T13:41:35+02:00",
|
||||
"path": "/nix/store/k8y6gk4pqri76657c2sy4j4bkyh30jz5-digestif",
|
||||
"sha256": "12pksz1l84iml7ng6yhywf0fyy8lclmcn2jjkdrh994lb7q9ya99",
|
||||
"rev": "f1b4202928a49e8c20f84ed14deafd0f6b798e2f",
|
||||
"date": "2022-12-07T18:12:23+01:00",
|
||||
"path": "/nix/store/ss4kfahp9gnz2y826fr5w6dqxyxs25sn-digestif",
|
||||
"sha256": "1jb8h7yks8bp74jpq85sz69d2k69vhp6gliajz8ximl3hbhdq17i",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": true,
|
||||
"deepClone": false,
|
||||
@ -424,7 +456,7 @@ buildLuarocksPackage {
|
||||
meta = {
|
||||
homepage = "https://github.com/astoff/digestif/";
|
||||
description = "A code analyzer for TeX";
|
||||
license.fullName = "MIT";
|
||||
license.fullName = "GPLv3+ and other free licenses";
|
||||
};
|
||||
}) {};
|
||||
|
||||
@ -546,10 +578,10 @@ buildLuarocksPackage {
|
||||
|
||||
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
|
||||
"url": "https://github.com/lewis6991/gitsigns.nvim",
|
||||
"rev": "56e01cb0ea52635854e97bd2dd2587c8ebfab978",
|
||||
"date": "2022-10-16T16:50:37+01:00",
|
||||
"path": "/nix/store/yrm4xpi43x2sijw8gamvlfgqnyd7j19l-gitsigns.nvim",
|
||||
"sha256": "0rdfnw2pr0hjxlw7bfjfvbh7lll4ba8ymp5nxq58d0jq01lzsxkr",
|
||||
"rev": "2ab3bdf0a40bab53033048c6be75bda86316b55d",
|
||||
"date": "2022-12-19T14:51:38+00:00",
|
||||
"path": "/nix/store/hdjmih6vd3707wdfvycnvq1ig2q349xx-gitsigns.nvim",
|
||||
"sha256": "13j5cmrd54cx9d8rirmys01xgmf90ylc3wb5dzmsdjc7hy0viha2",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": true,
|
||||
"deepClone": false,
|
||||
@ -693,10 +725,10 @@ buildLuarocksPackage {
|
||||
|
||||
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
|
||||
"url": "https://github.com/stevedonovan/LDoc.git",
|
||||
"rev": "71dd5edbda829cd87b312956f4eae1ff8133fb14",
|
||||
"date": "2022-06-17T13:41:29+03:00",
|
||||
"path": "/nix/store/ywgvf4a5bdh7b7jzx8xgibch0a9kr9d2-LDoc",
|
||||
"sha256": "0wwr28fl46y84p78bxaw9wsb7b4x7hmjywfdx5d70axh0amnlyrv",
|
||||
"rev": "01d648f4ad50c3d14f2acadee6acb26beda56990",
|
||||
"date": "2022-11-18T00:01:45+01:00",
|
||||
"path": "/nix/store/m7vvl2b5k69jrb88d0y60f2y4ryazkp9-LDoc",
|
||||
"sha256": "1kl0ba9mnd7nksakzb3vwr0hkkkgyk92v93r2w9xnrq879dhy5mm",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": true,
|
||||
"deepClone": false,
|
||||
@ -1084,17 +1116,17 @@ lua-cjson = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
|
||||
}:
|
||||
buildLuarocksPackage {
|
||||
pname = "lua-cjson";
|
||||
version = "2.1.0.6-1";
|
||||
version = "2.1.0.10-1";
|
||||
knownRockspec = (fetchurl {
|
||||
url = "mirror://luarocks/lua-cjson-2.1.0.6-1.rockspec";
|
||||
sha256 = "1x6dk17lwmgkafpki99yl1hlypchbrxr9sxqafrmx7wwvzbz6q11";
|
||||
url = "mirror://luarocks/lua-cjson-2.1.0.10-1.rockspec";
|
||||
sha256 = "05sp7rq72x4kdkyid1ch0yyscwsi5wk85d2hj6xwssz3h8n8drdg";
|
||||
}).outPath;
|
||||
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
|
||||
"url": "https://github.com/openresty/lua-cjson",
|
||||
"rev": "a03094c5473d9a9764bb486fbe5e99a62d166dae",
|
||||
"date": "2018-04-19T12:03:43-07:00",
|
||||
"path": "/nix/store/qdpqx2g0xi1c9fknzxx280mcdq6fi8rw-lua-cjson",
|
||||
"sha256": "0i2sjsi6flax1k0bm647yijgmc02jznq9bn88mj71pgii79pfjhw",
|
||||
"rev": "96e6e0ce67ed070a52223c1e9518c9018b1ce376",
|
||||
"date": "2021-12-10T20:19:58+08:00",
|
||||
"path": "/nix/store/1ac8lz6smfa8zqfipqfsg749l9rw4ly9-lua-cjson",
|
||||
"sha256": "03hdsv7d77mggis58k8fmlpbh1d544m0lfqyl9rpjcqkiqs1qvza",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": true,
|
||||
"deepClone": false,
|
||||
@ -1233,17 +1265,17 @@ lua-protobuf = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
|
||||
}:
|
||||
buildLuarocksPackage {
|
||||
pname = "lua-protobuf";
|
||||
version = "0.4.0-1";
|
||||
version = "0.4.1-1";
|
||||
knownRockspec = (fetchurl {
|
||||
url = "mirror://luarocks/lua-protobuf-0.4.0-1.rockspec";
|
||||
sha256 = "053r6z37847wm1xaxv5rwplmdqkp507qawgd382z0l7m05f06ls9";
|
||||
url = "mirror://luarocks/lua-protobuf-0.4.1-1.rockspec";
|
||||
sha256 = "0b395lhby26drb8dzf2gn2avlwvxmnaqmqx5m4g3ik7dmmn7p09i";
|
||||
}).outPath;
|
||||
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
|
||||
"url": "https://github.com/starwing/lua-protobuf.git",
|
||||
"rev": "832facd266366cd86ee9bf41d35327255d0033f2",
|
||||
"date": "2022-07-27T14:34:12+08:00",
|
||||
"path": "/nix/store/g68x4cbi6ssd5zak14r5cbi7k88d3ml9-lua-protobuf",
|
||||
"sha256": "0ynfq0va4w8zlr67ld6v9nmi5mnvchfygd8h5jbwk2vzlj9hg2yw",
|
||||
"rev": "2a2b0b95117642ad9470bfe0add7dd6ce82f3869",
|
||||
"date": "2022-11-29T21:34:24+08:00",
|
||||
"path": "/nix/store/8yjzfj6gy8nkz1dxf0bmy8afwiv8gsjr-lua-protobuf",
|
||||
"sha256": "0c1vjji0nj9lznsxw5gbnhab0ibs69298yrsn5yky0hhz8mmx5nr",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": true,
|
||||
"deepClone": false,
|
||||
@ -1365,17 +1397,17 @@ lua-resty-openssl = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
|
||||
, fetchgit}:
|
||||
buildLuarocksPackage {
|
||||
pname = "lua-resty-openssl";
|
||||
version = "0.8.13-1";
|
||||
version = "0.8.15-1";
|
||||
knownRockspec = (fetchurl {
|
||||
url = "mirror://luarocks/lua-resty-openssl-0.8.13-1.rockspec";
|
||||
sha256 = "12wd4v2pc3ppnr64109nx4sh33clwllfbp11mmg1c1n2w13fz578";
|
||||
url = "mirror://luarocks/lua-resty-openssl-0.8.15-1.rockspec";
|
||||
sha256 = "1i5nvii1wjgs28lcg8gk1axh394fz773br23jppa7rcan7lvrs4j";
|
||||
}).outPath;
|
||||
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
|
||||
"url": "https://github.com/fffonion/lua-resty-openssl.git",
|
||||
"rev": "3293e301f6c3818b780f1a818eacc9b78960b274",
|
||||
"date": "2022-10-14T16:38:23+08:00",
|
||||
"path": "/nix/store/ykj5yj8sj9rc5122gg7dcnq723fsxjq5-lua-resty-openssl",
|
||||
"sha256": "0hkhy8x34z9m7wsqxrrc4vfqw0dbjhq36pjkqcq391vlsvzxhx5h",
|
||||
"rev": "fadbea797bed4227269128a14fdabd4dee7cc486",
|
||||
"date": "2022-10-28T12:17:38+08:00",
|
||||
"path": "/nix/store/a6qqhb2p408mldvm1rqya09rjn04bbkj-lua-resty-openssl",
|
||||
"sha256": "0w03fggfnqch6q90lwsig803i3rv74vsdxlfdbfb4si2yssjyxsz",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": true,
|
||||
"deepClone": false,
|
||||
@ -1635,17 +1667,17 @@ luacheck = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
|
||||
}:
|
||||
buildLuarocksPackage {
|
||||
pname = "luacheck";
|
||||
version = "1.0.0-1";
|
||||
version = "1.1.0-1";
|
||||
knownRockspec = (fetchurl {
|
||||
url = "mirror://luarocks/luacheck-1.0.0-1.rockspec";
|
||||
sha256 = "0q5kqix5n016piqhasp4h22srz1lzp96cjls4fgsbirjn87gsnxv";
|
||||
url = "mirror://luarocks/luacheck-1.1.0-1.rockspec";
|
||||
sha256 = "1r8d02x0hw28rd5p2gr7sf503lczjxv6qk1q66b375ibx6smpyza";
|
||||
}).outPath;
|
||||
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
|
||||
"url": "https://github.com/lunarmodules/luacheck.git",
|
||||
"rev": "4d2979930245415e556a7c9f47b63ea038afcfee",
|
||||
"date": "2022-08-24T12:50:43+03:00",
|
||||
"path": "/nix/store/kfqdn4v9nzqqdw02fri10ic7v61r99n7-luacheck",
|
||||
"sha256": "1dkqcaf0yrbcwbjiqbpdksj39sj8rbkd8432q568dgq2z5y9khcf",
|
||||
"rev": "fcbdeacad00e643e0d78c56b9ba6d8b3c7fa584f",
|
||||
"date": "2022-12-19T20:51:56+03:00",
|
||||
"path": "/nix/store/srzi8dfrbb9gby9lc7r4sndzzrpzd7nm-luacheck",
|
||||
"sha256": "0bkbcxadlf0j59lyvadp7hs7l107blkci15i0hrbi72bx18hj99h",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": true,
|
||||
"deepClone": false,
|
||||
@ -1992,17 +2024,17 @@ lualogging = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
|
||||
}:
|
||||
buildLuarocksPackage {
|
||||
pname = "lualogging";
|
||||
version = "1.7.0-1";
|
||||
version = "1.8.0-1";
|
||||
knownRockspec = (fetchurl {
|
||||
url = "mirror://luarocks/lualogging-1.7.0-1.rockspec";
|
||||
sha256 = "1h6zrhp3jvx4257gkskg8b6kd7pm6pd9wzhqb20vllyhj5vfb53h";
|
||||
url = "mirror://luarocks/lualogging-1.8.0-1.rockspec";
|
||||
sha256 = "0q1719r8lg8rnql809ylm6dbnja85f6nwyqir6f9giq3kcbvnsaq";
|
||||
}).outPath;
|
||||
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
|
||||
"url": "https://github.com/lunarmodules/lualogging.git",
|
||||
"rev": "540df4424165b622d7c408b1f9d2d3420a5206e8",
|
||||
"date": "2022-09-21T22:50:18+02:00",
|
||||
"path": "/nix/store/69jb23b1gv0pcb20jwan342zzp0zjw1f-lualogging",
|
||||
"sha256": "1rwbf593qx67cbk45vm155d7ws1y0xgxmwca508l8clq7d6rv3x0",
|
||||
"rev": "1c6fcf5f68e4d0324c5977f1a27083c06f4d1b8f",
|
||||
"date": "2022-10-22T09:15:52+02:00",
|
||||
"path": "/nix/store/yi5v7b8jyplgylsjamjg9c0iswjpzrfj-lualogging",
|
||||
"sha256": "17y84wrbijfm1z91p8i41ijq9py69qn0k6c5in9yl2mha7s1vndh",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": true,
|
||||
"deepClone": false,
|
||||
@ -2309,10 +2341,10 @@ luautf8 = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
|
||||
}:
|
||||
buildLuarocksPackage {
|
||||
pname = "luautf8";
|
||||
version = "0.1.4-1";
|
||||
version = "0.1.5-1";
|
||||
knownRockspec = (fetchurl {
|
||||
url = "mirror://luarocks/luautf8-0.1.4-1.rockspec";
|
||||
sha256 = "1pa91djyymhzfqnlc559v9wgk5l0m40wq0hnlnf841w6h5aj4fra";
|
||||
url = "mirror://luarocks/luautf8-0.1.5-1.rockspec";
|
||||
sha256 = "0b2fzb3ignpb028j35np3mkkydg73dpm0lqr4z89gzy2gfjm0iy7";
|
||||
}).outPath;
|
||||
src = fetchurl {
|
||||
url = "https://github.com/starwing/luautf8/archive/refs/tags/0.1.4.tar.gz";
|
||||
@ -2372,10 +2404,10 @@ buildLuarocksPackage {
|
||||
|
||||
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
|
||||
"url": "https://github.com/rktjmp/lush.nvim",
|
||||
"rev": "fca6940b754812746c9758cc512cc97dcdb47de0",
|
||||
"date": "2022-10-17T06:32:03+11:00",
|
||||
"path": "/nix/store/aybmp713rb8qa0crm94hgzjcqdvjjv8f-lush.nvim",
|
||||
"sha256": "1q8jzyxdxlif7sjxjqs8x696q1734saca5g05gqhvv5d23287hrn",
|
||||
"rev": "4cc81a12731fbefce1582a940b755691eb3eb6d1",
|
||||
"date": "2022-12-16T22:20:07+11:00",
|
||||
"path": "/nix/store/2h8v2ff1bha580jzyrhhwa9lnj98f327-lush.nvim",
|
||||
"sha256": "0zwb9d8makr9k20cdf7fajhk3frbh4n4p1zajxig0f3ws867zjqx",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": true,
|
||||
"deepClone": false,
|
||||
@ -2451,14 +2483,14 @@ lyaml = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
|
||||
}:
|
||||
buildLuarocksPackage {
|
||||
pname = "lyaml";
|
||||
version = "6.2.7-1";
|
||||
version = "6.2.8-1";
|
||||
knownRockspec = (fetchurl {
|
||||
url = "mirror://luarocks/lyaml-6.2.7-1.rockspec";
|
||||
sha256 = "0m5bnzg24nyk35gcn4rydgzk0ysk1f6rslxwxd0w3drl1bg64zja";
|
||||
url = "mirror://luarocks/lyaml-6.2.8-1.rockspec";
|
||||
sha256 = "0d0h70kjl5fkq589y1sx8qy8as002dhcf88pf60pghvch002ryi1";
|
||||
}).outPath;
|
||||
src = fetchzip {
|
||||
url = "http://github.com/gvvaughan/lyaml/archive/v6.2.7.zip";
|
||||
sha256 = "1qfvk610xgglyv9n2dp0cnh21f20q2zkl941qsv9qcbnm2f03vna";
|
||||
url = "http://github.com/gvvaughan/lyaml/archive/v6.2.8.zip";
|
||||
sha256 = "0r3jjsd8x2fs1aanki0s1mvpznl16f32c1qfgmicy0icgy5xfch0";
|
||||
};
|
||||
|
||||
disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.5");
|
||||
@ -2539,10 +2571,10 @@ buildLuarocksPackage {
|
||||
|
||||
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
|
||||
"url": "https://github.com/leafo/moonscript.git",
|
||||
"rev": "b7efcd131046ed921ae1075d7c0f6a3b64a570f7",
|
||||
"date": "2021-03-18T11:51:52-07:00",
|
||||
"path": "/nix/store/xijbk0bgjpxjgmvscbqnghj4r3zdzgxl-moonscript",
|
||||
"sha256": "14xx6pij0djblfv3g2hi0xlljh7h0yrbb03f4x90q5j66v693gx7",
|
||||
"rev": "a0108328373d5f3f1aefb98341aa895dd75a1b2a",
|
||||
"date": "2022-11-04T13:38:05-07:00",
|
||||
"path": "/nix/store/js597jw44cdfq154a7bpqba99ninzsqh-moonscript",
|
||||
"sha256": "02ig93c1dzrbs64mz40bkzz3p93fdxm6m0i7gfqwiickybr9wd97",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": true,
|
||||
"deepClone": false,
|
||||
@ -2614,10 +2646,10 @@ buildLuarocksPackage {
|
||||
|
||||
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
|
||||
"url": "https://github.com/hrsh7th/nvim-cmp",
|
||||
"rev": "e94d3489311f941788756953df23ca84f83eec95",
|
||||
"date": "2022-10-16T18:29:26+09:00",
|
||||
"path": "/nix/store/jplbdkkgdbwxm930wyvxs6ghbljvh47g-nvim-cmp",
|
||||
"sha256": "1v6iw2bqaqxzspl239jw3aqj64mc9sq2xxibvll7rmxxgv2mgyb5",
|
||||
"rev": "8bbaeda725d5db6e4e1be2867a64b43bf547cf06",
|
||||
"date": "2022-12-15T20:27:02+09:00",
|
||||
"path": "/nix/store/bd3da1ahlp53p3b12780h2x29amr8a3h-nvim-cmp",
|
||||
"sha256": "1ldbvspz6aam78d47ldpa7bv4z419bzsk5nhli75mz0vzidfvrw5",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": true,
|
||||
"deepClone": false,
|
||||
@ -2644,10 +2676,10 @@ buildLuarocksPackage {
|
||||
|
||||
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
|
||||
"url": "https://github.com/lunarmodules/penlight.git",
|
||||
"rev": "d5958e242b95984a278c39c63fadc5ef1258978b",
|
||||
"date": "2022-08-14T10:06:20+02:00",
|
||||
"path": "/nix/store/91nha43c2gdjyn8146fn9zfghlgvvdzz-penlight",
|
||||
"sha256": "0bvc1a3g41mx8wlaq4ig3cl568rsysyggsr00hf7bi0ygf529sny",
|
||||
"rev": "b101290c532c2901764de57367d3f2b84127286d",
|
||||
"date": "2022-10-23T07:52:51+03:00",
|
||||
"path": "/nix/store/k2jh5076dwb8dp6h05vbdj9jpa87gl1f-penlight",
|
||||
"sha256": "10pb55cfqrpc9a112pvldkanh63s8dww452gl2rkjnrsh9b9gw4b",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": true,
|
||||
"deepClone": false,
|
||||
@ -2963,6 +2995,38 @@ buildLuarocksPackage {
|
||||
};
|
||||
}) {};
|
||||
|
||||
teal-language-server = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
|
||||
, fetchgit, cyan, dkjson, luafilesystem
|
||||
}:
|
||||
buildLuarocksPackage {
|
||||
pname = "teal-language-server";
|
||||
version = "dev-1";
|
||||
knownRockspec = (fetchurl {
|
||||
url = "mirror://luarocks/teal-language-server-dev-1.rockspec";
|
||||
sha256 = "01l44c6bknz7ff9xqgich31hlb0yk4ms5k1hs4rhm3cs95s5vlzc";
|
||||
}).outPath;
|
||||
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
|
||||
"url": "https://git@github.com/teal-language/teal-language-server.git",
|
||||
"rev": "38266ed482ef4b7e51d9cf149f4c75103fd0cefc",
|
||||
"date": "2022-11-22T12:51:28-06:00",
|
||||
"path": "/nix/store/3wzza2p2c9ylcj8ihv4xmkgljkwgs0z6-teal-language-server",
|
||||
"sha256": "0q50a9f4gskx80mifpg9lf5haxsiw53b9lik398ijbkym4mfg2sz",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": true,
|
||||
"deepClone": false,
|
||||
"leaveDotGit": false
|
||||
}
|
||||
'') ["date" "path"]) ;
|
||||
|
||||
propagatedBuildInputs = [ cyan dkjson luafilesystem ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/teal-language/teal-language-server";
|
||||
description = "A language server for the Teal language";
|
||||
license.fullName = "MIT";
|
||||
};
|
||||
}) {};
|
||||
|
||||
tl = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
|
||||
, fetchgit, argparse, compat53, luafilesystem
|
||||
, dkjson}:
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
, platformToolsVersion ? "33.0.2"
|
||||
, buildToolsVersions ? [ "32.0.0" ]
|
||||
, includeEmulator ? false
|
||||
, emulatorVersion ? "31.3.7"
|
||||
, emulatorVersion ? "31.3.9"
|
||||
, platformVersions ? []
|
||||
, includeSources ? false
|
||||
, includeSystemImages ? false
|
||||
@ -250,7 +250,7 @@ rec {
|
||||
|
||||
by setting nixpkgs config option 'android_sdk.accept_license = true;'.
|
||||
'' else callPackage ./tools.nix {
|
||||
inherit deployAndroidPackage packages toolsVersion;
|
||||
inherit deployAndroidPackage packages toolsVersion os;
|
||||
|
||||
postInstall = ''
|
||||
# Symlink all requested plugins
|
||||
|
||||
@ -826,11 +826,11 @@ with self;
|
||||
|
||||
pythonlib = janePackage {
|
||||
pname = "pythonlib";
|
||||
hash = "0p88vmp19zmr0r58dz6sawsmbn4yi2vyymad2c82kp93kg66nm1v";
|
||||
version = "0.15.1";
|
||||
hash = "sha256-j8WXVTEiBmHtoTjkbnIh31vC4IghfAMaEL19nDLx3mc=";
|
||||
meta.description = "A library to help writing wrappers around ocaml code for python";
|
||||
patches = lib.optional (lib.versionAtLeast ocaml.version "4.13") ./pythonlib.patch;
|
||||
buildInputs = [ ppx_optcomp ];
|
||||
propagatedBuildInputs = [ ppx_expect ppx_let ppx_python stdio typerep ];
|
||||
meta.broken = lib.versionAtLeast ocaml.version "4.14";
|
||||
};
|
||||
|
||||
re2 = janePackage {
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
diff --git a/src/type.ml b/src/type.ml
|
||||
index 8a9e648..3f3b0e9 100644
|
||||
--- a/src/type.ml
|
||||
+++ b/src/type.ml
|
||||
@@ -31,12 +31,12 @@ let of_type_desc type_desc ~env =
|
||||
| Tunivar _ -> Or_error.error_string "not handled: Tunivar"
|
||||
| Tvariant _ -> Or_error.error_string "not handled: Tvariant"
|
||||
| Tnil -> Or_error.error_string "not handled: Tnil"
|
||||
- | Tobject (_, _) -> Or_error.error_string "not handled: Tobject"
|
||||
- | Tfield (_, _, _, _) -> Or_error.error_string "not handled: Tfield"
|
||||
- | Tpackage (_, _, _) -> Or_error.error_string "not handled: Tpackage"
|
||||
- | Tpoly (_, _) -> Or_error.error_string "not handled: Tpoly"
|
||||
+ | Tobject _ -> Or_error.error_string "not handled: Tobject"
|
||||
+ | Tfield _ -> Or_error.error_string "not handled: Tfield"
|
||||
+ | Tpackage _ -> Or_error.error_string "not handled: Tpackage"
|
||||
+ | Tpoly _ -> Or_error.error_string "not handled: Tpoly"
|
||||
| Tlink e -> walk e.desc
|
||||
- | Tsubst e -> walk e.desc
|
||||
+ | Tsubst (e, _) -> walk e.desc
|
||||
| Ttuple es ->
|
||||
let%bind tuple = List.map es ~f:(fun e -> walk e.desc) |> Or_error.all in
|
||||
(match tuple with
|
||||
@ -14,6 +14,7 @@
|
||||
, pytest-mock
|
||||
, python-json-logger
|
||||
, pytestCheckHook
|
||||
, pythonRelaxDepsHook
|
||||
, pythonOlder
|
||||
, pyyaml
|
||||
, toolz
|
||||
@ -23,7 +24,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ansible-later";
|
||||
version = "2.0.23";
|
||||
version = "3.0.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -32,23 +33,29 @@ buildPythonPackage rec {
|
||||
owner = "thegeeklab";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-FQnyWC7d9h8Ya2BlaTGTrNXkHtJJLdeNL7qXP7scLFA=";
|
||||
hash = "sha256-pYNL9G4A45IE6hZcihPICYfOzd5hH6Xqy0EYyBajbxQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'version = "0.0.0"' 'version = "${version}"' \
|
||||
--replace " --cov=ansiblelater --cov-report=xml:coverage.xml --cov-report=term --cov-append --no-cov-on-fail" "" \
|
||||
--replace 'PyYAML = "6.0"' 'PyYAML = "*"' \
|
||||
--replace 'unidiff = "0.7.3"' 'unidiff = "*"' \
|
||||
--replace 'jsonschema = "' 'jsonschema = "^' \
|
||||
--replace 'python-json-logger = "' 'python-json-logger = "^' \
|
||||
--replace 'toolz = "0.11.2' 'toolz = "*' \
|
||||
--replace 'yamllint = "' 'yamllint = "^'
|
||||
--replace " --cov=ansiblelater --cov-report=xml:coverage.xml --cov-report=term --cov-append --no-cov-on-fail" ""
|
||||
'';
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"flake8"
|
||||
"jsonschema"
|
||||
"pathspec"
|
||||
"python-json-logger"
|
||||
"pyyaml"
|
||||
"toolz"
|
||||
"unidiff"
|
||||
"yamllint"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -84,6 +91,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Best practice scanner for Ansible roles and playbooks";
|
||||
homepage = "https://github.com/thegeeklab/ansible-later";
|
||||
changelog = "https://github.com/thegeeklab/ansible-later/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ tboerger ];
|
||||
};
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "appthreat-vulnerability-db";
|
||||
version = "4.2.0";
|
||||
version = "4.3.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "AppThreat";
|
||||
repo = "vulnerability-db";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-uZkPQYuF8EbX5+Qyj7CjxJhpT+DywCSwbORKXqaY0z8=";
|
||||
hash = "sha256-1WBaNTARe0ULWHf0g/6Jljo1yCffnJAS9ycbhGqzOUk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -36,7 +36,7 @@ buildPythonPackage rec {
|
||||
packageurl-python
|
||||
semver
|
||||
tabulate
|
||||
];
|
||||
] ++ httpx.optional-dependencies.http2;
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
|
||||
@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "atenpdu";
|
||||
version = "0.3.6";
|
||||
version = "0.4.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-cl7PZdIdLGvoYd5x7QyjkTBc+pVB9F7En9sxcUoX34Q=";
|
||||
hash = "sha256-mn44nChWy6z/B+gLc3MDndkRb2+geoojT/4AqwKpLXM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "awscrt";
|
||||
version = "0.15.1";
|
||||
version = "0.16.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-2VBdad9NL19eW2Djot2gkynyjSCUvG4f0KnEub6M0vg=";
|
||||
hash = "sha256-j9++euxSsvf6ZLkVJtyGdlOx6WWrAXEOczqwypYZkXA=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
@ -33,11 +33,6 @@ buildPythonPackage rec {
|
||||
"strictoverflow"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "extra_link_args += ['-Wl,-fatal_warnings']" ""
|
||||
'';
|
||||
|
||||
# gcc <10 is not supported, LLVM on darwin is just fine
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
@ -58,6 +53,7 @@ buildPythonPackage rec {
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/awslabs/aws-crt-python";
|
||||
changelog = "https://github.com/awslabs/aws-crt-python/releases/tag/v${version}";
|
||||
description = "Python bindings for the AWS Common Runtime";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ davegallant ];
|
||||
|
||||
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
postPatch = ''
|
||||
mkdir -p $out/bin
|
||||
'' + pip.postPatch;
|
||||
'' + (pip.postPatch or ""); # `pip` does not necessarily have a `postPatch` field.
|
||||
|
||||
nativeBuildInputs = [ makeWrapper unzip ];
|
||||
buildInputs = [ python ];
|
||||
|
||||
@ -5,8 +5,9 @@
|
||||
, deepmerge
|
||||
, dm-haiku
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, jaxlib
|
||||
, poetry
|
||||
, poetry-core
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, pyyaml
|
||||
@ -35,6 +36,14 @@ buildPythonPackage rec {
|
||||
hash = "sha256-FZmLriYhsX+zyQKCtCjbOy6MH+AvjzHRNUyaDSXGlLI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "use-poetry-core.patch";
|
||||
url = "https://github.com/poets-ai/elegy/commit/0ed472882f470ed9eb7a63b8a537ffabe7e19aa7.patch";
|
||||
hash = "sha256-nO/imHo7tEsiZh+64CF/M4eXQ1so3IunVhv8CvYP1ks=";
|
||||
})
|
||||
];
|
||||
|
||||
# The cloudpickle constraint is too strict. wandb is marked as an optional
|
||||
# dependency but `buildPythonPackage` doesn't seem to respect that setting.
|
||||
# Python constraint: https://github.com/poets-ai/elegy/issues/244
|
||||
@ -46,7 +55,7 @@ buildPythonPackage rec {
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry
|
||||
poetry-core
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -14,14 +14,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-monitoring";
|
||||
version = "2.11.3";
|
||||
version = "2.12.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Nm27yxdf6woQoP37CeNrHggM2Wobv9W9JrmTlx5A4uY=";
|
||||
hash = "sha256-J0I8P+5BQq1igzKEGtccv66KxPTrzmPErtpx3ornk24=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "huawei-lte-api";
|
||||
version = "1.6.7";
|
||||
version = "1.6.9";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.4";
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "Salamek";
|
||||
repo = "huawei-lte-api";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-CMGOR5b8Uc8ZIuMlkCkxZqTqUA/Im2RgXK4uFZdoHeU=";
|
||||
hash = "sha256-8a+6q1XBgI0+J0Tb2xn3fMeiZbB9djiwPnfY3RFhIg4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ical";
|
||||
version = "4.2.3";
|
||||
version = "4.2.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
||||
owner = "allenporter";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Af08Xnf5PNWTzRfRENSixVlfcqrvhSuutGxoDzHG4dk=";
|
||||
hash = "sha256-TpR4NRcVBLdoUg8AurvvdJ9FqUeEV7MCH60JtPPrQxI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -1,65 +1,103 @@
|
||||
{ lib
|
||||
, backoff
|
||||
, backports-datetime-fromisoformat
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, geojson
|
||||
, google-api-core
|
||||
, jinja2
|
||||
, imagesize
|
||||
, ndjson
|
||||
, numpy
|
||||
, opencv
|
||||
# , opencv-python
|
||||
, packaging
|
||||
, pillow
|
||||
, pydantic
|
||||
# , pygeotile
|
||||
, pyproj
|
||||
, pytest-cases
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, pythonRelaxDepsHook
|
||||
, rasterio
|
||||
, requests
|
||||
, shapely
|
||||
, tqdm
|
||||
, typeguard
|
||||
, typing-extensions
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "labelbox";
|
||||
version = "3.24.1";
|
||||
version = "3.33.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Labelbox";
|
||||
repo = "labelbox-python";
|
||||
rev = "refs/tags/v.${version}";
|
||||
sha256 = "sha256-pcIbCtVOr6pwodgNv8aGZ+k2Z9cQPCQm1UBJWJAlj/o=";
|
||||
hash = "sha256-lYhgBELeVtNUp6ZvcSTIeKp2YkaGt6MH8BbzSERGHXw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pytest.ini \
|
||||
--replace "-s -vv -x --reruns 5 --reruns-delay 10 --durations=20" "-s -vv -x --durations=20"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"backoff"
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
backoff
|
||||
backports-datetime-fromisoformat
|
||||
google-api-core
|
||||
jinja2
|
||||
ndjson
|
||||
pillow
|
||||
pydantic
|
||||
rasterio
|
||||
requests
|
||||
shapely
|
||||
tqdm
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py --replace "pydantic==1.8" "pydantic>=1.8"
|
||||
'';
|
||||
passthru.optional-dependencies = {
|
||||
data = [
|
||||
shapely
|
||||
geojson
|
||||
numpy
|
||||
pillow
|
||||
# opencv-python
|
||||
typeguard
|
||||
imagesize
|
||||
pyproj
|
||||
# pygeotile
|
||||
typing-extensions
|
||||
packaging
|
||||
];
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
pytest-cases
|
||||
pytestCheckHook
|
||||
];
|
||||
] ++ passthru.optional-dependencies.data;
|
||||
|
||||
disabledTestPaths = [
|
||||
# Requires network access
|
||||
"tests/integration"
|
||||
# Missing requirements
|
||||
"tests/data"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "labelbox" ];
|
||||
pythonImportsCheck = [
|
||||
"labelbox"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Platform API for LabelBox";
|
||||
homepage = "https://github.com/Labelbox/labelbox-python";
|
||||
changelog = "https://github.com/Labelbox/labelbox-python/blob/v.${version}/CHANGELOG.md";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ rakesh4g ];
|
||||
};
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "proxmoxer";
|
||||
version = "2.0.0";
|
||||
version = "2.0.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-phCeJkiY8XxaD4VQCxOzoInkwWQzHU7ZGdHvxNVgifU=";
|
||||
hash = "sha256-kwD6yJhVTaVAAUVA6k4r6HZy4w+MPDF7DfJBS8wGE/c=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "psrpcore";
|
||||
version = "0.2.0";
|
||||
version = "0.2.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "jborean93";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-uX99BsQn1Ckl+2Lt4I0EMZLTKeDrX0mtSc9w5aFpvxQ=";
|
||||
hash = "sha256-KMSyqXKhNH+i9Y0Mx3DHCwJZOkl4Va2n0zu0TEitslU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyinfra";
|
||||
version = "2.5.3";
|
||||
version = "2.6";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
||||
owner = "Fizzadar";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-1buLaBhhmc4FnROr5M+bqSlsbkfjl58a1/4qWBXE97Y=";
|
||||
hash = "sha256-SNeucJvjnwQ0o+gukXwEKybBaW01hPtYXCFcPeOuXA8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -64,6 +64,7 @@ buildPythonPackage rec {
|
||||
ad-hoc command execution, service deployment, configuration management and more.
|
||||
'';
|
||||
homepage = "https://github.com/Fizzadar/pyinfra";
|
||||
changelog = "https://github.com/Fizzadar/pyinfra/blob/v${version}/CHANGELOG.md";
|
||||
maintainers = with maintainers; [ totoroot ];
|
||||
license = licenses.mit;
|
||||
};
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytube";
|
||||
version = "12.1.0";
|
||||
version = "12.1.2";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "pytube";
|
||||
repo = "pytube";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-o4kfZLkEs+XYor2sS2lfuDZkPfHrB+rDoxroc4f55gc=";
|
||||
hash = "sha256-Y4mriCwFvwAZ3e8kHKo9/S2vReb4q+b8KTHxtQo8SEw=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyvicare";
|
||||
version = "2.21.0";
|
||||
version = "2.22.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "somm15";
|
||||
repo = "PyViCare";
|
||||
rev = version;
|
||||
sha256 = "sha256-zAm1kN5oRVzoRElIabeMmZYuZQHqrgNqHxbVv/UbN/8=";
|
||||
sha256 = "sha256-1Vfdp0JOqDlt07BCTJXcJ1V0kTzGwCR0ccnGlCYgtEM=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
@ -10,11 +10,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pywayland";
|
||||
version = "0.4.14";
|
||||
version = "0.4.15";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-CXJidzwFvS1ewqYyfpJhwQtqh4TtUfhO9O0iYJpOCy0=";
|
||||
hash = "sha256-vz7Sjd8KT7UgOBI5AN5q6CS7jl+WL87w91cgm0bXRGw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchPypi
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, pdfrw
|
||||
, reportlab
|
||||
@ -12,15 +12,17 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "rmrl";
|
||||
version = "0.2.1";
|
||||
version = "unstable-2022-12-11";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "c532bef4168350e6ab17cf37c6481dc12b6a78e007c073503f082f36215b71c9";
|
||||
src = fetchFromGitHub {
|
||||
owner = "naturale0";
|
||||
repo = "rmrl";
|
||||
rev = "3c908536f11dfa92f81e7127ae76f18f0b2cc3e3";
|
||||
hash = "sha256-13pMfRe2McWDpBTlJy/TBT0W5wyd0EXDoocxeIzmqCo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -42,7 +44,7 @@ buildPythonPackage rec {
|
||||
|
||||
meta = {
|
||||
description = "Render reMarkable documents to PDF";
|
||||
homepage = "https://github.com/rschroll/rmrl";
|
||||
homepage = "https://github.com/naturale0/rmrl";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ dotlambda ];
|
||||
};
|
||||
|
||||
@ -95,6 +95,7 @@ buildPythonPackage rec {
|
||||
"test_nested_css"
|
||||
"test_nested_xpath"
|
||||
"test_flavor_detection"
|
||||
"test_follow_whitespace"
|
||||
# Requires network access
|
||||
"AnonymousFTPTestCase"
|
||||
"FTPFeedStorageTest"
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sensor-state-data";
|
||||
version = "2.12.1";
|
||||
version = "2.13.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "Bluetooth-Devices";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Ycn62qQ+IMqtuuE/wJPUDlyTiklu2WYrGD+wVXssRFg=";
|
||||
hash = "sha256-iLHv2rwynpSAKlRn2ezq2VUR7v4oHNJaPg/prlkZo6U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sensorpro-ble";
|
||||
version = "0.5.0";
|
||||
version = "0.5.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "Bluetooth-Devices";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-B5WtOl1Va2rqm6PZEUCYakN7mE2zz/edGj+TtwDcS+Y=";
|
||||
hash = "sha256-D0xHNPsGlNBoHR3LqR6TbVhqXWapzwYsG+uN3kSF1oE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -49,6 +49,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Library for Sensorpro BLE devices";
|
||||
homepage = "https://github.com/Bluetooth-Devices/sensorpro-ble";
|
||||
changelog = "https://github.com/Bluetooth-Devices/sensorpro-ble/blob/v${version}/CHANGELOG.md";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
{ buildPythonPackage
|
||||
, lib
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, isPy27
|
||||
, odfpy
|
||||
, openpyxl
|
||||
, pandas
|
||||
, setuptools-scm
|
||||
, pytestCheckHook
|
||||
, pytest-cov
|
||||
, pythonOlder
|
||||
, pyyaml
|
||||
, setuptools-scm
|
||||
, tabulate
|
||||
, unicodecsv
|
||||
, xlrd
|
||||
, xlwt
|
||||
@ -17,26 +17,79 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "tablib";
|
||||
version = "3.2.1";
|
||||
disabled = isPy27;
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-pX8ncLjCJf6+wcseZQEqac8w3Si+gQ4P+Y0CR2jH0PE=";
|
||||
hash = "sha256-pX8ncLjCJf6+wcseZQEqac8w3Si+gQ4P+Y0CR2jH0PE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
propagatedBuildInputs = [ xlwt openpyxl pyyaml xlrd odfpy ];
|
||||
checkInputs = [ pytestCheckHook pytest-cov unicodecsv pandas ];
|
||||
postPatch = ''
|
||||
substituteInPlace pytest.ini \
|
||||
--replace " --cov=tablib --cov=tests --cov-report xml --cov-report term --cov-report html" ""
|
||||
'';
|
||||
|
||||
# test_tablib needs MarkupPy, which isn't packaged yet
|
||||
pytestFlagsArray = [ "--ignore=tests/test_tablib.py" ];
|
||||
nativeBuildInputs = [
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "tablib" ];
|
||||
passthru.optional-dependencies = {
|
||||
all = [
|
||||
# markuppy
|
||||
odfpy
|
||||
openpyxl
|
||||
pandas
|
||||
pyyaml
|
||||
tabulate
|
||||
xlrd
|
||||
xlwt
|
||||
];
|
||||
cli = [
|
||||
tabulate
|
||||
];
|
||||
html = [
|
||||
# markuppy
|
||||
];
|
||||
ods = [
|
||||
odfpy
|
||||
];
|
||||
pandas = [
|
||||
pandas
|
||||
];
|
||||
xls = [
|
||||
xlrd
|
||||
xlwt
|
||||
];
|
||||
xlsx = [
|
||||
openpyxl
|
||||
];
|
||||
yaml = [
|
||||
pyyaml
|
||||
];
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
pandas
|
||||
pytestCheckHook
|
||||
unicodecsv
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# test_tablib needs MarkupPy, which isn't packaged yet
|
||||
"tests/test_tablib.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"tablib"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Format-agnostic tabular dataset library";
|
||||
homepage = "https://tablib.readthedocs.io/";
|
||||
changelog = "https://github.com/jazzband/tablib/raw/v${version}/HISTORY.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tabula-py";
|
||||
version = "2.5.1";
|
||||
version = "2.6.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -21,8 +21,8 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "chezou";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Dfi6LzrLDz9VVDmbeK1dEaWuQosD4tvAH13Q4Mp3smA=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-L/N4TqVHIlwqVeBKlUq5Oz1VW/105Ov6Yicvnn/lxlI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -65,6 +65,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Module to extract table from PDF into pandas DataFrame";
|
||||
homepage = "https://github.com/chezou/tabula-py";
|
||||
changelog = "https://github.com/chezou/tabula-py/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
||||
@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "traitsui";
|
||||
version = "7.4.1";
|
||||
version = "7.4.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-TFs9Oq6qvR7IGgqMQPnM0o+oy51k7RORfJkNF0ZU+h0=";
|
||||
hash = "sha256-IEcb8znD7ed/BrL6l76Qrj0Wbr78zBZ7y9oifHWxZj8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -1,31 +1,38 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, six
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "w3lib";
|
||||
version = "2.0.1";
|
||||
version = "2.1.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-E98V+MF7Fj3g/V+qiSwa0UPhkN/L25hTS7l16zfGx9Y=";
|
||||
hash = "sha256-DhGY8bdFGVtrPdGkzWYBH7+C8wpNnauu4fnlyG8CAnQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ six ];
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
pythonImportsCheck = [ "w3lib" ];
|
||||
pythonImportsCheck = [
|
||||
"w3lib"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
"test_add_or_replace_parameter"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A library of web-related functions";
|
||||
description = "Library of web-related functions";
|
||||
homepage = "https://github.com/scrapy/w3lib";
|
||||
changelog = "https://github.com/scrapy/w3lib/blob/v${version}/NEWS";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "websockets";
|
||||
version = "10.3";
|
||||
version = "10.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -17,12 +17,9 @@ buildPythonPackage rec {
|
||||
owner = "aaugustin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-ZUn/DvO1Kx7Uxne4DF/am69YL1c48qpgQrGek355Z+4=";
|
||||
hash = "sha256-IylvnaS8cHatA+WMc5uY9E+l+52INqOMITU1VJPO2xY=";
|
||||
};
|
||||
|
||||
# Tests fail on Darwin with `OSError: AF_UNIX path too long`
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
patchPhase = ''
|
||||
# Disable all tests that need to terminate within a predetermined amount of
|
||||
# time. This is nondeterministic.
|
||||
@ -44,7 +41,12 @@ buildPythonPackage rec {
|
||||
done
|
||||
'';
|
||||
|
||||
checkInputs = [ unittestCheckHook ];
|
||||
checkInputs = [
|
||||
unittestCheckHook
|
||||
];
|
||||
|
||||
# Tests fail on Darwin with `OSError: AF_UNIX path too long`
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"websockets"
|
||||
@ -53,6 +55,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "WebSocket implementation in Python";
|
||||
homepage = "https://websockets.readthedocs.io/";
|
||||
changelog = "https://github.com/aaugustin/websockets/blob/${version}/docs/project/changelog.rst";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "xsdata";
|
||||
version = "22.11";
|
||||
version = "22.12";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-3A2vyK6UdelWSzcN7pzPz6xKnU3X+rum7dKzl6OfWoc=";
|
||||
hash = "sha256-o9Xxt7b/+MkW94Jcg26ihaTn0/OpTcu+0OY7oV3JRGY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ytmusicapi";
|
||||
version = "0.24.0";
|
||||
version = "0.24.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-vbSWgBze3tFLEpHdh3JXij3m5R6iAhTSjrCMaSLZalY=";
|
||||
hash = "sha256-8NYutkZwR8tQzsVzYsOo6HdkiZ6WbIconDjcOwgs3PM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,17 +1,17 @@
|
||||
{
|
||||
"version": "0.1.17",
|
||||
"version": "0.1.18",
|
||||
"assets": {
|
||||
"aarch64-darwin": {
|
||||
"asset": "scala-cli-aarch64-apple-darwin.gz",
|
||||
"sha256": "0p3z4wvindcb9wahq2q8ca24zgl05qb3z2asmqi2z54pqfkc21d7"
|
||||
"sha256": "10aygxlhm579yb4rzdissw3a41vq1sh78zlfpl2qphfc6zj7jlg2"
|
||||
},
|
||||
"x86_64-darwin": {
|
||||
"asset": "scala-cli-x86_64-apple-darwin.gz",
|
||||
"sha256": "17zj3g62b27blbdfa3j4lzvs3v13jyy7428zxalkpdx8ixy0ghyy"
|
||||
"sha256": "1bm6wnnln1f7z5hgkdjqqhkwf7wljlgdw5m6f16k8y9nii1cad0y"
|
||||
},
|
||||
"x86_64-linux": {
|
||||
"asset": "scala-cli-x86_64-pc-linux.gz",
|
||||
"sha256": "0dm7jhsvrjb73wyvvds17r779gcm00yvsy31arc8552df5nkq4iz"
|
||||
"sha256": "1h8s8w1qi0y1psgaqpjwd206g39ljs7qyifng08dpb2a6f37hba8"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "ctlptl";
|
||||
version = "0.8.12";
|
||||
version = "0.8.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tilt-dev";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-h0JR641+VBiTJY8INXhxwvsyZGLH4YRdkddwo2IUDQk=";
|
||||
sha256 = "sha256-JCBlP8ESCiqr4pk8QyG5CVs+3qSlnvw0jYS5R0Civk0=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-M9B/rfMBjYJb9szmYPVZqURlcv62qHOLJ3ka0v++z0s=";
|
||||
|
||||
@ -5,13 +5,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "sqlfluff";
|
||||
version = "1.4.2";
|
||||
version = "1.4.5";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-B1tqL8bc+mWEjQrS4lQM55/ahOeUyuE8VBtk6QMj6Mk=";
|
||||
hash = "sha256-Kc0doBR2iOy54arxOYXH5eHlcM7pXFVUqedopsZH8rE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
@ -43,9 +44,10 @@ python3.pkgs.buildPythonApplication rec {
|
||||
|
||||
disabledTestPaths = [
|
||||
# Don't run the plugin related tests
|
||||
"test/core/plugin_test.py"
|
||||
"plugins/sqlfluff-templater-dbt"
|
||||
"plugins/sqlfluff-plugin-example/test/rules/rule_test_cases_test.py"
|
||||
"plugins/sqlfluff-templater-dbt"
|
||||
"test/core/plugin_test.py"
|
||||
"test/diff_quality_plugin_test.py"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
@ -62,6 +64,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
meta = with lib; {
|
||||
description = "SQL linter and auto-formatter";
|
||||
homepage = "https://www.sqlfluff.com/";
|
||||
changelog = "https://github.com/sqlfluff/sqlfluff/blob/${version}/CHANGELOG.md";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
||||
@ -16,6 +16,7 @@
|
||||
, libappindicator-gtk3
|
||||
, libxshmfence
|
||||
, libglvnd
|
||||
, wayland
|
||||
}@args:
|
||||
|
||||
let
|
||||
|
||||
@ -16,6 +16,7 @@
|
||||
, libappindicator-gtk3
|
||||
, libxshmfence
|
||||
, libglvnd
|
||||
, wayland
|
||||
}:
|
||||
|
||||
version: hashes:
|
||||
@ -64,7 +65,7 @@ let
|
||||
};
|
||||
|
||||
electronLibPath = with lib; makeLibraryPath (
|
||||
[ libuuid at-spi2-atk at-spi2-core libappindicator-gtk3 ]
|
||||
[ libuuid at-spi2-atk at-spi2-core libappindicator-gtk3 wayland ]
|
||||
++ optionals (versionAtLeast version "9.0.0") [ libdrm mesa ]
|
||||
++ optionals (versionOlder version "10.0.0") [ libXScrnSaver ]
|
||||
++ optionals (versionAtLeast version "11.0.0") [ libxkbcommon ]
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{ lib, stdenv, fetchFromGitHub, opam-installer, ocamlPackages }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "opam2json";
|
||||
version = "0.2";
|
||||
version = "0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tweag";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "fe8bm/V/4r2iNxgbitT2sXBqDHQ0GBSnSUSBg/1aXoI=";
|
||||
sha256 = "sha256-5pXfbUfpVABtKbii6aaI2EdAZTjHJ2QntEf0QD2O5AM=";
|
||||
};
|
||||
|
||||
buildInputs = with ocamlPackages; [ yojson opam-file-format cmdliner ];
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "operator-sdk";
|
||||
version = "1.25.3";
|
||||
version = "1.26.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "operator-framework";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-f+FbmkCdM5Ub/nbq5Z8HnZ1KexGV59U/zPLpOkfs200=";
|
||||
hash = "sha256-hIJTdTZ24+VwF1M/RvKcnQRzZga0nsjlTTUFYxZn0lo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-1Vz+SIrNULajDqzZt53+o9wv1zLPBvKrO28BTqS4VbM=";
|
||||
|
||||
@ -7,16 +7,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ruff";
|
||||
version = "0.0.186";
|
||||
version = "0.0.188";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "charliermarsh";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-mCX/s4DsnGoQgeP1oZmR8motTdKz7Gj2FWrvBkgM7WA=";
|
||||
sha256 = "sha256-Xe9opiFZ68plNqs5QkkM13ADUCQGcRR7hpELnxwvT3o=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-lvttZWSdqff8eRXEe6/GPelE1ZJheozN2dEBURapY9w=";
|
||||
cargoSha256 = "sha256-c0gma/KL4OnCppu9ZEALB3KjDyV97qZcknuncU03cm8=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.CoreServices
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-pgx";
|
||||
version = "0.6.0";
|
||||
version = "0.6.1";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit version pname;
|
||||
sha256 = "sha256-CXOInyT0fY17e4iuGhUpR9EPd2M8jauR5TKpPlhTJoQ=";
|
||||
sha256 = "sha256-O4eHVbJBudybsPab+zr2eXnfheREMqLAHAKm2GDbfrs=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-RtPFFIuurSPMhGLcGLOu0em1biimVkTaAKP5EUPtQ9U=";
|
||||
cargoSha256 = "sha256-MucGrA3qXgJOcT2LMNmoNOhQi8QA3LuqgZEHKycLCCo=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@ -2,22 +2,18 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "typeshare";
|
||||
version = "1.0.0";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit version;
|
||||
pname = "typeshare-cli";
|
||||
sha256 = "sha256-KDmE5f9B2lNVbjdF8d81NTJIwpvPhsoLMA8w7iYIIl8=";
|
||||
sha256 = "sha256-SbTI7170Oc1e09dv4TvUwByG3qkyAL5YXZ96NzI0FSI=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-b983tSue9WHkPrcIhp5QSjwj+lESURUYueebjXUWMJY=";
|
||||
cargoSha256 = "sha256-5EhXw2WcRJqCbdMvOtich9EYQqi0uwCH1a1XXIo8aAo=";
|
||||
|
||||
buildFeatures = [ "go" ];
|
||||
|
||||
postInstall = ''
|
||||
ln -s $out/bin/typeshare{-cli,}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Command Line Tool for generating language files with typeshare";
|
||||
homepage = "https://github.com/1password/typeshare";
|
||||
|
||||
@ -1,18 +1,18 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, sq }:
|
||||
buildGoModule rec {
|
||||
pname = "sq";
|
||||
version = "0.15.11";
|
||||
version = "0.16.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "neilotoole";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-sYaQb7MFeTgJ/WPuCuMYjLcgmO/FhMGgOvY1HfGh2ag=";
|
||||
sha256 = "sha256-0BpQDlLWERm8UOcmxAVH5aWBGrcdV64YB7S+3etOtU0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
vendorSha256 = "sha256-P1NxcjRA0g9NK2EaEG5E9G2TywTp5uvHesQE7+EG4ag=";
|
||||
vendorSha256 = "sha256-tzq22S3fuaxOIoXL1mMPV90El8cUwzm2XSaiDHIuc4g=";
|
||||
|
||||
# Some tests violates sandbox constraints.
|
||||
doCheck = false;
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "flyctl";
|
||||
version = "0.0.440";
|
||||
version = "0.0.441";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "superfly";
|
||||
repo = "flyctl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-pqly/5QEwKTp9wdh+Tq4KhOFmSD1TLodamo64e13o/s=";
|
||||
sha256 = "sha256-T69OGS9w0furVOABvctzCxSgUJpwppWRFCmOlWzgagE=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-yVR3pUsveZf4052hr6aO4fnvEOQyHdm3N7khcobcoyE=";
|
||||
|
||||
@ -26,25 +26,25 @@
|
||||
}:
|
||||
|
||||
let
|
||||
openrct2-version = "0.4.2";
|
||||
openrct2-version = "0.4.3";
|
||||
|
||||
# Those versions MUST match the pinned versions within the CMakeLists.txt
|
||||
# file. The REPLAYS repository from the CMakeLists.txt is not necessary.
|
||||
objects-version = "1.3.5";
|
||||
objects-version = "1.3.7";
|
||||
title-sequences-version = "0.4.0";
|
||||
|
||||
openrct2-src = fetchFromGitHub {
|
||||
owner = "OpenRCT2";
|
||||
repo = "OpenRCT2";
|
||||
rev = "v${openrct2-version}";
|
||||
sha256 = "sha256-38syOFZm0eGCI1vbJxG8truX5vuafwSG0lp2o499zUs=";
|
||||
sha256 = "sha256-TAe9b7uqdC8XzwDWZkyYKFV+Rn2AeR3MMBZ1lo9pRis=";
|
||||
};
|
||||
|
||||
objects-src = fetchFromGitHub {
|
||||
owner = "OpenRCT2";
|
||||
repo = "objects";
|
||||
rev = "v${objects-version}";
|
||||
sha256 = "sha256-S9fjgtb45vhRTWnYEgmIlKej5fGBtnhKOn35npmX70U=";
|
||||
sha256 = "sha256-6c6bbXFi6iqmOOfqggXv3DyYgo4+eiPUIDnkKAAhX5s=";
|
||||
};
|
||||
|
||||
title-sequences-src = fetchFromGitHub {
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, jdk8
|
||||
, jdk
|
||||
, jdk17
|
||||
, zlib
|
||||
, file
|
||||
, wrapQtAppsHook
|
||||
@ -20,7 +20,7 @@
|
||||
, tomlplusplus
|
||||
, ghc_filesystem
|
||||
, msaClientID ? ""
|
||||
, jdks ? [ jdk jdk8 ]
|
||||
, jdks ? [ jdk17 jdk8 ]
|
||||
}:
|
||||
|
||||
let
|
||||
@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-aIBaenSnssv0/r2+UT5R4nBwo2QBGZ1Zp0CWOeiaeDE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ extra-cmake-modules cmake file jdk wrapQtAppsHook ];
|
||||
nativeBuildInputs = [ extra-cmake-modules cmake file jdk17 wrapQtAppsHook ];
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qtsvg
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# This file is autogenerated! Run ./update.sh to regenerate.
|
||||
{
|
||||
version = "20221109";
|
||||
sourceHash = "sha256-77xRUo4g24j5rGWYzVn/DZ1rfY+Ks9cmZ/+GCHELP5E=";
|
||||
outputHash = "sha256-pPhqbi4PRr+0FQ7K8M/SibgYeI45spcdqgb5garyJo8=";
|
||||
version = "20221214";
|
||||
sourceHash = "sha256-vljUwXekmCYAH932wfbJe/hC4TDPRQOgEiPTUMeUKLE=";
|
||||
outputHash = "sha256-h0cCqnl6XvSoeyq54JHvl45z7qe/7ZKrcMNJJeqVLMk=";
|
||||
}
|
||||
|
||||
@ -1,8 +1,18 @@
|
||||
{ stdenvNoCC, lib, linuxPackages }:
|
||||
{ stdenvNoCC, lib, fetchFromGitHub }:
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "rtw89-firmware";
|
||||
inherit (linuxPackages.rtw89) version src;
|
||||
|
||||
# TODO: probably remove after updating linux firmware
|
||||
# https://github.com/lwfinger/rtw89/commit/a2c113501a5a988683f236df1aa79ce40f29e1be
|
||||
version = "unstable-2021-10-21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lwfinger";
|
||||
repo = "rtw89";
|
||||
rev = "0684157cba90e36bff5bc61a59e7e87c359b5e5c";
|
||||
sha256 = "0cvawyi1ksw9xkr8pzwipsl7b8hnmrb17w5cblyicwih8fqaw632";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "raspberrypi-eeprom";
|
||||
version = "2022.04.26-138a1";
|
||||
version = "2022.12.07-138a1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "raspberrypi";
|
||||
repo = "rpi-eeprom";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-/Y+EaAxJQofDRE67HY8AVqAdOPdFI01/EhYCAT5qlSM=";
|
||||
hash = "sha256-/Q9zj/Hn/8S7bF1CN6ZCg705VYU+QUagNr4RNgZl+oA=";
|
||||
};
|
||||
|
||||
buildInputs = [ python3 ];
|
||||
|
||||
@ -5,13 +5,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "rtw89";
|
||||
version = "unstable-2021-10-21";
|
||||
version = "unstable-2022-12-18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lwfinger";
|
||||
repo = "rtw89";
|
||||
rev = "0684157cba90e36bff5bc61a59e7e87c359b5e5c";
|
||||
sha256 = "0cvawyi1ksw9xkr8pzwipsl7b8hnmrb17w5cblyicwih8fqaw632";
|
||||
rev = "e834edfe8bee6e27e31c2f783817a9c13ff45665";
|
||||
sha256 = "19ApYiEvA0E6qgf5XQc03paZ+ghjZL8JoC3vSYYw3xU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = kernel.moduleBuildDependencies;
|
||||
@ -30,12 +30,12 @@ stdenv.mkDerivation {
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = " Driver for Realtek 8852AE, an 802.11ax device";
|
||||
description = " Driver for Realtek 8852AE, 8852BE, and 8853CE, 802.11ax devices";
|
||||
homepage = "https://github.com/lwfinger/rtw89";
|
||||
license = with licenses; [ gpl2Only ];
|
||||
maintainers = with maintainers; [ tvorog ];
|
||||
platforms = platforms.linux;
|
||||
broken = kernel.kernelOlder "5.4";
|
||||
broken = kernel.kernelOlder "5.7";
|
||||
priority = -1;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
{ lib, stdenv, buildGoModule, fetchFromGitHub
|
||||
, pkg-config, taglib, alsa-lib
|
||||
, zlib, AudioToolbox, AppKit
|
||||
, pkg-config, taglib, zlib
|
||||
|
||||
# Disable on-the-fly transcoding,
|
||||
# removing the dependency on ffmpeg.
|
||||
@ -8,32 +7,37 @@
|
||||
# to the original file, but if transcoding is configured
|
||||
# that takes a while. So best to disable all transcoding
|
||||
# in the configuration if you disable transcodingSupport.
|
||||
, transcodingSupport ? true, ffmpeg }:
|
||||
, transcodingSupport ? true, ffmpeg
|
||||
, mpv }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gonic";
|
||||
version = "0.14.0";
|
||||
version = "0.15.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sentriz";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-wX97HtvHgHpKTDwZl/wHQRpiyDJ7U38CpdzWu/CYizQ=";
|
||||
sha256 = "sha256-sTvdMLa7rwrTRDH5DR5nJCzzbtXM9y8mq63CNR1lVfI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ taglib zlib ]
|
||||
++ lib.optionals stdenv.isLinux [ alsa-lib ]
|
||||
++ lib.optionals stdenv.isDarwin [ AudioToolbox AppKit ];
|
||||
vendorSha256 = "sha256-oTuaA5ZsZ7zMcjzGh37zO/1XyOfj6xjfNr6A7ecrOiA=";
|
||||
buildInputs = [ taglib zlib ];
|
||||
vendorSha256 = "sha256-B9qzhh7FKkZPfuylxlyNP0blU5sjGwM6bLsw+vFkkb4=";
|
||||
|
||||
# TODO(Profpatsch): write a test for transcoding support,
|
||||
# since it is prone to break
|
||||
postPatch = lib.optionalString transcodingSupport ''
|
||||
substituteInPlace \
|
||||
server/encode/encode.go \
|
||||
transcode/transcode.go \
|
||||
--replace \
|
||||
'"ffmpeg"' \
|
||||
'"${lib.getBin ffmpeg}/bin/ffmpeg"'
|
||||
'`ffmpeg' \
|
||||
'`${lib.getBin ffmpeg}/bin/ffmpeg'
|
||||
'' + ''
|
||||
substituteInPlace \
|
||||
jukebox/jukebox.go \
|
||||
--replace \
|
||||
'"mpv"' \
|
||||
'"${lib.getBin mpv}/bin/mpv"'
|
||||
'';
|
||||
|
||||
meta = {
|
||||
@ -41,5 +45,6 @@ buildGoModule rec {
|
||||
description = "Music streaming server / subsonic server API implementation";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ Profpatsch ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user