mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 08:23:09 +00:00
Merge master into staging-next
This commit is contained in:
commit
bafb3e4e13
@ -4,7 +4,7 @@ let
|
||||
cfg = config.services.buildbot-master;
|
||||
opt = options.services.buildbot-master;
|
||||
|
||||
package = pkgs.python3.pkgs.toPythonModule cfg.package;
|
||||
package = cfg.package.python.pkgs.toPythonModule cfg.package;
|
||||
python = package.pythonModule;
|
||||
|
||||
escapeStr = lib.escape [ "'" ];
|
||||
|
@ -26,7 +26,7 @@ in
|
||||
How often or when garbage collection is performed. For most desktop and server systems
|
||||
a sufficient garbage collection is once a week.
|
||||
|
||||
The format is described in
|
||||
This value must be a calendar event in the format specified by
|
||||
{manpage}`systemd.time(7)`.
|
||||
'';
|
||||
};
|
||||
|
@ -50,6 +50,7 @@ let
|
||||
"junos-czerwonk"
|
||||
"kea"
|
||||
"keylight"
|
||||
"klipper"
|
||||
"knot"
|
||||
"lnd"
|
||||
"mail"
|
||||
|
@ -0,0 +1,55 @@
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
let
|
||||
cfg = config.services.prometheus.exporters.klipper;
|
||||
inherit (lib)
|
||||
mkOption
|
||||
mkMerge
|
||||
mkIf
|
||||
types
|
||||
concatStringsSep
|
||||
any
|
||||
optionalString
|
||||
;
|
||||
moonraker = config.services.moonraker;
|
||||
in
|
||||
{
|
||||
port = 9101;
|
||||
extraOpts = {
|
||||
package = lib.mkPackageOption pkgs "prometheus-klipper-exporter" { };
|
||||
|
||||
moonrakerApiKey = mkOption {
|
||||
type = types.str;
|
||||
default = "";
|
||||
description = ''
|
||||
API Key to authenticate with the Moonraker APIs.
|
||||
Only needed if the host running the exporter is not a trusted client to Moonraker.
|
||||
'';
|
||||
};
|
||||
};
|
||||
serviceOpts = mkMerge (
|
||||
[
|
||||
{
|
||||
serviceConfig = {
|
||||
ExecStart = concatStringsSep " " [
|
||||
"${cfg.package}/bin/prometheus-klipper-exporter"
|
||||
(optionalString (cfg.moonrakerApiKey != "") "--moonraker.apikey ${cfg.moonrakerApiKey}")
|
||||
"--web.listen-address ${cfg.listenAddress}:${toString cfg.port}"
|
||||
"${concatStringsSep " " cfg.extraFlags}"
|
||||
];
|
||||
};
|
||||
}
|
||||
]
|
||||
++ [
|
||||
(mkIf config.services.moonraker.enable {
|
||||
after = [ "moonraker.service" ];
|
||||
requires = [ "moonraker.service" ];
|
||||
})
|
||||
]
|
||||
);
|
||||
}
|
@ -44,6 +44,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://xiph.org/flac/";
|
||||
description = "Library and tools for encoding and decoding the FLAC lossless audio file format";
|
||||
changelog = "https://xiph.org/flac/changelog.html";
|
||||
mainProgram = "flac";
|
||||
platforms = platforms.all;
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ ruuda ];
|
||||
|
54
pkgs/applications/blockchains/polkadot/Cargo.lock
generated
54
pkgs/applications/blockchains/polkadot/Cargo.lock
generated
@ -788,7 +788,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "asset-hub-rococo-runtime"
|
||||
version = "0.22.0"
|
||||
version = "0.22.1"
|
||||
dependencies = [
|
||||
"asset-test-utils",
|
||||
"assets-common",
|
||||
@ -920,7 +920,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "asset-hub-westend-runtime"
|
||||
version = "0.26.0"
|
||||
version = "0.26.1"
|
||||
dependencies = [
|
||||
"asset-test-utils",
|
||||
"assets-common",
|
||||
@ -1752,7 +1752,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "bp-header-chain"
|
||||
version = "0.18.0"
|
||||
version = "0.18.1"
|
||||
dependencies = [
|
||||
"bp-runtime",
|
||||
"bp-test-utils",
|
||||
@ -2034,6 +2034,7 @@ dependencies = [
|
||||
"staging-xcm",
|
||||
"staging-xcm-executor",
|
||||
"testnet-parachains-constants",
|
||||
"xcm-runtime-apis",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -2227,6 +2228,7 @@ dependencies = [
|
||||
"staging-xcm",
|
||||
"staging-xcm-executor",
|
||||
"testnet-parachains-constants",
|
||||
"xcm-runtime-apis",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -3980,7 +3982,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "cumulus-client-service"
|
||||
version = "0.18.0"
|
||||
version = "0.19.0"
|
||||
dependencies = [
|
||||
"cumulus-client-cli",
|
||||
"cumulus-client-collator",
|
||||
@ -4050,7 +4052,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "cumulus-pallet-parachain-system"
|
||||
version = "0.17.0"
|
||||
version = "0.17.1"
|
||||
dependencies = [
|
||||
"assert_matches",
|
||||
"bytes",
|
||||
@ -4298,7 +4300,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "cumulus-relay-chain-inprocess-interface"
|
||||
version = "0.18.0"
|
||||
version = "0.19.0"
|
||||
dependencies = [
|
||||
"async-trait",
|
||||
"cumulus-primitives-core",
|
||||
@ -4344,7 +4346,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "cumulus-relay-chain-minimal-node"
|
||||
version = "0.18.0"
|
||||
version = "0.19.0"
|
||||
dependencies = [
|
||||
"array-bytes",
|
||||
"async-trait",
|
||||
@ -5117,7 +5119,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "emulated-integration-tests-common"
|
||||
version = "14.0.0"
|
||||
version = "14.1.0"
|
||||
dependencies = [
|
||||
"asset-test-utils",
|
||||
"bp-messages",
|
||||
@ -8766,7 +8768,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "mmr-rpc"
|
||||
version = "37.0.0"
|
||||
version = "38.0.0"
|
||||
dependencies = [
|
||||
"jsonrpsee",
|
||||
"parity-scale-codec",
|
||||
@ -10844,7 +10846,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "pallet-message-queue"
|
||||
version = "41.0.0"
|
||||
version = "41.0.1"
|
||||
dependencies = [
|
||||
"environmental",
|
||||
"frame-benchmarking",
|
||||
@ -12035,7 +12037,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "pallet-xcm-bridge-hub-router"
|
||||
version = "0.15.0"
|
||||
version = "0.15.1"
|
||||
dependencies = [
|
||||
"bp-xcm-bridge-hub-router",
|
||||
"frame-benchmarking",
|
||||
@ -12869,7 +12871,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "polkadot"
|
||||
version = "17.0.0"
|
||||
version = "18.0.0"
|
||||
dependencies = [
|
||||
"assert_cmd",
|
||||
"color-eyre",
|
||||
@ -13021,7 +13023,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "polkadot-cli"
|
||||
version = "18.0.0"
|
||||
version = "19.0.0"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"clap 4.5.11",
|
||||
@ -13695,7 +13697,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "polkadot-node-network-protocol"
|
||||
version = "18.0.0"
|
||||
version = "18.0.1"
|
||||
dependencies = [
|
||||
"async-channel",
|
||||
"async-trait",
|
||||
@ -13875,7 +13877,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "polkadot-parachain-bin"
|
||||
version = "6.0.0"
|
||||
version = "7.0.0"
|
||||
dependencies = [
|
||||
"asset-hub-rococo-runtime",
|
||||
"asset-hub-westend-runtime",
|
||||
@ -13913,7 +13915,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "polkadot-parachain-lib"
|
||||
version = "0.2.0"
|
||||
version = "0.3.0"
|
||||
dependencies = [
|
||||
"assert_cmd",
|
||||
"async-trait",
|
||||
@ -14037,7 +14039,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "polkadot-rpc"
|
||||
version = "18.0.0"
|
||||
version = "19.0.0"
|
||||
dependencies = [
|
||||
"jsonrpsee",
|
||||
"mmr-rpc",
|
||||
@ -14137,7 +14139,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "polkadot-runtime-parachains"
|
||||
version = "17.0.0"
|
||||
version = "17.0.1"
|
||||
dependencies = [
|
||||
"assert_matches",
|
||||
"bitflags 1.3.2",
|
||||
@ -14197,7 +14199,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "polkadot-sdk"
|
||||
version = "0.6.0"
|
||||
version = "0.7.0"
|
||||
dependencies = [
|
||||
"asset-test-utils",
|
||||
"assets-common",
|
||||
@ -14699,7 +14701,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "polkadot-service"
|
||||
version = "18.0.0"
|
||||
version = "19.0.0"
|
||||
dependencies = [
|
||||
"assert_matches",
|
||||
"async-trait",
|
||||
@ -17311,7 +17313,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "sc-client-db"
|
||||
version = "0.44.0"
|
||||
version = "0.44.1"
|
||||
dependencies = [
|
||||
"array-bytes",
|
||||
"criterion",
|
||||
@ -17856,7 +17858,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "sc-network"
|
||||
version = "0.45.0"
|
||||
version = "0.45.1"
|
||||
dependencies = [
|
||||
"array-bytes",
|
||||
"assert_matches",
|
||||
@ -17961,7 +17963,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "sc-network-light"
|
||||
version = "0.44.0"
|
||||
version = "0.44.1"
|
||||
dependencies = [
|
||||
"array-bytes",
|
||||
"async-channel",
|
||||
@ -18000,7 +18002,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "sc-network-sync"
|
||||
version = "0.44.0"
|
||||
version = "0.44.1"
|
||||
dependencies = [
|
||||
"array-bytes",
|
||||
"async-channel",
|
||||
@ -18072,7 +18074,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "sc-network-transactions"
|
||||
version = "0.44.0"
|
||||
version = "0.44.1"
|
||||
dependencies = [
|
||||
"array-bytes",
|
||||
"futures",
|
||||
@ -20992,7 +20994,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "staging-xcm-builder"
|
||||
version = "17.0.0"
|
||||
version = "17.0.1"
|
||||
dependencies = [
|
||||
"assert_matches",
|
||||
"frame-support",
|
||||
|
@ -1,15 +1,16 @@
|
||||
{ fetchFromGitHub
|
||||
, lib
|
||||
, openssl
|
||||
, pkg-config
|
||||
, protobuf
|
||||
, rocksdb_8_3
|
||||
, rust-jemalloc-sys-unprefixed
|
||||
, rustPlatform
|
||||
, rustc
|
||||
, stdenv
|
||||
, Security
|
||||
, SystemConfiguration
|
||||
{
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
openssl,
|
||||
pkg-config,
|
||||
protobuf,
|
||||
rocksdb_8_3,
|
||||
rust-jemalloc-sys-unprefixed,
|
||||
rustPlatform,
|
||||
rustc,
|
||||
stdenv,
|
||||
Security,
|
||||
SystemConfiguration,
|
||||
}:
|
||||
|
||||
let
|
||||
@ -17,13 +18,13 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "polkadot";
|
||||
version = "stable2409";
|
||||
version = "stable2409-1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paritytech";
|
||||
repo = "polkadot-sdk";
|
||||
rev = "polkadot-${version}";
|
||||
hash = "sha256-QNjk2lb04VLYpwbE7hmUVaujijX9nkZxVdseTS1G85E=";
|
||||
hash = "sha256-SbQaauElMNuCg0q6aN0ckg39huNZyiq8px9iXWFFtyc=";
|
||||
|
||||
# the build process of polkadot requires a .git folder in order to determine
|
||||
# the git commit hash that is being built and add it to the version string.
|
||||
@ -53,7 +54,10 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
buildType = "production";
|
||||
|
||||
cargoBuildFlags = [ "-p" "polkadot" ];
|
||||
cargoBuildFlags = [
|
||||
"-p"
|
||||
"polkadot"
|
||||
];
|
||||
|
||||
# NOTE: tests currently fail to compile due to an issue with cargo-auditable
|
||||
# and resolution of features flags, potentially related to this:
|
||||
@ -68,9 +72,13 @@ rustPlatform.buildRustPackage rec {
|
||||
];
|
||||
|
||||
# NOTE: jemalloc is used by default on Linux with unprefixed enabled
|
||||
buildInputs = [ openssl ] ++
|
||||
lib.optionals stdenv.hostPlatform.isLinux [ rust-jemalloc-sys-unprefixed ] ++
|
||||
lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ];
|
||||
buildInputs =
|
||||
[ openssl ]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [ rust-jemalloc-sys-unprefixed ]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
Security
|
||||
SystemConfiguration
|
||||
];
|
||||
|
||||
# NOTE: disable building `core`/`std` in wasm environment since rust-src isn't
|
||||
# available for `rustc-wasm32`
|
||||
@ -84,8 +92,15 @@ rustPlatform.buildRustPackage rec {
|
||||
description = "Polkadot Node Implementation";
|
||||
homepage = "https://polkadot.network";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ akru andresilva FlorianFranzen RaghavSood ];
|
||||
maintainers = with maintainers; [
|
||||
akru
|
||||
andresilva
|
||||
FlorianFranzen
|
||||
RaghavSood
|
||||
];
|
||||
# See Iso::from_arch in src/isa/mod.rs in cranelift-codegen-meta.
|
||||
platforms = intersectLists platforms.unix (platforms.aarch64 ++ platforms.s390x ++ platforms.riscv64 ++ platforms.x86);
|
||||
platforms = intersectLists platforms.unix (
|
||||
platforms.aarch64 ++ platforms.s390x ++ platforms.riscv64 ++ platforms.x86
|
||||
);
|
||||
};
|
||||
}
|
||||
|
@ -69,9 +69,9 @@ in rec {
|
||||
|
||||
unstable = fetchurl rec {
|
||||
# NOTE: Don't forget to change the hash for staging as well.
|
||||
version = "9.19";
|
||||
version = "9.20";
|
||||
url = "https://dl.winehq.org/wine/source/9.x/wine-${version}.tar.xz";
|
||||
hash = "sha256-LBOgw/MfJaVNQV2GeFoa1G74oHrpc7a2mTRaRSBqwBU=";
|
||||
hash = "sha256-lfK0WxRYElvn2fzMlMpfjM4KXkrhHQ0ZPPt93bNeeoY=";
|
||||
inherit (stable) patches;
|
||||
|
||||
## see http://wiki.winehq.org/Gecko
|
||||
@ -117,7 +117,7 @@ in rec {
|
||||
staging = fetchFromGitLab rec {
|
||||
# https://gitlab.winehq.org/wine/wine-staging
|
||||
inherit (unstable) version;
|
||||
hash = "sha256-TKW8y8kPsI0af/nEr3rU9nH49I77u+/6CHE64JgdkOU=";
|
||||
hash = "sha256-ewozuCtYPaV9d4XD9sdRGMfJcBIE13TC5vNEWdbcGCs=";
|
||||
domain = "gitlab.winehq.org";
|
||||
owner = "wine";
|
||||
repo = "wine-staging";
|
||||
|
@ -399,13 +399,13 @@
|
||||
"vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw="
|
||||
},
|
||||
"equinix": {
|
||||
"hash": "sha256-FFUmNDP10Aqj5aBWuYYO1redZlXMNVLEskQAjPSgXoY=",
|
||||
"hash": "sha256-RlJsM5gZPHQxE7Lab2J1MVFL1YaSz2kC/1F68Nep1jc=",
|
||||
"homepage": "https://registry.terraform.io/providers/equinix/equinix",
|
||||
"owner": "equinix",
|
||||
"repo": "terraform-provider-equinix",
|
||||
"rev": "v2.8.0",
|
||||
"rev": "v2.9.0",
|
||||
"spdx": "MIT",
|
||||
"vendorHash": "sha256-k9NmPXtvjLDWDGMbloJwErNkzuJVe8T6lnlYE2iO5w4="
|
||||
"vendorHash": "sha256-D08K1+0m5HcLTr6VfP0adMdTBh6st4cQyWf95fd6GlY="
|
||||
},
|
||||
"exoscale": {
|
||||
"hash": "sha256-fS7ZK+d7paUoaPuxXh6N6Sw38dzlxOAVCHgsHUL2Gz8=",
|
||||
|
@ -11,7 +11,7 @@ buildGoModule rec {
|
||||
version = "0.12.1";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "maxwell.ydns.eu/git";
|
||||
domain = "maxwell.eurofusion.eu/git";
|
||||
owner = "rnhmjoj";
|
||||
repo = "magnetico";
|
||||
rev = "v${version}";
|
||||
@ -31,7 +31,7 @@ buildGoModule rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Autonomous (self-hosted) BitTorrent DHT search engine suite";
|
||||
homepage = "https://maxwell.ydns.eu/git/rnhmjoj/magnetico";
|
||||
homepage = "https://maxwell.eurofusion.eu/git/rnhmjoj/magnetico";
|
||||
license = licenses.agpl3Only;
|
||||
badPlatforms = platforms.darwin;
|
||||
maintainers = with maintainers; [ rnhmjoj ];
|
||||
|
@ -1,7 +1,9 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchFromGitLab
|
||||
, fetchpatch
|
||||
, autoreconfHook269
|
||||
, autoconf-archive
|
||||
, pkg-config
|
||||
, gtk3
|
||||
, fribidi
|
||||
@ -24,9 +26,12 @@ stdenv.mkDerivation rec {
|
||||
pname = "abiword";
|
||||
version = "3.0.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.abisource.com/downloads/abiword/${version}/source/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-ElckfplwUI1tFFbT4zDNGQnEtCsl4PChvDJSbW86IbQ=";
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "World";
|
||||
repo = "AbiWord";
|
||||
rev = "refs/tags/release-${version}";
|
||||
hash = "sha256-Z55qPm4MYwbG8bvXpX2TH8bxQaJjvb3Em1ymM1XwGqo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -38,6 +43,8 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook269
|
||||
autoconf-archive
|
||||
pkg-config
|
||||
wrapGAppsHook3
|
||||
perl
|
||||
@ -62,10 +69,18 @@ stdenv.mkDerivation rec {
|
||||
strictDeps = true;
|
||||
enableParallelBuilding = true;
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs ./tools/cdump/xp/cdump.pl ./po/ui-backport.pl
|
||||
'';
|
||||
|
||||
preAutoreconf = ''
|
||||
./autogen-common.sh
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Word processing program, similar to Microsoft Word";
|
||||
mainProgram = "abiword";
|
||||
homepage = "https://www.abisource.com/";
|
||||
homepage = "https://gitlab.gnome.org/World/AbiWord/";
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ pSub ylwghst sna ];
|
||||
|
@ -25,14 +25,14 @@ let
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
version = "16.2.21";
|
||||
version = "16.3.1";
|
||||
pname = "jmol";
|
||||
|
||||
src = let
|
||||
baseVersion = "${lib.versions.major version}.${lib.versions.minor version}";
|
||||
in fetchurl {
|
||||
url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz";
|
||||
hash = "sha256-9gIOrHoy0JyoPXaHOfBDHCL+ykmmHNam+Um12sHqZsE=";
|
||||
hash = "sha256-mjID6o+2yhzKd1g3MO4as1dA11nhessjzCDHSUyUQBw=";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
@ -49,7 +49,7 @@
|
||||
, zlib
|
||||
, gsl
|
||||
, ntl
|
||||
, jdk
|
||||
, jre8
|
||||
, less
|
||||
}:
|
||||
|
||||
@ -96,7 +96,7 @@ let
|
||||
ecm
|
||||
lcalc
|
||||
rubiks
|
||||
jdk # only needed for `jmol` which may be replaced in the future
|
||||
jre8 # only needed for `jmol` (https://sourceforge.net/p/jmol/mailman/message/58818762/), which will be optional in sage 10.5
|
||||
less # needed to prevent transient test errors until https://github.com/ipython/ipython/pull/11864 is resolved
|
||||
]
|
||||
));
|
||||
|
33
pkgs/by-name/ce/certinfo-go/package.nix
Normal file
33
pkgs/by-name/ce/certinfo-go/package.nix
Normal file
@ -0,0 +1,33 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "certinfo-go";
|
||||
version = "0.1.36";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paepckehh";
|
||||
repo = "certinfo";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ySXp5dPdGhBEbo9uvCsINCufhm9j/dIX0Jn+Ou73NjM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-wrz33FSBz4Kg9aYCj7/Pq07bP73MV9iSQKc3X39OkHc=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/paepckehh/certinfo/releases/tag/v${version}";
|
||||
homepage = "https://paepcke.de/certinfo";
|
||||
description = "Tool to analyze and troubleshoot x.509 & ssh certificates, encoded keys, ...";
|
||||
license = lib.licenses.bsd3;
|
||||
mainProgram = "certinfo";
|
||||
maintainers = with lib.maintainers; [ paepcke ];
|
||||
};
|
||||
}
|
50
pkgs/by-name/cl/clipcat/0001-fix-build.patch
Normal file
50
pkgs/by-name/cl/clipcat/0001-fix-build.patch
Normal file
@ -0,0 +1,50 @@
|
||||
From 9ba11f90c4364529f220c44a3266926bf8f6a4b4 Mon Sep 17 00:00:00 2001
|
||||
From: wxt <3264117476@qq.com>
|
||||
Date: Tue, 22 Oct 2024 18:43:20 +0800
|
||||
Subject: [PATCH] fix build
|
||||
|
||||
---
|
||||
Cargo.toml | 1 -
|
||||
crates/proto/build.rs | 1 -
|
||||
crates/proto/src/lib.rs | 1 -
|
||||
3 files changed, 3 deletions(-)
|
||||
|
||||
diff --git a/Cargo.toml b/Cargo.toml
|
||||
index 8deae48..214a0e3 100644
|
||||
--- a/Cargo.toml
|
||||
+++ b/Cargo.toml
|
||||
@@ -122,7 +122,6 @@ clipcat-server = { path = "./crates/server" }
|
||||
|
||||
[workspace.lints.rust]
|
||||
async_fn_in_trait = "allow"
|
||||
-box_pointers = "allow"
|
||||
|
||||
# TODO: deny `unused_crate_dependencies` after https://github.com/rust-lang/rust/issues/95513 being solved
|
||||
unused_crate_dependencies = "allow"
|
||||
diff --git a/crates/proto/build.rs b/crates/proto/build.rs
|
||||
index 5e38f62..d6ba4be 100644
|
||||
--- a/crates/proto/build.rs
|
||||
+++ b/crates/proto/build.rs
|
||||
@@ -6,7 +6,6 @@ fn prost_config() -> Config {
|
||||
config
|
||||
}
|
||||
|
||||
-#[allow(box_pointers)]
|
||||
fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||
tonic_build::configure().compile_with_config(
|
||||
prost_config(),
|
||||
diff --git a/crates/proto/src/lib.rs b/crates/proto/src/lib.rs
|
||||
index a7205ab..e4dcd02 100644
|
||||
--- a/crates/proto/src/lib.rs
|
||||
+++ b/crates/proto/src/lib.rs
|
||||
@@ -2,7 +2,6 @@ mod utils;
|
||||
mod proto {
|
||||
// SAFETY: allow: prost
|
||||
#![allow(
|
||||
- box_pointers,
|
||||
unreachable_pub,
|
||||
unused_qualifications,
|
||||
unused_results,
|
||||
--
|
||||
2.46.1
|
||||
|
@ -1,10 +1,11 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
, protobuf
|
||||
, installShellFiles
|
||||
, darwin
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
protobuf,
|
||||
installShellFiles,
|
||||
darwin,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
@ -13,8 +14,8 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xrelkd";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
repo = "clipcat";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-95y/HiLmhqt1DFmAxLg/W7lr/9dfVtce4+tx+vG2Nuw=";
|
||||
};
|
||||
|
||||
@ -28,10 +29,13 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
nativeBuildInputs = [
|
||||
protobuf
|
||||
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
patches = [
|
||||
./0001-fix-build.patch
|
||||
];
|
||||
|
||||
checkFlags = [
|
||||
# Some test cases interact with X11, skip them
|
||||
"--skip=test_x11_clipboard"
|
||||
@ -47,12 +51,12 @@ rustPlatform.buildRustPackage rec {
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Clipboard Manager written in Rust Programming Language";
|
||||
homepage = "https://github.com/xrelkd/clipcat";
|
||||
license = licenses.gpl3Only;
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
maintainers = with maintainers; [ xrelkd ];
|
||||
license = lib.licenses.gpl3Only;
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
maintainers = with lib.maintainers; [ xrelkd bot-wxt1221 ];
|
||||
mainProgram = "clipcatd";
|
||||
};
|
||||
}
|
||||
|
@ -9,13 +9,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cue";
|
||||
version = "0.10.0";
|
||||
version = "0.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cue-lang";
|
||||
repo = "cue";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-GvReoBP8QCdrKxox8yPLZEk5YvTvwr7kflpS/jN8GTg=";
|
||||
hash = "sha256-CwPD+JUoKcs0HqWuZYH2c8AdwK6X0SS3aNGpkcPZ4C4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-sLTpra7JwgF4l1UCrUtzQA4xrP4OqxBcZ1qEssBdFtk=";
|
||||
|
@ -10,13 +10,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dpp";
|
||||
version = "10.0.31";
|
||||
version = "10.0.32";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "brainboxdotcc";
|
||||
repo = "DPP";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-IsgYGfPcqiJBQ1MM97jI7ksvc49ZcCn3i6/yMe8zLjY=";
|
||||
hash = "sha256-pr7u4x4xdyydEQcNROjfkoV/ODqixugcTuCWMGeixC8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -29,13 +29,13 @@ let
|
||||
in
|
||||
stdenv'.mkDerivation (finalAttrs: {
|
||||
pname = "dune3d";
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dune3d";
|
||||
repo = "dune3d";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-Z/kdOc/MbnnEyRsel3aZGndTAy1eCdAK0Wdta0HxaE4=";
|
||||
hash = "sha256-oS10xek4IyRrjZTBvDsjqCA9NE93vzB0W9iQEm2IMf4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -48,13 +48,13 @@ let
|
||||
in
|
||||
stdenv'.mkDerivation (finalAttrs: {
|
||||
pname = "fastfetch";
|
||||
version = "2.27.1";
|
||||
version = "2.28.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fastfetch-cli";
|
||||
repo = "fastfetch";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-N/C6vGNebOFQ5RRpHD2hTqvHbX5mwICqIeFsdSCjaR4=";
|
||||
hash = "sha256-fkAtBO9POd3JKNNt0jV1ufIN1s8HaFW7P2+32cRycWs=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
@ -16,17 +16,17 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "grafana-alloy";
|
||||
version = "1.4.1";
|
||||
version = "1.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "grafana";
|
||||
repo = "alloy";
|
||||
hash = "sha256-/LCp4PUt85HR+ig0/v7KlS1cFcFGpI8TXHk3IlcEkvk=";
|
||||
hash = "sha256-ISSmTdX/LgbreoGJry33xdOO9J98nh8SZBJwEFsFyvY=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-fhUoQGNRoWNbU5U21X45s+eJ8XjCkvYULTRShyq0f3E=";
|
||||
vendorHash = "sha256-O7x71Ghd8zI2Ns8Jj/Z5FWXKjyeHaPD8gyNmpwpIems=";
|
||||
|
||||
nativeBuildInputs = [ fixup-yarn-lock yarn nodejs installShellFiles ];
|
||||
|
||||
@ -62,7 +62,7 @@ buildGoModule rec {
|
||||
|
||||
yarnOfflineCache = fetchYarnDeps {
|
||||
yarnLock = "${src}/internal/web/ui/yarn.lock";
|
||||
hash = "sha256-Y0WcmjFtiNXue2kcJGlvHVBGmMLewGICISoRHnBPHGw=";
|
||||
hash = "sha256-Q4IrOfCUlXM/5577Wk8UCIs76+XbuoHz7sIEJJTMKc4=";
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
|
@ -1,54 +1,73 @@
|
||||
{ lib, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, xorg
|
||||
, freetype
|
||||
, alsa-lib
|
||||
, curl
|
||||
, libjack2
|
||||
, lv2
|
||||
, pkg-config
|
||||
, libGLU
|
||||
, libGL
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
xorg,
|
||||
freetype,
|
||||
alsa-lib,
|
||||
curl,
|
||||
libjack2,
|
||||
lv2,
|
||||
pkg-config,
|
||||
libGLU,
|
||||
libGL,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
version = "0.9.0";
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "helm";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mtytel";
|
||||
repo = "helm";
|
||||
rev = "927d2ed27f71a735c3ff2a1226ce3129d1544e7e";
|
||||
sha256 = "17ys2vvhncx9i3ydg3xwgz1d3gqv4yr5mqi7vr0i0ca6nad6x3d4";
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
hash = "sha256-pI1umrJGMRBB3ifiWrInG7/Rwn+8j9f8iKkzC/cW2p8=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
xorg.libX11 xorg.libXcomposite xorg.libXcursor xorg.libXext
|
||||
xorg.libXinerama xorg.libXrender xorg.libXrandr
|
||||
freetype alsa-lib curl libjack2 libGLU libGL lv2
|
||||
xorg.libX11
|
||||
xorg.libXcomposite
|
||||
xorg.libXcursor
|
||||
xorg.libXext
|
||||
xorg.libXinerama
|
||||
xorg.libXrender
|
||||
xorg.libXrandr
|
||||
freetype
|
||||
alsa-lib
|
||||
curl
|
||||
libjack2
|
||||
libGLU
|
||||
libGL
|
||||
lv2
|
||||
];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
CXXFLAGS = "-DHAVE_LROUND";
|
||||
CXXFLAGS = [
|
||||
"-DHAVE_LROUND"
|
||||
"-fpermissive"
|
||||
];
|
||||
enableParallelBuilding = true;
|
||||
makeFlags = [ "DESTDIR=$(out)" ];
|
||||
makeFlags = [ "DESTDIR=${placeholder "out"}" ];
|
||||
|
||||
patches = [
|
||||
# gcc9 compatibility https://github.com/mtytel/helm/pull/233
|
||||
(fetchpatch {
|
||||
url = "https://github.com/mtytel/helm/commit/cb611a80bd5a36d31bfc31212ebbf79aa86c6f08.patch";
|
||||
sha256 = "1i2289srcfz17c3zzab6f51aznzdj62kk53l4afr32bkjh9s4ixk";
|
||||
hash = "sha256-s0eiE5RziZGdInSUOYWR7duvQnFmqf8HO+E7lnVCQsQ=";
|
||||
})
|
||||
];
|
||||
|
||||
prePatch = ''
|
||||
sed -i 's|usr/||g' Makefile
|
||||
sed -i "s|/usr/share/|$out/share/|" src/common/load_save.cpp
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile \
|
||||
--replace-fail "usr/" ""
|
||||
|
||||
substituteInPlace src/common/load_save.cpp \
|
||||
--replace-fail "/usr/share/" "$out/share/"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://tytel.org/helm";
|
||||
meta = {
|
||||
homepage = "https://tytel.org/helm";
|
||||
description = "Free, cross-platform, polyphonic synthesizer";
|
||||
longDescription = ''
|
||||
A free, cross-platform, polyphonic synthesizer.
|
||||
@ -68,8 +87,11 @@
|
||||
Effects: Formant filter, stutter, delay
|
||||
'';
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = [ maintainers.magnetophon ];
|
||||
platforms = platforms.linux;
|
||||
maintainers = with lib.maintainers; [
|
||||
magnetophon
|
||||
bot-wxt1221
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "helm";
|
||||
};
|
||||
}
|
||||
})
|
@ -7,23 +7,24 @@
|
||||
, makeWrapper
|
||||
, copyDesktopItems
|
||||
, makeDesktopItem
|
||||
, nix-update-script
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "legcord";
|
||||
version = "1.0.1";
|
||||
version = "1.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Legcord";
|
||||
repo = "Legcord";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-R2mtE3L2cJgmbWT0aMoDbnM5tiyPk+dnPBedq8ro1lY=";
|
||||
hash = "sha256-YmNRkNN7lWHMbUiGOxPa9b+TaLybj1XE7AonCnB88KY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pnpm.configHook nodejs makeWrapper copyDesktopItems ];
|
||||
|
||||
pnpmDeps = pnpm.fetchDeps {
|
||||
inherit pname version src;
|
||||
hash = "sha256-73v8xkidY9IBUFz/M0BYEVGnoVsr3uh3jP0p6T8QBbA=";
|
||||
hash = "sha256-ZPTp6l7qtvgsYPY6FZvhuYxD8TdkBkaQO2SG1fQzU7s=";
|
||||
};
|
||||
|
||||
ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
|
||||
@ -72,6 +73,8 @@ stdenv.mkDerivation rec {
|
||||
})
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = with lib; {
|
||||
description = "Lightweight, alternative desktop client for Discord";
|
||||
homepage = "https://legcord.app";
|
||||
|
@ -1,29 +1,30 @@
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, curl, openssl, Security }:
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
curl,
|
||||
openssl,
|
||||
darwin,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libhv";
|
||||
version = "1.3.2";
|
||||
version = "1.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ithewei";
|
||||
repo = "libhv";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-tVuQwj2HvAhp51urGCuNPjBEIaTu9yR031Ih/5or9Pk=";
|
||||
hash = "sha256-N2YD84eORA5nDpeeqy9jCvRx86PkRaKLzI6LF1AnHtU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build failure on gcc-13:
|
||||
# https://github.com/ithewei/libhv/pull/490
|
||||
(fetchpatch {
|
||||
name = "gcc-13.patch";
|
||||
url = "https://github.com/ithewei/libhv/commit/b3e61519fbdbbb956fed275c0a849ba5d4d6e45c.patch";
|
||||
hash = "sha256-fuYI+B3qZkSAbLZc0p6/0fnqaHx6w9N9vhTEE2t6UUs=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = [ curl openssl ] ++ lib.optional stdenv.hostPlatform.isDarwin Security;
|
||||
buildInputs = [
|
||||
curl
|
||||
openssl
|
||||
] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security;
|
||||
|
||||
cmakeFlags = [
|
||||
"-DENABLE_UDS=ON"
|
@ -15,13 +15,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "maa-cli";
|
||||
version = "0.4.12";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MaaAssistantArknights";
|
||||
repo = "maa-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-cq1FCsBHwcL8a51MswG/5TvyzSbtOvqw06OZfIXDVwg=";
|
||||
hash = "sha256-k2mDqsxM6eveIFfdRu6ZxRsIgkA2qZxLfLNeWAEFCfs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec {
|
||||
buildNoDefaultFeatures = true;
|
||||
buildFeatures = [ "git2" ];
|
||||
|
||||
cargoHash = "sha256-eXgZt8sLbHkVNWqFv8Zdq7xrFBi1YhKI8Js0OT2Npi8=";
|
||||
cargoHash = "sha256-w34+3zRn4ZGA2aZZ3+lZqo4/QcDSpmt1HNb+gZtAavI=";
|
||||
|
||||
# maa-cli would only seach libMaaCore.so and resources in itself's path
|
||||
# https://github.com/MaaAssistantArknights/maa-cli/issues/67
|
||||
|
84
pkgs/by-name/ms/msedgedriver/package.nix
Normal file
84
pkgs/by-name/ms/msedgedriver/package.nix
Normal file
@ -0,0 +1,84 @@
|
||||
{
|
||||
autoPatchelfHook,
|
||||
fetchzip,
|
||||
glib,
|
||||
lib,
|
||||
libxcb,
|
||||
nspr,
|
||||
nss,
|
||||
stdenvNoCC,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "msedgedriver";
|
||||
# finding a version that has all 4 builds is a pain
|
||||
# https://msedgewebdriverstorage.z22.web.core.windows.net/?form=MA13LH
|
||||
version = "130.0.2849.1";
|
||||
|
||||
src =
|
||||
let
|
||||
inherit (stdenvNoCC.hostPlatform) system;
|
||||
selectSystem = attrs: attrs.${system} or (throw "Unsupported system: ${system}");
|
||||
suffix = selectSystem {
|
||||
x86_64-linux = "linux64";
|
||||
aarch64-linux = "arm64";
|
||||
x86_64-darwin = "mac64";
|
||||
aarch64-darwin = "mac64_m1";
|
||||
};
|
||||
|
||||
hash = selectSystem {
|
||||
x86_64-linux = "sha256-U6YGD2PAhVUa7f+R5pmKLazGLOBbf3bRqzlwIJewA+w=";
|
||||
aarch64-linux = "sha256-QJ1jRw8kkWbT8US5qI8DMZI/7Q8yJWpFXrfzGdxDWKE=";
|
||||
x86_64-darwin = "sha256-Ejcv1DtuEiLJvTsv48AwoCQlFO3xM9PkM3HvZG65AC4=";
|
||||
aarch64-darwin = "sha256-ykn4bYREE6xmJY02WiCRGsGnyWjnmnZM8FemK4XZqhc=";
|
||||
};
|
||||
in
|
||||
fetchzip {
|
||||
url = "https://msedgedriver.azureedge.net/${finalAttrs.version}/edgedriver_${suffix}.zip";
|
||||
inherit hash;
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
libxcb
|
||||
nspr
|
||||
nss
|
||||
];
|
||||
|
||||
nativeBuildInputs = lib.optionals (!stdenvNoCC.hostPlatform.isDarwin) [ autoPatchelfHook ];
|
||||
|
||||
installPhase =
|
||||
if stdenvNoCC.hostPlatform.isDarwin then
|
||||
''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/{Applications/msedgedriver,bin}
|
||||
cp -R . $out/Applications/msedgedriver
|
||||
|
||||
runHook postInstall
|
||||
''
|
||||
else
|
||||
''
|
||||
runHook preInstall
|
||||
|
||||
install -m777 -D "msedgedriver" $out/bin/msedgedriver
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://developer.microsoft.com/en-us/microsoft-edge/tools/webdriver";
|
||||
description = "WebDriver implementation that controls an Edge browser running on the local machine";
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
license = lib.licenses.unfree;
|
||||
maintainers = with lib.maintainers; [ cholli ];
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"aarch64-linux"
|
||||
"x86_64-darwin"
|
||||
"aarch64-darwin"
|
||||
];
|
||||
mainProgram = "msedgedriver";
|
||||
};
|
||||
})
|
@ -14,12 +14,12 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "openjump";
|
||||
version = "2.2.1";
|
||||
revision = "r5222%5B94156e5%5D";
|
||||
version = "2.3.0";
|
||||
revision = "r5279%5Bd24616e%5D";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/jump-pilot/OpenJUMP/${finalAttrs.version}/OpenJUMP-Portable-${finalAttrs.version}-${finalAttrs.revision}-PLUS.zip";
|
||||
hash = "sha256-+/AMmD6NDPy+2Gq1Ji5i/QWGU7FOsU+kKsWoNXcx/VI=";
|
||||
hash = "sha256-IO44iGnFQt/ir1WlvBrEHjdC+0DZTfJIVAJgRcxrFMI=";
|
||||
};
|
||||
|
||||
# TODO: build from source
|
||||
|
66
pkgs/by-name/po/pocketsphinx/package.nix
Normal file
66
pkgs/by-name/po/pocketsphinx/package.nix
Normal file
@ -0,0 +1,66 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
cmake,
|
||||
doxygen,
|
||||
fetchFromGitHub,
|
||||
gitUpdater,
|
||||
graphviz,
|
||||
gst_all_1,
|
||||
pkg-config,
|
||||
testers,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "pocketsphinx";
|
||||
version = "5.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cmusphinx";
|
||||
repo = "pocketsphinx";
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
hash = "sha256-aCQpRmGHX08rA8UIt6Xf37XM34HysEzvcucLhL355k8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
doxygen
|
||||
graphviz
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [ gst_all_1.gstreamer ];
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
|
||||
(lib.cmakeBool "BUILD_GSTREAMER" true)
|
||||
(lib.cmakeFeature "CMAKE_INSTALL_DATADIR" "${placeholder "data"}/share")
|
||||
];
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"data"
|
||||
"dev"
|
||||
"lib"
|
||||
"man"
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = gitUpdater { rev-prefix = "v"; };
|
||||
tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Small speech recognizer";
|
||||
homepage = "https://github.com/cmusphinx/pocketsphinx";
|
||||
changelog = "https://github.com/cmusphinx/pocketsphinx/blob/v${finalAttrs.version}/NEWS";
|
||||
license = with licenses; [
|
||||
bsd2
|
||||
bsd3
|
||||
mit
|
||||
];
|
||||
pkgConfigModules = [ "pocketsphinx" ];
|
||||
mainProgram = "pocketsphinx";
|
||||
maintainers = with maintainers; [ jopejoe1 ];
|
||||
};
|
||||
})
|
34
pkgs/by-name/pr/prometheus-klipper-exporter/package.nix
Normal file
34
pkgs/by-name/pr/prometheus-klipper-exporter/package.nix
Normal file
@ -0,0 +1,34 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
nixosTests,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "prometheus-klipper-exporter";
|
||||
version = "0.11.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "scross01";
|
||||
repo = "prometheus-klipper-exporter";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ow7bzgaY4pYccslITlkNBKfZBJv9uwPk25I1Y3bnjbU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-0nbLHZ2WMLMK0zKZuUYz355K01Xspn9svmlFCtQjed0=";
|
||||
|
||||
doCheck = true;
|
||||
|
||||
passthru.tests = {
|
||||
inherit (nixosTests.prometheus-exporters) process;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = " Prometheus Exporter for Klipper ";
|
||||
homepage = "https://github.com/scross01/prometheus-klipper-exporter";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ wulfsta ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "trickest-cli";
|
||||
version = "1.8.2";
|
||||
version = "1.8.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "trickest";
|
||||
repo = "trickest-cli";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-X7JGzTaTm7CE5+mTvnV93d5Hx2A1vF+aufmC5/xWRtc=";
|
||||
hash = "sha256-9RZmLs95dHZw5hgob5+iogxb6DV0FqVaY+PavGFpXj4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-gk8YMMvTHBL7yoXU9n0jhtUS472fqLW5m+mSl4Lio6c=";
|
||||
|
@ -2,17 +2,17 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "vacuum-go";
|
||||
version = "0.12.1";
|
||||
version = "0.14.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "daveshanley";
|
||||
repo = "vacuum";
|
||||
# using refs/tags because simple version gives: 'the given path has multiple possibilities' error
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-uNmjb1fj9bMawvNgITxu/RIZeLEn8JzIpFbSMrsmFIQ=";
|
||||
hash = "sha256-t/KbwyxInMvxsICdh0kix27+MKre480+I/KkbwxLg1M=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Yxzj3IAYp6C7qLbV2RV4lWZRDSheauZXvd+p5B5Y3qA=";
|
||||
vendorHash = "sha256-6ay7aGFf50txrRZbjOuG2rVeetVo0SWgpURLmFyhszA=";
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
ldflags = [
|
||||
|
@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "xeol";
|
||||
version = "0.10.0";
|
||||
version = "0.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xeol-io";
|
||||
repo = "xeol";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-5QlHfchVRFNpU/sBTS9AWOENU86jBatF6KI97NoJa50=";
|
||||
hash = "sha256-4fMH07XKMnpX54mS9pAuTBiHcP6nXj8vpuk3f/3ik+k=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-MLNUmJOpgKkIe5NUWYMA5avVvt6QLit0i4hpoaadcrs=";
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libmodbus";
|
||||
version = "3.1.10";
|
||||
version = "3.1.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stephane";
|
||||
repo = "libmodbus";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-e2lB5D41a5MOmz9M90ZXfIltSOxNDOrQUpRNU2yYd1k=";
|
||||
hash = "sha256-d/diR9yeV0WY0C6wqxYZfOjEKFeWTvN73MxcWtXPOJc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
@ -1,38 +1,41 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
stdenv,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
|
||||
# build-system
|
||||
poetry-core,
|
||||
|
||||
# dependencies
|
||||
scikit-learn,
|
||||
numpy,
|
||||
scipy,
|
||||
colorama,
|
||||
|
||||
# tests
|
||||
jupyter,
|
||||
matplotlib,
|
||||
nbconvert,
|
||||
nbformat,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bayesian-optimization";
|
||||
version = "1.5.1";
|
||||
version = "2.0.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bayesian-optimization";
|
||||
repo = "BayesianOptimization";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-pDgvdQhlJ5aMRGdi2qXRXVCdJRvrOP/Nr0SSZyHH1WM=";
|
||||
hash = "sha256-XAO+UeHsOFAmUXqzMY/Iws1E738ZnU4Wz7E4YNIeGKY=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
scikit-learn
|
||||
numpy
|
||||
scipy
|
||||
@ -49,14 +52,13 @@ buildPythonPackage rec {
|
||||
|
||||
pythonImportsCheck = [ "bayes_opt" ];
|
||||
|
||||
meta = with lib; {
|
||||
broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64;
|
||||
description = ''
|
||||
A Python implementation of global optimization with gaussian processes
|
||||
'';
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
meta = {
|
||||
description = "Python implementation of global optimization with gaussian processes";
|
||||
homepage = "https://github.com/bayesian-optimization/BayesianOptimization";
|
||||
changelog = "https://github.com/bayesian-optimization/BayesianOptimization/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.juliendehos ];
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.juliendehos ];
|
||||
};
|
||||
}
|
||||
|
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "clarifai-grpc";
|
||||
version = "10.8.7";
|
||||
version = "10.9.10";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "Clarifai";
|
||||
repo = "clarifai-python-grpc";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-En4zOSIOK+1JGmG6UhGieb4lM/q6akl7xF0s/64ocPg=";
|
||||
hash = "sha256-XJqbZicRQCiykdXn2R8tOzWPbtrso9IwZYpcTcY7vio=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
57
pkgs/development/python-modules/pocketsphinx/default.nix
Normal file
57
pkgs/development/python-modules/pocketsphinx/default.nix
Normal file
@ -0,0 +1,57 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildPythonPackage,
|
||||
cmake,
|
||||
cython,
|
||||
fetchFromGitHub,
|
||||
memory-profiler,
|
||||
ninja,
|
||||
pathspec,
|
||||
pocketsphinx,
|
||||
pytestCheckHook,
|
||||
scikit-build,
|
||||
scikit-build-core,
|
||||
sounddevice,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
inherit (pocketsphinx) version src;
|
||||
pname = "pocketsphinx";
|
||||
pyproject = true;
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
env.CMAKE_ARGS = lib.cmakeBool "USE_INSTALLED_POCKETSPHINX" true;
|
||||
|
||||
buildInputs = [ pocketsphinx ];
|
||||
|
||||
build-system = [
|
||||
cmake
|
||||
cython
|
||||
ninja
|
||||
pathspec
|
||||
scikit-build-core
|
||||
];
|
||||
|
||||
dependencies = [ sounddevice ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
memory-profiler
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "pocketsphinx" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Small speech recognizer";
|
||||
homepage = "https://github.com/cmusphinx/pocketsphinx";
|
||||
changelog = "https://github.com/cmusphinx/pocketsphinx/blob/v${version}/NEWS";
|
||||
license = with licenses; [
|
||||
bsd2
|
||||
bsd3
|
||||
mit
|
||||
];
|
||||
maintainers = with maintainers; [ jopejoe1 ];
|
||||
};
|
||||
}
|
@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pylutron";
|
||||
version = "0.2.15";
|
||||
version = "0.2.16";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-1UUW3Ym11jR4dxSS1OOVPl6h69I6H782Q4ZeVitty0c=";
|
||||
hash = "sha256-SuG5x8GWTsCOve3jj1hrtsm37yNRHVFuFjapQafHTbA=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
@ -12,16 +12,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "securityreporter";
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
disabled = pythonOlder "3.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dongit-org";
|
||||
repo = "python-reporter";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Ddq1qjaQemawK+u3ArlsChrkzRbcuaj5LrswyTGwTrg=";
|
||||
hash = "sha256-fpsvjbPE6iaOmLxykGSkCjkhFTmb8xhXa8pDrWN66KM=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
@ -2,10 +2,13 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
numpy,
|
||||
flac,
|
||||
openai,
|
||||
openai-whisper,
|
||||
pocketsphinx,
|
||||
pyaudio,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
torch,
|
||||
requests,
|
||||
setuptools,
|
||||
soundfile,
|
||||
@ -26,29 +29,41 @@ buildPythonPackage rec {
|
||||
hash = "sha256-icXZUg2lVLo8Z5t9ptDj67BjQLnEgrG8geYZ/lZeJt4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# Remove Bundled binaries
|
||||
rm speech_recognition/flac-*
|
||||
rm -r third-party
|
||||
|
||||
substituteInPlace speech_recognition/audio.py \
|
||||
--replace-fail 'shutil_which("flac")' '"${lib.getExe flac}"'
|
||||
'';
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
pyaudio
|
||||
requests
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
optional-dependencies = {
|
||||
whisper-api = [ openai ];
|
||||
whisper-local = [
|
||||
openai-whisper
|
||||
soundfile
|
||||
];
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
numpy
|
||||
pytestCheckHook
|
||||
torch
|
||||
soundfile
|
||||
];
|
||||
pocketsphinx
|
||||
] ++ optional-dependencies.whisper-local ++ optional-dependencies.whisper-api;
|
||||
|
||||
pythonImportsCheck = [ "speech_recognition" ];
|
||||
|
||||
disabledTests = [
|
||||
# Test files are missing in source
|
||||
"test_flac"
|
||||
# Attribute error
|
||||
"test_whisper"
|
||||
# PocketSphinx is not available in Nixpkgs
|
||||
"test_sphinx"
|
||||
# Parsed string does not match expected
|
||||
"test_sphinx_keywords"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
@ -156,7 +156,7 @@ buildPythonApplication rec {
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
inherit withPlugins;
|
||||
inherit withPlugins python;
|
||||
updateScript = ./update.sh;
|
||||
} // lib.optionalAttrs stdenv.hostPlatform.isLinux {
|
||||
tests = {
|
||||
|
@ -67,6 +67,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Small single “window” launcher for the WebKit WPE port";
|
||||
homepage = "https://github.com/Igalia/cog";
|
||||
mainProgram = "cog";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.matthewbauer ];
|
||||
platforms = platforms.linux;
|
||||
|
@ -8,13 +8,13 @@
|
||||
buildHomeAssistantComponent rec {
|
||||
owner = "wills106";
|
||||
domain = "solax_modbus";
|
||||
version = "2024.10.3";
|
||||
version = "2024.10.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wills106";
|
||||
repo = "homeassistant-solax-modbus";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-6XLXCD7ItTGCRN9XQUetZfZBuMbFEmho6IOyFs4m0ek=";
|
||||
hash = "sha256-EeFDUxZ7/W5Ng+d56mOCeRntga0uU55OQsaPWzM/bcY=";
|
||||
};
|
||||
|
||||
dependencies = [ pymodbus ];
|
||||
|
946
pkgs/shells/ion/Cargo.lock
generated
946
pkgs/shells/ion/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -1,17 +1,17 @@
|
||||
diff --git a/build.rs b/build.rs
|
||||
index 9a32b7a2..77bc41bc 100644
|
||||
--- a/build.rs
|
||||
+++ b/build.rs
|
||||
@@ -23,13 +23,7 @@ fn write_version_file() -> io::Result<()> {
|
||||
let target = env::var("TARGET").unwrap();
|
||||
let version_fname = Path::new(&env::var("OUT_DIR").unwrap()).join("version_string");
|
||||
@@ -25,10 +25,9 @@ fn write_version_file() -> io::Result<()> {
|
||||
let mut version_file = File::create(&version_fname)?;
|
||||
- write!(
|
||||
- &mut version_file,
|
||||
write!(
|
||||
&mut version_file,
|
||||
- "r#\"ion {} ({})\nrev {}\"#",
|
||||
- version,
|
||||
+ "r#\"ion {} ({})\nrev \"#",
|
||||
version,
|
||||
- target,
|
||||
- get_git_rev()?.trim()
|
||||
- )?;
|
||||
+ write!(&mut version_file, "r#\"ion {version} ({target})\n\"#")?;
|
||||
+ target
|
||||
)?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
}
|
@ -1,31 +1,29 @@
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, stdenv
|
||||
, darwin
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitLab
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "ion";
|
||||
version = "unstable-2022-11-27";
|
||||
version = "unstable-2024-09-20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.redox-os.org";
|
||||
owner = "redox-os";
|
||||
repo = "ion";
|
||||
rev = "3bb8966fc99ba223033e1e02b0a6d50fc25cbef4";
|
||||
sha256 = "sha256-6KW/YkMQFeGb1i+1YdADZRW89UruHsfPhMq9Cvxjl/4=";
|
||||
rev = "8acd140eeec76cd5efbd36f9ea8425763200a76b";
|
||||
hash = "sha256-jiJ5XW7S6/pVEOPYJKurolLI3UrOyuaEP/cqm1a0rIU=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"calculate-0.7.0" = "sha256-wUmi8XLgEMgECeaCM0r1KxJ+oTd47QozgFBANKSwt24=";
|
||||
"decimal-2.1.0" = "sha256-s5mDRCkaDBUdaywYEJzTfe7qH25sG5UUo5iVmPE+zrw=";
|
||||
"calculate-0.7.0" = "sha256-3CI+7TZeW1sk6pBigxESK/E7G+G1/MniVIn4sqfk7+w=";
|
||||
"nix-0.23.1" = "sha256-yWJYrQt9piJHhqBkH/hn9dsXR8oqzl0RKPrzx9fvqlw=";
|
||||
"object-pool-0.5.3" = "sha256-LWP0b62sk2dcqnQEEvLmZVvWSVLJ722yH/zIIPL93W4=";
|
||||
"redox_liner-0.5.1" = "sha256-OT9E4AwQgm5NngcCtcno1VKhkS4d8Eq/l+8aYHvXtTY=";
|
||||
"redox_liner-0.5.2" = "sha256-ZjVLACkyOT6jVRWyMj0ixJwCv6IjllCLHNTERlncIpk=";
|
||||
"small-0.1.0" = "sha256-QIzEfFc0EDEllf+YxVyV7j/PvC7nVWiK0YYBoZBQZ3Q=";
|
||||
"termion-1.5.6" = "sha256-NTY/2SbqkSyslnN5Xg6lrQ0MTrOhTMHqN+XXqN6Nkr8=";
|
||||
};
|
||||
};
|
||||
|
||||
@ -34,24 +32,16 @@ rustPlatform.buildRustPackage rec {
|
||||
./build-script.patch
|
||||
];
|
||||
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
];
|
||||
|
||||
checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# test assumes linux
|
||||
"--skip=binary::completer::tests::filename_completion"
|
||||
];
|
||||
|
||||
passthru = {
|
||||
shellPath = "/bin/ion";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Modern system shell with simple (and powerful) syntax";
|
||||
mainProgram = "ion";
|
||||
homepage = "https://gitlab.redox-os.org/redox-os/ion";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ dywedir ];
|
||||
maintainers = with maintainers; [dywedir arthsmn];
|
||||
mainProgram = "ion";
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
@ -1,28 +1,28 @@
|
||||
{ lib
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
{
|
||||
lib,
|
||||
python3,
|
||||
python3Packages,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
}:
|
||||
let
|
||||
pname = "whisper-ctranslate2";
|
||||
version = "0.4.5";
|
||||
version = "0.4.6";
|
||||
in
|
||||
python3.pkgs.buildPythonApplication {
|
||||
python3Packages.buildPythonApplication {
|
||||
inherit pname version;
|
||||
pyproject = true;
|
||||
|
||||
disabled = python3.pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Softcatala";
|
||||
repo = "whisper-ctranslate2";
|
||||
rev = version;
|
||||
hash = "sha256-hnotnEpw+5hVWVKknZHqiBSeDWy9XEjL3ojQD2ZXbAM=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-sIkZIzSGqPbjg9BMkcciGFr024Pd8ohXl/NdbsxhjH0=";
|
||||
};
|
||||
|
||||
build-system = [ python3.pkgs.setuptools ];
|
||||
build-system = [ python3Packages.setuptools ];
|
||||
|
||||
dependencies = with python3.pkgs; [
|
||||
dependencies = with python3Packages; [
|
||||
ctranslate2
|
||||
faster-whisper
|
||||
numpy
|
||||
@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication {
|
||||
tqdm
|
||||
];
|
||||
|
||||
nativeCheckInputs = with python3.pkgs; [
|
||||
nativeCheckInputs = with python3Packages; [
|
||||
nose2
|
||||
];
|
||||
|
||||
@ -44,12 +44,12 @@ python3.pkgs.buildPythonApplication {
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Whisper command line client compatible with original OpenAI client based on CTranslate2";
|
||||
homepage = "https://github.com/Softcatala/whisper-ctranslate2";
|
||||
changelog = "https://github.com/Softcatala/whisper-ctranslate2/releases/tag/${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ happysalada ];
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ happysalada ];
|
||||
mainProgram = "whisper-ctranslate2";
|
||||
};
|
||||
}
|
||||
|
@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
|
||||
version = "0.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://maxwell.ydns.eu/git/rnhmjoj/fakeroute/releases/download/v${version}/fakeroute-${version}.tar.gz";
|
||||
url = "https://maxwell.eurofusion.eu/git/rnhmjoj/fakeroute/releases/download/v${version}/fakeroute-${version}.tar.gz";
|
||||
hash = "sha256-DoXGJm8vOlAD6ZuvVAt6bkgfahc8WgyYIXCrgqzfiWg=";
|
||||
};
|
||||
|
||||
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
||||
description = ''
|
||||
Make your machine appears to be anywhere on the internet in a traceroute
|
||||
'';
|
||||
homepage = "https://maxwell.ydns.eu/git/rnhmjoj/fakeroute";
|
||||
homepage = "https://maxwell.eurofusion.eu/git/rnhmjoj/fakeroute";
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.linux;
|
||||
mainProgram = "fakeroute";
|
||||
|
@ -6,18 +6,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cnspec";
|
||||
version = "11.26.0";
|
||||
version = "11.27.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mondoohq";
|
||||
repo = "cnspec";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-dbcTQuaUiVDcPKkYt10CJYHEleNqji1yEE8jEBBJtpg=";
|
||||
hash = "sha256-6B+OiIX/9NkbroOhM4zNbWoKDbequS1sBk6QNlVEG1I=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
vendorHash = "sha256-lG+PssQh/Cyp6Qgibm/OcJqnVecKERJNVLzKscIFnGo=";
|
||||
vendorHash = "sha256-RjJ/UN0EvKTzR7XazRLStIht6wR0X7XIUDghMzRqEX4=";
|
||||
|
||||
subPackages = [ "apps/cnspec" ];
|
||||
|
||||
|
@ -21028,10 +21028,6 @@ with pkgs;
|
||||
|
||||
libhugetlbfs = callPackage ../development/libraries/libhugetlbfs { };
|
||||
|
||||
libhv = callPackage ../development/libraries/libhv {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
libhwy = callPackage ../development/libraries/libhwy { };
|
||||
|
||||
libHX = callPackage ../development/libraries/libHX { };
|
||||
@ -37145,8 +37141,6 @@ with pkgs;
|
||||
|
||||
hck = callPackage ../tools/text/hck { };
|
||||
|
||||
helm = callPackage ../applications/audio/helm { };
|
||||
|
||||
helmfile = callPackage ../applications/networking/cluster/helmfile { };
|
||||
|
||||
helmfile-wrapped = callPackage ../applications/networking/cluster/helmfile {
|
||||
|
@ -10563,6 +10563,10 @@ self: super: with self; {
|
||||
|
||||
pocket = callPackage ../development/python-modules/pocket { };
|
||||
|
||||
pocketsphinx = callPackage ../development/python-modules/pocketsphinx {
|
||||
inherit (pkgs) pocketsphinx;
|
||||
};
|
||||
|
||||
podcastparser = callPackage ../development/python-modules/podcastparser { };
|
||||
|
||||
podcats = callPackage ../development/python-modules/podcats { };
|
||||
|
Loading…
Reference in New Issue
Block a user